@matheusbsbs / matheus-bagliano / commits / 9c11578b00

gitk: Update .po files

Signed-off-by: Paul Mackerras <paulus@samba.org>

Paul Mackerras committed May 17, 2015 at 14:33 UTC 9c11578b00732e4cdb1398c49a3615fd187cfc40
12 files changed +3583 -3403
po/bg.po
+298 -279
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk master\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-04-07 07:49+0300\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2015-04-07 07:54+0300\n"
13 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
14 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -26,7 +26,7 @@ msgstr "Списъкът с неслети файлове не може да б
26 msgid "Color words"
27 msgstr "Оцветяване на думите"
28
29 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
30 msgid "Markup words"
31 msgstr "Отбелязване на думите"
32
@@ -59,14 +59,18 @@ msgstr "Грешка при изпълнение на „git log“:"
59 msgid "Reading"
60 msgstr "Прочитане"
61
62 -#: gitk:496 gitk:4508
62 +#: gitk:496 gitk:4525
63 msgid "Reading commits..."
64 msgstr "Прочитане на подаванията…"
65
66 -#: gitk:499 gitk:1637 gitk:4511
66 +#: gitk:499 gitk:1637 gitk:4528
67 msgid "No commits selected"
68 msgstr "Не са избрани подавания"
69
70 +#: gitk:1445 gitk:4045 gitk:12432
71 +msgid "Command line"
72 +msgstr "Команден ред"
73 +
74 #: gitk:1511
75 msgid "Can't parse git log output:"
76 msgstr "Изходът от „git log“ не може да се анализира:"
@@ -75,16 +79,12 @@ msgstr "Изходът от „git log“ не може да се анализи
79 msgid "No commit information available"
80 msgstr "Липсва информация за подавания"
81
78 -#: gitk:1897
79 -msgid "mc"
80 -msgstr "mc"
81 -
82 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
82 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
83 msgid "OK"
84 msgstr "Добре"
85
86 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
87 -#: gitk:11221 gitk:11501
86 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
87 +#: gitk:11242 gitk:11522
88 msgid "Cancel"
89 msgstr "Отказ"
90
@@ -136,15 +136,15 @@ msgstr "Редактиране на изгледа…"
136 msgid "Delete view"
137 msgstr "Изтриване на изгледа"
138
139 -#: gitk:2088
139 +#: gitk:2088 gitk:4043
140 msgid "All files"
141 msgstr "Всички файлове"
142
143 -#: gitk:2083 gitk:4050
143 +#: gitk:2083 gitk:4067
144 msgid "View"
145 msgstr "Изглед"
146
147 -#: gitk:2093 gitk:2103 gitk:3009
147 +#: gitk:2093 gitk:2103 gitk:3012
148 msgid "About gitk"
149 msgstr "Относно gitk"
150
@@ -156,7 +156,7 @@ msgstr "Клавишни комбинации"
156 msgid "Help"
157 msgstr "Помощ"
158
159 -#: gitk:2185 gitk:8633
159 +#: gitk:2185 gitk:8652
160 msgid "SHA1 ID:"
161 msgstr "SHA1:"
162
@@ -172,53 +172,53 @@ msgstr "Търсене"
172 msgid "commit"
173 msgstr "подаване"
174
175 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
176 -#: gitk:6893
175 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
176 +#: gitk:6912
177 msgid "containing:"
178 msgstr "съдържащо:"
179
180 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
180 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
181 msgid "touching paths:"
182 msgstr "засягащо пътищата:"
183
184 -#: gitk:2303 gitk:4759
184 +#: gitk:2303 gitk:4777
185 msgid "adding/removing string:"
186 msgstr "добавящо/премахващо низ"
187
188 -#: gitk:2304 gitk:4761
188 +#: gitk:2304 gitk:4779
189 msgid "changing lines matching:"
190 msgstr "променящо редове напасващи:"
191
192 -#: gitk:2313 gitk:2315 gitk:4748
192 +#: gitk:2313 gitk:2315 gitk:4766
193 msgid "Exact"
194 msgstr "Точно"
195
196 -#: gitk:2315 gitk:4836 gitk:6704
196 +#: gitk:2315 gitk:4854 gitk:6723
197 msgid "IgnCase"
198 msgstr "Без регистър"
199
200 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
200 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
201 msgid "Regexp"
202 msgstr "Рег. израз"
203
204 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
204 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
205 msgid "All fields"
206 msgstr "Всички полета"
207
208 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
208 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
209 msgid "Headline"
210 msgstr "Първи ред"
211
212 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
212 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
213 msgid "Comments"
214 msgstr "Коментари"
215
216 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
217 -#: gitk:8826
216 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
217 +#: gitk:8845
218 msgid "Author"
219 msgstr "Автор"
220
221 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
221 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
222 msgid "Committer"
223 msgstr "Подаващ"
224
@@ -246,7 +246,7 @@ msgstr "Контекст в редове"
246 msgid "Ignore space change"
247 msgstr "Празните знаци без значение"
248
249 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
249 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
250 msgid "Line diff"
251 msgstr "Поредови разлики"
252
@@ -258,99 +258,107 @@ msgstr "Кръпка"
258 msgid "Tree"
259 msgstr "Дърво"
260
261 -#: gitk:2616 gitk:2636
261 +#: gitk:2617 gitk:2637
262 msgid "Diff this -> selected"
263 msgstr "Разлики между това и избраното"
264
265 -#: gitk:2617 gitk:2637
265 +#: gitk:2618 gitk:2638
266 msgid "Diff selected -> this"
267 msgstr "Разлики между избраното и това"
268
269 -#: gitk:2618 gitk:2638
269 +#: gitk:2619 gitk:2639
270 msgid "Make patch"
271 msgstr "Създаване на кръпка"
272
273 -#: gitk:2619 gitk:9235
273 +#: gitk:2620 gitk:9254
274 msgid "Create tag"
275 msgstr "Създаване на етикет"
276
277 -#: gitk:2620 gitk:9352
277 +#: gitk:2621 gitk:9371
278 msgid "Write commit to file"
279 msgstr "Запазване на подаването във файл"
280
281 -#: gitk:2621 gitk:9409
281 +#: gitk:2622 gitk:9428
282 msgid "Create new branch"
283 msgstr "Създаване на нов клон"
284
285 -#: gitk:2622
285 +#: gitk:2623
286 msgid "Cherry-pick this commit"
287 msgstr "Отбиране на това подаване"
288
289 -#: gitk:2623
289 +#: gitk:2624
290 msgid "Reset HEAD branch to here"
291 msgstr "Привеждане на върха на клона към текущото подаване"
292
293 -#: gitk:2624
293 +#: gitk:2625
294 msgid "Mark this commit"
295 msgstr "Отбелязване на това подаване"
296
297 -#: gitk:2625
297 +#: gitk:2626
298 msgid "Return to mark"
299 msgstr "Връщане към отбелязаното подаване"
300
301 -#: gitk:2626
301 +#: gitk:2627
302 msgid "Find descendant of this and mark"
303 msgstr "Откриване и отбелязване на наследниците"
304
305 -#: gitk:2627
305 +#: gitk:2628
306 msgid "Compare with marked commit"
307 msgstr "Сравнение с отбелязаното подаване"
308
309 -#: gitk:2628 gitk:2639
309 +#: gitk:2629 gitk:2640
310 msgid "Diff this -> marked commit"
311 msgstr "Разлики между това и отбелязаното"
312
313 -#: gitk:2629 gitk:2640
313 +#: gitk:2630 gitk:2641
314 msgid "Diff marked commit -> this"
315 msgstr "Разлики между отбелязаното и това"
316
317 -#: gitk:2630
317 +#: gitk:2631
318 msgid "Revert this commit"
319 msgstr "Отмяна на това подаване"
320
321 -#: gitk:2646
321 +#: gitk:2647
322 msgid "Check out this branch"
323 msgstr "Изтегляне на този клон"
324
325 -#: gitk:2647
325 +#: gitk:2648
326 msgid "Remove this branch"
327 msgstr "Изтриване на този клон"
328
329 -#: gitk:2654
329 +#: gitk:2649
330 +msgid "Copy branch name"
331 +msgstr ""
332 +
333 +#: gitk:2656
334 msgid "Highlight this too"
335 msgstr "Отбелязване и на това"
336
333 -#: gitk:2655
337 +#: gitk:2657
338 msgid "Highlight this only"
339 msgstr "Отбелязване само на това"
340
337 -#: gitk:2656
341 +#: gitk:2658
342 msgid "External diff"
343 msgstr "Външна програма за разлики"
344
341 -#: gitk:2657
345 +#: gitk:2659
346 msgid "Blame parent commit"
347 msgstr "Анотиране на родителското подаване"
348
345 -#: gitk:2664
349 +#: gitk:2660
350 +msgid "Copy path"
351 +msgstr ""
352 +
353 +#: gitk:2667
354 msgid "Show origin of this line"
355 msgstr "Показване на произхода на този ред"
356
349 -#: gitk:2665
357 +#: gitk:2668
358 msgid "Run git gui blame on this line"
359 msgstr "Изпълнение на „git gui blame“ върху този ред"
360
353 -#: gitk:3011
361 +#: gitk:3014
362 msgid ""
363 "\n"
364 "Gitk - a commit viewer for git\n"
@@ -366,312 +374,318 @@ msgstr ""
374 "\n"
375 "Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
376
369 -#: gitk:3019 gitk:3085 gitk:9836
377 +#: gitk:3022 gitk:3089 gitk:9857
378 msgid "Close"
379 msgstr "Затваряне"
380
373 -#: gitk:3040
381 +#: gitk:3043
382 msgid "Gitk key bindings"
383 msgstr "Клавишни комбинации"
384
377 -#: gitk:3043
385 +#: gitk:3046
386 msgid "Gitk key bindings:"
387 msgstr "Клавишни комбинации:"
388
381 -#: gitk:3045
389 +#: gitk:3048
390 #, tcl-format
391 msgid "<%s-Q>\t\tQuit"
392 msgstr "<%s-Q>\t\tСпиране на програмата"
393
386 -#: gitk:3046
394 +#: gitk:3049
395 #, tcl-format
396 msgid "<%s-W>\t\tClose window"
397 msgstr "<%s-W>\t\tЗатваряне на прозореца"
398
391 -#: gitk:3047
399 +#: gitk:3050
400 msgid "<Home>\t\tMove to first commit"
401 msgstr "<Home>\t\tКъм първото подаване"
402
395 -#: gitk:3048
403 +#: gitk:3051
404 msgid "<End>\t\tMove to last commit"
405 msgstr "<End>\t\tКъм последното подаване"
406
399 -#: gitk:3049
407 +#: gitk:3052
408 msgid "<Up>, p, k\tMove up one commit"
409 msgstr "<Up>, p, k\tЕдно подаване нагоре"
410
403 -#: gitk:3050
411 +#: gitk:3053
412 msgid "<Down>, n, j\tMove down one commit"
413 msgstr "<Down>, n, j\tЕдно подаване надолу"
414
407 -#: gitk:3051
415 +#: gitk:3054
416 msgid "<Left>, z, h\tGo back in history list"
417 msgstr "<Left>, z, h\tНазад в историята"
418
411 -#: gitk:3052
419 +#: gitk:3055
420 msgid "<Right>, x, l\tGo forward in history list"
421 msgstr "<Right>, x, l\tНапред в историята"
422
415 -#: gitk:3053
423 +#: gitk:3056
424 #, tcl-format
425 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
426 msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята"
427
420 -#: gitk:3054
428 +#: gitk:3057
429 msgid "<PageUp>\tMove up one page in commit list"
430 msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
431
424 -#: gitk:3055
432 +#: gitk:3058
433 msgid "<PageDown>\tMove down one page in commit list"
434 msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
435
428 -#: gitk:3056
436 +#: gitk:3059
437 #, tcl-format
438 msgid "<%s-Home>\tScroll to top of commit list"
439 msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
440
433 -#: gitk:3057
441 +#: gitk:3060
442 #, tcl-format
443 msgid "<%s-End>\tScroll to bottom of commit list"
444 msgstr "<%s-End>\tКъм края на списъка с подаванията"
445
438 -#: gitk:3058
446 +#: gitk:3061
447 #, tcl-format
448 msgid "<%s-Up>\tScroll commit list up one line"
449 msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
450
443 -#: gitk:3059
451 +#: gitk:3062
452 #, tcl-format
453 msgid "<%s-Down>\tScroll commit list down one line"
454 msgstr "<%s-Down>\tРед надолу в списъка с подавания"
455
448 -#: gitk:3060
456 +#: gitk:3063
457 #, tcl-format
458 msgid "<%s-PageUp>\tScroll commit list up one page"
459 msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
460
453 -#: gitk:3061
461 +#: gitk:3064
462 #, tcl-format
463 msgid "<%s-PageDown>\tScroll commit list down one page"
464 msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
465
458 -#: gitk:3062
466 +#: gitk:3065
467 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
468 msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
469
462 -#: gitk:3063
470 +#: gitk:3066
471 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
472 msgstr ""
473 "<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
474
467 -#: gitk:3064
475 +#: gitk:3067
476 msgid "<Delete>, b\tScroll diff view up one page"
477 msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
478
471 -#: gitk:3065
479 +#: gitk:3068
480 msgid "<Backspace>\tScroll diff view up one page"
481 msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
482
475 -#: gitk:3066
483 +#: gitk:3069
484 msgid "<Space>\t\tScroll diff view down one page"
485 msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
486
479 -#: gitk:3067
487 +#: gitk:3070
488 msgid "u\t\tScroll diff view up 18 lines"
489 msgstr "u\t\t18 реда нагоре в изгледа за разлики"
490
483 -#: gitk:3068
491 +#: gitk:3071
492 msgid "d\t\tScroll diff view down 18 lines"
493 msgstr "d\t\t18 реда надолу в изгледа за разлики"
494
487 -#: gitk:3069
495 +#: gitk:3072
496 #, tcl-format
497 msgid "<%s-F>\t\tFind"
498 msgstr "<%s-F>\t\tТърсене"
499
492 -#: gitk:3070
500 +#: gitk:3073
501 #, tcl-format
502 msgid "<%s-G>\t\tMove to next find hit"
503 msgstr "<%s-G>\t\tКъм следващата поява"
504
497 -#: gitk:3071
505 +#: gitk:3074
506 msgid "<Return>\tMove to next find hit"
507 msgstr "<Return>\tКъм следващата поява"
508
501 -#: gitk:3072
509 +#: gitk:3075
510 +#, fuzzy
511 +msgid "g\t\tGo to commit"
512 +msgstr "<End>\t\tКъм последното подаване"
513 +
514 +#: gitk:3076
515 msgid "/\t\tFocus the search box"
516 msgstr "/\t\tФокус върху полето за търсене"
517
505 -#: gitk:3073
518 +#: gitk:3077
519 msgid "?\t\tMove to previous find hit"
520 msgstr "?\t\tКъм предишната поява"
521
509 -#: gitk:3074
522 +#: gitk:3078
523 msgid "f\t\tScroll diff view to next file"
524 msgstr "f\t\tСледващ файл в изгледа за разлики"
525
513 -#: gitk:3075
526 +#: gitk:3079
527 #, tcl-format
528 msgid "<%s-S>\t\tSearch for next hit in diff view"
529 msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
530
518 -#: gitk:3076
531 +#: gitk:3080
532 #, tcl-format
533 msgid "<%s-R>\t\tSearch for previous hit in diff view"
534 msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
535
523 -#: gitk:3077
536 +#: gitk:3081
537 #, tcl-format
538 msgid "<%s-KP+>\tIncrease font size"
539 msgstr "<%s-KP+>\tПо-голям размер на шрифта"
540
528 -#: gitk:3078
541 +#: gitk:3082
542 #, tcl-format
543 msgid "<%s-plus>\tIncrease font size"
544 msgstr "<%s-plus>\tПо-голям размер на шрифта"
545
533 -#: gitk:3079
546 +#: gitk:3083
547 #, tcl-format
548 msgid "<%s-KP->\tDecrease font size"
549 msgstr "<%s-KP->\tПо-малък размер на шрифта"
550
538 -#: gitk:3080
551 +#: gitk:3084
552 #, tcl-format
553 msgid "<%s-minus>\tDecrease font size"
554 msgstr "<%s-minus>\tПо-малък размер на шрифта"
555
543 -#: gitk:3081
556 +#: gitk:3085
557 msgid "<F5>\t\tUpdate"
558 msgstr "<F5>\t\tОбновяване"
559
547 -#: gitk:3546 gitk:3555
560 +#: gitk:3550 gitk:3559
561 #, tcl-format
562 msgid "Error creating temporary directory %s:"
563 msgstr "Грешка при създаването на временната директория „%s“:"
564
552 -#: gitk:3568
565 +#: gitk:3572
566 #, tcl-format
567 msgid "Error getting \"%s\" from %s:"
568 msgstr "Грешка при получаването на „%s“ от %s:"
569
557 -#: gitk:3631
570 +#: gitk:3635
571 msgid "command failed:"
572 msgstr "неуспешно изпълнение на команда:"
573
561 -#: gitk:3780
574 +#: gitk:3784
575 msgid "No such commit"
576 msgstr "Такова подаване няма"
577
565 -#: gitk:3794
578 +#: gitk:3798
579 msgid "git gui blame: command failed:"
580 msgstr "„git gui blame“: неуспешно изпълнение на команда:"
581
569 -#: gitk:3825
582 +#: gitk:3829
583 #, tcl-format
584 msgid "Couldn't read merge head: %s"
585 msgstr "Върхът за сливане не може да бъде прочетен: %s"
586
574 -#: gitk:3833
587 +#: gitk:3837
588 #, tcl-format
589 msgid "Error reading index: %s"
590 msgstr "Грешка при прочитане на индекса: %s"
591
579 -#: gitk:3858
592 +#: gitk:3862
593 #, tcl-format
594 msgid "Couldn't start git blame: %s"
595 msgstr "Командата „git blame“ не може да бъде стартирана: %s"
596
584 -#: gitk:3861 gitk:6735
597 +#: gitk:3865 gitk:6754
598 msgid "Searching"
599 msgstr "Търсене"
600
588 -#: gitk:3893
601 +#: gitk:3897
602 #, tcl-format
603 msgid "Error running git blame: %s"
604 msgstr "Грешка при изпълнението на „git blame“: %s"
605
593 -#: gitk:3921
606 +#: gitk:3925
607 #, tcl-format
608 msgid "That line comes from commit %s, which is not in this view"
609 msgstr "Този ред идва от подаването %s, което не е в изгледа"
610
598 -#: gitk:3935
611 +#: gitk:3939
612 msgid "External diff viewer failed:"
613 msgstr "Неуспешно изпълнение на външната програма за разлики:"
614
602 -#: gitk:4053
615 +#: gitk:4070
616 msgid "Gitk view definition"
617 msgstr "Дефиниция на изглед в Gitk"
618
606 -#: gitk:4057
619 +#: gitk:4074
620 msgid "Remember this view"
621 msgstr "Запазване на този изглед"
622
610 -#: gitk:4058
623 +#: gitk:4075
624 msgid "References (space separated list):"
625 msgstr "Указатели (списък с разделител интервал):"
626
614 -#: gitk:4059
627 +#: gitk:4076
628 msgid "Branches & tags:"
629 msgstr "Клони и етикети:"
630
618 -#: gitk:4060
631 +#: gitk:4077
632 msgid "All refs"
633 msgstr "Всички указатели"
634
622 -#: gitk:4061
635 +#: gitk:4078
636 msgid "All (local) branches"
637 msgstr "Всички (локални) клони"
638
626 -#: gitk:4062
639 +#: gitk:4079
640 msgid "All tags"
641 msgstr "Всички етикети"
642
630 -#: gitk:4063
643 +#: gitk:4080
644 msgid "All remote-tracking branches"
645 msgstr "Всички следящи клони"
646
634 -#: gitk:4064
647 +#: gitk:4081
648 msgid "Commit Info (regular expressions):"
649 msgstr "Информация за подаване (рег. изр.):"
650
638 -#: gitk:4065
651 +#: gitk:4082
652 msgid "Author:"
653 msgstr "Автор:"
654
642 -#: gitk:4066
655 +#: gitk:4083
656 msgid "Committer:"
657 msgstr "Подал:"
658
646 -#: gitk:4067
659 +#: gitk:4084
660 msgid "Commit Message:"
661 msgstr "Съобщение при подаване:"
662
650 -#: gitk:4068
663 +#: gitk:4085
664 msgid "Matches all Commit Info criteria"
665 msgstr "Съвпадение по всички характеристики на подаването"
666
654 -#: gitk:4069
655 -msgid "Matches none Commit Info criteria"
667 +#: gitk:4086
668 +#, fuzzy
669 +msgid "Matches no Commit Info criteria"
670 msgstr "Съвпадение по никоя от характеристиките на подаването"
671
658 -#: gitk:4070
672 +#: gitk:4087
673 msgid "Changes to Files:"
674 msgstr "Промени по файловете:"
675
662 -#: gitk:4071
676 +#: gitk:4088
677 msgid "Fixed String"
678 msgstr "Дословен низ"
679
666 -#: gitk:4072
680 +#: gitk:4089
681 msgid "Regular Expression"
682 msgstr "Регулярен израз"
683
670 -#: gitk:4073
684 +#: gitk:4090
685 msgid "Search string:"
686 msgstr "Низ за търсене:"
687
674 -#: gitk:4074
688 +#: gitk:4091
689 msgid ""
690 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
691 "15:27:38\"):"
@@ -679,204 +693,204 @@ msgstr ""
693 "Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
694 "„March 17, 2009 15:27:38“):"
695
682 -#: gitk:4075
696 +#: gitk:4092
697 msgid "Since:"
698 msgstr "От:"
699
686 -#: gitk:4076
700 +#: gitk:4093
701 msgid "Until:"
702 msgstr "До:"
703
690 -#: gitk:4077
704 +#: gitk:4094
705 msgid "Limit and/or skip a number of revisions (positive integer):"
706 msgstr ""
707 "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
708 "число):"
709
696 -#: gitk:4078
710 +#: gitk:4095
711 msgid "Number to show:"
712 msgstr "Брой показани:"
713
700 -#: gitk:4079
714 +#: gitk:4096
715 msgid "Number to skip:"
716 msgstr "Брой прескочени:"
717
704 -#: gitk:4080
718 +#: gitk:4097
719 msgid "Miscellaneous options:"
720 msgstr "Разни:"
721
708 -#: gitk:4081
722 +#: gitk:4098
723 msgid "Strictly sort by date"
724 msgstr "Подреждане по дата"
725
712 -#: gitk:4082
726 +#: gitk:4099
727 msgid "Mark branch sides"
728 msgstr "Отбелязване на страните по клона"
729
716 -#: gitk:4083
730 +#: gitk:4100
731 msgid "Limit to first parent"
732 msgstr "Само първия родител"
733
720 -#: gitk:4084
734 +#: gitk:4101
735 msgid "Simple history"
736 msgstr "Опростена история"
737
724 -#: gitk:4085
738 +#: gitk:4102
739 msgid "Additional arguments to git log:"
740 msgstr "Допълнителни аргументи към „git log“:"
741
728 -#: gitk:4086
742 +#: gitk:4103
743 msgid "Enter files and directories to include, one per line:"
744 msgstr "Въведете файловете и директориите за включване, по елемент на ред"
745
732 -#: gitk:4087
746 +#: gitk:4104
747 msgid "Command to generate more commits to include:"
748 msgstr ""
749 "Команда за генерирането на допълнителни подавания, които да бъдат включени:"
750
737 -#: gitk:4211
751 +#: gitk:4228
752 msgid "Gitk: edit view"
753 msgstr "Gitk: редактиране на изглед"
754
741 -#: gitk:4219
755 +#: gitk:4236
756 msgid "-- criteria for selecting revisions"
757 msgstr "— критерии за избор на версии"
758
745 -#: gitk:4224
759 +#: gitk:4241
760 msgid "View Name"
761 msgstr "Име на изглед"
762
749 -#: gitk:4299
763 +#: gitk:4316
764 msgid "Apply (F5)"
765 msgstr "Прилагане (F5)"
766
753 -#: gitk:4337
767 +#: gitk:4354
768 msgid "Error in commit selection arguments:"
769 msgstr "Грешка в аргументите за избор на подавания:"
770
757 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
771 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
772 msgid "None"
773 msgstr "Няма"
774
761 -#: gitk:5003 gitk:5008
775 +#: gitk:5021 gitk:5026
776 msgid "Descendant"
777 msgstr "Наследник"
778
765 -#: gitk:5004
779 +#: gitk:5022
780 msgid "Not descendant"
781 msgstr "Не е наследник"
782
769 -#: gitk:5011 gitk:5016
783 +#: gitk:5029 gitk:5034
784 msgid "Ancestor"
785 msgstr "Предшественик"
786
773 -#: gitk:5012
787 +#: gitk:5030
788 msgid "Not ancestor"
789 msgstr "Не е предшественик"
790
777 -#: gitk:5306
791 +#: gitk:5324
792 msgid "Local changes checked in to index but not committed"
793 msgstr "Локални промени добавени към индекса, но неподадени"
794
781 -#: gitk:5342
795 +#: gitk:5360
796 msgid "Local uncommitted changes, not checked in to index"
797 msgstr "Локални промени извън индекса"
798
785 -#: gitk:7115
799 +#: gitk:7134
800 msgid "and many more"
801 msgstr "и още много"
802
789 -#: gitk:7118
803 +#: gitk:7137
804 msgid "many"
805 msgstr "много"
806
793 -#: gitk:7309
807 +#: gitk:7328
808 msgid "Tags:"
809 msgstr "Етикети:"
810
797 -#: gitk:7326 gitk:7332 gitk:8806
811 +#: gitk:7345 gitk:7351 gitk:8825
812 msgid "Parent"
813 msgstr "Родител"
814
801 -#: gitk:7337
815 +#: gitk:7356
816 msgid "Child"
817 msgstr "Дете"
818
805 -#: gitk:7346
819 +#: gitk:7365
820 msgid "Branch"
821 msgstr "Клон"
822
809 -#: gitk:7349
823 +#: gitk:7368
824 msgid "Follows"
825 msgstr "Следва"
826
813 -#: gitk:7352
827 +#: gitk:7371
828 msgid "Precedes"
829 msgstr "Предшества"
830
817 -#: gitk:7947
831 +#: gitk:7966
832 #, tcl-format
833 msgid "Error getting diffs: %s"
834 msgstr "Грешка при получаването на разликите: %s"
835
822 -#: gitk:8631
836 +#: gitk:8650
837 msgid "Goto:"
838 msgstr "Към ред:"
839
826 -#: gitk:8652
840 +#: gitk:8671
841 #, tcl-format
842 msgid "Short SHA1 id %s is ambiguous"
843 msgstr "Съкратената сума по SHA1 %s не е еднозначна"
844
831 -#: gitk:8659
845 +#: gitk:8678
846 #, tcl-format
847 msgid "Revision %s is not known"
848 msgstr "Непозната версия %s"
849
836 -#: gitk:8669
850 +#: gitk:8688
851 #, tcl-format
852 msgid "SHA1 id %s is not known"
853 msgstr "Непозната сума по SHA1 %s"
854
841 -#: gitk:8671
855 +#: gitk:8690
856 #, tcl-format
857 msgid "Revision %s is not in the current view"
858 msgstr "Версия %s не е в текущия изглед"
859
846 -#: gitk:8813 gitk:8828
860 +#: gitk:8832 gitk:8847
861 msgid "Date"
862 msgstr "Дата"
863
850 -#: gitk:8816
864 +#: gitk:8835
865 msgid "Children"
866 msgstr "Деца"
867
854 -#: gitk:8879
868 +#: gitk:8898
869 #, tcl-format
870 msgid "Reset %s branch to here"
871 msgstr "Зануляване на клона „%s“ към текущото подаване"
872
859 -#: gitk:8881
873 +#: gitk:8900
874 msgid "Detached head: can't reset"
875 msgstr "Несвързан връх: невъзможно зануляване"
876
863 -#: gitk:8986 gitk:8992
877 +#: gitk:9005 gitk:9011
878 msgid "Skipping merge commit "
879 msgstr "Пропускане на подаването на сливането"
880
867 -#: gitk:9001 gitk:9006
881 +#: gitk:9020 gitk:9025
882 msgid "Error getting patch ID for "
883 msgstr "Грешка при получаването на идентификатора на "
884
871 -#: gitk:9002 gitk:9007
885 +#: gitk:9021 gitk:9026
886 msgid " - stopping\n"
887 msgstr " — спиране\n"
888
875 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
889 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
890 msgid "Commit "
891 msgstr "Подаване"
892
879 -#: gitk:9016
893 +#: gitk:9035
894 msgid ""
895 " is the same patch as\n"
896 " "
@@ -884,7 +898,7 @@ msgstr ""
898 " е същата кръпка като\n"
899 " "
900
887 -#: gitk:9024
901 +#: gitk:9043
902 msgid ""
903 " differs from\n"
904 " "
@@ -892,7 +906,7 @@ msgstr ""
906 " се различава от\n"
907 " "
908
895 -#: gitk:9026
909 +#: gitk:9045
910 msgid ""
911 "Diff of commits:\n"
912 "\n"
@@ -900,130 +914,130 @@ msgstr ""
914 "Разлика между подаванията:\n"
915 "\n"
916
903 -#: gitk:9038 gitk:9047
917 +#: gitk:9057 gitk:9066
918 #, tcl-format
919 msgid " has %s children - stopping\n"
920 msgstr " има %s деца — спиране\n"
921
908 -#: gitk:9066
922 +#: gitk:9085
923 #, tcl-format
924 msgid "Error writing commit to file: %s"
925 msgstr "Грешка при запазването на подаването във файл: %s"
926
913 -#: gitk:9072
927 +#: gitk:9091
928 #, tcl-format
929 msgid "Error diffing commits: %s"
930 msgstr "Грешка при изчисляването на разликите между подаванията: %s"
931
918 -#: gitk:9118
932 +#: gitk:9137
933 msgid "Top"
934 msgstr "Най-горе"
935
922 -#: gitk:9119
936 +#: gitk:9138
937 msgid "From"
938 msgstr "От"
939
926 -#: gitk:9124
940 +#: gitk:9143
941 msgid "To"
942 msgstr "До"
943
930 -#: gitk:9148
944 +#: gitk:9167
945 msgid "Generate patch"
946 msgstr "Генериране на кръпка"
947
934 -#: gitk:9150
948 +#: gitk:9169
949 msgid "From:"
950 msgstr "От:"
951
938 -#: gitk:9159
952 +#: gitk:9178
953 msgid "To:"
954 msgstr "До:"
955
942 -#: gitk:9168
956 +#: gitk:9187
957 msgid "Reverse"
958 msgstr "Обръщане"
959
946 -#: gitk:9170 gitk:9366
960 +#: gitk:9189 gitk:9385
961 msgid "Output file:"
962 msgstr "Запазване във файла:"
963
950 -#: gitk:9176
964 +#: gitk:9195
965 msgid "Generate"
966 msgstr "Генериране"
967
954 -#: gitk:9214
968 +#: gitk:9233
969 msgid "Error creating patch:"
970 msgstr "Грешка при създаването на кръпка:"
971
958 -#: gitk:9237 gitk:9354 gitk:9411
972 +#: gitk:9256 gitk:9373 gitk:9430
973 msgid "ID:"
974 msgstr "Идентификатор:"
975
962 -#: gitk:9246
976 +#: gitk:9265
977 msgid "Tag name:"
978 msgstr "Име на етикет:"
979
966 -#: gitk:9249
980 +#: gitk:9268
981 msgid "Tag message is optional"
982 msgstr "Съобщението за етикет е незадължително"
983
970 -#: gitk:9251
984 +#: gitk:9270
985 msgid "Tag message:"
986 msgstr "Съобщение за етикет:"
987
974 -#: gitk:9255 gitk:9420
988 +#: gitk:9274 gitk:9439
989 msgid "Create"
990 msgstr "Създаване"
991
978 -#: gitk:9273
992 +#: gitk:9292
993 msgid "No tag name specified"
994 msgstr "Липсва име на етикет"
995
982 -#: gitk:9277
996 +#: gitk:9296
997 #, tcl-format
998 msgid "Tag \"%s\" already exists"
999 msgstr "Етикетът „%s“ вече съществува"
1000
987 -#: gitk:9287
1001 +#: gitk:9306
1002 msgid "Error creating tag:"
1003 msgstr "Грешка при създаването на етикет:"
1004
991 -#: gitk:9363
1005 +#: gitk:9382
1006 msgid "Command:"
1007 msgstr "Команда:"
1008
995 -#: gitk:9371
1009 +#: gitk:9390
1010 msgid "Write"
1011 msgstr "Запазване"
1012
999 -#: gitk:9389
1013 +#: gitk:9408
1014 msgid "Error writing commit:"
1015 msgstr "Грешка при запазването на подаването:"
1016
1003 -#: gitk:9416
1017 +#: gitk:9435
1018 msgid "Name:"
1019 msgstr "Име:"
1020
1007 -#: gitk:9439
1021 +#: gitk:9458
1022 msgid "Please specify a name for the new branch"
1023 msgstr "Укажете име за новия клон"
1024
1011 -#: gitk:9444
1025 +#: gitk:9463
1026 #, tcl-format
1027 msgid "Branch '%s' already exists. Overwrite?"
1028 msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?"
1029
1016 -#: gitk:9511
1030 +#: gitk:9530
1031 #, tcl-format
1032 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1033 msgstr ""
1034 "Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?"
1035
1022 -#: gitk:9516
1036 +#: gitk:9535
1037 msgid "Cherry-picking"
1038 msgstr "Отбиране"
1039
1026 -#: gitk:9525
1040 +#: gitk:9544
1041 #, tcl-format
1042 msgid ""
1043 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1032,7 +1046,7 @@ msgstr ""
1046 "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
1047 "Подайте, занулете или ги скатайте и пробвайте отново."
1048
1035 -#: gitk:9531
1049 +#: gitk:9550
1050 msgid ""
1051 "Cherry-pick failed because of merge conflict.\n"
1052 "Do you wish to run git citool to resolve it?"
@@ -1040,20 +1054,20 @@ msgstr ""
1054 "Неуспешно отбиране поради конфликти при сливане.\n"
1055 "Искате ли да ги коригирате чрез „git citool“?"
1056
1043 -#: gitk:9547 gitk:9605
1057 +#: gitk:9566 gitk:9624
1058 msgid "No changes committed"
1059 msgstr "Не са подадени промени"
1060
1047 -#: gitk:9574
1061 +#: gitk:9593
1062 #, tcl-format
1063 msgid "Commit %s is not included in branch %s -- really revert it?"
1064 msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?"
1065
1052 -#: gitk:9579
1066 +#: gitk:9598
1067 msgid "Reverting"
1068 msgstr "Отмяна"
1069
1056 -#: gitk:9587
1070 +#: gitk:9606
1071 #, tcl-format
1072 msgid ""
1073 "Revert failed because of local changes to the following files:%s Please "
@@ -1062,7 +1076,7 @@ msgstr ""
1076 "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
1077 "Подайте, занулете или ги скатайте и пробвайте отново.<"
1078
1065 -#: gitk:9591
1079 +#: gitk:9610
1080 msgid ""
1081 "Revert failed because of merge conflict.\n"
1082 " Do you wish to run git citool to resolve it?"
@@ -1070,28 +1084,28 @@ msgstr ""
1084 "Неуспешно отмяна поради конфликти при сливане.\n"
1085 "Искате ли да ги коригирате чрез „git citool“?"
1086
1073 -#: gitk:9634
1087 +#: gitk:9653
1088 msgid "Confirm reset"
1089 msgstr "Потвърждаване на зануляването"
1090
1077 -#: gitk:9636
1091 +#: gitk:9655
1092 #, tcl-format
1093 msgid "Reset branch %s to %s?"
1094 msgstr "Да се занули ли клонът „%s“ към „%s“?"
1095
1082 -#: gitk:9638
1096 +#: gitk:9657
1097 msgid "Reset type:"
1098 msgstr "Вид зануляване:"
1099
1086 -#: gitk:9641
1100 +#: gitk:9660
1101 msgid "Soft: Leave working tree and index untouched"
1102 msgstr "Слабо: работното дърво и индекса остават същите"
1103
1090 -#: gitk:9644
1104 +#: gitk:9663
1105 msgid "Mixed: Leave working tree untouched, reset index"
1106 msgstr "Смесено: работното дърво остава същото, индексът се занулява"
1107
1094 -#: gitk:9647
1108 +#: gitk:9666
1109 msgid ""
1110 "Hard: Reset working tree and index\n"
1111 "(discard ALL local changes)"
@@ -1099,19 +1113,19 @@ msgstr ""
1113 "Силно: зануляване и на работното дърво, и на индекса\n"
1114 "(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)"
1115
1102 -#: gitk:9664
1116 +#: gitk:9683
1117 msgid "Resetting"
1118 msgstr "Зануляване"
1119
1106 -#: gitk:9724
1120 +#: gitk:9743
1121 msgid "Checking out"
1122 msgstr "Изтегляне"
1123
1110 -#: gitk:9777
1124 +#: gitk:9796
1125 msgid "Cannot delete the currently checked-out branch"
1126 msgstr "Текущо изтегленият клон не може да бъде изтрит"
1127
1114 -#: gitk:9783
1128 +#: gitk:9802
1129 #, tcl-format
1130 msgid ""
1131 "The commits on branch %s aren't on any other branch.\n"
@@ -1120,16 +1134,16 @@ msgstr ""
1134 "Подаванията на клона „%s“ не са на никой друг клон.\n"
1135 "Наистина ли да се изтрие клонът „%s“?"
1136
1123 -#: gitk:9814
1137 +#: gitk:9833
1138 #, tcl-format
1139 msgid "Tags and heads: %s"
1140 msgstr "Етикети и върхове: %s"
1141
1128 -#: gitk:9829
1142 +#: gitk:9850
1143 msgid "Filter"
1144 msgstr "Филтриране"
1145
1132 -#: gitk:10125
1146 +#: gitk:10146
1147 msgid ""
1148 "Error reading commit topology information; branch and preceding/following "
1149 "tag information will be incomplete."
@@ -1137,213 +1151,218 @@ msgstr ""
1151 "Грешка при прочитането на топологията на подаванията. Информацията за клона "
1152 "и предшестващите/следващите етикети ще е непълна."
1153
1140 -#: gitk:11102
1154 +#: gitk:11123
1155 msgid "Tag"
1156 msgstr "Етикет"
1157
1144 -#: gitk:11106
1158 +#: gitk:11127
1159 msgid "Id"
1160 msgstr "Идентификатор"
1161
1148 -#: gitk:11189
1162 +#: gitk:11210
1163 msgid "Gitk font chooser"
1164 msgstr "Избор на шрифт за Gitk"
1165
1152 -#: gitk:11206
1166 +#: gitk:11227
1167 msgid "B"
1168 msgstr "Ч"
1169
1156 -#: gitk:11209
1170 +#: gitk:11230
1171 msgid "I"
1172 msgstr "К"
1173
1160 -#: gitk:11327
1174 +#: gitk:11348
1175 msgid "Commit list display options"
1176 msgstr "Настройки на списъка с подавания"
1177
1164 -#: gitk:11330
1178 +#: gitk:11351
1179 msgid "Maximum graph width (lines)"
1180 msgstr "Максимална широчина на графа (в редове)"
1181
1168 -#: gitk:11334
1182 +#: gitk:11355
1183 #, no-tcl-format
1184 msgid "Maximum graph width (% of pane)"
1185 msgstr "Максимална широчина на графа (% от панела)"
1186
1173 -#: gitk:11337
1187 +#: gitk:11358
1188 msgid "Show local changes"
1189 msgstr "Показване на локалните промени"
1190
1177 -#: gitk:11340
1191 +#: gitk:11361
1192 msgid "Auto-select SHA1 (length)"
1193 msgstr "Автоматично избиране на SHA1 (дължина)"
1194
1181 -#: gitk:11344
1195 +#: gitk:11365
1196 msgid "Hide remote refs"
1197 msgstr "Скриване на отдалечените указатели"
1198
1185 -#: gitk:11348
1199 +#: gitk:11369
1200 msgid "Diff display options"
1201 msgstr "Настройки на показването на разликите"
1202
1189 -#: gitk:11350
1203 +#: gitk:11371
1204 msgid "Tab spacing"
1205 msgstr "Широчина на табулатора"
1206
1193 -#: gitk:11353
1207 +#: gitk:11374
1208 msgid "Display nearby tags/heads"
1209 msgstr "Извеждане на близките етикети и върхове"
1210
1197 -#: gitk:11356
1211 +#: gitk:11377
1212 msgid "Maximum # tags/heads to show"
1213 msgstr "Максимален брой етикети/върхове за показване"
1214
1201 -#: gitk:11359
1215 +#: gitk:11380
1216 msgid "Limit diffs to listed paths"
1217 msgstr "Разлика само в избраните пътища"
1218
1205 -#: gitk:11362
1219 +#: gitk:11383
1220 msgid "Support per-file encodings"
1221 msgstr "Поддръжка на различни кодирания за всеки файл"
1222
1209 -#: gitk:11368 gitk:11515
1223 +#: gitk:11389 gitk:11536
1224 msgid "External diff tool"
1225 msgstr "Външен инструмент за разлики"
1226
1213 -#: gitk:11369
1227 +#: gitk:11390
1228 msgid "Choose..."
1229 msgstr "Избор…"
1230
1217 -#: gitk:11374
1231 +#: gitk:11395
1232 msgid "General options"
1233 msgstr "Общи настройки"
1234
1221 -#: gitk:11377
1235 +#: gitk:11398
1236 msgid "Use themed widgets"
1237 msgstr "Използване на тема за графичните обекти"
1238
1225 -#: gitk:11379
1239 +#: gitk:11400
1240 msgid "(change requires restart)"
1241 msgstr "(промяната изисква рестартиране на Gitk)"
1242
1229 -#: gitk:11381
1243 +#: gitk:11402
1244 msgid "(currently unavailable)"
1245 msgstr "(в момента недостъпно)"
1246
1233 -#: gitk:11392
1247 +#: gitk:11413
1248 msgid "Colors: press to choose"
1249 msgstr "Цветове: избира се с натискане"
1250
1237 -#: gitk:11395
1251 +#: gitk:11416
1252 msgid "Interface"
1253 msgstr "Интерфейс"
1254
1241 -#: gitk:11396
1255 +#: gitk:11417
1256 msgid "interface"
1257 msgstr "интерфейс"
1258
1245 -#: gitk:11399
1259 +#: gitk:11420
1260 msgid "Background"
1261 msgstr "Фон"
1262
1249 -#: gitk:11400 gitk:11430
1263 +#: gitk:11421 gitk:11451
1264 msgid "background"
1265 msgstr "фон"
1266
1253 -#: gitk:11403
1267 +#: gitk:11424
1268 msgid "Foreground"
1269 msgstr "Знаци"
1270
1257 -#: gitk:11404
1271 +#: gitk:11425
1272 msgid "foreground"
1273 msgstr "знаци"
1274
1261 -#: gitk:11407
1275 +#: gitk:11428
1276 msgid "Diff: old lines"
1277 msgstr "Разлика: стари редове"
1278
1265 -#: gitk:11408
1279 +#: gitk:11429
1280 msgid "diff old lines"
1281 msgstr "разлика, стари редове"
1282
1269 -#: gitk:11412
1283 +#: gitk:11433
1284 msgid "Diff: new lines"
1285 msgstr "Разлика: нови редове"
1286
1273 -#: gitk:11413
1287 +#: gitk:11434
1288 msgid "diff new lines"
1289 msgstr "разлика, нови редове"
1290
1277 -#: gitk:11417
1291 +#: gitk:11438
1292 msgid "Diff: hunk header"
1293 msgstr "Разлика: начало на парче"
1294
1281 -#: gitk:11419
1295 +#: gitk:11440
1296 msgid "diff hunk header"
1297 msgstr "разлика, начало на парче"
1298
1285 -#: gitk:11423
1299 +#: gitk:11444
1300 msgid "Marked line bg"
1301 msgstr "Фон на отбелязан ред"
1302
1289 -#: gitk:11425
1303 +#: gitk:11446
1304 msgid "marked line background"
1305 msgstr "фон на отбелязан ред"
1306
1293 -#: gitk:11429
1307 +#: gitk:11450
1308 msgid "Select bg"
1309 msgstr "Избор на фон"
1310
1297 -#: gitk:11438
1311 +#: gitk:11459
1312 msgid "Fonts: press to choose"
1313 msgstr "Шрифтове: избира се с натискане"
1314
1301 -#: gitk:11440
1315 +#: gitk:11461
1316 msgid "Main font"
1317 msgstr "Основен шрифт"
1318
1305 -#: gitk:11441
1319 +#: gitk:11462
1320 msgid "Diff display font"
1321 msgstr "Шрифт за разликите"
1322
1309 -#: gitk:11442
1323 +#: gitk:11463
1324 msgid "User interface font"
1325 msgstr "Шрифт на интерфейса"
1326
1313 -#: gitk:11464
1327 +#: gitk:11485
1328 msgid "Gitk preferences"
1329 msgstr "Настройки на Gitk"
1330
1317 -#: gitk:11473
1331 +#: gitk:11494
1332 msgid "General"
1333 msgstr "Общи"
1334
1321 -#: gitk:11474
1335 +#: gitk:11495
1336 msgid "Colors"
1337 msgstr "Цветове"
1338
1325 -#: gitk:11475
1339 +#: gitk:11496
1340 msgid "Fonts"
1341 msgstr "Шрифтове"
1342
1329 -#: gitk:11525
1343 +#: gitk:11546
1344 #, tcl-format
1345 msgid "Gitk: choose color for %s"
1346 msgstr "Gitk: избор на цвят на „%s“"
1347
1334 -#: gitk:12242
1348 +#: gitk:12059
1349 +msgid ""
1350 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1351 +" Gitk requires at least Tcl/Tk 8.4."
1352 +msgstr ""
1353 +
1354 +#: gitk:12269
1355 msgid "Cannot find a git repository here."
1356 msgstr "Тук липсва хранилище на Git."
1357
1338 -#: gitk:12289
1358 +#: gitk:12316
1359 #, tcl-format
1360 msgid "Ambiguous argument '%s': both revision and filename"
1361 msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
1362
1343 -#: gitk:12301
1363 +#: gitk:12328
1364 msgid "Bad arguments to gitk:"
1365 msgstr "Неправилни аргументи на gitk:"
1366
1347 -#: gitk:12405
1348 -msgid "Command line"
1349 -msgstr "Команден ред"
1367 +#~ msgid "mc"
1368 +#~ msgstr "mc"
po/ca.po
+297 -279
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2015-02-01 22:49-0700\n"
13 "Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
14 "Language-Team: Catalan\n"
@@ -27,7 +27,7 @@ msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:"
27 msgid "Color words"
28 msgstr "Colora les paraules"
29
30 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
30 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
31 msgid "Markup words"
32 msgstr "Marca les paraules"
33
@@ -61,14 +61,18 @@ msgstr "Error en executar git log:"
61 msgid "Reading"
62 msgstr "Llegint"
63
64 -#: gitk:496 gitk:4508
64 +#: gitk:496 gitk:4525
65 msgid "Reading commits..."
66 msgstr "Llegint les revisions..."
67
68 -#: gitk:499 gitk:1637 gitk:4511
68 +#: gitk:499 gitk:1637 gitk:4528
69 msgid "No commits selected"
70 msgstr "Cap comissió seleccionada"
71
72 +#: gitk:1445 gitk:4045 gitk:12432
73 +msgid "Command line"
74 +msgstr "Línia d'ordres"
75 +
76 #: gitk:1511
77 msgid "Can't parse git log output:"
78 msgstr "No es pot analitzar la sortida del git log:"
@@ -77,16 +81,12 @@ msgstr "No es pot analitzar la sortida del git log:"
81 msgid "No commit information available"
82 msgstr "Cap informació de comissió disponible"
83
80 -#: gitk:1897
81 -msgid "mc"
82 -msgstr "mc"
83 -
84 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
84 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
85 msgid "OK"
86 msgstr "D'acord"
87
88 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
89 -#: gitk:11221 gitk:11501
88 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
89 +#: gitk:11242 gitk:11522
90 msgid "Cancel"
91 msgstr "Cancel·la"
92
@@ -138,15 +138,15 @@ msgstr "Edita la vista..."
138 msgid "Delete view"
139 msgstr "Suprimeix vista"
140
141 -#: gitk:2088
141 +#: gitk:2088 gitk:4043
142 msgid "All files"
143 msgstr "Tots els fitxers"
144
145 -#: gitk:2083 gitk:4050
145 +#: gitk:2083 gitk:4067
146 msgid "View"
147 msgstr "Vista"
148
149 -#: gitk:2093 gitk:2103 gitk:3009
149 +#: gitk:2093 gitk:2103 gitk:3012
150 msgid "About gitk"
151 msgstr "Quant al gitk"
152
@@ -158,7 +158,7 @@ msgstr "Associacions de tecles"
158 msgid "Help"
159 msgstr "Ajuda"
160
161 -#: gitk:2185 gitk:8633
161 +#: gitk:2185 gitk:8652
162 msgid "SHA1 ID:"
163 msgstr "ID SHA1:"
164
@@ -174,53 +174,53 @@ msgstr "Cerca"
174 msgid "commit"
175 msgstr "comissió"
176
177 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
178 -#: gitk:6893
177 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
178 +#: gitk:6912
179 msgid "containing:"
180 msgstr "que contingui:"
181
182 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
182 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
183 msgid "touching paths:"
184 msgstr "que toqui els camins:"
185
186 -#: gitk:2303 gitk:4759
186 +#: gitk:2303 gitk:4777
187 msgid "adding/removing string:"
188 msgstr "que afegeixi/elimini la cadena:"
189
190 -#: gitk:2304 gitk:4761
190 +#: gitk:2304 gitk:4779
191 msgid "changing lines matching:"
192 msgstr "que tingui línies canviades coincidents amb:"
193
194 -#: gitk:2313 gitk:2315 gitk:4748
194 +#: gitk:2313 gitk:2315 gitk:4766
195 msgid "Exact"
196 msgstr "Exacte"
197
198 -#: gitk:2315 gitk:4836 gitk:6704
198 +#: gitk:2315 gitk:4854 gitk:6723
199 msgid "IgnCase"
200 msgstr "Ignora majúscula i minúscula"
201
202 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
202 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
203 msgid "Regexp"
204 msgstr "Regexp"
205
206 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
206 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
207 msgid "All fields"
208 msgstr "Tots els camps"
209
210 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
210 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
211 msgid "Headline"
212 msgstr "Titular"
213
214 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
214 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
215 msgid "Comments"
216 msgstr "Comentaris"
217
218 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
219 -#: gitk:8826
218 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
219 +#: gitk:8845
220 msgid "Author"
221 msgstr "Autor"
222
223 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
223 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
224 msgid "Committer"
225 msgstr "Comitent"
226
@@ -248,7 +248,7 @@ msgstr "Línies de context"
248 msgid "Ignore space change"
249 msgstr "Ignora canvis d'espai"
250
251 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
251 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
252 msgid "Line diff"
253 msgstr "Diferència de línies"
254
@@ -260,99 +260,107 @@ msgstr "Pedaç"
260 msgid "Tree"
261 msgstr "Arbre"
262
263 -#: gitk:2616 gitk:2636
263 +#: gitk:2617 gitk:2637
264 msgid "Diff this -> selected"
265 msgstr "Diferencia aquesta -> la seleccionada"
266
267 -#: gitk:2617 gitk:2637
267 +#: gitk:2618 gitk:2638
268 msgid "Diff selected -> this"
269 msgstr "Diferencia la seleccionada -> aquesta"
270
271 -#: gitk:2618 gitk:2638
271 +#: gitk:2619 gitk:2639
272 msgid "Make patch"
273 msgstr "Fes pedaç"
274
275 -#: gitk:2619 gitk:9235
275 +#: gitk:2620 gitk:9254
276 msgid "Create tag"
277 msgstr "Crea etiqueta"
278
279 -#: gitk:2620 gitk:9352
279 +#: gitk:2621 gitk:9371
280 msgid "Write commit to file"
281 msgstr "Escriu la comissió a un fitxer"
282
283 -#: gitk:2621 gitk:9409
283 +#: gitk:2622 gitk:9428
284 msgid "Create new branch"
285 msgstr "Crea una branca nova"
286
287 -#: gitk:2622
287 +#: gitk:2623
288 msgid "Cherry-pick this commit"
289 msgstr "Recull aquesta comissió com a cirera"
290
291 -#: gitk:2623
291 +#: gitk:2624
292 msgid "Reset HEAD branch to here"
293 msgstr "Restableix la branca HEAD aquí"
294
295 -#: gitk:2624
295 +#: gitk:2625
296 msgid "Mark this commit"
297 msgstr "Marca aquesta comissió"
298
299 -#: gitk:2625
299 +#: gitk:2626
300 msgid "Return to mark"
301 msgstr "Torna a la marca"
302
303 -#: gitk:2626
303 +#: gitk:2627
304 msgid "Find descendant of this and mark"
305 msgstr "Troba la descendent d'aquesta i marca-la"
306
307 -#: gitk:2627
307 +#: gitk:2628
308 msgid "Compare with marked commit"
309 msgstr "Compara amb la comissió marcada"
310
311 -#: gitk:2628 gitk:2639
311 +#: gitk:2629 gitk:2640
312 msgid "Diff this -> marked commit"
313 msgstr "Diferencia aquesta -> la comissió marcada"
314
315 -#: gitk:2629 gitk:2640
315 +#: gitk:2630 gitk:2641
316 msgid "Diff marked commit -> this"
317 msgstr "Diferencia la comissió seleccionada -> aquesta"
318
319 -#: gitk:2630
319 +#: gitk:2631
320 msgid "Revert this commit"
321 msgstr "Reverteix aquesta comissió"
322
323 -#: gitk:2646
323 +#: gitk:2647
324 msgid "Check out this branch"
325 msgstr "Agafa aquesta branca"
326
327 -#: gitk:2647
327 +#: gitk:2648
328 msgid "Remove this branch"
329 msgstr "Elimina aquesta branca"
330
331 -#: gitk:2654
331 +#: gitk:2649
332 +msgid "Copy branch name"
333 +msgstr ""
334 +
335 +#: gitk:2656
336 msgid "Highlight this too"
337 msgstr "Ressalta aquest també"
338
335 -#: gitk:2655
339 +#: gitk:2657
340 msgid "Highlight this only"
341 msgstr "Ressalta només aquest"
342
339 -#: gitk:2656
343 +#: gitk:2658
344 msgid "External diff"
345 msgstr "Diferència externa"
346
343 -#: gitk:2657
347 +#: gitk:2659
348 msgid "Blame parent commit"
349 msgstr "Culpabilitat de la comissió mare"
350
347 -#: gitk:2664
351 +#: gitk:2660
352 +msgid "Copy path"
353 +msgstr ""
354 +
355 +#: gitk:2667
356 msgid "Show origin of this line"
357 msgstr "Mostra l'origen d'aquesta línia"
358
351 -#: gitk:2665
359 +#: gitk:2668
360 msgid "Run git gui blame on this line"
361 msgstr "Executa git gui blame en aquesta línia"
362
355 -#: gitk:3011
363 +#: gitk:3014
364 msgid ""
365 "\n"
366 "Gitk - a commit viewer for git\n"
@@ -368,314 +376,319 @@ msgstr ""
376 "\n"
377 "Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU"
378
371 -#: gitk:3019 gitk:3085 gitk:9836
379 +#: gitk:3022 gitk:3089 gitk:9857
380 msgid "Close"
381 msgstr "Tanca"
382
375 -#: gitk:3040
383 +#: gitk:3043
384 msgid "Gitk key bindings"
385 msgstr "Associacions de tecles del Gitk"
386
379 -#: gitk:3043
387 +#: gitk:3046
388 msgid "Gitk key bindings:"
389 msgstr "Associacions de tecles del Gitk:"
390
383 -#: gitk:3045
391 +#: gitk:3048
392 #, tcl-format
393 msgid "<%s-Q>\t\tQuit"
394 msgstr "<%s-Q>\t\tSurt"
395
388 -#: gitk:3046
396 +#: gitk:3049
397 #, tcl-format
398 msgid "<%s-W>\t\tClose window"
399 msgstr "<%s-W>\t\tTanca la finestra"
400
393 -#: gitk:3047
401 +#: gitk:3050
402 msgid "<Home>\t\tMove to first commit"
403 msgstr "<Inici>\t\tVés a la primera comissió"
404
397 -#: gitk:3048
405 +#: gitk:3051
406 msgid "<End>\t\tMove to last commit"
407 msgstr "<Fi>\t\tVés a l'última comissió"
408
401 -#: gitk:3049
409 +#: gitk:3052
410 msgid "<Up>, p, k\tMove up one commit"
411 msgstr "<Amunt>, p, k\tMou-te una comissió amunt"
412
405 -#: gitk:3050
413 +#: gitk:3053
414 msgid "<Down>, n, j\tMove down one commit"
415 msgstr "<Avall>, n, j\tMou-te una comissió avall"
416
409 -#: gitk:3051
417 +#: gitk:3054
418 msgid "<Left>, z, h\tGo back in history list"
419 msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història"
420
413 -#: gitk:3052
421 +#: gitk:3055
422 msgid "<Right>, x, l\tGo forward in history list"
423 msgstr "<Dreta>, x, l\tAvança en la llista d'història"
424
417 -#: gitk:3053
425 +#: gitk:3056
426 #, tcl-format
427 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
428 msgstr ""
429 "<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història"
430
423 -#: gitk:3054
431 +#: gitk:3057
432 msgid "<PageUp>\tMove up one page in commit list"
433 msgstr "<RePàg>\tBaixa una pàgina en la llista de comissions"
434
427 -#: gitk:3055
435 +#: gitk:3058
436 msgid "<PageDown>\tMove down one page in commit list"
437 msgstr "<AvPàg>\tBaixa per una pàgina en la llista de comissions"
438
431 -#: gitk:3056
439 +#: gitk:3059
440 #, tcl-format
441 msgid "<%s-Home>\tScroll to top of commit list"
442 msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions"
443
436 -#: gitk:3057
444 +#: gitk:3060
445 #, tcl-format
446 msgid "<%s-End>\tScroll to bottom of commit list"
447 msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions"
448
441 -#: gitk:3058
449 +#: gitk:3061
450 #, tcl-format
451 msgid "<%s-Up>\tScroll commit list up one line"
452 msgstr "<%s-Amunt>\tDesplaça la llista de comissions una línia cap amunt"
453
446 -#: gitk:3059
454 +#: gitk:3062
455 #, tcl-format
456 msgid "<%s-Down>\tScroll commit list down one line"
457 msgstr "<%s-Avall>\tDesplaça la llista de comissions una línia cap avall"
458
451 -#: gitk:3060
459 +#: gitk:3063
460 #, tcl-format
461 msgid "<%s-PageUp>\tScroll commit list up one page"
462 msgstr "<%s-RePàg>\tDesplaça la llista de comissions amunt per una pàgina"
463
456 -#: gitk:3061
464 +#: gitk:3064
465 #, tcl-format
466 msgid "<%s-PageDown>\tScroll commit list down one page"
467 msgstr "<%s-AvPàg>\tDesplaça la llista de comissions una pàgina cap avall"
468
461 -#: gitk:3062
469 +#: gitk:3065
470 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
471 msgstr "<Maj-Amunt>\tCerca cap enrere (amunt, les comissions més noves)"
472
465 -#: gitk:3063
473 +#: gitk:3066
474 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
475 msgstr "<Maj-Avall>\tCerca cap endavant (avall, les comissions més velles)"
476
469 -#: gitk:3064
477 +#: gitk:3067
478 msgid "<Delete>, b\tScroll diff view up one page"
479 msgstr "<Supr>, b\tDesplaça la vista de diferència una pàgina cap amunt"
480
473 -#: gitk:3065
481 +#: gitk:3068
482 msgid "<Backspace>\tScroll diff view up one page"
483 msgstr "<Retrocés>\tDesplaça la vista de diferència una pàgina cap amunt"
484
477 -#: gitk:3066
485 +#: gitk:3069
486 msgid "<Space>\t\tScroll diff view down one page"
487 msgstr "<Espai>\t\tDesplaça la vista de diferència una pàgina cap avall"
488
481 -#: gitk:3067
489 +#: gitk:3070
490 msgid "u\t\tScroll diff view up 18 lines"
491 msgstr "u\t\tDesplaça la vista de diferència 18 línies cap amunt"
492
485 -#: gitk:3068
493 +#: gitk:3071
494 msgid "d\t\tScroll diff view down 18 lines"
495 msgstr "d\t\tDesplaça la vista de diferència 18 línies cap avall "
496
489 -#: gitk:3069
497 +#: gitk:3072
498 #, tcl-format
499 msgid "<%s-F>\t\tFind"
500 msgstr "<%s-F>\t\tCerca"
501
494 -#: gitk:3070
502 +#: gitk:3073
503 #, tcl-format
504 msgid "<%s-G>\t\tMove to next find hit"
505 msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca"
506
499 -#: gitk:3071
507 +#: gitk:3074
508 msgid "<Return>\tMove to next find hit"
509 msgstr "<Retorn>\tMou-te a la propera coincidència de la cerca"
510
503 -#: gitk:3072
511 +#: gitk:3075
512 +#, fuzzy
513 +msgid "g\t\tGo to commit"
514 +msgstr "<Fi>\t\tVés a l'última comissió"
515 +
516 +#: gitk:3076
517 msgid "/\t\tFocus the search box"
518 msgstr "/\t\tPosa el focus a la caixa de cerca"
519
507 -#: gitk:3073
520 +#: gitk:3077
521 msgid "?\t\tMove to previous find hit"
522 msgstr "?\t\tMou a la coincidència prèvia de la cerca"
523
511 -#: gitk:3074
524 +#: gitk:3078
525 msgid "f\t\tScroll diff view to next file"
526 msgstr "f\t\tDesplaça la vista de diferència al proper fitxer"
527
515 -#: gitk:3075
528 +#: gitk:3079
529 #, tcl-format
530 msgid "<%s-S>\t\tSearch for next hit in diff view"
531 msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència"
532
520 -#: gitk:3076
533 +#: gitk:3080
534 #, tcl-format
535 msgid "<%s-R>\t\tSearch for previous hit in diff view"
536 msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència"
537
525 -#: gitk:3077
538 +#: gitk:3081
539 #, tcl-format
540 msgid "<%s-KP+>\tIncrease font size"
541 msgstr "<%s-KP+>\tAugmenta la mida de lletra"
542
530 -#: gitk:3078
543 +#: gitk:3082
544 #, tcl-format
545 msgid "<%s-plus>\tIncrease font size"
546 msgstr "<%s-més>\tAugmenta la mida de lletra"
547
535 -#: gitk:3079
548 +#: gitk:3083
549 #, tcl-format
550 msgid "<%s-KP->\tDecrease font size"
551 msgstr "<%s-KP->\tDisminueix la mida de lletra"
552
540 -#: gitk:3080
553 +#: gitk:3084
554 #, tcl-format
555 msgid "<%s-minus>\tDecrease font size"
556 msgstr "<%s-menys>\tDisminueix la mida de lletra"
557
545 -#: gitk:3081
558 +#: gitk:3085
559 msgid "<F5>\t\tUpdate"
560 msgstr "<F5>\t\tActualitza"
561
549 -#: gitk:3546 gitk:3555
562 +#: gitk:3550 gitk:3559
563 #, tcl-format
564 msgid "Error creating temporary directory %s:"
565 msgstr "Error en crear el directori temporal %s:"
566
554 -#: gitk:3568
567 +#: gitk:3572
568 #, tcl-format
569 msgid "Error getting \"%s\" from %s:"
570 msgstr "Error en obtenir \"%s\" de %s:"
571
559 -#: gitk:3631
572 +#: gitk:3635
573 msgid "command failed:"
574 msgstr "l'ordre ha fallat:"
575
563 -#: gitk:3780
576 +#: gitk:3784
577 msgid "No such commit"
578 msgstr "Cap comissió així"
579
567 -#: gitk:3794
580 +#: gitk:3798
581 msgid "git gui blame: command failed:"
582 msgstr "git gui blame: l'ordre ha fallat:"
583
571 -#: gitk:3825
584 +#: gitk:3829
585 #, tcl-format
586 msgid "Couldn't read merge head: %s"
587 msgstr "No s'ha pogut llegir el cap de fusió: %s"
588
576 -#: gitk:3833
589 +#: gitk:3837
590 #, tcl-format
591 msgid "Error reading index: %s"
592 msgstr "Error en llegir l'índex: %s"
593
581 -#: gitk:3858
594 +#: gitk:3862
595 #, tcl-format
596 msgid "Couldn't start git blame: %s"
597 msgstr "No s'ha pogut iniciar el git blame: %s"
598
586 -#: gitk:3861 gitk:6735
599 +#: gitk:3865 gitk:6754
600 msgid "Searching"
601 msgstr "Cercant"
602
590 -#: gitk:3893
603 +#: gitk:3897
604 #, tcl-format
605 msgid "Error running git blame: %s"
606 msgstr "Error en executar el git blame: %s"
607
595 -#: gitk:3921
608 +#: gitk:3925
609 #, tcl-format
610 msgid "That line comes from commit %s, which is not in this view"
611 msgstr ""
612 "Aquella línia ve de la comissió %s, la qual no és en aquesta visualització"
613
601 -#: gitk:3935
614 +#: gitk:3939
615 msgid "External diff viewer failed:"
616 msgstr "El visualitzador de diferència extern ha fallat:"
617
605 -#: gitk:4053
618 +#: gitk:4070
619 msgid "Gitk view definition"
620 msgstr "Definició de vista del Gitk"
621
609 -#: gitk:4057
622 +#: gitk:4074
623 msgid "Remember this view"
624 msgstr "Recorda aquesta vista"
625
613 -#: gitk:4058
626 +#: gitk:4075
627 msgid "References (space separated list):"
628 msgstr "Referències (llista separada per espais)"
629
617 -#: gitk:4059
630 +#: gitk:4076
631 msgid "Branches & tags:"
632 msgstr "Branques i etiquetes:"
633
621 -#: gitk:4060
634 +#: gitk:4077
635 msgid "All refs"
636 msgstr "Totes les referències"
637
625 -#: gitk:4061
638 +#: gitk:4078
639 msgid "All (local) branches"
640 msgstr "Totes les branques (locals)"
641
629 -#: gitk:4062
642 +#: gitk:4079
643 msgid "All tags"
644 msgstr "Totes les etiquetes"
645
633 -#: gitk:4063
646 +#: gitk:4080
647 msgid "All remote-tracking branches"
648 msgstr "Totes les branques amb seguiment remot"
649
637 -#: gitk:4064
650 +#: gitk:4081
651 msgid "Commit Info (regular expressions):"
652 msgstr "Informació de comissió (expressions regulars):"
653
641 -#: gitk:4065
654 +#: gitk:4082
655 msgid "Author:"
656 msgstr "Autor:"
657
645 -#: gitk:4066
658 +#: gitk:4083
659 msgid "Committer:"
660 msgstr "Comitent:"
661
649 -#: gitk:4067
662 +#: gitk:4084
663 msgid "Commit Message:"
664 msgstr "Missatge de comissió:"
665
653 -#: gitk:4068
666 +#: gitk:4085
667 msgid "Matches all Commit Info criteria"
668 msgstr "Coincideix amb tots els criteris d'informació de comissió"
669
657 -#: gitk:4069
670 +#: gitk:4086
671 #, fuzzy
659 -msgid "Matches none Commit Info criteria"
672 +msgid "Matches no Commit Info criteria"
673 msgstr "Coincideix amb tots els criteris d'informació de comissió"
674
662 -#: gitk:4070
675 +#: gitk:4087
676 msgid "Changes to Files:"
677 msgstr "Canvis als fitxers:"
678
666 -#: gitk:4071
679 +#: gitk:4088
680 msgid "Fixed String"
681 msgstr "Cadena fixa"
682
670 -#: gitk:4072
683 +#: gitk:4089
684 msgid "Regular Expression"
685 msgstr "Expressió regular"
686
674 -#: gitk:4073
687 +#: gitk:4090
688 msgid "Search string:"
689 msgstr "Cadena de cerca:"
690
678 -#: gitk:4074
691 +#: gitk:4091
692 msgid ""
693 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
694 "15:27:38\"):"
@@ -683,201 +696,201 @@ msgstr ""
696 "Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 "
697 "15:27:38\"):"
698
686 -#: gitk:4075
699 +#: gitk:4092
700 msgid "Since:"
701 msgstr "Des de:"
702
690 -#: gitk:4076
703 +#: gitk:4093
704 msgid "Until:"
705 msgstr "Fins:"
706
694 -#: gitk:4077
707 +#: gitk:4094
708 msgid "Limit and/or skip a number of revisions (positive integer):"
709 msgstr "Limita o salta un nombre de revisions (nombre enter positiu)"
710
698 -#: gitk:4078
711 +#: gitk:4095
712 msgid "Number to show:"
713 msgstr "Nombre a mostrar:"
714
702 -#: gitk:4079
715 +#: gitk:4096
716 msgid "Number to skip:"
717 msgstr "Nombre a saltar:"
718
706 -#: gitk:4080
719 +#: gitk:4097
720 msgid "Miscellaneous options:"
721 msgstr "Opcions miscel·lànies:"
722
710 -#: gitk:4081
723 +#: gitk:4098
724 msgid "Strictly sort by date"
725 msgstr "Ordena estrictament per data"
726
714 -#: gitk:4082
727 +#: gitk:4099
728 msgid "Mark branch sides"
729 msgstr "Marca els costats de les branques"
730
718 -#: gitk:4083
731 +#: gitk:4100
732 msgid "Limit to first parent"
733 msgstr "Limita a la primera mare"
734
722 -#: gitk:4084
735 +#: gitk:4101
736 msgid "Simple history"
737 msgstr "Història senzilla"
738
726 -#: gitk:4085
739 +#: gitk:4102
740 msgid "Additional arguments to git log:"
741 msgstr "Paràmetres addicionals al git log:"
742
730 -#: gitk:4086
743 +#: gitk:4103
744 msgid "Enter files and directories to include, one per line:"
745 msgstr "Introduïu els fitxers i directoris a incloure, un per línia:"
746
734 -#: gitk:4087
747 +#: gitk:4104
748 msgid "Command to generate more commits to include:"
749 msgstr "Ordre per a generar més comissions a incloure:"
750
738 -#: gitk:4211
751 +#: gitk:4228
752 msgid "Gitk: edit view"
753 msgstr "Gitk: vista d'edició"
754
742 -#: gitk:4219
755 +#: gitk:4236
756 msgid "-- criteria for selecting revisions"
757 msgstr "-- criteris per a seleccionar les revisions"
758
746 -#: gitk:4224
759 +#: gitk:4241
760 msgid "View Name"
761 msgstr "Nom de vista"
762
750 -#: gitk:4299
763 +#: gitk:4316
764 msgid "Apply (F5)"
765 msgstr "Aplica (F5)"
766
754 -#: gitk:4337
767 +#: gitk:4354
768 msgid "Error in commit selection arguments:"
769 msgstr "Error en els paràmetres de selecció de comissions:"
770
758 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
771 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
772 msgid "None"
773 msgstr "Cap"
774
762 -#: gitk:5003 gitk:5008
775 +#: gitk:5021 gitk:5026
776 msgid "Descendant"
777 msgstr "Descendent"
778
766 -#: gitk:5004
779 +#: gitk:5022
780 msgid "Not descendant"
781 msgstr "No descendent"
782
770 -#: gitk:5011 gitk:5016
783 +#: gitk:5029 gitk:5034
784 msgid "Ancestor"
785 msgstr "Avantpassat"
786
774 -#: gitk:5012
787 +#: gitk:5030
788 msgid "Not ancestor"
789 msgstr "No avantpassat"
790
778 -#: gitk:5306
791 +#: gitk:5324
792 msgid "Local changes checked in to index but not committed"
793 msgstr "Canvis locals registrats en l'índex però no comesos"
794
782 -#: gitk:5342
795 +#: gitk:5360
796 msgid "Local uncommitted changes, not checked in to index"
797 msgstr "Canvis locals sense cometre, no registrats en l'índex"
798
786 -#: gitk:7115
799 +#: gitk:7134
800 msgid "and many more"
801 msgstr "i moltes més"
802
790 -#: gitk:7118
803 +#: gitk:7137
804 msgid "many"
805 msgstr "moltes"
806
794 -#: gitk:7309
807 +#: gitk:7328
808 msgid "Tags:"
809 msgstr "Etiquetes:"
810
798 -#: gitk:7326 gitk:7332 gitk:8806
811 +#: gitk:7345 gitk:7351 gitk:8825
812 msgid "Parent"
813 msgstr "Mare"
814
802 -#: gitk:7337
815 +#: gitk:7356
816 msgid "Child"
817 msgstr "Filla"
818
806 -#: gitk:7346
819 +#: gitk:7365
820 msgid "Branch"
821 msgstr "Branca"
822
810 -#: gitk:7349
823 +#: gitk:7368
824 msgid "Follows"
825 msgstr "Segueix"
826
814 -#: gitk:7352
827 +#: gitk:7371
828 msgid "Precedes"
829 msgstr "Precedeix"
830
818 -#: gitk:7947
831 +#: gitk:7966
832 #, tcl-format
833 msgid "Error getting diffs: %s"
834 msgstr "Error en obtenir les diferències: %s"
835
823 -#: gitk:8631
836 +#: gitk:8650
837 msgid "Goto:"
838 msgstr "Vés a:"
839
827 -#: gitk:8652
840 +#: gitk:8671
841 #, tcl-format
842 msgid "Short SHA1 id %s is ambiguous"
843 msgstr "L'id SHA1 curta %s és ambigua"
844
832 -#: gitk:8659
845 +#: gitk:8678
846 #, tcl-format
847 msgid "Revision %s is not known"
848 msgstr "La revisió %s és desconeguda"
849
837 -#: gitk:8669
850 +#: gitk:8688
851 #, tcl-format
852 msgid "SHA1 id %s is not known"
853 msgstr "L'id SHA1 %s és desconeguda"
854
842 -#: gitk:8671
855 +#: gitk:8690
856 #, tcl-format
857 msgid "Revision %s is not in the current view"
858 msgstr "La revisió %s no és en la vista actual"
859
847 -#: gitk:8813 gitk:8828
860 +#: gitk:8832 gitk:8847
861 msgid "Date"
862 msgstr "Data"
863
851 -#: gitk:8816
864 +#: gitk:8835
865 msgid "Children"
866 msgstr "Filles"
867
855 -#: gitk:8879
868 +#: gitk:8898
869 #, tcl-format
870 msgid "Reset %s branch to here"
871 msgstr "Restableix la branca %s aquí"
872
860 -#: gitk:8881
873 +#: gitk:8900
874 msgid "Detached head: can't reset"
875 msgstr "Cap separat: no es pot restablir"
876
864 -#: gitk:8986 gitk:8992
877 +#: gitk:9005 gitk:9011
878 msgid "Skipping merge commit "
879 msgstr "Saltant la comissió de fusió "
880
868 -#: gitk:9001 gitk:9006
881 +#: gitk:9020 gitk:9025
882 msgid "Error getting patch ID for "
883 msgstr "Error en obtenir l'ID de pedaç de "
884
872 -#: gitk:9002 gitk:9007
885 +#: gitk:9021 gitk:9026
886 msgid " - stopping\n"
887 msgstr " - aturant\n"
888
876 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
889 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
890 msgid "Commit "
891 msgstr "Comissió "
892
880 -#: gitk:9016
893 +#: gitk:9035
894 msgid ""
895 " is the same patch as\n"
896 " "
@@ -885,7 +898,7 @@ msgstr ""
898 " és el mateix pedaç que\n"
899 " "
900
888 -#: gitk:9024
901 +#: gitk:9043
902 msgid ""
903 " differs from\n"
904 " "
@@ -893,7 +906,7 @@ msgstr ""
906 " difereix de\n"
907 " "
908
896 -#: gitk:9026
909 +#: gitk:9045
910 msgid ""
911 "Diff of commits:\n"
912 "\n"
@@ -901,131 +914,131 @@ msgstr ""
914 "Diferència entre comissions:\n"
915 "\n"
916
904 -#: gitk:9038 gitk:9047
917 +#: gitk:9057 gitk:9066
918 #, tcl-format
919 msgid " has %s children - stopping\n"
920 msgstr " té %s filles - aturant\n"
921
909 -#: gitk:9066
922 +#: gitk:9085
923 #, tcl-format
924 msgid "Error writing commit to file: %s"
925 msgstr "Error en escriure la comissió al fitxer: %s"
926
914 -#: gitk:9072
927 +#: gitk:9091
928 #, tcl-format
929 msgid "Error diffing commits: %s"
930 msgstr "Error en diferenciar les comissions: %s"
931
919 -#: gitk:9118
932 +#: gitk:9137
933 msgid "Top"
934 msgstr "Part superior"
935
923 -#: gitk:9119
936 +#: gitk:9138
937 msgid "From"
938 msgstr "De"
939
927 -#: gitk:9124
940 +#: gitk:9143
941 msgid "To"
942 msgstr "A"
943
931 -#: gitk:9148
944 +#: gitk:9167
945 msgid "Generate patch"
946 msgstr "Genera pedaç"
947
935 -#: gitk:9150
948 +#: gitk:9169
949 msgid "From:"
950 msgstr "De:"
951
939 -#: gitk:9159
952 +#: gitk:9178
953 msgid "To:"
954 msgstr "A:"
955
943 -#: gitk:9168
956 +#: gitk:9187
957 msgid "Reverse"
958 msgstr "Inverteix"
959
947 -#: gitk:9170 gitk:9366
960 +#: gitk:9189 gitk:9385
961 msgid "Output file:"
962 msgstr "Fitxer de sortida:"
963
951 -#: gitk:9176
964 +#: gitk:9195
965 msgid "Generate"
966 msgstr "Genera"
967
955 -#: gitk:9214
968 +#: gitk:9233
969 msgid "Error creating patch:"
970 msgstr "Error en crear el pedaç:"
971
959 -#: gitk:9237 gitk:9354 gitk:9411
972 +#: gitk:9256 gitk:9373 gitk:9430
973 msgid "ID:"
974 msgstr "ID:"
975
963 -#: gitk:9246
976 +#: gitk:9265
977 msgid "Tag name:"
978 msgstr "Nom d'etiqueta:"
979
967 -#: gitk:9249
980 +#: gitk:9268
981 msgid "Tag message is optional"
982 msgstr "El missatge d'etiqueta és opcional"
983
971 -#: gitk:9251
984 +#: gitk:9270
985 msgid "Tag message:"
986 msgstr "Missatge d'etiqueta:"
987
975 -#: gitk:9255 gitk:9420
988 +#: gitk:9274 gitk:9439
989 msgid "Create"
990 msgstr "Crea"
991
979 -#: gitk:9273
992 +#: gitk:9292
993 msgid "No tag name specified"
994 msgstr "No s'ha especificat cap nom d'etiqueta"
995
983 -#: gitk:9277
996 +#: gitk:9296
997 #, tcl-format
998 msgid "Tag \"%s\" already exists"
999 msgstr "L'etiqueta \"%s\" ja existeix"
1000
988 -#: gitk:9287
1001 +#: gitk:9306
1002 msgid "Error creating tag:"
1003 msgstr "Error en crear l'etiqueta:"
1004
992 -#: gitk:9363
1005 +#: gitk:9382
1006 msgid "Command:"
1007 msgstr "Ordre:"
1008
996 -#: gitk:9371
1009 +#: gitk:9390
1010 msgid "Write"
1011 msgstr "Escriu"
1012
1000 -#: gitk:9389
1013 +#: gitk:9408
1014 msgid "Error writing commit:"
1015 msgstr "Error en escriure la comissió:"
1016
1004 -#: gitk:9416
1017 +#: gitk:9435
1018 msgid "Name:"
1019 msgstr "Nom:"
1020
1008 -#: gitk:9439
1021 +#: gitk:9458
1022 msgid "Please specify a name for the new branch"
1023 msgstr "Si us plau, especifiqueu un nom per a la branca nova"
1024
1012 -#: gitk:9444
1025 +#: gitk:9463
1026 #, tcl-format
1027 msgid "Branch '%s' already exists. Overwrite?"
1028 msgstr "La branca '%s' ja existeix. Voleu sobreescriure?"
1029
1017 -#: gitk:9511
1030 +#: gitk:9530
1031 #, tcl-format
1032 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1033 msgstr ""
1034 "La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a "
1035 "aplicar-la?"
1036
1024 -#: gitk:9516
1037 +#: gitk:9535
1038 msgid "Cherry-picking"
1039 msgstr "Recollint cireres"
1040
1028 -#: gitk:9525
1041 +#: gitk:9544
1042 #, tcl-format
1043 msgid ""
1044 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1035,7 +1048,7 @@ msgstr ""
1048 "Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a "
1049 "intentar."
1050
1038 -#: gitk:9531
1051 +#: gitk:9550
1052 msgid ""
1053 "Cherry-pick failed because of merge conflict.\n"
1054 "Do you wish to run git citool to resolve it?"
@@ -1043,21 +1056,21 @@ msgstr ""
1056 "El recull de cireres ha fallat a causa d'un conflicte de fusió.\n"
1057 "Voleu executar el git citool per a resoldre'l?"
1058
1046 -#: gitk:9547 gitk:9605
1059 +#: gitk:9566 gitk:9624
1060 msgid "No changes committed"
1061 msgstr "Cap canvi comès"
1062
1050 -#: gitk:9574
1063 +#: gitk:9593
1064 #, tcl-format
1065 msgid "Commit %s is not included in branch %s -- really revert it?"
1066 msgstr ""
1067 "La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?"
1068
1056 -#: gitk:9579
1069 +#: gitk:9598
1070 msgid "Reverting"
1071 msgstr "Revertint"
1072
1060 -#: gitk:9587
1073 +#: gitk:9606
1074 #, tcl-format
1075 msgid ""
1076 "Revert failed because of local changes to the following files:%s Please "
@@ -1067,7 +1080,7 @@ msgstr ""
1080 "plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a "
1081 "intentar."
1082
1070 -#: gitk:9591
1083 +#: gitk:9610
1084 msgid ""
1085 "Revert failed because of merge conflict.\n"
1086 " Do you wish to run git citool to resolve it?"
@@ -1075,28 +1088,28 @@ msgstr ""
1088 "La reversió ha fallat a causa d'un conflicte de fusió.\n"
1089 " Voleu executar el git citool per a resoldre'l?"
1090
1078 -#: gitk:9634
1091 +#: gitk:9653
1092 msgid "Confirm reset"
1093 msgstr "Confirma el restabliment"
1094
1082 -#: gitk:9636
1095 +#: gitk:9655
1096 #, tcl-format
1097 msgid "Reset branch %s to %s?"
1098 msgstr "Voleu restablir la branca %s a %s?"
1099
1087 -#: gitk:9638
1100 +#: gitk:9657
1101 msgid "Reset type:"
1102 msgstr "Tipus de restabliment:"
1103
1091 -#: gitk:9641
1104 +#: gitk:9660
1105 msgid "Soft: Leave working tree and index untouched"
1106 msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar"
1107
1095 -#: gitk:9644
1108 +#: gitk:9663
1109 msgid "Mixed: Leave working tree untouched, reset index"
1110 msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex"
1111
1099 -#: gitk:9647
1112 +#: gitk:9666
1113 msgid ""
1114 "Hard: Reset working tree and index\n"
1115 "(discard ALL local changes)"
@@ -1104,19 +1117,19 @@ msgstr ""
1117 "Dur: Restableix l'arbre de treball i l'índex\n"
1118 "(descarta TOTS els canvis locals)"
1119
1107 -#: gitk:9664
1120 +#: gitk:9683
1121 msgid "Resetting"
1122 msgstr "Restablint"
1123
1111 -#: gitk:9724
1124 +#: gitk:9743
1125 msgid "Checking out"
1126 msgstr "Agafant"
1127
1115 -#: gitk:9777
1128 +#: gitk:9796
1129 msgid "Cannot delete the currently checked-out branch"
1130 msgstr "No es pot suprimir la branca actualment agafada"
1131
1119 -#: gitk:9783
1132 +#: gitk:9802
1133 #, tcl-format
1134 msgid ""
1135 "The commits on branch %s aren't on any other branch.\n"
@@ -1125,16 +1138,16 @@ msgstr ""
1138 "Les comissions en la branca %s no són en cap altra branca.\n"
1139 "Realment voleu suprimir la branca %s?"
1140
1128 -#: gitk:9814
1141 +#: gitk:9833
1142 #, tcl-format
1143 msgid "Tags and heads: %s"
1144 msgstr "Etiquetes i caps: %s"
1145
1133 -#: gitk:9829
1146 +#: gitk:9850
1147 msgid "Filter"
1148 msgstr "Filtre"
1149
1137 -#: gitk:10125
1150 +#: gitk:10146
1151 msgid ""
1152 "Error reading commit topology information; branch and preceding/following "
1153 "tag information will be incomplete."
@@ -1142,213 +1155,218 @@ msgstr ""
1155 "Error en llegir la informació de topologia de comissió; la informació sobre "
1156 "branques i etiquetes precedents/següents serà incompleta."
1157
1145 -#: gitk:11102
1158 +#: gitk:11123
1159 msgid "Tag"
1160 msgstr "Etiqueta"
1161
1149 -#: gitk:11106
1162 +#: gitk:11127
1163 msgid "Id"
1164 msgstr "Id"
1165
1153 -#: gitk:11189
1166 +#: gitk:11210
1167 msgid "Gitk font chooser"
1168 msgstr "Selector de tipus de lletra del Gitk"
1169
1157 -#: gitk:11206
1170 +#: gitk:11227
1171 msgid "B"
1172 msgstr "B"
1173
1161 -#: gitk:11209
1174 +#: gitk:11230
1175 msgid "I"
1176 msgstr "I"
1177
1165 -#: gitk:11327
1178 +#: gitk:11348
1179 msgid "Commit list display options"
1180 msgstr "Opcions de visualització de la llista de comissions"
1181
1169 -#: gitk:11330
1182 +#: gitk:11351
1183 msgid "Maximum graph width (lines)"
1184 msgstr "Amplada màxima del gràfic (línies)"
1185
1173 -#: gitk:11334
1186 +#: gitk:11355
1187 #, no-tcl-format
1188 msgid "Maximum graph width (% of pane)"
1189 msgstr "Amplada màxima del gràfic (% del panell)"
1190
1178 -#: gitk:11337
1191 +#: gitk:11358
1192 msgid "Show local changes"
1193 msgstr "Mostra els canvis locals"
1194
1182 -#: gitk:11340
1195 +#: gitk:11361
1196 msgid "Auto-select SHA1 (length)"
1197 msgstr "Selecciona automàticament l'SHA1 (longitud)"
1198
1186 -#: gitk:11344
1199 +#: gitk:11365
1200 msgid "Hide remote refs"
1201 msgstr "Amaga les referències remotes"
1202
1190 -#: gitk:11348
1203 +#: gitk:11369
1204 msgid "Diff display options"
1205 msgstr "Opcions de visualització de diferència"
1206
1194 -#: gitk:11350
1207 +#: gitk:11371
1208 msgid "Tab spacing"
1209 msgstr "Espaiat de tabulació"
1210
1198 -#: gitk:11353
1211 +#: gitk:11374
1212 msgid "Display nearby tags/heads"
1213 msgstr "Mostra etiquetes/caps propers"
1214
1202 -#: gitk:11356
1215 +#: gitk:11377
1216 msgid "Maximum # tags/heads to show"
1217 msgstr "Nombre màxim d'etiquetes/caps a mostrar"
1218
1206 -#: gitk:11359
1219 +#: gitk:11380
1220 msgid "Limit diffs to listed paths"
1221 msgstr "Limita les diferències als camins llistats"
1222
1210 -#: gitk:11362
1223 +#: gitk:11383
1224 msgid "Support per-file encodings"
1225 msgstr "Admet codificacions específiques per a cada fitxer"
1226
1214 -#: gitk:11368 gitk:11515
1227 +#: gitk:11389 gitk:11536
1228 msgid "External diff tool"
1229 msgstr "Eina de diferència externa"
1230
1218 -#: gitk:11369
1231 +#: gitk:11390
1232 msgid "Choose..."
1233 msgstr "Trieu..."
1234
1222 -#: gitk:11374
1235 +#: gitk:11395
1236 msgid "General options"
1237 msgstr "Opcions generals"
1238
1226 -#: gitk:11377
1239 +#: gitk:11398
1240 msgid "Use themed widgets"
1241 msgstr "Usa els ginys tematitzats"
1242
1230 -#: gitk:11379
1243 +#: gitk:11400
1244 msgid "(change requires restart)"
1245 msgstr "(el canvi requereix reiniciar)"
1246
1234 -#: gitk:11381
1247 +#: gitk:11402
1248 msgid "(currently unavailable)"
1249 msgstr "(actualment no disponible)"
1250
1238 -#: gitk:11392
1251 +#: gitk:11413
1252 msgid "Colors: press to choose"
1253 msgstr "Colors: pressiona per a triar"
1254
1242 -#: gitk:11395
1255 +#: gitk:11416
1256 msgid "Interface"
1257 msgstr "Interfície"
1258
1246 -#: gitk:11396
1259 +#: gitk:11417
1260 msgid "interface"
1261 msgstr "interfície"
1262
1250 -#: gitk:11399
1263 +#: gitk:11420
1264 msgid "Background"
1265 msgstr "Fons"
1266
1254 -#: gitk:11400 gitk:11430
1267 +#: gitk:11421 gitk:11451
1268 msgid "background"
1269 msgstr "fons"
1270
1258 -#: gitk:11403
1271 +#: gitk:11424
1272 msgid "Foreground"
1273 msgstr "Primer pla"
1274
1262 -#: gitk:11404
1275 +#: gitk:11425
1276 msgid "foreground"
1277 msgstr "primer pla"
1278
1266 -#: gitk:11407
1279 +#: gitk:11428
1280 msgid "Diff: old lines"
1281 msgstr "Diferència: línies velles"
1282
1270 -#: gitk:11408
1283 +#: gitk:11429
1284 msgid "diff old lines"
1285 msgstr "diferencia les línies velles"
1286
1274 -#: gitk:11412
1287 +#: gitk:11433
1288 msgid "Diff: new lines"
1289 msgstr "Diferència: línies noves"
1290
1278 -#: gitk:11413
1291 +#: gitk:11434
1292 msgid "diff new lines"
1293 msgstr "diferencia les línies noves"
1294
1282 -#: gitk:11417
1295 +#: gitk:11438
1296 msgid "Diff: hunk header"
1297 msgstr "Diferència: capçalera de tros"
1298
1286 -#: gitk:11419
1299 +#: gitk:11440
1300 msgid "diff hunk header"
1301 msgstr "diferencia la capçalera de tros"
1302
1290 -#: gitk:11423
1303 +#: gitk:11444
1304 msgid "Marked line bg"
1305 msgstr "Fons de la línia marcada"
1306
1294 -#: gitk:11425
1307 +#: gitk:11446
1308 msgid "marked line background"
1309 msgstr "fons de la línia marcada"
1310
1298 -#: gitk:11429
1311 +#: gitk:11450
1312 msgid "Select bg"
1313 msgstr "fons de la selecció"
1314
1302 -#: gitk:11438
1315 +#: gitk:11459
1316 msgid "Fonts: press to choose"
1317 msgstr "Tipus de lletra: pressiona per a triar"
1318
1306 -#: gitk:11440
1319 +#: gitk:11461
1320 msgid "Main font"
1321 msgstr "Tipus de lletra principal"
1322
1310 -#: gitk:11441
1323 +#: gitk:11462
1324 msgid "Diff display font"
1325 msgstr "Tipus de lletra de visualització de diferència"
1326
1314 -#: gitk:11442
1327 +#: gitk:11463
1328 msgid "User interface font"
1329 msgstr "Tipus de lletra de la interfície d'usuari"
1330
1318 -#: gitk:11464
1331 +#: gitk:11485
1332 msgid "Gitk preferences"
1333 msgstr "Preferències del Gitk"
1334
1322 -#: gitk:11473
1335 +#: gitk:11494
1336 msgid "General"
1337 msgstr "General"
1338
1326 -#: gitk:11474
1339 +#: gitk:11495
1340 msgid "Colors"
1341 msgstr "Colors"
1342
1330 -#: gitk:11475
1343 +#: gitk:11496
1344 msgid "Fonts"
1345 msgstr "Tipus de lletra"
1346
1334 -#: gitk:11525
1347 +#: gitk:11546
1348 #, tcl-format
1349 msgid "Gitk: choose color for %s"
1350 msgstr "Gitk: tria el color per a %s"
1351
1339 -#: gitk:12242
1352 +#: gitk:12059
1353 +msgid ""
1354 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1355 +" Gitk requires at least Tcl/Tk 8.4."
1356 +msgstr ""
1357 +
1358 +#: gitk:12269
1359 msgid "Cannot find a git repository here."
1360 msgstr "No es pot trobar cap dipòsit de git aquí."
1361
1343 -#: gitk:12289
1362 +#: gitk:12316
1363 #, tcl-format
1364 msgid "Ambiguous argument '%s': both revision and filename"
1365 msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer"
1366
1348 -#: gitk:12301
1367 +#: gitk:12328
1368 msgid "Bad arguments to gitk:"
1369 msgstr "Paràmetres dolents al gitk:"
1370
1352 -#: gitk:12405
1353 -msgid "Command line"
1354 -msgstr "Línia d'ordres"
1371 +#~ msgid "mc"
1372 +#~ msgstr "mc"
po/de.po
+297 -279
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: git-gui\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2010-01-27 20:27+0100\n"
13 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
14 "Language-Team: German\n"
@@ -25,7 +25,7 @@ msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
25 msgid "Color words"
26 msgstr ""
27
28 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
28 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
29 msgid "Markup words"
30 msgstr ""
31
@@ -59,14 +59,18 @@ msgstr "Fehler beim Ausführen von »git log«:"
59 msgid "Reading"
60 msgstr "Lesen"
61
62 -#: gitk:496 gitk:4508
62 +#: gitk:496 gitk:4525
63 msgid "Reading commits..."
64 msgstr "Versionen werden gelesen ..."
65
66 -#: gitk:499 gitk:1637 gitk:4511
66 +#: gitk:499 gitk:1637 gitk:4528
67 msgid "No commits selected"
68 msgstr "Keine Versionen ausgewählt"
69
70 +#: gitk:1445 gitk:4045 gitk:12432
71 +msgid "Command line"
72 +msgstr "Kommandozeile"
73 +
74 #: gitk:1511
75 msgid "Can't parse git log output:"
76 msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
@@ -75,16 +79,12 @@ msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
79 msgid "No commit information available"
80 msgstr "Keine Versionsinformation verfügbar"
81
78 -#: gitk:1897
79 -msgid "mc"
80 -msgstr "mc"
81 -
82 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
82 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
83 msgid "OK"
84 msgstr "Ok"
85
86 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
87 -#: gitk:11221 gitk:11501
86 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
87 +#: gitk:11242 gitk:11522
88 msgid "Cancel"
89 msgstr "Abbrechen"
90
@@ -136,15 +136,15 @@ msgstr "Ansicht bearbeiten ..."
136 msgid "Delete view"
137 msgstr "Ansicht entfernen"
138
139 -#: gitk:2088
139 +#: gitk:2088 gitk:4043
140 msgid "All files"
141 msgstr "Alle Dateien"
142
143 -#: gitk:2083 gitk:4050
143 +#: gitk:2083 gitk:4067
144 msgid "View"
145 msgstr "Ansicht"
146
147 -#: gitk:2093 gitk:2103 gitk:3009
147 +#: gitk:2093 gitk:2103 gitk:3012
148 msgid "About gitk"
149 msgstr "Über gitk"
150
@@ -156,7 +156,7 @@ msgstr "Tastenkürzel"
156 msgid "Help"
157 msgstr "Hilfe"
158
159 -#: gitk:2185 gitk:8633
159 +#: gitk:2185 gitk:8652
160 msgid "SHA1 ID:"
161 msgstr "SHA1 ID:"
162
@@ -172,53 +172,53 @@ msgstr "Suche"
172 msgid "commit"
173 msgstr "Version nach"
174
175 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
176 -#: gitk:6893
175 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
176 +#: gitk:6912
177 msgid "containing:"
178 msgstr "Beschreibung:"
179
180 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
180 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
181 msgid "touching paths:"
182 msgstr "Dateien:"
183
184 -#: gitk:2303 gitk:4759
184 +#: gitk:2303 gitk:4777
185 msgid "adding/removing string:"
186 msgstr "Änderungen:"
187
188 -#: gitk:2304 gitk:4761
188 +#: gitk:2304 gitk:4779
189 msgid "changing lines matching:"
190 msgstr ""
191
192 -#: gitk:2313 gitk:2315 gitk:4748
192 +#: gitk:2313 gitk:2315 gitk:4766
193 msgid "Exact"
194 msgstr "Exakt"
195
196 -#: gitk:2315 gitk:4836 gitk:6704
196 +#: gitk:2315 gitk:4854 gitk:6723
197 msgid "IgnCase"
198 msgstr "Kein Groß/Klein"
199
200 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
200 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
201 msgid "Regexp"
202 msgstr "Regexp"
203
204 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
204 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
205 msgid "All fields"
206 msgstr "Alle Felder"
207
208 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
208 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
209 msgid "Headline"
210 msgstr "Überschrift"
211
212 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
212 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
213 msgid "Comments"
214 msgstr "Beschreibung"
215
216 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
217 -#: gitk:8826
216 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
217 +#: gitk:8845
218 msgid "Author"
219 msgstr "Autor"
220
221 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
221 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
222 msgid "Committer"
223 msgstr "Eintragender"
224
@@ -246,7 +246,7 @@ msgstr "Kontextzeilen"
246 msgid "Ignore space change"
247 msgstr "Leerzeichenänderungen ignorieren"
248
249 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
249 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
250 msgid "Line diff"
251 msgstr ""
252
@@ -258,102 +258,110 @@ msgstr "Patch"
258 msgid "Tree"
259 msgstr "Baum"
260
261 -#: gitk:2616 gitk:2636
261 +#: gitk:2617 gitk:2637
262 msgid "Diff this -> selected"
263 msgstr "Vergleich: diese -> gewählte"
264
265 -#: gitk:2617 gitk:2637
265 +#: gitk:2618 gitk:2638
266 msgid "Diff selected -> this"
267 msgstr "Vergleich: gewählte -> diese"
268
269 -#: gitk:2618 gitk:2638
269 +#: gitk:2619 gitk:2639
270 msgid "Make patch"
271 msgstr "Patch erstellen"
272
273 -#: gitk:2619 gitk:9235
273 +#: gitk:2620 gitk:9254
274 msgid "Create tag"
275 msgstr "Markierung erstellen"
276
277 -#: gitk:2620 gitk:9352
277 +#: gitk:2621 gitk:9371
278 msgid "Write commit to file"
279 msgstr "Version in Datei schreiben"
280
281 -#: gitk:2621 gitk:9409
281 +#: gitk:2622 gitk:9428
282 msgid "Create new branch"
283 msgstr "Neuen Zweig erstellen"
284
285 -#: gitk:2622
285 +#: gitk:2623
286 msgid "Cherry-pick this commit"
287 msgstr "Diese Version pflücken"
288
289 -#: gitk:2623
289 +#: gitk:2624
290 msgid "Reset HEAD branch to here"
291 msgstr "HEAD-Zweig auf diese Version zurücksetzen"
292
293 -#: gitk:2624
293 +#: gitk:2625
294 msgid "Mark this commit"
295 msgstr "Lesezeichen setzen"
296
297 -#: gitk:2625
297 +#: gitk:2626
298 msgid "Return to mark"
299 msgstr "Zum Lesezeichen"
300
301 -#: gitk:2626
301 +#: gitk:2627
302 msgid "Find descendant of this and mark"
303 msgstr "Abkömmling von Lesezeichen und dieser Version finden"
304
305 -#: gitk:2627
305 +#: gitk:2628
306 msgid "Compare with marked commit"
307 msgstr "Mit Lesezeichen vergleichen"
308
309 -#: gitk:2628 gitk:2639
309 +#: gitk:2629 gitk:2640
310 #, fuzzy
311 msgid "Diff this -> marked commit"
312 msgstr "Vergleich: diese -> gewählte"
313
314 -#: gitk:2629 gitk:2640
314 +#: gitk:2630 gitk:2641
315 #, fuzzy
316 msgid "Diff marked commit -> this"
317 msgstr "Vergleich: gewählte -> diese"
318
319 -#: gitk:2630
319 +#: gitk:2631
320 #, fuzzy
321 msgid "Revert this commit"
322 msgstr "Lesezeichen setzen"
323
324 -#: gitk:2646
324 +#: gitk:2647
325 msgid "Check out this branch"
326 msgstr "Auf diesen Zweig umstellen"
327
328 -#: gitk:2647
328 +#: gitk:2648
329 msgid "Remove this branch"
330 msgstr "Zweig löschen"
331
332 -#: gitk:2654
332 +#: gitk:2649
333 +msgid "Copy branch name"
334 +msgstr ""
335 +
336 +#: gitk:2656
337 msgid "Highlight this too"
338 msgstr "Diesen auch hervorheben"
339
336 -#: gitk:2655
340 +#: gitk:2657
341 msgid "Highlight this only"
342 msgstr "Nur diesen hervorheben"
343
340 -#: gitk:2656
344 +#: gitk:2658
345 msgid "External diff"
346 msgstr "Externes Diff-Programm"
347
344 -#: gitk:2657
348 +#: gitk:2659
349 msgid "Blame parent commit"
350 msgstr "Annotieren der Elternversion"
351
348 -#: gitk:2664
352 +#: gitk:2660
353 +msgid "Copy path"
354 +msgstr ""
355 +
356 +#: gitk:2667
357 msgid "Show origin of this line"
358 msgstr "Herkunft dieser Zeile anzeigen"
359
352 -#: gitk:2665
360 +#: gitk:2668
361 msgid "Run git gui blame on this line"
362 msgstr "Diese Zeile annotieren (»git gui blame«)"
363
356 -#: gitk:3011
364 +#: gitk:3014
365 #, fuzzy
366 msgid ""
367 "\n"
@@ -371,517 +379,522 @@ msgstr ""
379 "Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
380 "License"
381
374 -#: gitk:3019 gitk:3085 gitk:9836
382 +#: gitk:3022 gitk:3089 gitk:9857
383 msgid "Close"
384 msgstr "Schließen"
385
378 -#: gitk:3040
386 +#: gitk:3043
387 msgid "Gitk key bindings"
388 msgstr "Gitk-Tastaturbelegung"
389
382 -#: gitk:3043
390 +#: gitk:3046
391 msgid "Gitk key bindings:"
392 msgstr "Gitk-Tastaturbelegung:"
393
386 -#: gitk:3045
394 +#: gitk:3048
395 #, tcl-format
396 msgid "<%s-Q>\t\tQuit"
397 msgstr "<%s-Q>\t\tBeenden"
398
391 -#: gitk:3046
399 +#: gitk:3049
400 #, fuzzy, tcl-format
401 msgid "<%s-W>\t\tClose window"
402 msgstr "<%s-F>\t\tSuchen"
403
396 -#: gitk:3047
404 +#: gitk:3050
405 msgid "<Home>\t\tMove to first commit"
406 msgstr "<Pos1>\t\tZur neuesten Version springen"
407
400 -#: gitk:3048
408 +#: gitk:3051
409 msgid "<End>\t\tMove to last commit"
410 msgstr "<Ende>\t\tZur ältesten Version springen"
411
404 -#: gitk:3049
412 +#: gitk:3052
413 #, fuzzy
414 msgid "<Up>, p, k\tMove up one commit"
415 msgstr "<Hoch>, p, i\tNächste neuere Version"
416
409 -#: gitk:3050
417 +#: gitk:3053
418 #, fuzzy
419 msgid "<Down>, n, j\tMove down one commit"
420 msgstr "<Runter>, n, k\tNächste ältere Version"
421
414 -#: gitk:3051
422 +#: gitk:3054
423 #, fuzzy
424 msgid "<Left>, z, h\tGo back in history list"
425 msgstr "<Links>, z, j\tEine Version zurückgehen"
426
419 -#: gitk:3052
427 +#: gitk:3055
428 msgid "<Right>, x, l\tGo forward in history list"
429 msgstr "<Rechts>, x, l\tEine Version weitergehen"
430
423 -#: gitk:3053
431 +#: gitk:3056
432 #, tcl-format
433 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
434 msgstr ""
435
428 -#: gitk:3054
436 +#: gitk:3057
437 msgid "<PageUp>\tMove up one page in commit list"
438 msgstr "<BildHoch>\tEine Seite nach oben blättern"
439
432 -#: gitk:3055
440 +#: gitk:3058
441 msgid "<PageDown>\tMove down one page in commit list"
442 msgstr "<BildRunter>\tEine Seite nach unten blättern"
443
436 -#: gitk:3056
444 +#: gitk:3059
445 #, tcl-format
446 msgid "<%s-Home>\tScroll to top of commit list"
447 msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
448
441 -#: gitk:3057
449 +#: gitk:3060
450 #, tcl-format
451 msgid "<%s-End>\tScroll to bottom of commit list"
452 msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
453
446 -#: gitk:3058
454 +#: gitk:3061
455 #, tcl-format
456 msgid "<%s-Up>\tScroll commit list up one line"
457 msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
458
451 -#: gitk:3059
459 +#: gitk:3062
460 #, tcl-format
461 msgid "<%s-Down>\tScroll commit list down one line"
462 msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
463
456 -#: gitk:3060
464 +#: gitk:3063
465 #, tcl-format
466 msgid "<%s-PageUp>\tScroll commit list up one page"
467 msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
468
461 -#: gitk:3061
469 +#: gitk:3064
470 #, tcl-format
471 msgid "<%s-PageDown>\tScroll commit list down one page"
472 msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
473
466 -#: gitk:3062
474 +#: gitk:3065
475 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
476 msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
477
470 -#: gitk:3063
478 +#: gitk:3066
479 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
480 msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
481
474 -#: gitk:3064
482 +#: gitk:3067
483 msgid "<Delete>, b\tScroll diff view up one page"
484 msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
485
478 -#: gitk:3065
486 +#: gitk:3068
487 msgid "<Backspace>\tScroll diff view up one page"
488 msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
489
482 -#: gitk:3066
490 +#: gitk:3069
491 msgid "<Space>\t\tScroll diff view down one page"
492 msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
493
486 -#: gitk:3067
494 +#: gitk:3070
495 msgid "u\t\tScroll diff view up 18 lines"
496 msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
497
490 -#: gitk:3068
498 +#: gitk:3071
499 msgid "d\t\tScroll diff view down 18 lines"
500 msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
501
494 -#: gitk:3069
502 +#: gitk:3072
503 #, tcl-format
504 msgid "<%s-F>\t\tFind"
505 msgstr "<%s-F>\t\tSuchen"
506
499 -#: gitk:3070
507 +#: gitk:3073
508 #, tcl-format
509 msgid "<%s-G>\t\tMove to next find hit"
510 msgstr "<%s-G>\t\tWeitersuchen"
511
504 -#: gitk:3071
512 +#: gitk:3074
513 msgid "<Return>\tMove to next find hit"
514 msgstr "<Eingabetaste>\tWeitersuchen"
515
508 -#: gitk:3072
516 +#: gitk:3075
517 +#, fuzzy
518 +msgid "g\t\tGo to commit"
519 +msgstr "<Ende>\t\tZur ältesten Version springen"
520 +
521 +#: gitk:3076
522 msgid "/\t\tFocus the search box"
523 msgstr "/\t\tTastaturfokus ins Suchfeld"
524
512 -#: gitk:3073
525 +#: gitk:3077
526 msgid "?\t\tMove to previous find hit"
527 msgstr "?\t\tRückwärts weitersuchen"
528
516 -#: gitk:3074
529 +#: gitk:3078
530 msgid "f\t\tScroll diff view to next file"
531 msgstr "f\t\tVergleich zur nächsten Datei blättern"
532
520 -#: gitk:3075
533 +#: gitk:3079
534 #, tcl-format
535 msgid "<%s-S>\t\tSearch for next hit in diff view"
536 msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
537
525 -#: gitk:3076
538 +#: gitk:3080
539 #, tcl-format
540 msgid "<%s-R>\t\tSearch for previous hit in diff view"
541 msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
542
530 -#: gitk:3077
543 +#: gitk:3081
544 #, tcl-format
545 msgid "<%s-KP+>\tIncrease font size"
546 msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
547
535 -#: gitk:3078
548 +#: gitk:3082
549 #, tcl-format
550 msgid "<%s-plus>\tIncrease font size"
551 msgstr "<%s-Plus>\tSchrift vergrößern"
552
540 -#: gitk:3079
553 +#: gitk:3083
554 #, tcl-format
555 msgid "<%s-KP->\tDecrease font size"
556 msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
557
545 -#: gitk:3080
558 +#: gitk:3084
559 #, tcl-format
560 msgid "<%s-minus>\tDecrease font size"
561 msgstr "<%s-Minus>\tSchrift verkleinern"
562
550 -#: gitk:3081
563 +#: gitk:3085
564 msgid "<F5>\t\tUpdate"
565 msgstr "<F5>\t\tAktualisieren"
566
554 -#: gitk:3546 gitk:3555
567 +#: gitk:3550 gitk:3559
568 #, tcl-format
569 msgid "Error creating temporary directory %s:"
570 msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
571
559 -#: gitk:3568
572 +#: gitk:3572
573 #, tcl-format
574 msgid "Error getting \"%s\" from %s:"
575 msgstr "Fehler beim Holen von »%s« von »%s«:"
576
564 -#: gitk:3631
577 +#: gitk:3635
578 msgid "command failed:"
579 msgstr "Kommando fehlgeschlagen:"
580
568 -#: gitk:3780
581 +#: gitk:3784
582 msgid "No such commit"
583 msgstr "Version nicht gefunden"
584
572 -#: gitk:3794
585 +#: gitk:3798
586 msgid "git gui blame: command failed:"
587 msgstr "git gui blame: Kommando fehlgeschlagen:"
588
576 -#: gitk:3825
589 +#: gitk:3829
590 #, tcl-format
591 msgid "Couldn't read merge head: %s"
592 msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
593
581 -#: gitk:3833
594 +#: gitk:3837
595 #, tcl-format
596 msgid "Error reading index: %s"
597 msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
598
586 -#: gitk:3858
599 +#: gitk:3862
600 #, tcl-format
601 msgid "Couldn't start git blame: %s"
602 msgstr "»git blame« konnte nicht gestartet werden: %s"
603
591 -#: gitk:3861 gitk:6735
604 +#: gitk:3865 gitk:6754
605 msgid "Searching"
606 msgstr "Suchen"
607
595 -#: gitk:3893
608 +#: gitk:3897
609 #, tcl-format
610 msgid "Error running git blame: %s"
611 msgstr "Fehler beim Ausführen von »git blame«: %s"
612
600 -#: gitk:3921
613 +#: gitk:3925
614 #, tcl-format
615 msgid "That line comes from commit %s, which is not in this view"
616 msgstr ""
617 "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
618
606 -#: gitk:3935
619 +#: gitk:3939
620 msgid "External diff viewer failed:"
621 msgstr "Externes Diff-Programm fehlgeschlagen:"
622
610 -#: gitk:4053
623 +#: gitk:4070
624 msgid "Gitk view definition"
625 msgstr "Gitk-Ansichten"
626
614 -#: gitk:4057
627 +#: gitk:4074
628 msgid "Remember this view"
629 msgstr "Diese Ansicht speichern"
630
618 -#: gitk:4058
631 +#: gitk:4075
632 msgid "References (space separated list):"
633 msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
634
622 -#: gitk:4059
635 +#: gitk:4076
636 msgid "Branches & tags:"
637 msgstr "Zweige/Markierungen:"
638
626 -#: gitk:4060
639 +#: gitk:4077
640 msgid "All refs"
641 msgstr "Alle Markierungen und Zweige"
642
630 -#: gitk:4061
643 +#: gitk:4078
644 msgid "All (local) branches"
645 msgstr "Alle (lokalen) Zweige"
646
634 -#: gitk:4062
647 +#: gitk:4079
648 msgid "All tags"
649 msgstr "Alle Markierungen"
650
638 -#: gitk:4063
651 +#: gitk:4080
652 msgid "All remote-tracking branches"
653 msgstr "Alle Übernahmezweige"
654
642 -#: gitk:4064
655 +#: gitk:4081
656 msgid "Commit Info (regular expressions):"
657 msgstr "Versionsinformationen (reguläre Ausdrücke):"
658
646 -#: gitk:4065
659 +#: gitk:4082
660 msgid "Author:"
661 msgstr "Autor:"
662
650 -#: gitk:4066
663 +#: gitk:4083
664 msgid "Committer:"
665 msgstr "Eintragender:"
666
654 -#: gitk:4067
667 +#: gitk:4084
668 msgid "Commit Message:"
669 msgstr "Versionsbeschreibung:"
670
658 -#: gitk:4068
671 +#: gitk:4085
672 msgid "Matches all Commit Info criteria"
673 msgstr "Alle Versionsinformationen-Kriterien erfüllen"
674
662 -#: gitk:4069
675 +#: gitk:4086
676 #, fuzzy
664 -msgid "Matches none Commit Info criteria"
677 +msgid "Matches no Commit Info criteria"
678 msgstr "Alle Versionsinformationen-Kriterien erfüllen"
679
667 -#: gitk:4070
680 +#: gitk:4087
681 msgid "Changes to Files:"
682 msgstr "Dateien:"
683
671 -#: gitk:4071
684 +#: gitk:4088
685 msgid "Fixed String"
686 msgstr "Zeichenkette"
687
675 -#: gitk:4072
688 +#: gitk:4089
689 msgid "Regular Expression"
690 msgstr "Regulärer Ausdruck"
691
679 -#: gitk:4073
692 +#: gitk:4090
693 msgid "Search string:"
694 msgstr "Suchausdruck:"
695
683 -#: gitk:4074
696 +#: gitk:4091
697 msgid ""
698 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
699 "15:27:38\"):"
700 msgstr ""
701 "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
702
690 -#: gitk:4075
703 +#: gitk:4092
704 msgid "Since:"
705 msgstr "Von:"
706
694 -#: gitk:4076
707 +#: gitk:4093
708 msgid "Until:"
709 msgstr "Bis:"
710
698 -#: gitk:4077
711 +#: gitk:4094
712 msgid "Limit and/or skip a number of revisions (positive integer):"
713 msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
714
702 -#: gitk:4078
715 +#: gitk:4095
716 msgid "Number to show:"
717 msgstr "Anzeigen:"
718
706 -#: gitk:4079
719 +#: gitk:4096
720 msgid "Number to skip:"
721 msgstr "Überspringen:"
722
710 -#: gitk:4080
723 +#: gitk:4097
724 msgid "Miscellaneous options:"
725 msgstr "Sonstiges:"
726
714 -#: gitk:4081
727 +#: gitk:4098
728 msgid "Strictly sort by date"
729 msgstr "Streng nach Datum sortieren"
730
718 -#: gitk:4082
731 +#: gitk:4099
732 msgid "Mark branch sides"
733 msgstr "Zweig-Seiten markieren"
734
722 -#: gitk:4083
735 +#: gitk:4100
736 msgid "Limit to first parent"
737 msgstr "Auf erste Elternversion beschränken"
738
726 -#: gitk:4084
739 +#: gitk:4101
740 msgid "Simple history"
741 msgstr "Einfache Historie"
742
730 -#: gitk:4085
743 +#: gitk:4102
744 msgid "Additional arguments to git log:"
745 msgstr "Zusätzliche Argumente für »git log«:"
746
734 -#: gitk:4086
747 +#: gitk:4103
748 msgid "Enter files and directories to include, one per line:"
749 msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
750
738 -#: gitk:4087
751 +#: gitk:4104
752 msgid "Command to generate more commits to include:"
753 msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
754
742 -#: gitk:4211
755 +#: gitk:4228
756 msgid "Gitk: edit view"
757 msgstr "Gitk: Ansicht bearbeiten"
758
746 -#: gitk:4219
759 +#: gitk:4236
760 msgid "-- criteria for selecting revisions"
761 msgstr "-- Auswahl der angezeigten Versionen"
762
750 -#: gitk:4224
763 +#: gitk:4241
764 msgid "View Name"
765 msgstr "Ansichtsname"
766
754 -#: gitk:4299
767 +#: gitk:4316
768 msgid "Apply (F5)"
769 msgstr "Anwenden (F5)"
770
758 -#: gitk:4337
771 +#: gitk:4354
772 msgid "Error in commit selection arguments:"
773 msgstr "Fehler in den ausgewählten Versionen:"
774
762 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
775 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
776 msgid "None"
777 msgstr "Keine"
778
766 -#: gitk:5003 gitk:5008
779 +#: gitk:5021 gitk:5026
780 msgid "Descendant"
781 msgstr "Abkömmling"
782
770 -#: gitk:5004
783 +#: gitk:5022
784 msgid "Not descendant"
785 msgstr "Kein Abkömmling"
786
774 -#: gitk:5011 gitk:5016
787 +#: gitk:5029 gitk:5034
788 msgid "Ancestor"
789 msgstr "Vorgänger"
790
778 -#: gitk:5012
791 +#: gitk:5030
792 msgid "Not ancestor"
793 msgstr "Kein Vorgänger"
794
782 -#: gitk:5306
795 +#: gitk:5324
796 msgid "Local changes checked in to index but not committed"
797 msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
798
786 -#: gitk:5342
799 +#: gitk:5360
800 msgid "Local uncommitted changes, not checked in to index"
801 msgstr "Lokale Änderungen, nicht bereitgestellt"
802
790 -#: gitk:7115
803 +#: gitk:7134
804 msgid "and many more"
805 msgstr ""
806
794 -#: gitk:7118
807 +#: gitk:7137
808 msgid "many"
809 msgstr "viele"
810
798 -#: gitk:7309
811 +#: gitk:7328
812 msgid "Tags:"
813 msgstr "Markierungen:"
814
802 -#: gitk:7326 gitk:7332 gitk:8806
815 +#: gitk:7345 gitk:7351 gitk:8825
816 msgid "Parent"
817 msgstr "Eltern"
818
806 -#: gitk:7337
819 +#: gitk:7356
820 msgid "Child"
821 msgstr "Kind"
822
810 -#: gitk:7346
823 +#: gitk:7365
824 msgid "Branch"
825 msgstr "Zweig"
826
814 -#: gitk:7349
827 +#: gitk:7368
828 msgid "Follows"
829 msgstr "Folgt auf"
830
818 -#: gitk:7352
831 +#: gitk:7371
832 msgid "Precedes"
833 msgstr "Vorgänger von"
834
822 -#: gitk:7947
835 +#: gitk:7966
836 #, tcl-format
837 msgid "Error getting diffs: %s"
838 msgstr "Fehler beim Laden des Vergleichs: %s"
839
827 -#: gitk:8631
840 +#: gitk:8650
841 msgid "Goto:"
842 msgstr "Gehe zu:"
843
831 -#: gitk:8652
844 +#: gitk:8671
845 #, tcl-format
846 msgid "Short SHA1 id %s is ambiguous"
847 msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
848
836 -#: gitk:8659
849 +#: gitk:8678
850 #, tcl-format
851 msgid "Revision %s is not known"
852 msgstr "Version »%s« ist unbekannt"
853
841 -#: gitk:8669
854 +#: gitk:8688
855 #, tcl-format
856 msgid "SHA1 id %s is not known"
857 msgstr "SHA1-Hashwert »%s« ist unbekannt"
858
846 -#: gitk:8671
859 +#: gitk:8690
860 #, tcl-format
861 msgid "Revision %s is not in the current view"
862 msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
863
851 -#: gitk:8813 gitk:8828
864 +#: gitk:8832 gitk:8847
865 msgid "Date"
866 msgstr "Datum"
867
855 -#: gitk:8816
868 +#: gitk:8835
869 msgid "Children"
870 msgstr "Kinder"
871
859 -#: gitk:8879
872 +#: gitk:8898
873 #, tcl-format
874 msgid "Reset %s branch to here"
875 msgstr "Zweig »%s« hierher zurücksetzen"
876
864 -#: gitk:8881
877 +#: gitk:8900
878 msgid "Detached head: can't reset"
879 msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
880
868 -#: gitk:8986 gitk:8992
881 +#: gitk:9005 gitk:9011
882 msgid "Skipping merge commit "
883 msgstr "Überspringe Zusammenführungs-Version "
884
872 -#: gitk:9001 gitk:9006
885 +#: gitk:9020 gitk:9025
886 msgid "Error getting patch ID for "
887 msgstr "Fehler beim Holen der Patch-ID für "
888
876 -#: gitk:9002 gitk:9007
889 +#: gitk:9021 gitk:9026
890 msgid " - stopping\n"
891 msgstr " - Abbruch.\n"
892
880 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
893 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
894 msgid "Commit "
895 msgstr "Version "
896
884 -#: gitk:9016
897 +#: gitk:9035
898 msgid ""
899 " is the same patch as\n"
900 " "
@@ -889,7 +902,7 @@ msgstr ""
902 " ist das gleiche Patch wie\n"
903 " "
904
892 -#: gitk:9024
905 +#: gitk:9043
906 msgid ""
907 " differs from\n"
908 " "
@@ -897,7 +910,7 @@ msgstr ""
910 " ist unterschiedlich von\n"
911 " "
912
900 -#: gitk:9026
913 +#: gitk:9045
914 msgid ""
915 "Diff of commits:\n"
916 "\n"
@@ -905,131 +918,131 @@ msgstr ""
918 "Vergleich der Versionen:\n"
919 "\n"
920
908 -#: gitk:9038 gitk:9047
921 +#: gitk:9057 gitk:9066
922 #, tcl-format
923 msgid " has %s children - stopping\n"
924 msgstr " hat %s Kinder. Abbruch\n"
925
913 -#: gitk:9066
926 +#: gitk:9085
927 #, tcl-format
928 msgid "Error writing commit to file: %s"
929 msgstr "Fehler beim Schreiben der Version in Datei: %s"
930
918 -#: gitk:9072
931 +#: gitk:9091
932 #, tcl-format
933 msgid "Error diffing commits: %s"
934 msgstr "Fehler beim Vergleichen der Versionen: %s"
935
923 -#: gitk:9118
936 +#: gitk:9137
937 msgid "Top"
938 msgstr "Oben"
939
927 -#: gitk:9119
940 +#: gitk:9138
941 msgid "From"
942 msgstr "Von"
943
931 -#: gitk:9124
944 +#: gitk:9143
945 msgid "To"
946 msgstr "bis"
947
935 -#: gitk:9148
948 +#: gitk:9167
949 msgid "Generate patch"
950 msgstr "Patch erstellen"
951
939 -#: gitk:9150
952 +#: gitk:9169
953 msgid "From:"
954 msgstr "Von:"
955
943 -#: gitk:9159
956 +#: gitk:9178
957 msgid "To:"
958 msgstr "bis:"
959
947 -#: gitk:9168
960 +#: gitk:9187
961 msgid "Reverse"
962 msgstr "Umgekehrt"
963
951 -#: gitk:9170 gitk:9366
964 +#: gitk:9189 gitk:9385
965 msgid "Output file:"
966 msgstr "Ausgabedatei:"
967
955 -#: gitk:9176
968 +#: gitk:9195
969 msgid "Generate"
970 msgstr "Erzeugen"
971
959 -#: gitk:9214
972 +#: gitk:9233
973 msgid "Error creating patch:"
974 msgstr "Fehler beim Erzeugen des Patches:"
975
963 -#: gitk:9237 gitk:9354 gitk:9411
976 +#: gitk:9256 gitk:9373 gitk:9430
977 msgid "ID:"
978 msgstr "ID:"
979
967 -#: gitk:9246
980 +#: gitk:9265
981 msgid "Tag name:"
982 msgstr "Markierungsname:"
983
971 -#: gitk:9249
984 +#: gitk:9268
985 msgid "Tag message is optional"
986 msgstr "Eine Markierungsbeschreibung ist optional"
987
975 -#: gitk:9251
988 +#: gitk:9270
989 msgid "Tag message:"
990 msgstr "Markierungsbeschreibung:"
991
979 -#: gitk:9255 gitk:9420
992 +#: gitk:9274 gitk:9439
993 msgid "Create"
994 msgstr "Erstellen"
995
983 -#: gitk:9273
996 +#: gitk:9292
997 msgid "No tag name specified"
998 msgstr "Kein Markierungsname angegeben"
999
987 -#: gitk:9277
1000 +#: gitk:9296
1001 #, tcl-format
1002 msgid "Tag \"%s\" already exists"
1003 msgstr "Markierung »%s« existiert bereits."
1004
992 -#: gitk:9287
1005 +#: gitk:9306
1006 msgid "Error creating tag:"
1007 msgstr "Fehler beim Erstellen der Markierung:"
1008
996 -#: gitk:9363
1009 +#: gitk:9382
1010 msgid "Command:"
1011 msgstr "Kommando:"
1012
1000 -#: gitk:9371
1013 +#: gitk:9390
1014 msgid "Write"
1015 msgstr "Schreiben"
1016
1004 -#: gitk:9389
1017 +#: gitk:9408
1018 msgid "Error writing commit:"
1019 msgstr "Fehler beim Schreiben der Version:"
1020
1008 -#: gitk:9416
1021 +#: gitk:9435
1022 msgid "Name:"
1023 msgstr "Name:"
1024
1012 -#: gitk:9439
1025 +#: gitk:9458
1026 msgid "Please specify a name for the new branch"
1027 msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
1028
1016 -#: gitk:9444
1029 +#: gitk:9463
1030 #, tcl-format
1031 msgid "Branch '%s' already exists. Overwrite?"
1032 msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
1033
1021 -#: gitk:9511
1034 +#: gitk:9530
1035 #, tcl-format
1036 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1037 msgstr ""
1038 "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
1039 "eintragen?"
1040
1028 -#: gitk:9516
1041 +#: gitk:9535
1042 msgid "Cherry-picking"
1043 msgstr "Version pflücken"
1044
1032 -#: gitk:9525
1045 +#: gitk:9544
1046 #, tcl-format
1047 msgid ""
1048 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1039,7 +1052,7 @@ msgstr ""
1052 "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
1053 "zwischenspeichern (»git stash«) und dann erneut versuchen."
1054
1042 -#: gitk:9531
1055 +#: gitk:9550
1056 msgid ""
1057 "Cherry-pick failed because of merge conflict.\n"
1058 "Do you wish to run git citool to resolve it?"
@@ -1048,23 +1061,23 @@ msgstr ""
1061 "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
1062 "werden, um diesen Konflikt aufzulösen?"
1063
1051 -#: gitk:9547 gitk:9605
1064 +#: gitk:9566 gitk:9624
1065 msgid "No changes committed"
1066 msgstr "Keine Änderungen eingetragen"
1067
1055 -#: gitk:9574
1068 +#: gitk:9593
1069 #, fuzzy, tcl-format
1070 msgid "Commit %s is not included in branch %s -- really revert it?"
1071 msgstr ""
1072 "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
1073 "eintragen?"
1074
1062 -#: gitk:9579
1075 +#: gitk:9598
1076 #, fuzzy
1077 msgid "Reverting"
1078 msgstr "Zurücksetzen"
1079
1067 -#: gitk:9587
1080 +#: gitk:9606
1081 #, fuzzy, tcl-format
1082 msgid ""
1083 "Revert failed because of local changes to the following files:%s Please "
@@ -1074,7 +1087,7 @@ msgstr ""
1087 "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
1088 "zwischenspeichern (»git stash«) und dann erneut versuchen."
1089
1077 -#: gitk:9591
1090 +#: gitk:9610
1091 #, fuzzy
1092 msgid ""
1093 "Revert failed because of merge conflict.\n"
@@ -1084,30 +1097,30 @@ msgstr ""
1097 "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
1098 "werden, um diesen Konflikt aufzulösen?"
1099
1087 -#: gitk:9634
1100 +#: gitk:9653
1101 msgid "Confirm reset"
1102 msgstr "Zurücksetzen bestätigen"
1103
1091 -#: gitk:9636
1104 +#: gitk:9655
1105 #, tcl-format
1106 msgid "Reset branch %s to %s?"
1107 msgstr "Zweig »%s« auf »%s« zurücksetzen?"
1108
1096 -#: gitk:9638
1109 +#: gitk:9657
1110 msgid "Reset type:"
1111 msgstr "Art des Zurücksetzens:"
1112
1100 -#: gitk:9641
1113 +#: gitk:9660
1114 msgid "Soft: Leave working tree and index untouched"
1115 msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
1116
1104 -#: gitk:9644
1117 +#: gitk:9663
1118 msgid "Mixed: Leave working tree untouched, reset index"
1119 msgstr ""
1120 "Gemischt: Arbeitskopie unverändert,\n"
1121 "Bereitstellung zurückgesetzt"
1122
1110 -#: gitk:9647
1123 +#: gitk:9666
1124 msgid ""
1125 "Hard: Reset working tree and index\n"
1126 "(discard ALL local changes)"
@@ -1115,21 +1128,21 @@ msgstr ""
1128 "Hart: Arbeitskopie und Bereitstellung\n"
1129 "(Alle lokalen Änderungen werden gelöscht)"
1130
1118 -#: gitk:9664
1131 +#: gitk:9683
1132 msgid "Resetting"
1133 msgstr "Zurücksetzen"
1134
1122 -#: gitk:9724
1135 +#: gitk:9743
1136 msgid "Checking out"
1137 msgstr "Umstellen"
1138
1126 -#: gitk:9777
1139 +#: gitk:9796
1140 msgid "Cannot delete the currently checked-out branch"
1141 msgstr ""
1142 "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
1143 "gelöscht werden."
1144
1132 -#: gitk:9783
1145 +#: gitk:9802
1146 #, tcl-format
1147 msgid ""
1148 "The commits on branch %s aren't on any other branch.\n"
@@ -1138,16 +1151,16 @@ msgstr ""
1151 "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
1152 "Zweig »%s« trotzdem löschen?"
1153
1141 -#: gitk:9814
1154 +#: gitk:9833
1155 #, tcl-format
1156 msgid "Tags and heads: %s"
1157 msgstr "Markierungen und Zweige: %s"
1158
1146 -#: gitk:9829
1159 +#: gitk:9850
1160 msgid "Filter"
1161 msgstr "Filtern"
1162
1150 -#: gitk:10125
1163 +#: gitk:10146
1164 msgid ""
1165 "Error reading commit topology information; branch and preceding/following "
1166 "tag information will be incomplete."
@@ -1155,219 +1168,224 @@ msgstr ""
1168 "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
1169 "Vorgänger/Nachfolger werden unvollständig sein."
1170
1158 -#: gitk:11102
1171 +#: gitk:11123
1172 msgid "Tag"
1173 msgstr "Markierung"
1174
1162 -#: gitk:11106
1175 +#: gitk:11127
1176 msgid "Id"
1177 msgstr "Id"
1178
1166 -#: gitk:11189
1179 +#: gitk:11210
1180 msgid "Gitk font chooser"
1181 msgstr "Gitk-Schriften wählen"
1182
1170 -#: gitk:11206
1183 +#: gitk:11227
1184 msgid "B"
1185 msgstr "F"
1186
1174 -#: gitk:11209
1187 +#: gitk:11230
1188 msgid "I"
1189 msgstr "K"
1190
1178 -#: gitk:11327
1191 +#: gitk:11348
1192 msgid "Commit list display options"
1193 msgstr "Anzeige der Versionsliste"
1194
1182 -#: gitk:11330
1195 +#: gitk:11351
1196 msgid "Maximum graph width (lines)"
1197 msgstr "Maximale Graphenbreite (Zeilen)"
1198
1186 -#: gitk:11334
1199 +#: gitk:11355
1200 #, no-tcl-format
1201 msgid "Maximum graph width (% of pane)"
1202 msgstr "Maximale Graphenbreite (% des Fensters)"
1203
1191 -#: gitk:11337
1204 +#: gitk:11358
1205 msgid "Show local changes"
1206 msgstr "Lokale Änderungen anzeigen"
1207
1195 -#: gitk:11340
1208 +#: gitk:11361
1209 #, fuzzy
1210 msgid "Auto-select SHA1 (length)"
1211 msgstr "SHA1-Hashwert automatisch auswählen"
1212
1200 -#: gitk:11344
1213 +#: gitk:11365
1214 msgid "Hide remote refs"
1215 msgstr "Entfernte Zweige/Markierungen ausblenden"
1216
1204 -#: gitk:11348
1217 +#: gitk:11369
1218 msgid "Diff display options"
1219 msgstr "Anzeige des Vergleichs"
1220
1208 -#: gitk:11350
1221 +#: gitk:11371
1222 msgid "Tab spacing"
1223 msgstr "Tabulatorbreite"
1224
1212 -#: gitk:11353
1225 +#: gitk:11374
1226 #, fuzzy
1227 msgid "Display nearby tags/heads"
1228 msgstr "Naheliegende Markierungen anzeigen"
1229
1217 -#: gitk:11356
1230 +#: gitk:11377
1231 msgid "Maximum # tags/heads to show"
1232 msgstr ""
1233
1221 -#: gitk:11359
1234 +#: gitk:11380
1235 msgid "Limit diffs to listed paths"
1236 msgstr "Vergleich nur für angezeigte Pfade"
1237
1225 -#: gitk:11362
1238 +#: gitk:11383
1239 msgid "Support per-file encodings"
1240 msgstr "Zeichenkodierung pro Datei ermitteln"
1241
1229 -#: gitk:11368 gitk:11515
1242 +#: gitk:11389 gitk:11536
1243 msgid "External diff tool"
1244 msgstr "Externes Diff-Programm"
1245
1233 -#: gitk:11369
1246 +#: gitk:11390
1247 msgid "Choose..."
1248 msgstr "Wählen ..."
1249
1237 -#: gitk:11374
1250 +#: gitk:11395
1251 msgid "General options"
1252 msgstr "Allgemeine Optionen"
1253
1241 -#: gitk:11377
1254 +#: gitk:11398
1255 msgid "Use themed widgets"
1256 msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen"
1257
1245 -#: gitk:11379
1258 +#: gitk:11400
1259 msgid "(change requires restart)"
1260 msgstr "(Änderungen werden erst nach Neustart wirksam)"
1261
1249 -#: gitk:11381
1262 +#: gitk:11402
1263 msgid "(currently unavailable)"
1264 msgstr "(Momentan nicht verfügbar)"
1265
1253 -#: gitk:11392
1266 +#: gitk:11413
1267 msgid "Colors: press to choose"
1268 msgstr "Farben: Klicken zum Wählen"
1269
1257 -#: gitk:11395
1270 +#: gitk:11416
1271 msgid "Interface"
1272 msgstr "Benutzeroberfläche"
1273
1261 -#: gitk:11396
1274 +#: gitk:11417
1275 msgid "interface"
1276 msgstr "Benutzeroberfläche"
1277
1265 -#: gitk:11399
1278 +#: gitk:11420
1279 msgid "Background"
1280 msgstr "Hintergrund"
1281
1269 -#: gitk:11400 gitk:11430
1282 +#: gitk:11421 gitk:11451
1283 msgid "background"
1284 msgstr "Hintergrund"
1285
1273 -#: gitk:11403
1286 +#: gitk:11424
1287 msgid "Foreground"
1288 msgstr "Vordergrund"
1289
1277 -#: gitk:11404
1290 +#: gitk:11425
1291 msgid "foreground"
1292 msgstr "Vordergrund"
1293
1281 -#: gitk:11407
1294 +#: gitk:11428
1295 msgid "Diff: old lines"
1296 msgstr "Vergleich: Alte Zeilen"
1297
1285 -#: gitk:11408
1298 +#: gitk:11429
1299 msgid "diff old lines"
1300 msgstr "Vergleich - Alte Zeilen"
1301
1289 -#: gitk:11412
1302 +#: gitk:11433
1303 msgid "Diff: new lines"
1304 msgstr "Vergleich: Neue Zeilen"
1305
1293 -#: gitk:11413
1306 +#: gitk:11434
1307 msgid "diff new lines"
1308 msgstr "Vergleich - Neue Zeilen"
1309
1297 -#: gitk:11417
1310 +#: gitk:11438
1311 msgid "Diff: hunk header"
1312 msgstr "Vergleich: Änderungstitel"
1313
1301 -#: gitk:11419
1314 +#: gitk:11440
1315 msgid "diff hunk header"
1316 msgstr "Vergleich - Änderungstitel"
1317
1305 -#: gitk:11423
1318 +#: gitk:11444
1319 msgid "Marked line bg"
1320 msgstr "Hintergrund für markierte Zeile"
1321
1309 -#: gitk:11425
1322 +#: gitk:11446
1323 msgid "marked line background"
1324 msgstr "Hintergrund für markierte Zeile"
1325
1313 -#: gitk:11429
1326 +#: gitk:11450
1327 msgid "Select bg"
1328 msgstr "Hintergrundfarbe auswählen"
1329
1317 -#: gitk:11438
1330 +#: gitk:11459
1331 msgid "Fonts: press to choose"
1332 msgstr "Schriftart: Klicken zum Wählen"
1333
1321 -#: gitk:11440
1334 +#: gitk:11461
1335 msgid "Main font"
1336 msgstr "Programmschriftart"
1337
1325 -#: gitk:11441
1338 +#: gitk:11462
1339 msgid "Diff display font"
1340 msgstr "Schriftart für Vergleich"
1341
1329 -#: gitk:11442
1342 +#: gitk:11463
1343 msgid "User interface font"
1344 msgstr "Beschriftungen"
1345
1333 -#: gitk:11464
1346 +#: gitk:11485
1347 msgid "Gitk preferences"
1348 msgstr "Gitk-Einstellungen"
1349
1337 -#: gitk:11473
1350 +#: gitk:11494
1351 #, fuzzy
1352 msgid "General"
1353 msgstr "Erzeugen"
1354
1342 -#: gitk:11474
1355 +#: gitk:11495
1356 msgid "Colors"
1357 msgstr ""
1358
1346 -#: gitk:11475
1359 +#: gitk:11496
1360 msgid "Fonts"
1361 msgstr ""
1362
1350 -#: gitk:11525
1363 +#: gitk:11546
1364 #, tcl-format
1365 msgid "Gitk: choose color for %s"
1366 msgstr "Gitk: Farbe wählen für %s"
1367
1355 -#: gitk:12242
1368 +#: gitk:12059
1369 +msgid ""
1370 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1371 +" Gitk requires at least Tcl/Tk 8.4."
1372 +msgstr ""
1373 +
1374 +#: gitk:12269
1375 msgid "Cannot find a git repository here."
1376 msgstr "Kein Git-Projektarchiv gefunden."
1377
1359 -#: gitk:12289
1378 +#: gitk:12316
1379 #, tcl-format
1380 msgid "Ambiguous argument '%s': both revision and filename"
1381 msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
1382
1364 -#: gitk:12301
1383 +#: gitk:12328
1384 msgid "Bad arguments to gitk:"
1385 msgstr "Falsche Kommandozeilen-Parameter für gitk:"
1386
1368 -#: gitk:12405
1369 -msgid "Command line"
1370 -msgstr "Kommandozeile"
1387 +#~ msgid "mc"
1388 +#~ msgstr "mc"
1389
1390 #~ msgid "next"
1391 #~ msgstr "nächste"
po/es.po
+297 -287
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2008-03-25 11:20+0100\n"
13 "Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n"
14 "Language-Team: Spanish\n"
@@ -25,7 +25,7 @@ msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
25 msgid "Color words"
26 msgstr ""
27
28 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
28 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
29 msgid "Markup words"
30 msgstr ""
31
@@ -61,14 +61,18 @@ msgstr "Error al crear la etiqueta:"
61 msgid "Reading"
62 msgstr "Leyendo"
63
64 -#: gitk:496 gitk:4508
64 +#: gitk:496 gitk:4525
65 msgid "Reading commits..."
66 msgstr "Leyendo revisiones..."
67
68 -#: gitk:499 gitk:1637 gitk:4511
68 +#: gitk:499 gitk:1637 gitk:4528
69 msgid "No commits selected"
70 msgstr "No se seleccionaron revisiones"
71
72 +#: gitk:1445 gitk:4045 gitk:12432
73 +msgid "Command line"
74 +msgstr "Línea de comandos"
75 +
76 #: gitk:1511
77 msgid "Can't parse git log output:"
78 msgstr "Error analizando la salida de git log:"
@@ -77,16 +81,12 @@ msgstr "Error analizando la salida de git log:"
81 msgid "No commit information available"
82 msgstr "Falta información sobre las revisiones"
83
80 -#: gitk:1897
81 -msgid "mc"
82 -msgstr ""
83 -
84 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
84 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
85 msgid "OK"
86 msgstr "Aceptar"
87
88 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
89 -#: gitk:11221 gitk:11501
88 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
89 +#: gitk:11242 gitk:11522
90 msgid "Cancel"
91 msgstr "Cancelar"
92
@@ -138,15 +138,15 @@ msgstr "Modificar vista..."
138 msgid "Delete view"
139 msgstr "Eliminar vista"
140
141 -#: gitk:2088
141 +#: gitk:2088 gitk:4043
142 msgid "All files"
143 msgstr "Todos los archivos"
144
145 -#: gitk:2083 gitk:4050
145 +#: gitk:2083 gitk:4067
146 msgid "View"
147 msgstr "Vista"
148
149 -#: gitk:2093 gitk:2103 gitk:3009
149 +#: gitk:2093 gitk:2103 gitk:3012
150 msgid "About gitk"
151 msgstr "Acerca de gitk"
152
@@ -158,7 +158,7 @@ msgstr "Combinaciones de teclas"
158 msgid "Help"
159 msgstr "Ayuda"
160
161 -#: gitk:2185 gitk:8633
161 +#: gitk:2185 gitk:8652
162 msgid "SHA1 ID:"
163 msgstr "SHA1 ID:"
164
@@ -174,53 +174,53 @@ msgstr "Buscar"
174 msgid "commit"
175 msgstr "revisión"
176
177 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
178 -#: gitk:6893
177 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
178 +#: gitk:6912
179 msgid "containing:"
180 msgstr "que contiene:"
181
182 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
182 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
183 msgid "touching paths:"
184 msgstr "que modifica la ruta:"
185
186 -#: gitk:2303 gitk:4759
186 +#: gitk:2303 gitk:4777
187 msgid "adding/removing string:"
188 msgstr "que añade/elimina cadena:"
189
190 -#: gitk:2304 gitk:4761
190 +#: gitk:2304 gitk:4779
191 msgid "changing lines matching:"
192 msgstr ""
193
194 -#: gitk:2313 gitk:2315 gitk:4748
194 +#: gitk:2313 gitk:2315 gitk:4766
195 msgid "Exact"
196 msgstr "Exacto"
197
198 -#: gitk:2315 gitk:4836 gitk:6704
198 +#: gitk:2315 gitk:4854 gitk:6723
199 msgid "IgnCase"
200 msgstr "NoMayús"
201
202 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
202 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
203 msgid "Regexp"
204 msgstr "Regex"
205
206 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
206 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
207 msgid "All fields"
208 msgstr "Todos los campos"
209
210 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
210 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
211 msgid "Headline"
212 msgstr "Título"
213
214 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
214 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
215 msgid "Comments"
216 msgstr "Comentarios"
217
218 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
219 -#: gitk:8826
218 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
219 +#: gitk:8845
220 msgid "Author"
221 msgstr "Autor"
222
223 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
223 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
224 msgid "Committer"
225 msgstr ""
226
@@ -248,7 +248,7 @@ msgstr "Líneas de contexto"
248 msgid "Ignore space change"
249 msgstr "Ignora cambios de espaciado"
250
251 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
251 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
252 msgid "Line diff"
253 msgstr ""
254
@@ -260,103 +260,111 @@ msgstr "Parche"
260 msgid "Tree"
261 msgstr "Árbol"
262
263 -#: gitk:2616 gitk:2636
263 +#: gitk:2617 gitk:2637
264 msgid "Diff this -> selected"
265 msgstr "Diferencia de esta -> seleccionada"
266
267 -#: gitk:2617 gitk:2637
267 +#: gitk:2618 gitk:2638
268 msgid "Diff selected -> this"
269 msgstr "Diferencia de seleccionada -> esta"
270
271 -#: gitk:2618 gitk:2638
271 +#: gitk:2619 gitk:2639
272 msgid "Make patch"
273 msgstr "Crear patch"
274
275 -#: gitk:2619 gitk:9235
275 +#: gitk:2620 gitk:9254
276 msgid "Create tag"
277 msgstr "Crear etiqueta"
278
279 -#: gitk:2620 gitk:9352
279 +#: gitk:2621 gitk:9371
280 msgid "Write commit to file"
281 msgstr "Escribir revisiones a archivo"
282
283 -#: gitk:2621 gitk:9409
283 +#: gitk:2622 gitk:9428
284 msgid "Create new branch"
285 msgstr "Crear nueva rama"
286
287 -#: gitk:2622
287 +#: gitk:2623
288 msgid "Cherry-pick this commit"
289 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
290
291 -#: gitk:2623
291 +#: gitk:2624
292 msgid "Reset HEAD branch to here"
293 msgstr "Traer la rama HEAD aquí"
294
295 -#: gitk:2624
295 +#: gitk:2625
296 #, fuzzy
297 msgid "Mark this commit"
298 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
299
300 -#: gitk:2625
300 +#: gitk:2626
301 msgid "Return to mark"
302 msgstr ""
303
304 -#: gitk:2626
304 +#: gitk:2627
305 msgid "Find descendant of this and mark"
306 msgstr ""
307
308 -#: gitk:2627
308 +#: gitk:2628
309 msgid "Compare with marked commit"
310 msgstr ""
311
312 -#: gitk:2628 gitk:2639
312 +#: gitk:2629 gitk:2640
313 #, fuzzy
314 msgid "Diff this -> marked commit"
315 msgstr "Diferencia de esta -> seleccionada"
316
317 -#: gitk:2629 gitk:2640
317 +#: gitk:2630 gitk:2641
318 #, fuzzy
319 msgid "Diff marked commit -> this"
320 msgstr "Diferencia de seleccionada -> esta"
321
322 -#: gitk:2630
322 +#: gitk:2631
323 #, fuzzy
324 msgid "Revert this commit"
325 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
326
327 -#: gitk:2646
327 +#: gitk:2647
328 msgid "Check out this branch"
329 msgstr "Cambiar a esta rama"
330
331 -#: gitk:2647
331 +#: gitk:2648
332 msgid "Remove this branch"
333 msgstr "Eliminar esta rama"
334
335 -#: gitk:2654
335 +#: gitk:2649
336 +msgid "Copy branch name"
337 +msgstr ""
338 +
339 +#: gitk:2656
340 msgid "Highlight this too"
341 msgstr "Seleccionar también"
342
339 -#: gitk:2655
343 +#: gitk:2657
344 msgid "Highlight this only"
345 msgstr "Seleccionar sólo"
346
343 -#: gitk:2656
347 +#: gitk:2658
348 msgid "External diff"
349 msgstr ""
350
347 -#: gitk:2657
351 +#: gitk:2659
352 msgid "Blame parent commit"
353 msgstr ""
354
351 -#: gitk:2664
355 +#: gitk:2660
356 +msgid "Copy path"
357 +msgstr ""
358 +
359 +#: gitk:2667
360 msgid "Show origin of this line"
361 msgstr ""
362
355 -#: gitk:2665
363 +#: gitk:2668
364 msgid "Run git gui blame on this line"
365 msgstr ""
366
359 -#: gitk:3011
367 +#: gitk:3014
368 #, fuzzy
369 msgid ""
370 "\n"
@@ -374,728 +382,733 @@ msgstr ""
382 "Uso y redistribución permitidos según los términos de la Licencia Pública "
383 "General de GNU (GNU GPL)"
384
377 -#: gitk:3019 gitk:3085 gitk:9836
385 +#: gitk:3022 gitk:3089 gitk:9857
386 msgid "Close"
387 msgstr "Cerrar"
388
381 -#: gitk:3040
389 +#: gitk:3043
390 msgid "Gitk key bindings"
391 msgstr "Combinaciones de tecla de Gitk"
392
385 -#: gitk:3043
393 +#: gitk:3046
394 msgid "Gitk key bindings:"
395 msgstr "Combinaciones de tecla de Gitk:"
396
389 -#: gitk:3045
397 +#: gitk:3048
398 #, tcl-format
399 msgid "<%s-Q>\t\tQuit"
400 msgstr "<%s-Q>\t\tSalir"
401
394 -#: gitk:3046
402 +#: gitk:3049
403 #, fuzzy, tcl-format
404 msgid "<%s-W>\t\tClose window"
405 msgstr "<%s-F>\t\tBuscar"
406
399 -#: gitk:3047
407 +#: gitk:3050
408 msgid "<Home>\t\tMove to first commit"
409 msgstr "<Home>\t\tIr a la primera revisión"
410
403 -#: gitk:3048
411 +#: gitk:3051
412 msgid "<End>\t\tMove to last commit"
413 msgstr "<End>\t\tIr a la última revisión"
414
407 -#: gitk:3049
415 +#: gitk:3052
416 #, fuzzy
417 msgid "<Up>, p, k\tMove up one commit"
418 msgstr "<Up>, p, i\tSubir una revisión"
419
412 -#: gitk:3050
420 +#: gitk:3053
421 #, fuzzy
422 msgid "<Down>, n, j\tMove down one commit"
423 msgstr "<Down>, n, k\tBajar una revisión"
424
417 -#: gitk:3051
425 +#: gitk:3054
426 #, fuzzy
427 msgid "<Left>, z, h\tGo back in history list"
428 msgstr "<Left>, z, j\tRetroceder en la historia"
429
422 -#: gitk:3052
430 +#: gitk:3055
431 msgid "<Right>, x, l\tGo forward in history list"
432 msgstr "<Right>, x, l\tAvanzar en la historia"
433
426 -#: gitk:3053
434 +#: gitk:3056
435 #, tcl-format
436 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
437 msgstr ""
438
431 -#: gitk:3054
439 +#: gitk:3057
440 msgid "<PageUp>\tMove up one page in commit list"
441 msgstr "<PageUp>\tSubir una página en la lista de revisiones"
442
435 -#: gitk:3055
443 +#: gitk:3058
444 msgid "<PageDown>\tMove down one page in commit list"
445 msgstr "<PageDown>\tBajar una página en la lista de revisiones"
446
439 -#: gitk:3056
447 +#: gitk:3059
448 #, tcl-format
449 msgid "<%s-Home>\tScroll to top of commit list"
450 msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones"
451
444 -#: gitk:3057
452 +#: gitk:3060
453 #, tcl-format
454 msgid "<%s-End>\tScroll to bottom of commit list"
455 msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones"
456
449 -#: gitk:3058
457 +#: gitk:3061
458 #, tcl-format
459 msgid "<%s-Up>\tScroll commit list up one line"
460 msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones"
461
454 -#: gitk:3059
462 +#: gitk:3062
463 #, tcl-format
464 msgid "<%s-Down>\tScroll commit list down one line"
465 msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones"
466
459 -#: gitk:3060
467 +#: gitk:3063
468 #, tcl-format
469 msgid "<%s-PageUp>\tScroll commit list up one page"
470 msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones"
471
464 -#: gitk:3061
472 +#: gitk:3064
473 #, tcl-format
474 msgid "<%s-PageDown>\tScroll commit list down one page"
475 msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones"
476
469 -#: gitk:3062
477 +#: gitk:3065
478 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
479 msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)"
480
473 -#: gitk:3063
481 +#: gitk:3066
482 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
483 msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)"
484
477 -#: gitk:3064
485 +#: gitk:3067
486 msgid "<Delete>, b\tScroll diff view up one page"
487 msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias"
488
481 -#: gitk:3065
489 +#: gitk:3068
490 msgid "<Backspace>\tScroll diff view up one page"
491 msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias"
492
485 -#: gitk:3066
493 +#: gitk:3069
494 msgid "<Space>\t\tScroll diff view down one page"
495 msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias"
496
489 -#: gitk:3067
497 +#: gitk:3070
498 msgid "u\t\tScroll diff view up 18 lines"
499 msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias"
500
493 -#: gitk:3068
501 +#: gitk:3071
502 msgid "d\t\tScroll diff view down 18 lines"
503 msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias"
504
497 -#: gitk:3069
505 +#: gitk:3072
506 #, tcl-format
507 msgid "<%s-F>\t\tFind"
508 msgstr "<%s-F>\t\tBuscar"
509
502 -#: gitk:3070
510 +#: gitk:3073
511 #, tcl-format
512 msgid "<%s-G>\t\tMove to next find hit"
513 msgstr "<%s-G>\t\tBuscar el siguiente"
514
507 -#: gitk:3071
515 +#: gitk:3074
516 msgid "<Return>\tMove to next find hit"
517 msgstr "<Return>\tBuscar el siguiente"
518
511 -#: gitk:3072
519 +#: gitk:3075
520 +#, fuzzy
521 +msgid "g\t\tGo to commit"
522 +msgstr "<End>\t\tIr a la última revisión"
523 +
524 +#: gitk:3076
525 msgid "/\t\tFocus the search box"
526 msgstr ""
527
515 -#: gitk:3073
528 +#: gitk:3077
529 msgid "?\t\tMove to previous find hit"
530 msgstr "?\t\tBuscar el anterior"
531
519 -#: gitk:3074
532 +#: gitk:3078
533 msgid "f\t\tScroll diff view to next file"
534 msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
535
523 -#: gitk:3075
536 +#: gitk:3079
537 #, tcl-format
538 msgid "<%s-S>\t\tSearch for next hit in diff view"
539 msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias"
540
528 -#: gitk:3076
541 +#: gitk:3080
542 #, tcl-format
543 msgid "<%s-R>\t\tSearch for previous hit in diff view"
544 msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias"
545
533 -#: gitk:3077
546 +#: gitk:3081
547 #, tcl-format
548 msgid "<%s-KP+>\tIncrease font size"
549 msgstr "<%s-KP+>\tAumentar tamaño del texto"
550
538 -#: gitk:3078
551 +#: gitk:3082
552 #, tcl-format
553 msgid "<%s-plus>\tIncrease font size"
554 msgstr "<%s-plus>\tAumentar tamaño del texto"
555
543 -#: gitk:3079
556 +#: gitk:3083
557 #, tcl-format
558 msgid "<%s-KP->\tDecrease font size"
559 msgstr "<%s-KP->\tDisminuir tamaño del texto"
560
548 -#: gitk:3080
561 +#: gitk:3084
562 #, tcl-format
563 msgid "<%s-minus>\tDecrease font size"
564 msgstr "<%s-minus>\tDisminuir tamaño del texto"
565
553 -#: gitk:3081
566 +#: gitk:3085
567 msgid "<F5>\t\tUpdate"
568 msgstr "<F5>\t\tActualizar"
569
557 -#: gitk:3546 gitk:3555
570 +#: gitk:3550 gitk:3559
571 #, fuzzy, tcl-format
572 msgid "Error creating temporary directory %s:"
573 msgstr "Error en la creación del parche:"
574
562 -#: gitk:3568
575 +#: gitk:3572
576 #, fuzzy, tcl-format
577 msgid "Error getting \"%s\" from %s:"
578 msgstr "Error al leer las diferencias de fusión:"
579
567 -#: gitk:3631
580 +#: gitk:3635
581 #, fuzzy
582 msgid "command failed:"
583 msgstr "Línea de comandos"
584
572 -#: gitk:3780
585 +#: gitk:3784
586 #, fuzzy
587 msgid "No such commit"
588 msgstr "No se han guardado cambios"
589
577 -#: gitk:3794
590 +#: gitk:3798
591 msgid "git gui blame: command failed:"
592 msgstr ""
593
581 -#: gitk:3825
594 +#: gitk:3829
595 #, tcl-format
596 msgid "Couldn't read merge head: %s"
597 msgstr ""
598
586 -#: gitk:3833
599 +#: gitk:3837
600 #, fuzzy, tcl-format
601 msgid "Error reading index: %s"
602 msgstr "Error al crear la etiqueta:"
603
591 -#: gitk:3858
604 +#: gitk:3862
605 #, tcl-format
606 msgid "Couldn't start git blame: %s"
607 msgstr ""
608
596 -#: gitk:3861 gitk:6735
609 +#: gitk:3865 gitk:6754
610 msgid "Searching"
611 msgstr "Buscando"
612
600 -#: gitk:3893
613 +#: gitk:3897
614 #, fuzzy, tcl-format
615 msgid "Error running git blame: %s"
616 msgstr "Error al crear la etiqueta:"
617
605 -#: gitk:3921
618 +#: gitk:3925
619 #, tcl-format
620 msgid "That line comes from commit %s, which is not in this view"
621 msgstr ""
622
610 -#: gitk:3935
623 +#: gitk:3939
624 #, fuzzy
625 msgid "External diff viewer failed:"
626 msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
627
615 -#: gitk:4053
628 +#: gitk:4070
629 msgid "Gitk view definition"
630 msgstr "Definición de vistas de Gitk"
631
619 -#: gitk:4057
632 +#: gitk:4074
633 msgid "Remember this view"
634 msgstr "Recordar esta vista"
635
623 -#: gitk:4058
636 +#: gitk:4075
637 msgid "References (space separated list):"
638 msgstr ""
639
627 -#: gitk:4059
640 +#: gitk:4076
641 msgid "Branches & tags:"
642 msgstr ""
643
631 -#: gitk:4060
644 +#: gitk:4077
645 #, fuzzy
646 msgid "All refs"
647 msgstr "Todos los archivos"
648
636 -#: gitk:4061
649 +#: gitk:4078
650 msgid "All (local) branches"
651 msgstr ""
652
640 -#: gitk:4062
653 +#: gitk:4079
654 msgid "All tags"
655 msgstr ""
656
644 -#: gitk:4063
657 +#: gitk:4080
658 msgid "All remote-tracking branches"
659 msgstr ""
660
648 -#: gitk:4064
661 +#: gitk:4081
662 msgid "Commit Info (regular expressions):"
663 msgstr ""
664
652 -#: gitk:4065
665 +#: gitk:4082
666 #, fuzzy
667 msgid "Author:"
668 msgstr "Autor"
669
657 -#: gitk:4066
670 +#: gitk:4083
671 #, fuzzy
672 msgid "Committer:"
673 msgstr "revisión"
674
662 -#: gitk:4067
675 +#: gitk:4084
676 msgid "Commit Message:"
677 msgstr ""
678
666 -#: gitk:4068
679 +#: gitk:4085
680 msgid "Matches all Commit Info criteria"
681 msgstr ""
682
670 -#: gitk:4069
671 -msgid "Matches none Commit Info criteria"
683 +#: gitk:4086
684 +msgid "Matches no Commit Info criteria"
685 msgstr ""
686
674 -#: gitk:4070
687 +#: gitk:4087
688 msgid "Changes to Files:"
689 msgstr ""
690
678 -#: gitk:4071
691 +#: gitk:4088
692 msgid "Fixed String"
693 msgstr ""
694
682 -#: gitk:4072
695 +#: gitk:4089
696 msgid "Regular Expression"
697 msgstr ""
698
686 -#: gitk:4073
699 +#: gitk:4090
700 #, fuzzy
701 msgid "Search string:"
702 msgstr "Buscando"
703
691 -#: gitk:4074
704 +#: gitk:4091
705 msgid ""
706 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
707 "15:27:38\"):"
708 msgstr ""
709
697 -#: gitk:4075
710 +#: gitk:4092
711 msgid "Since:"
712 msgstr ""
713
701 -#: gitk:4076
714 +#: gitk:4093
715 msgid "Until:"
716 msgstr ""
717
705 -#: gitk:4077
718 +#: gitk:4094
719 msgid "Limit and/or skip a number of revisions (positive integer):"
720 msgstr ""
721
709 -#: gitk:4078
722 +#: gitk:4095
723 msgid "Number to show:"
724 msgstr ""
725
713 -#: gitk:4079
726 +#: gitk:4096
727 msgid "Number to skip:"
728 msgstr ""
729
717 -#: gitk:4080
730 +#: gitk:4097
731 msgid "Miscellaneous options:"
732 msgstr ""
733
721 -#: gitk:4081
734 +#: gitk:4098
735 msgid "Strictly sort by date"
736 msgstr ""
737
725 -#: gitk:4082
738 +#: gitk:4099
739 msgid "Mark branch sides"
740 msgstr ""
741
729 -#: gitk:4083
742 +#: gitk:4100
743 #, fuzzy
744 msgid "Limit to first parent"
745 msgstr "Limitar las diferencias a las rutas seleccionadas"
746
734 -#: gitk:4084
747 +#: gitk:4101
748 msgid "Simple history"
749 msgstr ""
750
738 -#: gitk:4085
751 +#: gitk:4102
752 #, fuzzy
753 msgid "Additional arguments to git log:"
754 msgstr "Revisiones a incluir (argumentos a git log):"
755
743 -#: gitk:4086
756 +#: gitk:4103
757 msgid "Enter files and directories to include, one per line:"
758 msgstr "Introducir archivos y directorios a incluir, uno por línea:"
759
747 -#: gitk:4087
760 +#: gitk:4104
761 msgid "Command to generate more commits to include:"
762 msgstr "Comando que genera más revisiones a incluir:"
763
751 -#: gitk:4211
764 +#: gitk:4228
765 msgid "Gitk: edit view"
766 msgstr ""
767
755 -#: gitk:4219
768 +#: gitk:4236
769 msgid "-- criteria for selecting revisions"
770 msgstr ""
771
759 -#: gitk:4224
772 +#: gitk:4241
773 #, fuzzy
774 msgid "View Name"
775 msgstr "Vista"
776
764 -#: gitk:4299
777 +#: gitk:4316
778 msgid "Apply (F5)"
779 msgstr ""
780
768 -#: gitk:4337
781 +#: gitk:4354
782 msgid "Error in commit selection arguments:"
783 msgstr "Error en los argumentos de selección de las revisiones:"
784
772 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
785 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
786 msgid "None"
787 msgstr "Ninguno"
788
776 -#: gitk:5003 gitk:5008
789 +#: gitk:5021 gitk:5026
790 msgid "Descendant"
791 msgstr "Descendiente"
792
780 -#: gitk:5004
793 +#: gitk:5022
794 msgid "Not descendant"
795 msgstr "No descendiente"
796
784 -#: gitk:5011 gitk:5016
797 +#: gitk:5029 gitk:5034
798 msgid "Ancestor"
799 msgstr "Antepasado"
800
788 -#: gitk:5012
801 +#: gitk:5030
802 msgid "Not ancestor"
803 msgstr "No antepasado"
804
792 -#: gitk:5306
805 +#: gitk:5324
806 msgid "Local changes checked in to index but not committed"
807 msgstr "Cambios locales añadidos al índice pero sin completar revisión"
808
796 -#: gitk:5342
809 +#: gitk:5360
810 msgid "Local uncommitted changes, not checked in to index"
811 msgstr "Cambios locales sin añadir al índice"
812
800 -#: gitk:7115
813 +#: gitk:7134
814 msgid "and many more"
815 msgstr ""
816
804 -#: gitk:7118
817 +#: gitk:7137
818 msgid "many"
819 msgstr ""
820
808 -#: gitk:7309
821 +#: gitk:7328
822 msgid "Tags:"
823 msgstr "Etiquetas:"
824
812 -#: gitk:7326 gitk:7332 gitk:8806
825 +#: gitk:7345 gitk:7351 gitk:8825
826 msgid "Parent"
827 msgstr "Padre"
828
816 -#: gitk:7337
829 +#: gitk:7356
830 msgid "Child"
831 msgstr "Hija"
832
820 -#: gitk:7346
833 +#: gitk:7365
834 msgid "Branch"
835 msgstr "Rama"
836
824 -#: gitk:7349
837 +#: gitk:7368
838 msgid "Follows"
839 msgstr "Sigue-a"
840
828 -#: gitk:7352
841 +#: gitk:7371
842 msgid "Precedes"
843 msgstr "Precede-a"
844
832 -#: gitk:7947
845 +#: gitk:7966
846 #, fuzzy, tcl-format
847 msgid "Error getting diffs: %s"
848 msgstr "Error al leer las diferencias de fusión:"
849
837 -#: gitk:8631
850 +#: gitk:8650
851 msgid "Goto:"
852 msgstr "Ir a:"
853
841 -#: gitk:8652
854 +#: gitk:8671
855 #, tcl-format
856 msgid "Short SHA1 id %s is ambiguous"
857 msgstr "La id SHA1 abreviada %s es ambigua"
858
846 -#: gitk:8659
859 +#: gitk:8678
860 #, fuzzy, tcl-format
861 msgid "Revision %s is not known"
862 msgstr "La id SHA1 %s es desconocida"
863
851 -#: gitk:8669
864 +#: gitk:8688
865 #, tcl-format
866 msgid "SHA1 id %s is not known"
867 msgstr "La id SHA1 %s es desconocida"
868
856 -#: gitk:8671
869 +#: gitk:8690
870 #, tcl-format
871 msgid "Revision %s is not in the current view"
872 msgstr ""
873
861 -#: gitk:8813 gitk:8828
874 +#: gitk:8832 gitk:8847
875 msgid "Date"
876 msgstr "Fecha"
877
865 -#: gitk:8816
878 +#: gitk:8835
879 msgid "Children"
880 msgstr "Hijas"
881
869 -#: gitk:8879
882 +#: gitk:8898
883 #, tcl-format
884 msgid "Reset %s branch to here"
885 msgstr "Poner la rama %s en esta revisión"
886
874 -#: gitk:8881
887 +#: gitk:8900
888 msgid "Detached head: can't reset"
889 msgstr ""
890
878 -#: gitk:8986 gitk:8992
891 +#: gitk:9005 gitk:9011
892 msgid "Skipping merge commit "
893 msgstr ""
894
882 -#: gitk:9001 gitk:9006
895 +#: gitk:9020 gitk:9025
896 #, fuzzy
897 msgid "Error getting patch ID for "
898 msgstr "Error en la creación del parche:"
899
887 -#: gitk:9002 gitk:9007
900 +#: gitk:9021 gitk:9026
901 msgid " - stopping\n"
902 msgstr ""
903
891 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
904 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
905 #, fuzzy
906 msgid "Commit "
907 msgstr "revisión"
908
896 -#: gitk:9016
909 +#: gitk:9035
910 msgid ""
911 " is the same patch as\n"
912 " "
913 msgstr ""
914
902 -#: gitk:9024
915 +#: gitk:9043
916 msgid ""
917 " differs from\n"
918 " "
919 msgstr ""
920
908 -#: gitk:9026
921 +#: gitk:9045
922 msgid ""
923 "Diff of commits:\n"
924 "\n"
925 msgstr ""
926
914 -#: gitk:9038 gitk:9047
927 +#: gitk:9057 gitk:9066
928 #, tcl-format
929 msgid " has %s children - stopping\n"
930 msgstr ""
931
919 -#: gitk:9066
932 +#: gitk:9085
933 #, fuzzy, tcl-format
934 msgid "Error writing commit to file: %s"
935 msgstr "Error al escribir revisión:"
936
924 -#: gitk:9072
937 +#: gitk:9091
938 #, fuzzy, tcl-format
939 msgid "Error diffing commits: %s"
940 msgstr "Error al escribir revisión:"
941
929 -#: gitk:9118
942 +#: gitk:9137
943 msgid "Top"
944 msgstr "Origen"
945
933 -#: gitk:9119
946 +#: gitk:9138
947 msgid "From"
948 msgstr "De"
949
937 -#: gitk:9124
950 +#: gitk:9143
951 msgid "To"
952 msgstr "A"
953
941 -#: gitk:9148
954 +#: gitk:9167
955 msgid "Generate patch"
956 msgstr "Generar parche"
957
945 -#: gitk:9150
958 +#: gitk:9169
959 msgid "From:"
960 msgstr "De:"
961
949 -#: gitk:9159
962 +#: gitk:9178
963 msgid "To:"
964 msgstr "Para:"
965
953 -#: gitk:9168
966 +#: gitk:9187
967 msgid "Reverse"
968 msgstr "Invertir"
969
957 -#: gitk:9170 gitk:9366
970 +#: gitk:9189 gitk:9385
971 msgid "Output file:"
972 msgstr "Escribir a archivo:"
973
961 -#: gitk:9176
974 +#: gitk:9195
975 msgid "Generate"
976 msgstr "Generar"
977
965 -#: gitk:9214
978 +#: gitk:9233
979 msgid "Error creating patch:"
980 msgstr "Error en la creación del parche:"
981
969 -#: gitk:9237 gitk:9354 gitk:9411
982 +#: gitk:9256 gitk:9373 gitk:9430
983 msgid "ID:"
984 msgstr "ID:"
985
973 -#: gitk:9246
986 +#: gitk:9265
987 msgid "Tag name:"
988 msgstr "Nombre de etiqueta:"
989
977 -#: gitk:9249
990 +#: gitk:9268
991 msgid "Tag message is optional"
992 msgstr ""
993
981 -#: gitk:9251
994 +#: gitk:9270
995 #, fuzzy
996 msgid "Tag message:"
997 msgstr "Nombre de etiqueta:"
998
986 -#: gitk:9255 gitk:9420
999 +#: gitk:9274 gitk:9439
1000 msgid "Create"
1001 msgstr "Crear"
1002
990 -#: gitk:9273
1003 +#: gitk:9292
1004 msgid "No tag name specified"
1005 msgstr "No se ha especificado etiqueta"
1006
994 -#: gitk:9277
1007 +#: gitk:9296
1008 #, tcl-format
1009 msgid "Tag \"%s\" already exists"
1010 msgstr "La etiqueta \"%s\" ya existe"
1011
999 -#: gitk:9287
1012 +#: gitk:9306
1013 msgid "Error creating tag:"
1014 msgstr "Error al crear la etiqueta:"
1015
1003 -#: gitk:9363
1016 +#: gitk:9382
1017 msgid "Command:"
1018 msgstr "Comando:"
1019
1007 -#: gitk:9371
1020 +#: gitk:9390
1021 msgid "Write"
1022 msgstr "Escribir"
1023
1011 -#: gitk:9389
1024 +#: gitk:9408
1025 msgid "Error writing commit:"
1026 msgstr "Error al escribir revisión:"
1027
1015 -#: gitk:9416
1028 +#: gitk:9435
1029 msgid "Name:"
1030 msgstr "Nombre:"
1031
1019 -#: gitk:9439
1032 +#: gitk:9458
1033 msgid "Please specify a name for the new branch"
1034 msgstr "Especifique un nombre para la nueva rama"
1035
1023 -#: gitk:9444
1036 +#: gitk:9463
1037 #, fuzzy, tcl-format
1038 msgid "Branch '%s' already exists. Overwrite?"
1039 msgstr "La etiqueta \"%s\" ya existe"
1040
1028 -#: gitk:9511
1041 +#: gitk:9530
1042 #, tcl-format
1043 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1044 msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
1045
1033 -#: gitk:9516
1046 +#: gitk:9535
1047 msgid "Cherry-picking"
1048 msgstr "Eligiendo revisiones (cherry-picking)"
1049
1037 -#: gitk:9525
1050 +#: gitk:9544
1051 #, tcl-format
1052 msgid ""
1053 "Cherry-pick failed because of local changes to file '%s'.\n"
1054 "Please commit, reset or stash your changes and try again."
1055 msgstr ""
1056
1044 -#: gitk:9531
1057 +#: gitk:9550
1058 msgid ""
1059 "Cherry-pick failed because of merge conflict.\n"
1060 "Do you wish to run git citool to resolve it?"
1061 msgstr ""
1062
1050 -#: gitk:9547 gitk:9605
1063 +#: gitk:9566 gitk:9624
1064 msgid "No changes committed"
1065 msgstr "No se han guardado cambios"
1066
1054 -#: gitk:9574
1067 +#: gitk:9593
1068 #, fuzzy, tcl-format
1069 msgid "Commit %s is not included in branch %s -- really revert it?"
1070 msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
1071
1059 -#: gitk:9579
1072 +#: gitk:9598
1073 #, fuzzy
1074 msgid "Reverting"
1075 msgstr "Reponiendo"
1076
1064 -#: gitk:9587
1077 +#: gitk:9606
1078 #, tcl-format
1079 msgid ""
1080 "Revert failed because of local changes to the following files:%s Please "
1081 "commit, reset or stash your changes and try again."
1082 msgstr ""
1083
1071 -#: gitk:9591
1084 +#: gitk:9610
1085 msgid ""
1086 "Revert failed because of merge conflict.\n"
1087 " Do you wish to run git citool to resolve it?"
1088 msgstr ""
1089
1077 -#: gitk:9634
1090 +#: gitk:9653
1091 msgid "Confirm reset"
1092 msgstr "Confirmar git reset"
1093
1081 -#: gitk:9636
1094 +#: gitk:9655
1095 #, tcl-format
1096 msgid "Reset branch %s to %s?"
1097 msgstr "¿Reponer la rama %s a %s?"
1098
1086 -#: gitk:9638
1099 +#: gitk:9657
1100 msgid "Reset type:"
1101 msgstr "Tipo de reposición:"
1102
1090 -#: gitk:9641
1103 +#: gitk:9660
1104 msgid "Soft: Leave working tree and index untouched"
1105 msgstr "Suave: No altera la copia de trabajo ni el índice"
1106
1094 -#: gitk:9644
1107 +#: gitk:9663
1108 msgid "Mixed: Leave working tree untouched, reset index"
1109 msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo"
1110
1098 -#: gitk:9647
1111 +#: gitk:9666
1112 msgid ""
1113 "Hard: Reset working tree and index\n"
1114 "(discard ALL local changes)"
@@ -1103,19 +1116,19 @@ msgstr ""
1116 "Dura: Actualiza el índice y la copia de trabajo\n"
1117 "(abandona TODAS las modificaciones locales)"
1118
1106 -#: gitk:9664
1119 +#: gitk:9683
1120 msgid "Resetting"
1121 msgstr "Reponiendo"
1122
1110 -#: gitk:9724
1123 +#: gitk:9743
1124 msgid "Checking out"
1125 msgstr "Creando copia de trabajo"
1126
1114 -#: gitk:9777
1127 +#: gitk:9796
1128 msgid "Cannot delete the currently checked-out branch"
1129 msgstr "No se puede borrar la rama actual"
1130
1118 -#: gitk:9783
1131 +#: gitk:9802
1132 #, tcl-format
1133 msgid ""
1134 "The commits on branch %s aren't on any other branch.\n"
@@ -1124,16 +1137,16 @@ msgstr ""
1137 "Las revisiones de la rama %s no están presentes en otras ramas.\n"
1138 "¿Borrar la rama %s?"
1139
1127 -#: gitk:9814
1140 +#: gitk:9833
1141 #, tcl-format
1142 msgid "Tags and heads: %s"
1143 msgstr "Etiquetas y ramas: %s"
1144
1132 -#: gitk:9829
1145 +#: gitk:9850
1146 msgid "Filter"
1147 msgstr "Filtro"
1148
1136 -#: gitk:10125
1149 +#: gitk:10146
1150 msgid ""
1151 "Error reading commit topology information; branch and preceding/following "
1152 "tag information will be incomplete."
@@ -1141,228 +1154,232 @@ msgstr ""
1154 "Error al leer la topología de revisiones: la información sobre las ramas y "
1155 "etiquetas precedentes y siguientes será incompleta."
1156
1144 -#: gitk:11102
1157 +#: gitk:11123
1158 msgid "Tag"
1159 msgstr "Etiqueta"
1160
1148 -#: gitk:11106
1161 +#: gitk:11127
1162 msgid "Id"
1163 msgstr "Id"
1164
1152 -#: gitk:11189
1165 +#: gitk:11210
1166 msgid "Gitk font chooser"
1167 msgstr "Selector de tipografías gitk"
1168
1156 -#: gitk:11206
1169 +#: gitk:11227
1170 msgid "B"
1171 msgstr "B"
1172
1160 -#: gitk:11209
1173 +#: gitk:11230
1174 msgid "I"
1175 msgstr "I"
1176
1164 -#: gitk:11327
1177 +#: gitk:11348
1178 msgid "Commit list display options"
1179 msgstr "Opciones de visualización de la lista de revisiones"
1180
1168 -#: gitk:11330
1181 +#: gitk:11351
1182 msgid "Maximum graph width (lines)"
1183 msgstr "Ancho máximo del gráfico (en líneas)"
1184
1172 -#: gitk:11334
1185 +#: gitk:11355
1186 #, no-tcl-format
1187 msgid "Maximum graph width (% of pane)"
1188 msgstr "Ancho máximo del gráfico (en % del panel)"
1189
1177 -#: gitk:11337
1190 +#: gitk:11358
1191 msgid "Show local changes"
1192 msgstr "Mostrar cambios locales"
1193
1181 -#: gitk:11340
1194 +#: gitk:11361
1195 #, fuzzy
1196 msgid "Auto-select SHA1 (length)"
1197 msgstr "Seleccionar automáticamente SHA1 hash"
1198
1186 -#: gitk:11344
1199 +#: gitk:11365
1200 msgid "Hide remote refs"
1201 msgstr ""
1202
1190 -#: gitk:11348
1203 +#: gitk:11369
1204 msgid "Diff display options"
1205 msgstr "Opciones de visualización de diferencias"
1206
1194 -#: gitk:11350
1207 +#: gitk:11371
1208 msgid "Tab spacing"
1209 msgstr "Espaciado de tabulador"
1210
1198 -#: gitk:11353
1211 +#: gitk:11374
1212 #, fuzzy
1213 msgid "Display nearby tags/heads"
1214 msgstr "Mostrar etiquetas cercanas"
1215
1203 -#: gitk:11356
1216 +#: gitk:11377
1217 msgid "Maximum # tags/heads to show"
1218 msgstr ""
1219
1207 -#: gitk:11359
1220 +#: gitk:11380
1221 msgid "Limit diffs to listed paths"
1222 msgstr "Limitar las diferencias a las rutas seleccionadas"
1223
1211 -#: gitk:11362
1224 +#: gitk:11383
1225 msgid "Support per-file encodings"
1226 msgstr ""
1227
1215 -#: gitk:11368 gitk:11515
1228 +#: gitk:11389 gitk:11536
1229 msgid "External diff tool"
1230 msgstr ""
1231
1219 -#: gitk:11369
1232 +#: gitk:11390
1233 msgid "Choose..."
1234 msgstr ""
1235
1223 -#: gitk:11374
1236 +#: gitk:11395
1237 #, fuzzy
1238 msgid "General options"
1239 msgstr "Generar parche"
1240
1228 -#: gitk:11377
1241 +#: gitk:11398
1242 msgid "Use themed widgets"
1243 msgstr ""
1244
1232 -#: gitk:11379
1245 +#: gitk:11400
1246 msgid "(change requires restart)"
1247 msgstr ""
1248
1236 -#: gitk:11381
1249 +#: gitk:11402
1250 msgid "(currently unavailable)"
1251 msgstr ""
1252
1240 -#: gitk:11392
1253 +#: gitk:11413
1254 msgid "Colors: press to choose"
1255 msgstr "Colores: pulse para seleccionar"
1256
1244 -#: gitk:11395
1257 +#: gitk:11416
1258 msgid "Interface"
1259 msgstr ""
1260
1248 -#: gitk:11396
1261 +#: gitk:11417
1262 #, fuzzy
1263 msgid "interface"
1264 msgstr "Tipografía para interfaz de usuario"
1265
1253 -#: gitk:11399
1266 +#: gitk:11420
1267 msgid "Background"
1268 msgstr "Fondo"
1269
1257 -#: gitk:11400 gitk:11430
1270 +#: gitk:11421 gitk:11451
1271 #, fuzzy
1272 msgid "background"
1273 msgstr "Fondo"
1274
1262 -#: gitk:11403
1275 +#: gitk:11424
1276 msgid "Foreground"
1277 msgstr "Primer plano"
1278
1266 -#: gitk:11404
1279 +#: gitk:11425
1280 #, fuzzy
1281 msgid "foreground"
1282 msgstr "Primer plano"
1283
1271 -#: gitk:11407
1284 +#: gitk:11428
1285 msgid "Diff: old lines"
1286 msgstr "Diff: líneas viejas"
1287
1275 -#: gitk:11408
1288 +#: gitk:11429
1289 #, fuzzy
1290 msgid "diff old lines"
1291 msgstr "Diff: líneas viejas"
1292
1280 -#: gitk:11412
1293 +#: gitk:11433
1294 msgid "Diff: new lines"
1295 msgstr "Diff: líneas nuevas"
1296
1284 -#: gitk:11413
1297 +#: gitk:11434
1298 #, fuzzy
1299 msgid "diff new lines"
1300 msgstr "Diff: líneas nuevas"
1301
1289 -#: gitk:11417
1302 +#: gitk:11438
1303 msgid "Diff: hunk header"
1304 msgstr "Diff: cabecera de fragmento"
1305
1293 -#: gitk:11419
1306 +#: gitk:11440
1307 #, fuzzy
1308 msgid "diff hunk header"
1309 msgstr "Diff: cabecera de fragmento"
1310
1298 -#: gitk:11423
1311 +#: gitk:11444
1312 msgid "Marked line bg"
1313 msgstr ""
1314
1302 -#: gitk:11425
1315 +#: gitk:11446
1316 msgid "marked line background"
1317 msgstr ""
1318
1306 -#: gitk:11429
1319 +#: gitk:11450
1320 msgid "Select bg"
1321 msgstr "Color de fondo de la selección"
1322
1310 -#: gitk:11438
1323 +#: gitk:11459
1324 msgid "Fonts: press to choose"
1325 msgstr "Tipografías: pulse para elegir"
1326
1314 -#: gitk:11440
1327 +#: gitk:11461
1328 msgid "Main font"
1329 msgstr "Tipografía principal"
1330
1318 -#: gitk:11441
1331 +#: gitk:11462
1332 msgid "Diff display font"
1333 msgstr "Tipografía para diferencias"
1334
1322 -#: gitk:11442
1335 +#: gitk:11463
1336 msgid "User interface font"
1337 msgstr "Tipografía para interfaz de usuario"
1338
1326 -#: gitk:11464
1339 +#: gitk:11485
1340 msgid "Gitk preferences"
1341 msgstr "Preferencias de gitk"
1342
1330 -#: gitk:11473
1343 +#: gitk:11494
1344 #, fuzzy
1345 msgid "General"
1346 msgstr "Generar"
1347
1335 -#: gitk:11474
1348 +#: gitk:11495
1349 msgid "Colors"
1350 msgstr ""
1351
1339 -#: gitk:11475
1352 +#: gitk:11496
1353 msgid "Fonts"
1354 msgstr ""
1355
1343 -#: gitk:11525
1356 +#: gitk:11546
1357 #, tcl-format
1358 msgid "Gitk: choose color for %s"
1359 msgstr "Gitk: elegir color para %s"
1360
1348 -#: gitk:12242
1361 +#: gitk:12059
1362 +msgid ""
1363 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1364 +" Gitk requires at least Tcl/Tk 8.4."
1365 +msgstr ""
1366 +"Esta versión de Tcl/Tk es demasiado antigua.\n"
1367 +" Gitk requiere Tcl/Tk versión 8.4 o superior."
1368 +
1369 +#: gitk:12269
1370 msgid "Cannot find a git repository here."
1371 msgstr "No hay un repositorio git aquí."
1372
1352 -#: gitk:12289
1373 +#: gitk:12316
1374 #, tcl-format
1375 msgid "Ambiguous argument '%s': both revision and filename"
1376 msgstr ""
1377 "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
1378
1358 -#: gitk:12301
1379 +#: gitk:12328
1380 msgid "Bad arguments to gitk:"
1381 msgstr "Argumentos incorrectos a Gitk:"
1382
1362 -#: gitk:12405
1363 -msgid "Command line"
1364 -msgstr "Línea de comandos"
1365 -
1383 #~ msgid "SHA1 ID: "
1384 #~ msgstr "SHA1 ID: "
1385
@@ -1384,12 +1401,5 @@ msgstr "Línea de comandos"
1401 #~ msgid "Tag/Head %s is not known"
1402 #~ msgstr "La etiqueta/rama %s es deconocida"
1403
1387 -#~ msgid ""
1388 -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1389 -#~ " Gitk requires at least Tcl/Tk 8.4."
1390 -#~ msgstr ""
1391 -#~ "Esta versión de Tcl/Tk es demasiado antigua.\n"
1392 -#~ " Gitk requiere Tcl/Tk versión 8.4 o superior."
1393 -
1404 #~ msgid "Cannot find the git directory \"%s\"."
1405 #~ msgstr "No hay directorio git \"%s\"."
po/fr.po
+297 -287
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2009-11-19 22:13+0100\n"
13 "Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n"
14 "Language-Team: git@vger.kernel.org\n"
@@ -27,7 +27,7 @@ msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
27 msgid "Color words"
28 msgstr ""
29
30 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
30 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
31 msgid "Markup words"
32 msgstr ""
33
@@ -63,14 +63,18 @@ msgstr "Erreur à l'exécution de git log :"
63 msgid "Reading"
64 msgstr "Lecture en cours"
65
66 -#: gitk:496 gitk:4508
66 +#: gitk:496 gitk:4525
67 msgid "Reading commits..."
68 msgstr "Lecture des commits..."
69
70 -#: gitk:499 gitk:1637 gitk:4511
70 +#: gitk:499 gitk:1637 gitk:4528
71 msgid "No commits selected"
72 msgstr "Aucun commit sélectionné"
73
74 +#: gitk:1445 gitk:4045 gitk:12432
75 +msgid "Command line"
76 +msgstr "Ligne de commande"
77 +
78 #: gitk:1511
79 msgid "Can't parse git log output:"
80 msgstr "Impossible de lire la sortie de git log :"
@@ -79,16 +83,12 @@ msgstr "Impossible de lire la sortie de git log :"
83 msgid "No commit information available"
84 msgstr "Aucune information disponible sur le commit"
85
82 -#: gitk:1897
83 -msgid "mc"
84 -msgstr ""
85 -
86 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
86 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
87 msgid "OK"
88 msgstr "OK"
89
90 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
91 -#: gitk:11221 gitk:11501
90 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
91 +#: gitk:11242 gitk:11522
92 msgid "Cancel"
93 msgstr "Annuler"
94
@@ -140,15 +140,15 @@ msgstr "Éditer la vue..."
140 msgid "Delete view"
141 msgstr "Supprimer la vue"
142
143 -#: gitk:2088
143 +#: gitk:2088 gitk:4043
144 msgid "All files"
145 msgstr "Tous les fichiers"
146
147 -#: gitk:2083 gitk:4050
147 +#: gitk:2083 gitk:4067
148 msgid "View"
149 msgstr "Vue"
150
151 -#: gitk:2093 gitk:2103 gitk:3009
151 +#: gitk:2093 gitk:2103 gitk:3012
152 msgid "About gitk"
153 msgstr "À propos de gitk"
154
@@ -160,7 +160,7 @@ msgstr "Raccourcis clavier"
160 msgid "Help"
161 msgstr "Aide"
162
163 -#: gitk:2185 gitk:8633
163 +#: gitk:2185 gitk:8652
164 msgid "SHA1 ID:"
165 msgstr "Id SHA1 :"
166
@@ -176,53 +176,53 @@ msgstr "Recherche"
176 msgid "commit"
177 msgstr "commit"
178
179 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
180 -#: gitk:6893
179 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
180 +#: gitk:6912
181 msgid "containing:"
182 msgstr "contient :"
183
184 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
184 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
185 msgid "touching paths:"
186 msgstr "chemins modifiés :"
187
188 -#: gitk:2303 gitk:4759
188 +#: gitk:2303 gitk:4777
189 msgid "adding/removing string:"
190 msgstr "ajoute/supprime la chaîne :"
191
192 -#: gitk:2304 gitk:4761
192 +#: gitk:2304 gitk:4779
193 msgid "changing lines matching:"
194 msgstr ""
195
196 -#: gitk:2313 gitk:2315 gitk:4748
196 +#: gitk:2313 gitk:2315 gitk:4766
197 msgid "Exact"
198 msgstr "Exact"
199
200 -#: gitk:2315 gitk:4836 gitk:6704
200 +#: gitk:2315 gitk:4854 gitk:6723
201 msgid "IgnCase"
202 msgstr "Ignorer la casse"
203
204 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
204 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
205 msgid "Regexp"
206 msgstr "Expression régulière"
207
208 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
208 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
209 msgid "All fields"
210 msgstr "Tous les champs"
211
212 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
212 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
213 msgid "Headline"
214 msgstr "Surligner"
215
216 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
216 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
217 msgid "Comments"
218 msgstr "Commentaires"
219
220 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
221 -#: gitk:8826
220 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
221 +#: gitk:8845
222 msgid "Author"
223 msgstr "Auteur"
224
225 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
225 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
226 msgid "Committer"
227 msgstr "Auteur du commit"
228
@@ -250,7 +250,7 @@ msgstr "Lignes de contexte"
250 msgid "Ignore space change"
251 msgstr "Ignorer les modifications d'espace"
252
253 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
253 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
254 msgid "Line diff"
255 msgstr ""
256
@@ -262,102 +262,110 @@ msgstr "Patch"
262 msgid "Tree"
263 msgstr "Arbre"
264
265 -#: gitk:2616 gitk:2636
265 +#: gitk:2617 gitk:2637
266 msgid "Diff this -> selected"
267 msgstr "Diff entre ceci et la sélection"
268
269 -#: gitk:2617 gitk:2637
269 +#: gitk:2618 gitk:2638
270 msgid "Diff selected -> this"
271 msgstr "Diff entre sélection et ceci"
272
273 -#: gitk:2618 gitk:2638
273 +#: gitk:2619 gitk:2639
274 msgid "Make patch"
275 msgstr "Créer patch"
276
277 -#: gitk:2619 gitk:9235
277 +#: gitk:2620 gitk:9254
278 msgid "Create tag"
279 msgstr "Créer tag"
280
281 -#: gitk:2620 gitk:9352
281 +#: gitk:2621 gitk:9371
282 msgid "Write commit to file"
283 msgstr "Écrire le commit dans un fichier"
284
285 -#: gitk:2621 gitk:9409
285 +#: gitk:2622 gitk:9428
286 msgid "Create new branch"
287 msgstr "Créer une nouvelle branche"
288
289 -#: gitk:2622
289 +#: gitk:2623
290 msgid "Cherry-pick this commit"
291 msgstr "Cueillir (cherry-pick) ce commit"
292
293 -#: gitk:2623
293 +#: gitk:2624
294 msgid "Reset HEAD branch to here"
295 msgstr "Réinitialiser la branche HEAD vers cet état"
296
297 -#: gitk:2624
297 +#: gitk:2625
298 msgid "Mark this commit"
299 msgstr "Marquer ce commit"
300
301 -#: gitk:2625
301 +#: gitk:2626
302 msgid "Return to mark"
303 msgstr "Retourner à la marque"
304
305 -#: gitk:2626
305 +#: gitk:2627
306 msgid "Find descendant of this and mark"
307 msgstr "Chercher le descendant de ceci et le marquer"
308
309 -#: gitk:2627
309 +#: gitk:2628
310 msgid "Compare with marked commit"
311 msgstr "Comparer avec le commit marqué"
312
313 -#: gitk:2628 gitk:2639
313 +#: gitk:2629 gitk:2640
314 #, fuzzy
315 msgid "Diff this -> marked commit"
316 msgstr "Diff entre ceci et la sélection"
317
318 -#: gitk:2629 gitk:2640
318 +#: gitk:2630 gitk:2641
319 #, fuzzy
320 msgid "Diff marked commit -> this"
321 msgstr "Diff entre sélection et ceci"
322
323 -#: gitk:2630
323 +#: gitk:2631
324 #, fuzzy
325 msgid "Revert this commit"
326 msgstr "Marquer ce commit"
327
328 -#: gitk:2646
328 +#: gitk:2647
329 msgid "Check out this branch"
330 msgstr "Récupérer cette branche"
331
332 -#: gitk:2647
332 +#: gitk:2648
333 msgid "Remove this branch"
334 msgstr "Supprimer cette branche"
335
336 -#: gitk:2654
336 +#: gitk:2649
337 +msgid "Copy branch name"
338 +msgstr ""
339 +
340 +#: gitk:2656
341 msgid "Highlight this too"
342 msgstr "Surligner également ceci"
343
340 -#: gitk:2655
344 +#: gitk:2657
345 msgid "Highlight this only"
346 msgstr "Surligner seulement ceci"
347
344 -#: gitk:2656
348 +#: gitk:2658
349 msgid "External diff"
350 msgstr "Diff externe"
351
348 -#: gitk:2657
352 +#: gitk:2659
353 msgid "Blame parent commit"
354 msgstr "Blâmer le commit parent"
355
352 -#: gitk:2664
356 +#: gitk:2660
357 +msgid "Copy path"
358 +msgstr ""
359 +
360 +#: gitk:2667
361 msgid "Show origin of this line"
362 msgstr "Montrer l'origine de cette ligne"
363
356 -#: gitk:2665
364 +#: gitk:2668
365 msgid "Run git gui blame on this line"
366 msgstr "Exécuter git gui blame sur cette ligne"
367
360 -#: gitk:3011
368 +#: gitk:3014
369 #, fuzzy
370 msgid ""
371 "\n"
@@ -375,317 +383,322 @@ msgstr ""
383 "Utilisation et redistribution soumises aux termes de la GNU General Public "
384 "License"
385
378 -#: gitk:3019 gitk:3085 gitk:9836
386 +#: gitk:3022 gitk:3089 gitk:9857
387 msgid "Close"
388 msgstr "Fermer"
389
382 -#: gitk:3040
390 +#: gitk:3043
391 msgid "Gitk key bindings"
392 msgstr "Raccourcis clavier de Gitk"
393
386 -#: gitk:3043
394 +#: gitk:3046
395 msgid "Gitk key bindings:"
396 msgstr "Raccourcis clavier de Gitk :"
397
390 -#: gitk:3045
398 +#: gitk:3048
399 #, tcl-format
400 msgid "<%s-Q>\t\tQuit"
401 msgstr "<%s-Q>\t\tQuitter"
402
395 -#: gitk:3046
403 +#: gitk:3049
404 #, fuzzy, tcl-format
405 msgid "<%s-W>\t\tClose window"
406 msgstr "<%s-F>\t\tRechercher"
407
400 -#: gitk:3047
408 +#: gitk:3050
409 msgid "<Home>\t\tMove to first commit"
410 msgstr "<Début>\t\tAller au premier commit"
411
404 -#: gitk:3048
412 +#: gitk:3051
413 msgid "<End>\t\tMove to last commit"
414 msgstr "<Fin>\t\tAller au dernier commit"
415
408 -#: gitk:3049
416 +#: gitk:3052
417 #, fuzzy
418 msgid "<Up>, p, k\tMove up one commit"
419 msgstr "<Haut>, p, i\t Aller au commit suivant"
420
413 -#: gitk:3050
421 +#: gitk:3053
422 #, fuzzy
423 msgid "<Down>, n, j\tMove down one commit"
424 msgstr "<Bas>, n, k\t Aller au commit précédent"
425
418 -#: gitk:3051
426 +#: gitk:3054
427 #, fuzzy
428 msgid "<Left>, z, h\tGo back in history list"
429 msgstr "<Gauche>, z, j\tReculer dans l'historique"
430
423 -#: gitk:3052
431 +#: gitk:3055
432 msgid "<Right>, x, l\tGo forward in history list"
433 msgstr "<Droite>, x, l\tAvancer dans l'historique"
434
427 -#: gitk:3053
435 +#: gitk:3056
436 #, tcl-format
437 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
438 msgstr ""
439
432 -#: gitk:3054
440 +#: gitk:3057
441 msgid "<PageUp>\tMove up one page in commit list"
442 msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
443
436 -#: gitk:3055
444 +#: gitk:3058
445 msgid "<PageDown>\tMove down one page in commit list"
446 msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
447
440 -#: gitk:3056
448 +#: gitk:3059
449 #, tcl-format
450 msgid "<%s-Home>\tScroll to top of commit list"
451 msgstr "<%s-Début>\tAller en haut de la liste des commits"
452
445 -#: gitk:3057
453 +#: gitk:3060
454 #, tcl-format
455 msgid "<%s-End>\tScroll to bottom of commit list"
456 msgstr "<%s-End>\tAller en bas de la liste des commits"
457
450 -#: gitk:3058
458 +#: gitk:3061
459 #, tcl-format
460 msgid "<%s-Up>\tScroll commit list up one line"
461 msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
462
455 -#: gitk:3059
463 +#: gitk:3062
464 #, tcl-format
465 msgid "<%s-Down>\tScroll commit list down one line"
466 msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
467
460 -#: gitk:3060
468 +#: gitk:3063
469 #, tcl-format
470 msgid "<%s-PageUp>\tScroll commit list up one page"
471 msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
472
465 -#: gitk:3061
473 +#: gitk:3064
474 #, tcl-format
475 msgid "<%s-PageDown>\tScroll commit list down one page"
476 msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
477
470 -#: gitk:3062
478 +#: gitk:3065
479 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
480 msgstr ""
481 "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
482
475 -#: gitk:3063
483 +#: gitk:3066
484 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
485 msgstr ""
486 "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
487
480 -#: gitk:3064
488 +#: gitk:3067
489 msgid "<Delete>, b\tScroll diff view up one page"
490 msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
491
484 -#: gitk:3065
492 +#: gitk:3068
493 msgid "<Backspace>\tScroll diff view up one page"
494 msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
495
488 -#: gitk:3066
496 +#: gitk:3069
497 msgid "<Space>\t\tScroll diff view down one page"
498 msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
499
492 -#: gitk:3067
500 +#: gitk:3070
501 msgid "u\t\tScroll diff view up 18 lines"
502 msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
503
496 -#: gitk:3068
504 +#: gitk:3071
505 msgid "d\t\tScroll diff view down 18 lines"
506 msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
507
500 -#: gitk:3069
508 +#: gitk:3072
509 #, tcl-format
510 msgid "<%s-F>\t\tFind"
511 msgstr "<%s-F>\t\tRechercher"
512
505 -#: gitk:3070
513 +#: gitk:3073
514 #, tcl-format
515 msgid "<%s-G>\t\tMove to next find hit"
516 msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
517
510 -#: gitk:3071
518 +#: gitk:3074
519 msgid "<Return>\tMove to next find hit"
520 msgstr "<Return>\t\tAller au résultat de recherche suivant"
521
514 -#: gitk:3072
522 +#: gitk:3075
523 +#, fuzzy
524 +msgid "g\t\tGo to commit"
525 +msgstr "<Fin>\t\tAller au dernier commit"
526 +
527 +#: gitk:3076
528 msgid "/\t\tFocus the search box"
529 msgstr "/\t\tFocus sur la zone de recherche"
530
518 -#: gitk:3073
531 +#: gitk:3077
532 msgid "?\t\tMove to previous find hit"
533 msgstr "?\t\tAller au résultat de recherche précédent"
534
522 -#: gitk:3074
535 +#: gitk:3078
536 msgid "f\t\tScroll diff view to next file"
537 msgstr "f\t\tAller au prochain fichier dans la vue des diff"
538
526 -#: gitk:3075
539 +#: gitk:3079
540 #, tcl-format
541 msgid "<%s-S>\t\tSearch for next hit in diff view"
542 msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff"
543
531 -#: gitk:3076
544 +#: gitk:3080
545 #, tcl-format
546 msgid "<%s-R>\t\tSearch for previous hit in diff view"
547 msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff"
548
536 -#: gitk:3077
549 +#: gitk:3081
550 #, tcl-format
551 msgid "<%s-KP+>\tIncrease font size"
552 msgstr "<%s-KP+>\tAugmenter la taille de la police"
553
541 -#: gitk:3078
554 +#: gitk:3082
555 #, tcl-format
556 msgid "<%s-plus>\tIncrease font size"
557 msgstr "<%s-plus>\tAugmenter la taille de la police"
558
546 -#: gitk:3079
559 +#: gitk:3083
560 #, tcl-format
561 msgid "<%s-KP->\tDecrease font size"
562 msgstr "<%s-KP->\tDiminuer la taille de la police"
563
551 -#: gitk:3080
564 +#: gitk:3084
565 #, tcl-format
566 msgid "<%s-minus>\tDecrease font size"
567 msgstr "<%s-minus>\tDiminuer la taille de la police"
568
556 -#: gitk:3081
569 +#: gitk:3085
570 msgid "<F5>\t\tUpdate"
571 msgstr "<F5>\t\tMise à jour"
572
560 -#: gitk:3546 gitk:3555
573 +#: gitk:3550 gitk:3559
574 #, tcl-format
575 msgid "Error creating temporary directory %s:"
576 msgstr "Erreur lors de la création du répertoire temporaire %s :"
577
565 -#: gitk:3568
578 +#: gitk:3572
579 #, tcl-format
580 msgid "Error getting \"%s\" from %s:"
581 msgstr "Erreur en obtenant \"%s\" de %s:"
582
570 -#: gitk:3631
583 +#: gitk:3635
584 msgid "command failed:"
585 msgstr "échec de la commande :"
586
574 -#: gitk:3780
587 +#: gitk:3784
588 msgid "No such commit"
589 msgstr "Commit inexistant"
590
578 -#: gitk:3794
591 +#: gitk:3798
592 msgid "git gui blame: command failed:"
593 msgstr "git gui blame : échec de la commande :"
594
582 -#: gitk:3825
595 +#: gitk:3829
596 #, tcl-format
597 msgid "Couldn't read merge head: %s"
598 msgstr "Impossible de lire le head de la fusion : %s"
599
587 -#: gitk:3833
600 +#: gitk:3837
601 #, tcl-format
602 msgid "Error reading index: %s"
603 msgstr "Erreur à la lecture de l'index : %s"
604
592 -#: gitk:3858
605 +#: gitk:3862
606 #, tcl-format
607 msgid "Couldn't start git blame: %s"
608 msgstr "Impossible de démarrer git blame : %s"
609
597 -#: gitk:3861 gitk:6735
610 +#: gitk:3865 gitk:6754
611 msgid "Searching"
612 msgstr "Recherche en cours"
613
601 -#: gitk:3893
614 +#: gitk:3897
615 #, tcl-format
616 msgid "Error running git blame: %s"
617 msgstr "Erreur à l'exécution de git blame : %s"
618
606 -#: gitk:3921
619 +#: gitk:3925
620 #, tcl-format
621 msgid "That line comes from commit %s, which is not in this view"
622 msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
623
611 -#: gitk:3935
624 +#: gitk:3939
625 msgid "External diff viewer failed:"
626 msgstr "Échec de l'outil externe de visualisation des diff"
627
615 -#: gitk:4053
628 +#: gitk:4070
629 msgid "Gitk view definition"
630 msgstr "Définition des vues de Gitk"
631
619 -#: gitk:4057
632 +#: gitk:4074
633 msgid "Remember this view"
634 msgstr "Se souvenir de cette vue"
635
623 -#: gitk:4058
636 +#: gitk:4075
637 msgid "References (space separated list):"
638 msgstr "Références (liste d'éléments séparés par des espaces) :"
639
627 -#: gitk:4059
640 +#: gitk:4076
641 msgid "Branches & tags:"
642 msgstr "Branches & tags :"
643
631 -#: gitk:4060
644 +#: gitk:4077
645 msgid "All refs"
646 msgstr "Toutes les références"
647
635 -#: gitk:4061
648 +#: gitk:4078
649 msgid "All (local) branches"
650 msgstr "Toutes les branches (locales)"
651
639 -#: gitk:4062
652 +#: gitk:4079
653 msgid "All tags"
654 msgstr "Tous les tags"
655
643 -#: gitk:4063
656 +#: gitk:4080
657 msgid "All remote-tracking branches"
658 msgstr "Toutes les branches de suivi à distance"
659
647 -#: gitk:4064
660 +#: gitk:4081
661 msgid "Commit Info (regular expressions):"
662 msgstr "Info sur les commits (expressions régulières) :"
663
651 -#: gitk:4065
664 +#: gitk:4082
665 msgid "Author:"
666 msgstr "Auteur :"
667
655 -#: gitk:4066
668 +#: gitk:4083
669 msgid "Committer:"
670 msgstr "Commiteur :"
671
659 -#: gitk:4067
672 +#: gitk:4084
673 msgid "Commit Message:"
674 msgstr "Message de commit :"
675
663 -#: gitk:4068
676 +#: gitk:4085
677 msgid "Matches all Commit Info criteria"
678 msgstr "Correspond à tous les critères d'Info sur les commits"
679
667 -#: gitk:4069
680 +#: gitk:4086
681 #, fuzzy
669 -msgid "Matches none Commit Info criteria"
682 +msgid "Matches no Commit Info criteria"
683 msgstr "Correspond à tous les critères d'Info sur les commits"
684
672 -#: gitk:4070
685 +#: gitk:4087
686 msgid "Changes to Files:"
687 msgstr "Changements des fichiers :"
688
676 -#: gitk:4071
689 +#: gitk:4088
690 msgid "Fixed String"
691 msgstr "Chaîne Figée"
692
680 -#: gitk:4072
693 +#: gitk:4089
694 msgid "Regular Expression"
695 msgstr "Expression Régulière"
696
684 -#: gitk:4073
697 +#: gitk:4090
698 msgid "Search string:"
699 msgstr "Recherche de la chaîne :"
700
688 -#: gitk:4074
701 +#: gitk:4091
702 msgid ""
703 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
704 "15:27:38\"):"
@@ -693,204 +706,204 @@ msgstr ""
706 "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
707 "2009 15:27:38\") :"
708
696 -#: gitk:4075
709 +#: gitk:4092
710 msgid "Since:"
711 msgstr "De :"
712
700 -#: gitk:4076
713 +#: gitk:4093
714 msgid "Until:"
715 msgstr "Jusqu'au :"
716
704 -#: gitk:4077
717 +#: gitk:4094
718 msgid "Limit and/or skip a number of revisions (positive integer):"
719 msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :"
720
708 -#: gitk:4078
721 +#: gitk:4095
722 msgid "Number to show:"
723 msgstr "Nombre à afficher :"
724
712 -#: gitk:4079
725 +#: gitk:4096
726 msgid "Number to skip:"
727 msgstr "Nombre à sauter :"
728
716 -#: gitk:4080
729 +#: gitk:4097
730 msgid "Miscellaneous options:"
731 msgstr "Options diverses :"
732
720 -#: gitk:4081
733 +#: gitk:4098
734 msgid "Strictly sort by date"
735 msgstr "Trier par date"
736
737 # FIXME : traduction de "branch sides"
725 -#: gitk:4082
738 +#: gitk:4099
739 #, fuzzy
740 msgid "Mark branch sides"
741 msgstr "Marquer les extrémités des branches"
742
730 -#: gitk:4083
743 +#: gitk:4100
744 msgid "Limit to first parent"
745 msgstr "Limiter au premier ancêtre"
746
734 -#: gitk:4084
747 +#: gitk:4101
748 msgid "Simple history"
749 msgstr "Historique simple"
750
738 -#: gitk:4085
751 +#: gitk:4102
752 msgid "Additional arguments to git log:"
753 msgstr "Arguments supplémentaires de git log :"
754
742 -#: gitk:4086
755 +#: gitk:4103
756 msgid "Enter files and directories to include, one per line:"
757 msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
758
746 -#: gitk:4087
759 +#: gitk:4104
760 msgid "Command to generate more commits to include:"
761 msgstr "Commande pour générer plus de commits à inclure :"
762
750 -#: gitk:4211
763 +#: gitk:4228
764 msgid "Gitk: edit view"
765 msgstr "Gitk : éditer la vue"
766
754 -#: gitk:4219
767 +#: gitk:4236
768 msgid "-- criteria for selecting revisions"
769 msgstr "-- critère pour la sélection des révisions"
770
758 -#: gitk:4224
771 +#: gitk:4241
772 #, fuzzy
773 msgid "View Name"
774 msgstr "Nom de la vue :"
775
763 -#: gitk:4299
776 +#: gitk:4316
777 msgid "Apply (F5)"
778 msgstr "Appliquer (F5)"
779
767 -#: gitk:4337
780 +#: gitk:4354
781 msgid "Error in commit selection arguments:"
782 msgstr "Erreur dans les arguments de sélection des commits :"
783
771 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
784 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
785 msgid "None"
786 msgstr "Aucun"
787
775 -#: gitk:5003 gitk:5008
788 +#: gitk:5021 gitk:5026
789 msgid "Descendant"
790 msgstr "Descendant"
791
779 -#: gitk:5004
792 +#: gitk:5022
793 msgid "Not descendant"
794 msgstr "Pas un descendant"
795
783 -#: gitk:5011 gitk:5016
796 +#: gitk:5029 gitk:5034
797 msgid "Ancestor"
798 msgstr "Ancêtre"
799
787 -#: gitk:5012
800 +#: gitk:5030
801 msgid "Not ancestor"
802 msgstr "Pas un ancêtre"
803
791 -#: gitk:5306
804 +#: gitk:5324
805 msgid "Local changes checked in to index but not committed"
806 msgstr "Modifications locales enregistrées dans l'index mais non commitées"
807
795 -#: gitk:5342
808 +#: gitk:5360
809 msgid "Local uncommitted changes, not checked in to index"
810 msgstr "Modifications locales non enregistrées dans l'index et non commitées"
811
799 -#: gitk:7115
812 +#: gitk:7134
813 msgid "and many more"
814 msgstr ""
815
803 -#: gitk:7118
816 +#: gitk:7137
817 msgid "many"
818 msgstr "nombreux"
819
807 -#: gitk:7309
820 +#: gitk:7328
821 msgid "Tags:"
822 msgstr "Tags :"
823
811 -#: gitk:7326 gitk:7332 gitk:8806
824 +#: gitk:7345 gitk:7351 gitk:8825
825 msgid "Parent"
826 msgstr "Parent"
827
815 -#: gitk:7337
828 +#: gitk:7356
829 msgid "Child"
830 msgstr "Enfant"
831
819 -#: gitk:7346
832 +#: gitk:7365
833 msgid "Branch"
834 msgstr "Branche"
835
823 -#: gitk:7349
836 +#: gitk:7368
837 msgid "Follows"
838 msgstr "Suit"
839
827 -#: gitk:7352
840 +#: gitk:7371
841 msgid "Precedes"
842 msgstr "Précède"
843
831 -#: gitk:7947
844 +#: gitk:7966
845 #, tcl-format
846 msgid "Error getting diffs: %s"
847 msgstr "Erreur lors de la récupération des diff : %s"
848
836 -#: gitk:8631
849 +#: gitk:8650
850 msgid "Goto:"
851 msgstr "Aller à :"
852
840 -#: gitk:8652
853 +#: gitk:8671
854 #, tcl-format
855 msgid "Short SHA1 id %s is ambiguous"
856 msgstr "Id SHA1 court %s est ambigu"
857
845 -#: gitk:8659
858 +#: gitk:8678
859 #, tcl-format
860 msgid "Revision %s is not known"
861 msgstr "Id SHA1 %s est inconnu"
862
850 -#: gitk:8669
863 +#: gitk:8688
864 #, tcl-format
865 msgid "SHA1 id %s is not known"
866 msgstr "Id SHA1 %s est inconnu"
867
855 -#: gitk:8671
868 +#: gitk:8690
869 #, tcl-format
870 msgid "Revision %s is not in the current view"
871 msgstr "La révision %s n'est pas dans la vue courante"
872
860 -#: gitk:8813 gitk:8828
873 +#: gitk:8832 gitk:8847
874 msgid "Date"
875 msgstr "Date"
876
864 -#: gitk:8816
877 +#: gitk:8835
878 msgid "Children"
879 msgstr "Enfants"
880
868 -#: gitk:8879
881 +#: gitk:8898
882 #, tcl-format
883 msgid "Reset %s branch to here"
884 msgstr "Réinitialiser la branche %s vers cet état"
885
873 -#: gitk:8881
886 +#: gitk:8900
887 msgid "Detached head: can't reset"
888 msgstr "Head détaché : impossible de réinitialiser"
889
877 -#: gitk:8986 gitk:8992
890 +#: gitk:9005 gitk:9011
891 msgid "Skipping merge commit "
892 msgstr "Éviter le commit de la fusion "
893
881 -#: gitk:9001 gitk:9006
894 +#: gitk:9020 gitk:9025
895 msgid "Error getting patch ID for "
896 msgstr "Erreur à l'obtention de l'ID du patch pour "
897
885 -#: gitk:9002 gitk:9007
898 +#: gitk:9021 gitk:9026
899 msgid " - stopping\n"
900 msgstr " - arrêt en cours\n"
901
889 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
902 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
903 msgid "Commit "
904 msgstr "Commit "
905
893 -#: gitk:9016
906 +#: gitk:9035
907 msgid ""
908 " is the same patch as\n"
909 " "
@@ -898,7 +911,7 @@ msgstr ""
911 "est le même patch que \n"
912 " "
913
901 -#: gitk:9024
914 +#: gitk:9043
915 msgid ""
916 " differs from\n"
917 " "
@@ -906,138 +919,138 @@ msgstr ""
919 " diffère de\n"
920 " "
921
909 -#: gitk:9026
922 +#: gitk:9045
923 msgid ""
924 "Diff of commits:\n"
925 "\n"
926 msgstr ""
927
915 -#: gitk:9038 gitk:9047
928 +#: gitk:9057 gitk:9066
929 #, tcl-format
930 msgid " has %s children - stopping\n"
931 msgstr "a %s enfants - arrêt en cours\n"
932
920 -#: gitk:9066
933 +#: gitk:9085
934 #, fuzzy, tcl-format
935 msgid "Error writing commit to file: %s"
936 msgstr "Erreur à l'ecriture du commit :"
937
925 -#: gitk:9072
938 +#: gitk:9091
939 #, fuzzy, tcl-format
940 msgid "Error diffing commits: %s"
941 msgstr "Erreur à l'ecriture du commit :"
942
930 -#: gitk:9118
943 +#: gitk:9137
944 msgid "Top"
945 msgstr "Haut"
946
934 -#: gitk:9119
947 +#: gitk:9138
948 msgid "From"
949 msgstr "De"
950
938 -#: gitk:9124
951 +#: gitk:9143
952 msgid "To"
953 msgstr "À"
954
942 -#: gitk:9148
955 +#: gitk:9167
956 msgid "Generate patch"
957 msgstr "Générer le patch"
958
946 -#: gitk:9150
959 +#: gitk:9169
960 msgid "From:"
961 msgstr "De :"
962
950 -#: gitk:9159
963 +#: gitk:9178
964 msgid "To:"
965 msgstr "À :"
966
954 -#: gitk:9168
967 +#: gitk:9187
968 msgid "Reverse"
969 msgstr "Inverser"
970
958 -#: gitk:9170 gitk:9366
971 +#: gitk:9189 gitk:9385
972 msgid "Output file:"
973 msgstr "Fichier de sortie :"
974
962 -#: gitk:9176
975 +#: gitk:9195
976 msgid "Generate"
977 msgstr "Générer"
978
966 -#: gitk:9214
979 +#: gitk:9233
980 msgid "Error creating patch:"
981 msgstr "Erreur à la création du patch :"
982
970 -#: gitk:9237 gitk:9354 gitk:9411
983 +#: gitk:9256 gitk:9373 gitk:9430
984 msgid "ID:"
985 msgstr "ID :"
986
974 -#: gitk:9246
987 +#: gitk:9265
988 msgid "Tag name:"
989 msgstr "Nom du Tag :"
990
978 -#: gitk:9249
991 +#: gitk:9268
992 msgid "Tag message is optional"
993 msgstr ""
994
982 -#: gitk:9251
995 +#: gitk:9270
996 #, fuzzy
997 msgid "Tag message:"
998 msgstr "Nom du Tag :"
999
987 -#: gitk:9255 gitk:9420
1000 +#: gitk:9274 gitk:9439
1001 msgid "Create"
1002 msgstr "Créer"
1003
991 -#: gitk:9273
1004 +#: gitk:9292
1005 msgid "No tag name specified"
1006 msgstr "Aucun nom de tag spécifié"
1007
995 -#: gitk:9277
1008 +#: gitk:9296
1009 #, tcl-format
1010 msgid "Tag \"%s\" already exists"
1011 msgstr "Le tag \"%s\" existe déjà"
1012
1000 -#: gitk:9287
1013 +#: gitk:9306
1014 msgid "Error creating tag:"
1015 msgstr "Erreur à la création du tag :"
1016
1004 -#: gitk:9363
1017 +#: gitk:9382
1018 msgid "Command:"
1019 msgstr "Commande :"
1020
1008 -#: gitk:9371
1021 +#: gitk:9390
1022 msgid "Write"
1023 msgstr "Écrire"
1024
1012 -#: gitk:9389
1025 +#: gitk:9408
1026 msgid "Error writing commit:"
1027 msgstr "Erreur à l'ecriture du commit :"
1028
1016 -#: gitk:9416
1029 +#: gitk:9435
1030 msgid "Name:"
1031 msgstr "Nom :"
1032
1020 -#: gitk:9439
1033 +#: gitk:9458
1034 msgid "Please specify a name for the new branch"
1035 msgstr "Veuillez spécifier un nom pour la nouvelle branche"
1036
1024 -#: gitk:9444
1037 +#: gitk:9463
1038 #, tcl-format
1039 msgid "Branch '%s' already exists. Overwrite?"
1040 msgstr "La branche '%s' existe déjà. Écraser?"
1041
1029 -#: gitk:9511
1042 +#: gitk:9530
1043 #, tcl-format
1044 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1045 msgstr ""
1046 "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
1047 "tout?"
1048
1036 -#: gitk:9516
1049 +#: gitk:9535
1050 msgid "Cherry-picking"
1051 msgstr "Cueillir (Cherry-picking)"
1052
1040 -#: gitk:9525
1053 +#: gitk:9544
1054 #, tcl-format
1055 msgid ""
1056 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1048,7 +1061,7 @@ msgstr ""
1061 "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
1062 "nouveau."
1063
1051 -#: gitk:9531
1064 +#: gitk:9550
1065 msgid ""
1066 "Cherry-pick failed because of merge conflict.\n"
1067 "Do you wish to run git citool to resolve it?"
@@ -1057,23 +1070,23 @@ msgstr ""
1070 "fusion.\n"
1071 "Souhaitez-vous exécuter git citool pour le résoudre ?"
1072
1060 -#: gitk:9547 gitk:9605
1073 +#: gitk:9566 gitk:9624
1074 msgid "No changes committed"
1075 msgstr "Aucun changement commité"
1076
1064 -#: gitk:9574
1077 +#: gitk:9593
1078 #, fuzzy, tcl-format
1079 msgid "Commit %s is not included in branch %s -- really revert it?"
1080 msgstr ""
1081 "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
1082 "tout?"
1083
1071 -#: gitk:9579
1084 +#: gitk:9598
1085 #, fuzzy
1086 msgid "Reverting"
1087 msgstr "Réinitialisation"
1088
1076 -#: gitk:9587
1089 +#: gitk:9606
1090 #, fuzzy, tcl-format
1091 msgid ""
1092 "Revert failed because of local changes to the following files:%s Please "
@@ -1084,7 +1097,7 @@ msgstr ""
1097 "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
1098 "nouveau."
1099
1087 -#: gitk:9591
1100 +#: gitk:9610
1101 #, fuzzy
1102 msgid ""
1103 "Revert failed because of merge conflict.\n"
@@ -1094,30 +1107,30 @@ msgstr ""
1107 "fusion.\n"
1108 "Souhaitez-vous exécuter git citool pour le résoudre ?"
1109
1097 -#: gitk:9634
1110 +#: gitk:9653
1111 msgid "Confirm reset"
1112 msgstr "Confirmer la réinitialisation"
1113
1101 -#: gitk:9636
1114 +#: gitk:9655
1115 #, tcl-format
1116 msgid "Reset branch %s to %s?"
1117 msgstr "Réinitialiser la branche %s à %s?"
1118
1106 -#: gitk:9638
1119 +#: gitk:9657
1120 msgid "Reset type:"
1121 msgstr "Type de réinitialisation :"
1122
1110 -#: gitk:9641
1123 +#: gitk:9660
1124 msgid "Soft: Leave working tree and index untouched"
1125 msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
1126
1114 -#: gitk:9644
1127 +#: gitk:9663
1128 msgid "Mixed: Leave working tree untouched, reset index"
1129 msgstr ""
1130 "Hybride : Laisse le répertoire de travail dans son état courant, "
1131 "réinitialise l'index"
1132
1120 -#: gitk:9647
1133 +#: gitk:9666
1134 msgid ""
1135 "Hard: Reset working tree and index\n"
1136 "(discard ALL local changes)"
@@ -1125,21 +1138,21 @@ msgstr ""
1138 "Dure : Réinitialise le répertoire de travail et l'index\n"
1139 "(abandonne TOUS les changements locaux)"
1140
1128 -#: gitk:9664
1141 +#: gitk:9683
1142 msgid "Resetting"
1143 msgstr "Réinitialisation"
1144
1145 # Fixme: Récupération est-il vraiment une mauvaise traduction?
1133 -#: gitk:9724
1146 +#: gitk:9743
1147 #, fuzzy
1148 msgid "Checking out"
1149 msgstr "Récupération"
1150
1138 -#: gitk:9777
1151 +#: gitk:9796
1152 msgid "Cannot delete the currently checked-out branch"
1153 msgstr "Impossible de supprimer la branche en cours"
1154
1142 -#: gitk:9783
1155 +#: gitk:9802
1156 #, tcl-format
1157 msgid ""
1158 "The commits on branch %s aren't on any other branch.\n"
@@ -1148,16 +1161,16 @@ msgstr ""
1161 "Les commits de la branche %s ne sont dans aucune autre branche.\n"
1162 "Voulez-vous vraiment supprimer cette branche %s ?"
1163
1151 -#: gitk:9814
1164 +#: gitk:9833
1165 #, tcl-format
1166 msgid "Tags and heads: %s"
1167 msgstr "Tags et heads : %s"
1168
1156 -#: gitk:9829
1169 +#: gitk:9850
1170 msgid "Filter"
1171 msgstr "Filtrer"
1172
1160 -#: gitk:10125
1173 +#: gitk:10146
1174 msgid ""
1175 "Error reading commit topology information; branch and preceding/following "
1176 "tag information will be incomplete."
@@ -1166,223 +1179,227 @@ msgstr ""
1179 "informations sur les branches et les tags précédents/suivants seront "
1180 "incomplètes."
1181
1169 -#: gitk:11102
1182 +#: gitk:11123
1183 msgid "Tag"
1184 msgstr "Tag"
1185
1173 -#: gitk:11106
1186 +#: gitk:11127
1187 msgid "Id"
1188 msgstr "Id"
1189
1177 -#: gitk:11189
1190 +#: gitk:11210
1191 msgid "Gitk font chooser"
1192 msgstr "Sélecteur de police de Gitk"
1193
1181 -#: gitk:11206
1194 +#: gitk:11227
1195 msgid "B"
1196 msgstr "B"
1197
1185 -#: gitk:11209
1198 +#: gitk:11230
1199 msgid "I"
1200 msgstr "I"
1201
1189 -#: gitk:11327
1202 +#: gitk:11348
1203 msgid "Commit list display options"
1204 msgstr "Options d'affichage de la liste des commits"
1205
1193 -#: gitk:11330
1206 +#: gitk:11351
1207 msgid "Maximum graph width (lines)"
1208 msgstr "Longueur maximum du graphe (lignes)"
1209
1210 # FIXME : Traduction standard de "pane"?
1198 -#: gitk:11334
1211 +#: gitk:11355
1212 #, fuzzy, no-tcl-format
1213 msgid "Maximum graph width (% of pane)"
1214 msgstr "Longueur maximum du graphe (% du panneau)"
1215
1203 -#: gitk:11337
1216 +#: gitk:11358
1217 msgid "Show local changes"
1218 msgstr "Montrer les changements locaux"
1219
1207 -#: gitk:11340
1220 +#: gitk:11361
1221 #, fuzzy
1222 msgid "Auto-select SHA1 (length)"
1223 msgstr "Sélection auto. du SHA1"
1224
1212 -#: gitk:11344
1225 +#: gitk:11365
1226 msgid "Hide remote refs"
1227 msgstr "Cacher les refs distantes"
1228
1216 -#: gitk:11348
1229 +#: gitk:11369
1230 msgid "Diff display options"
1231 msgstr "Options d'affichage des diff"
1232
1220 -#: gitk:11350
1233 +#: gitk:11371
1234 msgid "Tab spacing"
1235 msgstr "Taille des tabulations"
1236
1224 -#: gitk:11353
1237 +#: gitk:11374
1238 #, fuzzy
1239 msgid "Display nearby tags/heads"
1240 msgstr "Afficher les tags les plus proches"
1241
1229 -#: gitk:11356
1242 +#: gitk:11377
1243 msgid "Maximum # tags/heads to show"
1244 msgstr ""
1245
1233 -#: gitk:11359
1246 +#: gitk:11380
1247 msgid "Limit diffs to listed paths"
1248 msgstr "Limiter les différences aux chemins listés"
1249
1237 -#: gitk:11362
1250 +#: gitk:11383
1251 msgid "Support per-file encodings"
1252 msgstr "Support pour un encodage des caractères par fichier"
1253
1241 -#: gitk:11368 gitk:11515
1254 +#: gitk:11389 gitk:11536
1255 msgid "External diff tool"
1256 msgstr "Outil diff externe"
1257
1245 -#: gitk:11369
1258 +#: gitk:11390
1259 msgid "Choose..."
1260 msgstr "Choisir..."
1261
1249 -#: gitk:11374
1262 +#: gitk:11395
1263 #, fuzzy
1264 msgid "General options"
1265 msgstr "Générer le patch"
1266
1254 -#: gitk:11377
1267 +#: gitk:11398
1268 msgid "Use themed widgets"
1269 msgstr ""
1270
1258 -#: gitk:11379
1271 +#: gitk:11400
1272 msgid "(change requires restart)"
1273 msgstr ""
1274
1262 -#: gitk:11381
1275 +#: gitk:11402
1276 msgid "(currently unavailable)"
1277 msgstr ""
1278
1266 -#: gitk:11392
1279 +#: gitk:11413
1280 msgid "Colors: press to choose"
1281 msgstr "Couleurs : cliquer pour choisir"
1282
1270 -#: gitk:11395
1283 +#: gitk:11416
1284 msgid "Interface"
1285 msgstr ""
1286
1274 -#: gitk:11396
1287 +#: gitk:11417
1288 #, fuzzy
1289 msgid "interface"
1290 msgstr "Police de l'interface utilisateur"
1291
1279 -#: gitk:11399
1292 +#: gitk:11420
1293 msgid "Background"
1294 msgstr "Arrière-plan"
1295
1283 -#: gitk:11400 gitk:11430
1296 +#: gitk:11421 gitk:11451
1297 msgid "background"
1298 msgstr "arrière-plan"
1299
1287 -#: gitk:11403
1300 +#: gitk:11424
1301 msgid "Foreground"
1302 msgstr "Premier plan"
1303
1291 -#: gitk:11404
1304 +#: gitk:11425
1305 msgid "foreground"
1306 msgstr "premier plan"
1307
1295 -#: gitk:11407
1308 +#: gitk:11428
1309 msgid "Diff: old lines"
1310 msgstr "Diff : anciennes lignes"
1311
1299 -#: gitk:11408
1312 +#: gitk:11429
1313 msgid "diff old lines"
1314 msgstr "diff anciennes lignes"
1315
1303 -#: gitk:11412
1316 +#: gitk:11433
1317 msgid "Diff: new lines"
1318 msgstr "Diff : nouvelles lignes"
1319
1307 -#: gitk:11413
1320 +#: gitk:11434
1321 msgid "diff new lines"
1322 msgstr "diff nouvelles lignes"
1323
1311 -#: gitk:11417
1324 +#: gitk:11438
1325 msgid "Diff: hunk header"
1326 msgstr "Diff : entête du hunk"
1327
1315 -#: gitk:11419
1328 +#: gitk:11440
1329 msgid "diff hunk header"
1330 msgstr "diff : entête du hunk"
1331
1319 -#: gitk:11423
1332 +#: gitk:11444
1333 msgid "Marked line bg"
1334 msgstr "Arrière-plan de la ligne marquée"
1335
1323 -#: gitk:11425
1336 +#: gitk:11446
1337 msgid "marked line background"
1338 msgstr "Arrière-plan de la ligne marquée"
1339
1327 -#: gitk:11429
1340 +#: gitk:11450
1341 msgid "Select bg"
1342 msgstr "Sélectionner l'arrière-plan"
1343
1331 -#: gitk:11438
1344 +#: gitk:11459
1345 msgid "Fonts: press to choose"
1346 msgstr "Polices : cliquer pour choisir"
1347
1335 -#: gitk:11440
1348 +#: gitk:11461
1349 msgid "Main font"
1350 msgstr "Police principale"
1351
1339 -#: gitk:11441
1352 +#: gitk:11462
1353 msgid "Diff display font"
1354 msgstr "Police d'affichage des diff"
1355
1343 -#: gitk:11442
1356 +#: gitk:11463
1357 msgid "User interface font"
1358 msgstr "Police de l'interface utilisateur"
1359
1347 -#: gitk:11464
1360 +#: gitk:11485
1361 msgid "Gitk preferences"
1362 msgstr "Préférences de Gitk"
1363
1351 -#: gitk:11473
1364 +#: gitk:11494
1365 #, fuzzy
1366 msgid "General"
1367 msgstr "Générer"
1368
1356 -#: gitk:11474
1369 +#: gitk:11495
1370 msgid "Colors"
1371 msgstr ""
1372
1360 -#: gitk:11475
1373 +#: gitk:11496
1374 msgid "Fonts"
1375 msgstr ""
1376
1364 -#: gitk:11525
1377 +#: gitk:11546
1378 #, tcl-format
1379 msgid "Gitk: choose color for %s"
1380 msgstr "Gitk : choisir la couleur de %s"
1381
1369 -#: gitk:12242
1382 +#: gitk:12059
1383 +msgid ""
1384 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1385 +" Gitk requires at least Tcl/Tk 8.4."
1386 +msgstr ""
1387 +"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
1388 +" Gitk requiert Tcl/Tk version 8.4 ou supérieur."
1389 +
1390 +#: gitk:12269
1391 msgid "Cannot find a git repository here."
1392 msgstr "Impossible de trouver un dépôt git ici."
1393
1373 -#: gitk:12289
1394 +#: gitk:12316
1395 #, tcl-format
1396 msgid "Ambiguous argument '%s': both revision and filename"
1397 msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier"
1398
1378 -#: gitk:12301
1399 +#: gitk:12328
1400 msgid "Bad arguments to gitk:"
1401 msgstr "Arguments invalides pour gitk :"
1402
1382 -#: gitk:12405
1383 -msgid "Command line"
1384 -msgstr "Ligne de commande"
1385 -
1403 #~ msgid "SHA1 ID: "
1404 #~ msgstr "ID SHA1 :"
1405
@@ -1398,12 +1415,5 @@ msgstr "Ligne de commande"
1415 #~ msgid "- stopping\n"
1416 #~ msgstr "- arrêt en cours\n"
1417
1401 -#~ msgid ""
1402 -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1403 -#~ " Gitk requires at least Tcl/Tk 8.4."
1404 -#~ msgstr ""
1405 -#~ "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
1406 -#~ " Gitk requiert Tcl/Tk version 8.4 ou supérieur."
1407 -
1418 #~ msgid "Cannot find the git directory \"%s\"."
1419 #~ msgstr "Impossible de trouver le répertoire git \"%s\"."
po/hu.po
+299 -286
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: git-gui\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2009-12-14 14:04+0100\n"
13 "Last-Translator: Laszlo Papp <djszapi@archlinux.us>\n"
14 "Language-Team: Hungarian\n"
@@ -25,7 +25,7 @@ msgstr "Nem sikerült letölteni az unmerged fájl listát:"
25 msgid "Color words"
26 msgstr ""
27
28 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
28 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
29 msgid "Markup words"
30 msgstr ""
31
@@ -58,14 +58,18 @@ msgstr "Hiba történt a git log végrehajtása közben:"
58 msgid "Reading"
59 msgstr "Olvasás"
60
61 -#: gitk:496 gitk:4508
61 +#: gitk:496 gitk:4525
62 msgid "Reading commits..."
63 msgstr "Commitok olvasása ..."
64
65 -#: gitk:499 gitk:1637 gitk:4511
65 +#: gitk:499 gitk:1637 gitk:4528
66 msgid "No commits selected"
67 msgstr "Nincsen commit kiválasztva"
68
69 +#: gitk:1445 gitk:4045 gitk:12432
70 +msgid "Command line"
71 +msgstr "Parancs sor"
72 +
73 #: gitk:1511
74 msgid "Can't parse git log output:"
75 msgstr "Nem lehet értelmezni a git log kimenetét:"
@@ -74,16 +78,12 @@ msgstr "Nem lehet értelmezni a git log kimenetét:"
78 msgid "No commit information available"
79 msgstr "Nincsen elérhető commit információ"
80
77 -#: gitk:1897
78 -msgid "mc"
79 -msgstr "mc"
80 -
81 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
81 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
82 msgid "OK"
83 msgstr "OK"
84
85 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
86 -#: gitk:11221 gitk:11501
85 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
86 +#: gitk:11242 gitk:11522
87 msgid "Cancel"
88 msgstr "Visszavonás"
89
@@ -135,15 +135,15 @@ msgstr "Nézet szerkesztése ..."
135 msgid "Delete view"
136 msgstr "Nézet törlése"
137
138 -#: gitk:2088
138 +#: gitk:2088 gitk:4043
139 msgid "All files"
140 msgstr "Minden fájl"
141
142 -#: gitk:2083 gitk:4050
142 +#: gitk:2083 gitk:4067
143 msgid "View"
144 msgstr "Nézet"
145
146 -#: gitk:2093 gitk:2103 gitk:3009
146 +#: gitk:2093 gitk:2103 gitk:3012
147 msgid "About gitk"
148 msgstr "Gitk névjegy"
149
@@ -155,7 +155,7 @@ msgstr "Billentyűkombináció"
155 msgid "Help"
156 msgstr "Segítség"
157
158 -#: gitk:2185 gitk:8633
158 +#: gitk:2185 gitk:8652
159 msgid "SHA1 ID:"
160 msgstr "SHA1 ID:"
161
@@ -171,53 +171,53 @@ msgstr "Keresés"
171 msgid "commit"
172 msgstr "commit"
173
174 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
175 -#: gitk:6893
174 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
175 +#: gitk:6912
176 msgid "containing:"
177 msgstr "tartalmazás:"
178
179 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
179 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
180 msgid "touching paths:"
181 msgstr "érintendő útvonalak:"
182
183 -#: gitk:2303 gitk:4759
183 +#: gitk:2303 gitk:4777
184 msgid "adding/removing string:"
185 msgstr "string hozzáadása/törlése:"
186
187 -#: gitk:2304 gitk:4761
187 +#: gitk:2304 gitk:4779
188 msgid "changing lines matching:"
189 msgstr ""
190
191 -#: gitk:2313 gitk:2315 gitk:4748
191 +#: gitk:2313 gitk:2315 gitk:4766
192 msgid "Exact"
193 msgstr "Pontos"
194
195 -#: gitk:2315 gitk:4836 gitk:6704
195 +#: gitk:2315 gitk:4854 gitk:6723
196 msgid "IgnCase"
197 msgstr "Kis/nagy betű nem számít"
198
199 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
199 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
200 msgid "Regexp"
201 msgstr "Regexp"
202
203 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
203 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
204 msgid "All fields"
205 msgstr "Minden mező"
206
207 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
207 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
208 msgid "Headline"
209 msgstr "Főcím"
210
211 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
211 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
212 msgid "Comments"
213 msgstr "Megjegyzések"
214
215 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
216 -#: gitk:8826
215 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
216 +#: gitk:8845
217 msgid "Author"
218 msgstr "Szerző"
219
220 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
220 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
221 msgid "Committer"
222 msgstr "Commitoló"
223
@@ -245,7 +245,7 @@ msgstr "Tartalmi sorok"
245 msgid "Ignore space change"
246 msgstr "Space váltás mellőzése"
247
248 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
248 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
249 msgid "Line diff"
250 msgstr ""
251
@@ -257,102 +257,110 @@ msgstr "Patch"
257 msgid "Tree"
258 msgstr "Tree"
259
260 -#: gitk:2616 gitk:2636
260 +#: gitk:2617 gitk:2637
261 msgid "Diff this -> selected"
262 msgstr "Diff ezeket -> kiválasztott"
263
264 -#: gitk:2617 gitk:2637
264 +#: gitk:2618 gitk:2638
265 msgid "Diff selected -> this"
266 msgstr "Diff kiválasztottakat -> ezt"
267
268 -#: gitk:2618 gitk:2638
268 +#: gitk:2619 gitk:2639
269 msgid "Make patch"
270 msgstr "Patch készítése"
271
272 -#: gitk:2619 gitk:9235
272 +#: gitk:2620 gitk:9254
273 msgid "Create tag"
274 msgstr "Tag készítése"
275
276 -#: gitk:2620 gitk:9352
276 +#: gitk:2621 gitk:9371
277 msgid "Write commit to file"
278 msgstr "Commit fáljba írása"
279
280 -#: gitk:2621 gitk:9409
280 +#: gitk:2622 gitk:9428
281 msgid "Create new branch"
282 msgstr "Új branch készítése"
283
284 -#: gitk:2622
284 +#: gitk:2623
285 msgid "Cherry-pick this commit"
286 msgstr "Cherry-pick erre a commitra"
287
288 -#: gitk:2623
288 +#: gitk:2624
289 msgid "Reset HEAD branch to here"
290 msgstr "HEAD branch újraindítása ide"
291
292 -#: gitk:2624
292 +#: gitk:2625
293 msgid "Mark this commit"
294 msgstr "Ezen commit megjelölése"
295
296 -#: gitk:2625
296 +#: gitk:2626
297 msgid "Return to mark"
298 msgstr "Visszatérés a megjelöléshez"
299
300 -#: gitk:2626
300 +#: gitk:2627
301 msgid "Find descendant of this and mark"
302 msgstr "Találd meg ezen utódokat és jelöld meg"
303
304 -#: gitk:2627
304 +#: gitk:2628
305 msgid "Compare with marked commit"
306 msgstr "Összehasonlítás a megjelölt commit-tal"
307
308 -#: gitk:2628 gitk:2639
308 +#: gitk:2629 gitk:2640
309 #, fuzzy
310 msgid "Diff this -> marked commit"
311 msgstr "Diff ezeket -> kiválasztott"
312
313 -#: gitk:2629 gitk:2640
313 +#: gitk:2630 gitk:2641
314 #, fuzzy
315 msgid "Diff marked commit -> this"
316 msgstr "Diff kiválasztottakat -> ezt"
317
318 -#: gitk:2630
318 +#: gitk:2631
319 #, fuzzy
320 msgid "Revert this commit"
321 msgstr "Ezen commit megjelölése"
322
323 -#: gitk:2646
323 +#: gitk:2647
324 msgid "Check out this branch"
325 msgstr "Check out ezt a branchot"
326
327 -#: gitk:2647
327 +#: gitk:2648
328 msgid "Remove this branch"
329 msgstr "Töröld ezt a branch-ot"
330
331 -#: gitk:2654
331 +#: gitk:2649
332 +msgid "Copy branch name"
333 +msgstr ""
334 +
335 +#: gitk:2656
336 msgid "Highlight this too"
337 msgstr "Emeld ki ezt is"
338
335 -#: gitk:2655
339 +#: gitk:2657
340 msgid "Highlight this only"
341 msgstr "Csak ezt emeld ki"
342
339 -#: gitk:2656
343 +#: gitk:2658
344 msgid "External diff"
345 msgstr "Külső diff"
346
343 -#: gitk:2657
347 +#: gitk:2659
348 msgid "Blame parent commit"
349 msgstr "Blame szülő kommitra"
350
347 -#: gitk:2664
351 +#: gitk:2660
352 +msgid "Copy path"
353 +msgstr ""
354 +
355 +#: gitk:2667
356 msgid "Show origin of this line"
357 msgstr "Mutasd meg ennek a sornak az eredetét"
358
351 -#: gitk:2665
359 +#: gitk:2668
360 msgid "Run git gui blame on this line"
361 msgstr "Futtasd a git gui blame-t ezen a soron"
362
355 -#: gitk:3011
363 +#: gitk:3014
364 #, fuzzy
365 msgid ""
366 "\n"
@@ -369,316 +377,321 @@ msgstr ""
377 "\n"
378 "Használd és terjeszd a GNU General Public License feltételei mellett"
379
372 -#: gitk:3019 gitk:3085 gitk:9836
380 +#: gitk:3022 gitk:3089 gitk:9857
381 msgid "Close"
382 msgstr "Bezárás"
383
376 -#: gitk:3040
384 +#: gitk:3043
385 msgid "Gitk key bindings"
386 msgstr "Gitk-billentyű hozzárendelés"
387
380 -#: gitk:3043
388 +#: gitk:3046
389 msgid "Gitk key bindings:"
390 msgstr "Gitk-billentyű hozzaárendelés:"
391
384 -#: gitk:3045
392 +#: gitk:3048
393 #, tcl-format
394 msgid "<%s-Q>\t\tQuit"
395 msgstr "<%s-Q>\t\tKilépés"
396
389 -#: gitk:3046
397 +#: gitk:3049
398 #, fuzzy, tcl-format
399 msgid "<%s-W>\t\tClose window"
400 msgstr "<%s-F>\t\tKeresés"
401
394 -#: gitk:3047
402 +#: gitk:3050
403 msgid "<Home>\t\tMove to first commit"
404 msgstr "<Pos1>\t\tElső commithoz"
405
398 -#: gitk:3048
406 +#: gitk:3051
407 msgid "<End>\t\tMove to last commit"
408 msgstr "<Ende>\t\tUtolsó commithoz"
409
402 -#: gitk:3049
410 +#: gitk:3052
411 #, fuzzy
412 msgid "<Up>, p, k\tMove up one commit"
413 msgstr "<Hoch>, p, i\tEgy committal feljebb"
414
407 -#: gitk:3050
415 +#: gitk:3053
416 #, fuzzy
417 msgid "<Down>, n, j\tMove down one commit"
418 msgstr "<Runter>, n, k\tEgy committal lejjebb"
419
412 -#: gitk:3051
420 +#: gitk:3054
421 #, fuzzy
422 msgid "<Left>, z, h\tGo back in history list"
423 msgstr "<Links>, z, j\tVissza a history listába"
424
417 -#: gitk:3052
425 +#: gitk:3055
426 msgid "<Right>, x, l\tGo forward in history list"
427 msgstr "<Rechts>, x, l\tElőre a history listába"
428
421 -#: gitk:3053
429 +#: gitk:3056
430 #, tcl-format
431 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
432 msgstr ""
433
426 -#: gitk:3054
434 +#: gitk:3057
435 msgid "<PageUp>\tMove up one page in commit list"
436 msgstr "<BildHoch>\tEgy lappal feljebb a commit listába"
437
430 -#: gitk:3055
438 +#: gitk:3058
439 msgid "<PageDown>\tMove down one page in commit list"
440 msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába"
441
434 -#: gitk:3056
442 +#: gitk:3059
443 #, tcl-format
444 msgid "<%s-Home>\tScroll to top of commit list"
445 msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez"
446
439 -#: gitk:3057
447 +#: gitk:3060
448 #, tcl-format
449 msgid "<%s-End>\tScroll to bottom of commit list"
450 msgstr "<%s-Ende>\tGörgetés a commit lista aljához"
451
444 -#: gitk:3058
452 +#: gitk:3061
453 #, tcl-format
454 msgid "<%s-Up>\tScroll commit list up one line"
455 msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában"
456
449 -#: gitk:3059
457 +#: gitk:3062
458 #, tcl-format
459 msgid "<%s-Down>\tScroll commit list down one line"
460 msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában"
461
454 -#: gitk:3060
462 +#: gitk:3063
463 #, tcl-format
464 msgid "<%s-PageUp>\tScroll commit list up one page"
465 msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában"
466
459 -#: gitk:3061
467 +#: gitk:3064
468 #, tcl-format
469 msgid "<%s-PageDown>\tScroll commit list down one page"
470 msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában"
471
464 -#: gitk:3062
472 +#: gitk:3065
473 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
474 msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)"
475
468 -#: gitk:3063
476 +#: gitk:3066
477 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
478 msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)"
479
472 -#: gitk:3064
480 +#: gitk:3067
481 msgid "<Delete>, b\tScroll diff view up one page"
482 msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben"
483
476 -#: gitk:3065
484 +#: gitk:3068
485 msgid "<Backspace>\tScroll diff view up one page"
486 msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben"
487
480 -#: gitk:3066
488 +#: gitk:3069
489 msgid "<Space>\t\tScroll diff view down one page"
490 msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben"
491
484 -#: gitk:3067
492 +#: gitk:3070
493 msgid "u\t\tScroll diff view up 18 lines"
494 msgstr "u\t\t18 sorral felfelé görgetés diff nézetben"
495
488 -#: gitk:3068
496 +#: gitk:3071
497 msgid "d\t\tScroll diff view down 18 lines"
498 msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben"
499
492 -#: gitk:3069
500 +#: gitk:3072
501 #, tcl-format
502 msgid "<%s-F>\t\tFind"
503 msgstr "<%s-F>\t\tKeresés"
504
497 -#: gitk:3070
505 +#: gitk:3073
506 #, tcl-format
507 msgid "<%s-G>\t\tMove to next find hit"
508 msgstr "<%s-G>\t\tKövetkező találathoz"
509
502 -#: gitk:3071
510 +#: gitk:3074
511 msgid "<Return>\tMove to next find hit"
512 msgstr "<Eingabetaste>\tKövetkező találathoz"
513
506 -#: gitk:3072
514 +#: gitk:3075
515 +#, fuzzy
516 +msgid "g\t\tGo to commit"
517 +msgstr "<Ende>\t\tUtolsó commithoz"
518 +
519 +#: gitk:3076
520 msgid "/\t\tFocus the search box"
521 msgstr "/\t\tLépj a keresési mezőre"
522
510 -#: gitk:3073
523 +#: gitk:3077
524 msgid "?\t\tMove to previous find hit"
525 msgstr "?\t\tElőző találathoz"
526
514 -#: gitk:3074
527 +#: gitk:3078
528 msgid "f\t\tScroll diff view to next file"
529 msgstr "f\t\tKövetkező fájlra görgetés diff nézetben"
530
518 -#: gitk:3075
531 +#: gitk:3079
532 #, tcl-format
533 msgid "<%s-S>\t\tSearch for next hit in diff view"
534 msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben"
535
523 -#: gitk:3076
536 +#: gitk:3080
537 #, tcl-format
538 msgid "<%s-R>\t\tSearch for previous hit in diff view"
539 msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben"
540
528 -#: gitk:3077
541 +#: gitk:3081
542 #, tcl-format
543 msgid "<%s-KP+>\tIncrease font size"
544 msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése"
545
533 -#: gitk:3078
546 +#: gitk:3082
547 #, tcl-format
548 msgid "<%s-plus>\tIncrease font size"
549 msgstr "<%s-Plus>\tBetűméret növelése"
550
538 -#: gitk:3079
551 +#: gitk:3083
552 #, tcl-format
553 msgid "<%s-KP->\tDecrease font size"
554 msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése"
555
543 -#: gitk:3080
556 +#: gitk:3084
557 #, tcl-format
558 msgid "<%s-minus>\tDecrease font size"
559 msgstr "<%s-Minus>\tBetűméret csökkentése"
560
548 -#: gitk:3081
561 +#: gitk:3085
562 msgid "<F5>\t\tUpdate"
563 msgstr "<F5>\t\tFrissítés"
564
552 -#: gitk:3546 gitk:3555
565 +#: gitk:3550 gitk:3559
566 #, tcl-format
567 msgid "Error creating temporary directory %s:"
568 msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:"
569
557 -#: gitk:3568
570 +#: gitk:3572
571 #, tcl-format
572 msgid "Error getting \"%s\" from %s:"
573 msgstr "Hiba történt \"%s\" letöltése közben %s-ről:"
574
562 -#: gitk:3631
575 +#: gitk:3635
576 msgid "command failed:"
577 msgstr "parancs hiba:"
578
566 -#: gitk:3780
579 +#: gitk:3784
580 msgid "No such commit"
581 msgstr "Nincs ilyen commit"
582
570 -#: gitk:3794
583 +#: gitk:3798
584 msgid "git gui blame: command failed:"
585 msgstr "git gui blame: parancs hiba:"
586
574 -#: gitk:3825
587 +#: gitk:3829
588 #, tcl-format
589 msgid "Couldn't read merge head: %s"
590 msgstr "Nem sikerült a Merge head olvasása: %s"
591
579 -#: gitk:3833
592 +#: gitk:3837
593 #, tcl-format
594 msgid "Error reading index: %s"
595 msgstr "Hiba történt az index olvasása közben: %s"
596
584 -#: gitk:3858
597 +#: gitk:3862
598 #, tcl-format
599 msgid "Couldn't start git blame: %s"
600 msgstr "Nem sikerült a git blame indítása: %s"
601
589 -#: gitk:3861 gitk:6735
602 +#: gitk:3865 gitk:6754
603 msgid "Searching"
604 msgstr "Keresés"
605
593 -#: gitk:3893
606 +#: gitk:3897
607 #, tcl-format
608 msgid "Error running git blame: %s"
609 msgstr "Hiba történt a git blame futtatása közben: %s"
610
598 -#: gitk:3921
611 +#: gitk:3925
612 #, tcl-format
613 msgid "That line comes from commit %s, which is not in this view"
614 msgstr ""
615 "A %s commitból származik az a sor, amelyik nem található ebben a nézetben"
616
604 -#: gitk:3935
617 +#: gitk:3939
618 msgid "External diff viewer failed:"
619 msgstr "Külső diff nézegető hiba:"
620
608 -#: gitk:4053
621 +#: gitk:4070
622 msgid "Gitk view definition"
623 msgstr "Gitk nézet meghatározása"
624
612 -#: gitk:4057
625 +#: gitk:4074
626 msgid "Remember this view"
627 msgstr "Maradj ennél a nézetnél"
628
616 -#: gitk:4058
629 +#: gitk:4075
630 msgid "References (space separated list):"
631 msgstr "Referenciák (szóközzel tagolt lista"
632
620 -#: gitk:4059
633 +#: gitk:4076
634 msgid "Branches & tags:"
635 msgstr "Branch-ek & tagek:"
636
624 -#: gitk:4060
637 +#: gitk:4077
638 msgid "All refs"
639 msgstr "Minden ref"
640
628 -#: gitk:4061
641 +#: gitk:4078
642 msgid "All (local) branches"
643 msgstr "Minden (helyi) branch"
644
632 -#: gitk:4062
645 +#: gitk:4079
646 msgid "All tags"
647 msgstr "Minden tag"
648
636 -#: gitk:4063
649 +#: gitk:4080
650 msgid "All remote-tracking branches"
651 msgstr "Minden távoli követő branch"
652
640 -#: gitk:4064
653 +#: gitk:4081
654 msgid "Commit Info (regular expressions):"
655 msgstr "Commit Infó (reguláris kifejezés):"
656
644 -#: gitk:4065
657 +#: gitk:4082
658 msgid "Author:"
659 msgstr "Szerző:"
660
648 -#: gitk:4066
661 +#: gitk:4083
662 msgid "Committer:"
663 msgstr "Commitoló:"
664
652 -#: gitk:4067
665 +#: gitk:4084
666 msgid "Commit Message:"
667 msgstr "Commit üzenet:"
668
656 -#: gitk:4068
669 +#: gitk:4085
670 msgid "Matches all Commit Info criteria"
671 msgstr "Egyezik minen Commit Infó feltétellel"
672
660 -#: gitk:4069
673 +#: gitk:4086
674 #, fuzzy
662 -msgid "Matches none Commit Info criteria"
675 +msgid "Matches no Commit Info criteria"
676 msgstr "Egyezik minen Commit Infó feltétellel"
677
665 -#: gitk:4070
678 +#: gitk:4087
679 msgid "Changes to Files:"
680 msgstr "Fájl változások:"
681
669 -#: gitk:4071
682 +#: gitk:4088
683 msgid "Fixed String"
684 msgstr "Fix String"
685
673 -#: gitk:4072
686 +#: gitk:4089
687 msgid "Regular Expression"
688 msgstr "Reguláris kifejezés"
689
677 -#: gitk:4073
690 +#: gitk:4090
691 msgid "Search string:"
692 msgstr "Keresés szöveg:"
693
681 -#: gitk:4074
694 +#: gitk:4091
695 msgid ""
696 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
697 "15:27:38\"):"
@@ -686,203 +699,203 @@ msgstr ""
699 "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
700 "15:27:38\"):"
701
689 -#: gitk:4075
702 +#: gitk:4092
703 msgid "Since:"
704 msgstr "Ettől:"
705
693 -#: gitk:4076
706 +#: gitk:4093
707 msgid "Until:"
708 msgstr "Eddig:"
709
697 -#: gitk:4077
710 +#: gitk:4094
711 msgid "Limit and/or skip a number of revisions (positive integer):"
712 msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):"
713
701 -#: gitk:4078
714 +#: gitk:4095
715 msgid "Number to show:"
716 msgstr "Mutatandó szám:"
717
705 -#: gitk:4079
718 +#: gitk:4096
719 msgid "Number to skip:"
720 msgstr "Kihagyandó szám:"
721
709 -#: gitk:4080
722 +#: gitk:4097
723 msgid "Miscellaneous options:"
724 msgstr "Különféle opciók:"
725
713 -#: gitk:4081
726 +#: gitk:4098
727 msgid "Strictly sort by date"
728 msgstr "Szigorú rendezás dátum alapján"
729
717 -#: gitk:4082
730 +#: gitk:4099
731 msgid "Mark branch sides"
732 msgstr "Jelölje meg az ágakat"
733
721 -#: gitk:4083
734 +#: gitk:4100
735 msgid "Limit to first parent"
736 msgstr "Korlátozás az első szülőre"
737
725 -#: gitk:4084
738 +#: gitk:4101
739 msgid "Simple history"
740 msgstr "Egyszerű history"
741
729 -#: gitk:4085
742 +#: gitk:4102
743 msgid "Additional arguments to git log:"
744 msgstr "További argumentok a git log-hoz:"
745
733 -#: gitk:4086
746 +#: gitk:4103
747 msgid "Enter files and directories to include, one per line:"
748 msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:"
749
737 -#: gitk:4087
750 +#: gitk:4104
751 msgid "Command to generate more commits to include:"
752 msgstr "Parancs több tartalmazó commit generálására:"
753
741 -#: gitk:4211
754 +#: gitk:4228
755 msgid "Gitk: edit view"
756 msgstr "Gitk: szerkesztés nézet"
757
745 -#: gitk:4219
758 +#: gitk:4236
759 msgid "-- criteria for selecting revisions"
760 msgstr "-- kritériumok a revíziók kiválasztásához"
761
749 -#: gitk:4224
762 +#: gitk:4241
763 msgid "View Name"
764 msgstr "Nézet neve"
765
753 -#: gitk:4299
766 +#: gitk:4316
767 msgid "Apply (F5)"
768 msgstr "Alkalmaz (F5)"
769
757 -#: gitk:4337
770 +#: gitk:4354
771 msgid "Error in commit selection arguments:"
772 msgstr "Hiba történt a commit argumentumok kiválasztása közben:"
773
761 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
774 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
775 msgid "None"
776 msgstr "Keine"
777
765 -#: gitk:5003 gitk:5008
778 +#: gitk:5021 gitk:5026
779 msgid "Descendant"
780 msgstr "Leszármazott"
781
769 -#: gitk:5004
782 +#: gitk:5022
783 msgid "Not descendant"
784 msgstr "Nem leszármazott"
785
773 -#: gitk:5011 gitk:5016
786 +#: gitk:5029 gitk:5034
787 msgid "Ancestor"
788 msgstr "Előd"
789
777 -#: gitk:5012
790 +#: gitk:5030
791 msgid "Not ancestor"
792 msgstr "Nem előd"
793
781 -#: gitk:5306
794 +#: gitk:5324
795 msgid "Local changes checked in to index but not committed"
796 msgstr ""
797 "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek "
798 "commitolva"
799
787 -#: gitk:5342
800 +#: gitk:5360
801 msgid "Local uncommitted changes, not checked in to index"
802 msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe"
803
791 -#: gitk:7115
804 +#: gitk:7134
805 msgid "and many more"
806 msgstr ""
807
795 -#: gitk:7118
808 +#: gitk:7137
809 msgid "many"
810 msgstr "sok"
811
799 -#: gitk:7309
812 +#: gitk:7328
813 msgid "Tags:"
814 msgstr "Tagek:"
815
803 -#: gitk:7326 gitk:7332 gitk:8806
816 +#: gitk:7345 gitk:7351 gitk:8825
817 msgid "Parent"
818 msgstr "Eltern"
819
807 -#: gitk:7337
820 +#: gitk:7356
821 msgid "Child"
822 msgstr "Gyerek"
823
811 -#: gitk:7346
824 +#: gitk:7365
825 msgid "Branch"
826 msgstr "Ág"
827
815 -#: gitk:7349
828 +#: gitk:7368
829 msgid "Follows"
830 msgstr "Következők"
831
819 -#: gitk:7352
832 +#: gitk:7371
833 msgid "Precedes"
834 msgstr "Megelőzők"
835
823 -#: gitk:7947
836 +#: gitk:7966
837 #, tcl-format
838 msgid "Error getting diffs: %s"
839 msgstr "Hiba történt a diff-ek letöltése közben: %s"
840
828 -#: gitk:8631
841 +#: gitk:8650
842 msgid "Goto:"
843 msgstr "Menj:"
844
832 -#: gitk:8652
845 +#: gitk:8671
846 #, tcl-format
847 msgid "Short SHA1 id %s is ambiguous"
848 msgstr "Rövid SHA1 id %s félreérthető"
849
837 -#: gitk:8659
850 +#: gitk:8678
851 #, tcl-format
852 msgid "Revision %s is not known"
853 msgstr "A(z) %s revízió nem ismert"
854
842 -#: gitk:8669
855 +#: gitk:8688
856 #, tcl-format
857 msgid "SHA1 id %s is not known"
858 msgstr "SHA1 id %s nem ismert"
859
847 -#: gitk:8671
860 +#: gitk:8690
861 #, tcl-format
862 msgid "Revision %s is not in the current view"
863 msgstr "A(z) %s revízió nincs a jelenlegi nézetben"
864
852 -#: gitk:8813 gitk:8828
865 +#: gitk:8832 gitk:8847
866 msgid "Date"
867 msgstr "Dátum"
868
856 -#: gitk:8816
869 +#: gitk:8835
870 msgid "Children"
871 msgstr "Gyerekek"
872
860 -#: gitk:8879
873 +#: gitk:8898
874 #, tcl-format
875 msgid "Reset %s branch to here"
876 msgstr "Állítsd vissza a %s branch-ot ide"
877
865 -#: gitk:8881
878 +#: gitk:8900
879 msgid "Detached head: can't reset"
880 msgstr "Elkülönített head: nem lehet visszaállítani"
881
869 -#: gitk:8986 gitk:8992
882 +#: gitk:9005 gitk:9011
883 msgid "Skipping merge commit "
884 msgstr "Merge commit kihagyása "
885
873 -#: gitk:9001 gitk:9006
886 +#: gitk:9020 gitk:9025
887 msgid "Error getting patch ID for "
888 msgstr "Hiba történt a patch ID megszerzése közben a következőnél "
889
877 -#: gitk:9002 gitk:9007
890 +#: gitk:9021 gitk:9026
891 msgid " - stopping\n"
892 msgstr " - abbahagyás\n"
893
881 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
894 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
895 msgid "Commit "
896 msgstr "Commit "
897
885 -#: gitk:9016
898 +#: gitk:9035
899 msgid ""
900 " is the same patch as\n"
901 " "
@@ -890,7 +903,7 @@ msgstr ""
903 " Ugyanaz a patch mint\n"
904 " "
905
893 -#: gitk:9024
906 +#: gitk:9043
907 msgid ""
908 " differs from\n"
909 " "
@@ -898,7 +911,7 @@ msgstr ""
911 " különbözik innentől\n"
912 " "
913
901 -#: gitk:9026
914 +#: gitk:9045
915 msgid ""
916 "Diff of commits:\n"
917 "\n"
@@ -906,132 +919,132 @@ msgstr ""
919 "A commitok diffje:\n"
920 "\n"
921
909 -#: gitk:9038 gitk:9047
922 +#: gitk:9057 gitk:9066
923 #, tcl-format
924 msgid " has %s children - stopping\n"
925 msgstr " %s gyereke van. abbahagyás\n"
926
914 -#: gitk:9066
927 +#: gitk:9085
928 #, tcl-format
929 msgid "Error writing commit to file: %s"
930 msgstr "Hiba történt a commit fájlba írása közben: %s"
931
919 -#: gitk:9072
932 +#: gitk:9091
933 #, tcl-format
934 msgid "Error diffing commits: %s"
935 msgstr "Hiba történt a commitok diffelése közben: %s"
936
924 -#: gitk:9118
937 +#: gitk:9137
938 msgid "Top"
939 msgstr "Teteje"
940
928 -#: gitk:9119
941 +#: gitk:9138
942 msgid "From"
943 msgstr "Innen"
944
932 -#: gitk:9124
945 +#: gitk:9143
946 msgid "To"
947 msgstr "Ide"
948
936 -#: gitk:9148
949 +#: gitk:9167
950 msgid "Generate patch"
951 msgstr "Patch generálása"
952
940 -#: gitk:9150
953 +#: gitk:9169
954 msgid "From:"
955 msgstr "Innen:"
956
944 -#: gitk:9159
957 +#: gitk:9178
958 msgid "To:"
959 msgstr "Ide:"
960
948 -#: gitk:9168
961 +#: gitk:9187
962 msgid "Reverse"
963 msgstr "Visszafele"
964
952 -#: gitk:9170 gitk:9366
965 +#: gitk:9189 gitk:9385
966 msgid "Output file:"
967 msgstr "Kimeneti fájl:"
968
956 -#: gitk:9176
969 +#: gitk:9195
970 msgid "Generate"
971 msgstr "Generálás"
972
960 -#: gitk:9214
973 +#: gitk:9233
974 msgid "Error creating patch:"
975 msgstr "Hiba törtét a patch készítése közben:"
976
964 -#: gitk:9237 gitk:9354 gitk:9411
977 +#: gitk:9256 gitk:9373 gitk:9430
978 msgid "ID:"
979 msgstr "ID:"
980
968 -#: gitk:9246
981 +#: gitk:9265
982 msgid "Tag name:"
983 msgstr "Tag név:"
984
972 -#: gitk:9249
985 +#: gitk:9268
986 msgid "Tag message is optional"
987 msgstr ""
988
976 -#: gitk:9251
989 +#: gitk:9270
990 #, fuzzy
991 msgid "Tag message:"
992 msgstr "Tag név:"
993
981 -#: gitk:9255 gitk:9420
994 +#: gitk:9274 gitk:9439
995 msgid "Create"
996 msgstr "Létrehozás"
997
985 -#: gitk:9273
998 +#: gitk:9292
999 msgid "No tag name specified"
1000 msgstr "A tag neve nincsen megadva"
1001
989 -#: gitk:9277
1002 +#: gitk:9296
1003 #, tcl-format
1004 msgid "Tag \"%s\" already exists"
1005 msgstr "%s Tag már létezik"
1006
994 -#: gitk:9287
1007 +#: gitk:9306
1008 msgid "Error creating tag:"
1009 msgstr "Hiba történt a tag létrehozása közben:"
1010
998 -#: gitk:9363
1011 +#: gitk:9382
1012 msgid "Command:"
1013 msgstr "Parancs:"
1014
1002 -#: gitk:9371
1015 +#: gitk:9390
1016 msgid "Write"
1017 msgstr "Írás"
1018
1006 -#: gitk:9389
1019 +#: gitk:9408
1020 msgid "Error writing commit:"
1021 msgstr "Hiba történt a commit írása közben:"
1022
1010 -#: gitk:9416
1023 +#: gitk:9435
1024 msgid "Name:"
1025 msgstr "Név:"
1026
1014 -#: gitk:9439
1027 +#: gitk:9458
1028 msgid "Please specify a name for the new branch"
1029 msgstr "Kérem adja meg a nevét az új branchhoz"
1030
1018 -#: gitk:9444
1031 +#: gitk:9463
1032 #, tcl-format
1033 msgid "Branch '%s' already exists. Overwrite?"
1034 msgstr "%s branch már létezik. Felülírja?"
1035
1023 -#: gitk:9511
1036 +#: gitk:9530
1037 #, tcl-format
1038 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1039 msgstr ""
1040 "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?"
1041 "eintragen?"
1042
1030 -#: gitk:9516
1043 +#: gitk:9535
1044 msgid "Cherry-picking"
1045 msgstr "Cherry-picking"
1046
1034 -#: gitk:9525
1047 +#: gitk:9544
1048 #, tcl-format
1049 msgid ""
1050 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1041,7 +1054,7 @@ msgstr ""
1054 "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja "
1055 "újra."
1056
1044 -#: gitk:9531
1057 +#: gitk:9550
1058 msgid ""
1059 "Cherry-pick failed because of merge conflict.\n"
1060 "Do you wish to run git citool to resolve it?"
@@ -1049,23 +1062,23 @@ msgstr ""
1062 "Cherry-pick hiba történt merge konfliktus miatt.\n"
1063 "Kívánja futtatni a git citool-t a probléma megoldásához?"
1064
1052 -#: gitk:9547 gitk:9605
1065 +#: gitk:9566 gitk:9624
1066 msgid "No changes committed"
1067 msgstr "Nincsen változás commitolva"
1068
1056 -#: gitk:9574
1069 +#: gitk:9593
1070 #, fuzzy, tcl-format
1071 msgid "Commit %s is not included in branch %s -- really revert it?"
1072 msgstr ""
1073 "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?"
1074 "eintragen?"
1075
1063 -#: gitk:9579
1076 +#: gitk:9598
1077 #, fuzzy
1078 msgid "Reverting"
1079 msgstr "Újraindítás"
1080
1068 -#: gitk:9587
1081 +#: gitk:9606
1082 #, fuzzy, tcl-format
1083 msgid ""
1084 "Revert failed because of local changes to the following files:%s Please "
@@ -1075,7 +1088,7 @@ msgstr ""
1088 "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja "
1089 "újra."
1090
1078 -#: gitk:9591
1091 +#: gitk:9610
1092 #, fuzzy
1093 msgid ""
1094 "Revert failed because of merge conflict.\n"
@@ -1084,28 +1097,28 @@ msgstr ""
1097 "Cherry-pick hiba történt merge konfliktus miatt.\n"
1098 "Kívánja futtatni a git citool-t a probléma megoldásához?"
1099
1087 -#: gitk:9634
1100 +#: gitk:9653
1101 msgid "Confirm reset"
1102 msgstr "Újraindítás megerősítése"
1103
1091 -#: gitk:9636
1104 +#: gitk:9655
1105 #, tcl-format
1106 msgid "Reset branch %s to %s?"
1107 msgstr "Újraindítja a %s branchot %s-ig?"
1108
1096 -#: gitk:9638
1109 +#: gitk:9657
1110 msgid "Reset type:"
1111 msgstr "Újraindítás típusa:"
1112
1100 -#: gitk:9641
1113 +#: gitk:9660
1114 msgid "Soft: Leave working tree and index untouched"
1115 msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül"
1116
1104 -#: gitk:9644
1117 +#: gitk:9663
1118 msgid "Mixed: Leave working tree untouched, reset index"
1119 msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet"
1120
1108 -#: gitk:9647
1121 +#: gitk:9666
1122 msgid ""
1123 "Hard: Reset working tree and index\n"
1124 "(discard ALL local changes)"
@@ -1113,19 +1126,19 @@ msgstr ""
1126 "Hard: Indítsd újra a working tree-t és az indexet\n"
1127 "(MINDEN lokális változás eldobása)"
1128
1116 -#: gitk:9664
1129 +#: gitk:9683
1130 msgid "Resetting"
1131 msgstr "Újraindítás"
1132
1120 -#: gitk:9724
1133 +#: gitk:9743
1134 msgid "Checking out"
1135 msgstr "Kivesz"
1136
1124 -#: gitk:9777
1137 +#: gitk:9796
1138 msgid "Cannot delete the currently checked-out branch"
1139 msgstr "Nem lehet a jelenleg kivett branch-ot törölni"
1140
1128 -#: gitk:9783
1141 +#: gitk:9802
1142 #, tcl-format
1143 msgid ""
1144 "The commits on branch %s aren't on any other branch.\n"
@@ -1134,16 +1147,16 @@ msgstr ""
1147 "A %s branchon található commit nem található meg semelyik másik branchon.\n"
1148 "Tényleg törli a %s branchot?"
1149
1137 -#: gitk:9814
1150 +#: gitk:9833
1151 #, tcl-format
1152 msgid "Tags and heads: %s"
1153 msgstr "Tagek és headek: %s"
1154
1142 -#: gitk:9829
1155 +#: gitk:9850
1156 msgid "Filter"
1157 msgstr "Szűrő"
1158
1146 -#: gitk:10125
1159 +#: gitk:10146
1160 msgid ""
1161 "Error reading commit topology information; branch and preceding/following "
1162 "tag information will be incomplete."
@@ -1151,219 +1164,226 @@ msgstr ""
1164 "Hiba történt a commit topológiai információ olvasása közben; branch ésa "
1165 "megelőző/következő információ nem lesz teljes."
1166
1154 -#: gitk:11102
1167 +#: gitk:11123
1168 msgid "Tag"
1169 msgstr "Tag"
1170
1158 -#: gitk:11106
1171 +#: gitk:11127
1172 msgid "Id"
1173 msgstr "Id"
1174
1162 -#: gitk:11189
1175 +#: gitk:11210
1176 msgid "Gitk font chooser"
1177 msgstr "Gitk-betű kiválasztó"
1178
1166 -#: gitk:11206
1179 +#: gitk:11227
1180 msgid "B"
1181 msgstr "F"
1182
1170 -#: gitk:11209
1183 +#: gitk:11230
1184 msgid "I"
1185 msgstr "K"
1186
1174 -#: gitk:11327
1187 +#: gitk:11348
1188 msgid "Commit list display options"
1189 msgstr "Commit lista kijelzési opciók"
1190
1178 -#: gitk:11330
1191 +#: gitk:11351
1192 msgid "Maximum graph width (lines)"
1193 msgstr "Maximális grafikon szélesség (sorok)"
1194
1182 -#: gitk:11334
1195 +#: gitk:11355
1196 #, no-tcl-format
1197 msgid "Maximum graph width (% of pane)"
1198 msgstr "Maximális grafikon szélesség (táble %-je)"
1199
1187 -#: gitk:11337
1200 +#: gitk:11358
1201 msgid "Show local changes"
1202 msgstr "Mutasd a lokális változtatásokat"
1203
1191 -#: gitk:11340
1204 +#: gitk:11361
1205 #, fuzzy
1206 msgid "Auto-select SHA1 (length)"
1207 msgstr "SHA1 Automatikus kiválasztása"
1208
1196 -#: gitk:11344
1209 +#: gitk:11365
1210 msgid "Hide remote refs"
1211 msgstr "A távoli refek elrejtése"
1212
1200 -#: gitk:11348
1213 +#: gitk:11369
1214 msgid "Diff display options"
1215 msgstr "Diff kijelző opciók"
1216
1204 -#: gitk:11350
1217 +#: gitk:11371
1218 msgid "Tab spacing"
1219 msgstr "Tab sorköz"
1220
1208 -#: gitk:11353
1221 +#: gitk:11374
1222 #, fuzzy
1223 msgid "Display nearby tags/heads"
1224 msgstr "Szomszédos tagek kijelzése"
1225
1213 -#: gitk:11356
1226 +#: gitk:11377
1227 msgid "Maximum # tags/heads to show"
1228 msgstr ""
1229
1217 -#: gitk:11359
1230 +#: gitk:11380
1231 msgid "Limit diffs to listed paths"
1232 msgstr "Korlátozott diffek a kilistázott útvonalakhoz"
1233
1221 -#: gitk:11362
1234 +#: gitk:11383
1235 msgid "Support per-file encodings"
1236 msgstr "Fájlonkénti kódolás támgatása"
1237
1225 -#: gitk:11368 gitk:11515
1238 +#: gitk:11389 gitk:11536
1239 msgid "External diff tool"
1240 msgstr "Külső diff alkalmazás"
1241
1229 -#: gitk:11369
1242 +#: gitk:11390
1243 msgid "Choose..."
1244 msgstr "Válaszd ..."
1245
1233 -#: gitk:11374
1246 +#: gitk:11395
1247 msgid "General options"
1248 msgstr "Általános opciók"
1249
1237 -#: gitk:11377
1250 +#: gitk:11398
1251 msgid "Use themed widgets"
1252 msgstr "Témázott vezérlők használata"
1253
1241 -#: gitk:11379
1254 +#: gitk:11400
1255 msgid "(change requires restart)"
1256 msgstr "(a változás újraindítást igényel)"
1257
1245 -#: gitk:11381
1258 +#: gitk:11402
1259 msgid "(currently unavailable)"
1260 msgstr "(jelenleg nem elérhető)"
1261
1249 -#: gitk:11392
1262 +#: gitk:11413
1263 msgid "Colors: press to choose"
1264 msgstr "Színek: nyomja meg a kiválasztáshoz"
1265
1253 -#: gitk:11395
1266 +#: gitk:11416
1267 msgid "Interface"
1268 msgstr "Interfész"
1269
1257 -#: gitk:11396
1270 +#: gitk:11417
1271 msgid "interface"
1272 msgstr "interfész"
1273
1261 -#: gitk:11399
1274 +#: gitk:11420
1275 msgid "Background"
1276 msgstr "Háttér"
1277
1265 -#: gitk:11400 gitk:11430
1278 +#: gitk:11421 gitk:11451
1279 msgid "background"
1280 msgstr "háttér"
1281
1269 -#: gitk:11403
1282 +#: gitk:11424
1283 msgid "Foreground"
1284 msgstr "Előtér"
1285
1273 -#: gitk:11404
1286 +#: gitk:11425
1287 msgid "foreground"
1288 msgstr "előtér"
1289
1277 -#: gitk:11407
1290 +#: gitk:11428
1291 msgid "Diff: old lines"
1292 msgstr "Diff: régi sorok"
1293
1281 -#: gitk:11408
1294 +#: gitk:11429
1295 msgid "diff old lines"
1296 msgstr "diff régi sorok"
1297
1285 -#: gitk:11412
1298 +#: gitk:11433
1299 msgid "Diff: new lines"
1300 msgstr "Diff: új sorok"
1301
1289 -#: gitk:11413
1302 +#: gitk:11434
1303 msgid "diff new lines"
1304 msgstr "diff - új sorok"
1305
1293 -#: gitk:11417
1306 +#: gitk:11438
1307 msgid "Diff: hunk header"
1308 msgstr "Diff: nagy headerök"
1309
1297 -#: gitk:11419
1310 +#: gitk:11440
1311 msgid "diff hunk header"
1312 msgstr "diff - nagy headerök"
1313
1301 -#: gitk:11423
1314 +#: gitk:11444
1315 msgid "Marked line bg"
1316 msgstr "Megjelölt sor háttér"
1317
1305 -#: gitk:11425
1318 +#: gitk:11446
1319 msgid "marked line background"
1320 msgstr "megjelölt sor háttér"
1321
1309 -#: gitk:11429
1322 +#: gitk:11450
1323 msgid "Select bg"
1324 msgstr "Válasszon hátteret"
1325
1313 -#: gitk:11438
1326 +#: gitk:11459
1327 msgid "Fonts: press to choose"
1328 msgstr "Betű: nyomja meg a kiválasztáshoz"
1329
1317 -#: gitk:11440
1330 +#: gitk:11461
1331 msgid "Main font"
1332 msgstr "Fő betű"
1333
1321 -#: gitk:11441
1334 +#: gitk:11462
1335 msgid "Diff display font"
1336 msgstr "Diff kijelző betű"
1337
1325 -#: gitk:11442
1338 +#: gitk:11463
1339 msgid "User interface font"
1340 msgstr "Felhasználói interfész betű"
1341
1329 -#: gitk:11464
1342 +#: gitk:11485
1343 msgid "Gitk preferences"
1344 msgstr "Gitk beállítások"
1345
1333 -#: gitk:11473
1346 +#: gitk:11494
1347 #, fuzzy
1348 msgid "General"
1349 msgstr "Generálás"
1350
1338 -#: gitk:11474
1351 +#: gitk:11495
1352 msgid "Colors"
1353 msgstr ""
1354
1342 -#: gitk:11475
1355 +#: gitk:11496
1356 msgid "Fonts"
1357 msgstr ""
1358
1346 -#: gitk:11525
1359 +#: gitk:11546
1360 #, tcl-format
1361 msgid "Gitk: choose color for %s"
1362 msgstr "Gitk: válasszon színt a %s-ra"
1363
1351 -#: gitk:12242
1364 +#: gitk:12059
1365 +msgid ""
1366 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1367 +" Gitk requires at least Tcl/Tk 8.4."
1368 +msgstr ""
1369 +"Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n"
1370 +"Gitk futtatásához legalább Tcl/Tk 8.4 szükséges."
1371 +
1372 +#: gitk:12269
1373 msgid "Cannot find a git repository here."
1374 msgstr "Nem találhatü git repository itt."
1375
1355 -#: gitk:12289
1376 +#: gitk:12316
1377 #, tcl-format
1378 msgid "Ambiguous argument '%s': both revision and filename"
1379 msgstr "Félreérthető argumentum '%s': revízió és fájlnév is"
1380
1360 -#: gitk:12301
1381 +#: gitk:12328
1382 msgid "Bad arguments to gitk:"
1383 msgstr "Rossz gitk argumentumok:"
1384
1364 -#: gitk:12405
1365 -msgid "Command line"
1366 -msgstr "Parancs sor"
1385 +#~ msgid "mc"
1386 +#~ msgstr "mc"
1387
1388 #~ msgid "SHA1 ID: "
1389 #~ msgstr "SHA1 ID: "
@@ -1397,10 +1417,3 @@ msgstr "Parancs sor"
1417
1418 #~ msgid "- stopping\n"
1419 #~ msgstr "- abbahagyás.\n"
1400 -
1401 -#~ msgid ""
1402 -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1403 -#~ " Gitk requires at least Tcl/Tk 8.4."
1404 -#~ msgstr ""
1405 -#~ "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n"
1406 -#~ "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges."
po/it.po
+295 -280
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2010-01-28 18:41+0100\n"
13 "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
14 "Language-Team: Italian\n"
@@ -25,7 +25,7 @@ msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:"
25 msgid "Color words"
26 msgstr ""
27
28 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
28 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
29 msgid "Markup words"
30 msgstr ""
31
@@ -59,14 +59,18 @@ msgstr "Errore nell'esecuzione di git log:"
59 msgid "Reading"
60 msgstr "Lettura in corso"
61
62 -#: gitk:496 gitk:4508
62 +#: gitk:496 gitk:4525
63 msgid "Reading commits..."
64 msgstr "Lettura delle revisioni in corso..."
65
66 -#: gitk:499 gitk:1637 gitk:4511
66 +#: gitk:499 gitk:1637 gitk:4528
67 msgid "No commits selected"
68 msgstr "Nessuna revisione selezionata"
69
70 +#: gitk:1445 gitk:4045 gitk:12432
71 +msgid "Command line"
72 +msgstr "Linea di comando"
73 +
74 #: gitk:1511
75 msgid "Can't parse git log output:"
76 msgstr "Impossibile elaborare i dati di git log:"
@@ -75,16 +79,12 @@ msgstr "Impossibile elaborare i dati di git log:"
79 msgid "No commit information available"
80 msgstr "Nessuna informazione disponibile sulle revisioni"
81
78 -#: gitk:1897
79 -msgid "mc"
80 -msgstr ""
81 -
82 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
82 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
83 msgid "OK"
84 msgstr "OK"
85
86 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
87 -#: gitk:11221 gitk:11501
86 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
87 +#: gitk:11242 gitk:11522
88 msgid "Cancel"
89 msgstr "Annulla"
90
@@ -136,15 +136,15 @@ msgstr "Modifica vista..."
136 msgid "Delete view"
137 msgstr "Elimina vista"
138
139 -#: gitk:2088
139 +#: gitk:2088 gitk:4043
140 msgid "All files"
141 msgstr "Tutti i file"
142
143 -#: gitk:2083 gitk:4050
143 +#: gitk:2083 gitk:4067
144 msgid "View"
145 msgstr "Vista"
146
147 -#: gitk:2093 gitk:2103 gitk:3009
147 +#: gitk:2093 gitk:2103 gitk:3012
148 msgid "About gitk"
149 msgstr "Informazioni su gitk"
150
@@ -156,7 +156,7 @@ msgstr "Scorciatoie da tastiera"
156 msgid "Help"
157 msgstr "Aiuto"
158
159 -#: gitk:2185 gitk:8633
159 +#: gitk:2185 gitk:8652
160 msgid "SHA1 ID:"
161 msgstr "SHA1 ID:"
162
@@ -172,53 +172,53 @@ msgstr "Trova"
172 msgid "commit"
173 msgstr "revisione"
174
175 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
176 -#: gitk:6893
175 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
176 +#: gitk:6912
177 msgid "containing:"
178 msgstr "contenente:"
179
180 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
180 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
181 msgid "touching paths:"
182 msgstr "che riguarda i percorsi:"
183
184 -#: gitk:2303 gitk:4759
184 +#: gitk:2303 gitk:4777
185 msgid "adding/removing string:"
186 msgstr "che aggiunge/rimuove la stringa:"
187
188 -#: gitk:2304 gitk:4761
188 +#: gitk:2304 gitk:4779
189 msgid "changing lines matching:"
190 msgstr ""
191
192 -#: gitk:2313 gitk:2315 gitk:4748
192 +#: gitk:2313 gitk:2315 gitk:4766
193 msgid "Exact"
194 msgstr "Esatto"
195
196 -#: gitk:2315 gitk:4836 gitk:6704
196 +#: gitk:2315 gitk:4854 gitk:6723
197 msgid "IgnCase"
198 msgstr ""
199
200 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
200 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
201 msgid "Regexp"
202 msgstr ""
203
204 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
204 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
205 msgid "All fields"
206 msgstr "Tutti i campi"
207
208 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
208 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
209 msgid "Headline"
210 msgstr "Titolo"
211
212 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
212 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
213 msgid "Comments"
214 msgstr "Commenti"
215
216 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
217 -#: gitk:8826
216 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
217 +#: gitk:8845
218 msgid "Author"
219 msgstr "Autore"
220
221 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
221 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
222 msgid "Committer"
223 msgstr "Revisione creata da"
224
@@ -246,7 +246,7 @@ msgstr "Linee di contesto"
246 msgid "Ignore space change"
247 msgstr "Ignora modifiche agli spazi"
248
249 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
249 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
250 msgid "Line diff"
251 msgstr ""
252
@@ -258,102 +258,110 @@ msgstr "Modifiche"
258 msgid "Tree"
259 msgstr "Directory"
260
261 -#: gitk:2616 gitk:2636
261 +#: gitk:2617 gitk:2637
262 msgid "Diff this -> selected"
263 msgstr "Diff questo -> selezionato"
264
265 -#: gitk:2617 gitk:2637
265 +#: gitk:2618 gitk:2638
266 msgid "Diff selected -> this"
267 msgstr "Diff selezionato -> questo"
268
269 -#: gitk:2618 gitk:2638
269 +#: gitk:2619 gitk:2639
270 msgid "Make patch"
271 msgstr "Crea patch"
272
273 -#: gitk:2619 gitk:9235
273 +#: gitk:2620 gitk:9254
274 msgid "Create tag"
275 msgstr "Crea etichetta"
276
277 -#: gitk:2620 gitk:9352
277 +#: gitk:2621 gitk:9371
278 msgid "Write commit to file"
279 msgstr "Scrivi revisione in un file"
280
281 -#: gitk:2621 gitk:9409
281 +#: gitk:2622 gitk:9428
282 msgid "Create new branch"
283 msgstr "Crea un nuovo ramo"
284
285 -#: gitk:2622
285 +#: gitk:2623
286 msgid "Cherry-pick this commit"
287 msgstr "Porta questa revisione in cima al ramo attuale"
288
289 -#: gitk:2623
289 +#: gitk:2624
290 msgid "Reset HEAD branch to here"
291 msgstr "Aggiorna il ramo HEAD a questa revisione"
292
293 -#: gitk:2624
293 +#: gitk:2625
294 msgid "Mark this commit"
295 msgstr "Segna questa revisione"
296
297 -#: gitk:2625
297 +#: gitk:2626
298 msgid "Return to mark"
299 msgstr "Torna alla revisione segnata"
300
301 -#: gitk:2626
301 +#: gitk:2627
302 msgid "Find descendant of this and mark"
303 msgstr "Trova il discendente di questa revisione e di quella segnata"
304
305 -#: gitk:2627
305 +#: gitk:2628
306 msgid "Compare with marked commit"
307 msgstr "Confronta con la revisione segnata"
308
309 -#: gitk:2628 gitk:2639
309 +#: gitk:2629 gitk:2640
310 #, fuzzy
311 msgid "Diff this -> marked commit"
312 msgstr "Diff questo -> selezionato"
313
314 -#: gitk:2629 gitk:2640
314 +#: gitk:2630 gitk:2641
315 #, fuzzy
316 msgid "Diff marked commit -> this"
317 msgstr "Diff selezionato -> questo"
318
319 -#: gitk:2630
319 +#: gitk:2631
320 #, fuzzy
321 msgid "Revert this commit"
322 msgstr "Segna questa revisione"
323
324 -#: gitk:2646
324 +#: gitk:2647
325 msgid "Check out this branch"
326 msgstr "Attiva questo ramo"
327
328 -#: gitk:2647
328 +#: gitk:2648
329 msgid "Remove this branch"
330 msgstr "Elimina questo ramo"
331
332 -#: gitk:2654
332 +#: gitk:2649
333 +msgid "Copy branch name"
334 +msgstr ""
335 +
336 +#: gitk:2656
337 msgid "Highlight this too"
338 msgstr "Evidenzia anche questo"
339
336 -#: gitk:2655
340 +#: gitk:2657
341 msgid "Highlight this only"
342 msgstr "Evidenzia solo questo"
343
340 -#: gitk:2656
344 +#: gitk:2658
345 msgid "External diff"
346 msgstr "Visualizza differenze in un altro programma"
347
344 -#: gitk:2657
348 +#: gitk:2659
349 msgid "Blame parent commit"
350 msgstr "Annota la revisione precedente"
351
348 -#: gitk:2664
352 +#: gitk:2660
353 +msgid "Copy path"
354 +msgstr ""
355 +
356 +#: gitk:2667
357 msgid "Show origin of this line"
358 msgstr "Mostra la provenienza di questa riga"
359
352 -#: gitk:2665
360 +#: gitk:2668
361 msgid "Run git gui blame on this line"
362 msgstr "Esegui git gui blame su questa riga"
363
356 -#: gitk:3011
364 +#: gitk:3014
365 #, fuzzy
366 msgid ""
367 "\n"
@@ -371,316 +379,321 @@ msgstr ""
379 "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
380 "License"
381
374 -#: gitk:3019 gitk:3085 gitk:9836
382 +#: gitk:3022 gitk:3089 gitk:9857
383 msgid "Close"
384 msgstr "Chiudi"
385
378 -#: gitk:3040
386 +#: gitk:3043
387 msgid "Gitk key bindings"
388 msgstr "Scorciatoie da tastiera di Gitk"
389
382 -#: gitk:3043
390 +#: gitk:3046
391 msgid "Gitk key bindings:"
392 msgstr "Scorciatoie da tastiera di Gitk:"
393
386 -#: gitk:3045
394 +#: gitk:3048
395 #, tcl-format
396 msgid "<%s-Q>\t\tQuit"
397 msgstr "<%s-Q>\t\tEsci"
398
391 -#: gitk:3046
399 +#: gitk:3049
400 #, fuzzy, tcl-format
401 msgid "<%s-W>\t\tClose window"
402 msgstr "<%s-F>\t\tTrova"
403
396 -#: gitk:3047
404 +#: gitk:3050
405 msgid "<Home>\t\tMove to first commit"
406 msgstr "<Home>\t\tVai alla prima revisione"
407
400 -#: gitk:3048
408 +#: gitk:3051
409 msgid "<End>\t\tMove to last commit"
410 msgstr "<End>\t\tVai all'ultima revisione"
411
404 -#: gitk:3049
412 +#: gitk:3052
413 #, fuzzy
414 msgid "<Up>, p, k\tMove up one commit"
415 msgstr "<Su>, p, i\tVai più in alto di una revisione"
416
409 -#: gitk:3050
417 +#: gitk:3053
418 #, fuzzy
419 msgid "<Down>, n, j\tMove down one commit"
420 msgstr "<Giù>, n, k\tVai più in basso di una revisione"
421
414 -#: gitk:3051
422 +#: gitk:3054
423 #, fuzzy
424 msgid "<Left>, z, h\tGo back in history list"
425 msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia"
426
419 -#: gitk:3052
427 +#: gitk:3055
428 msgid "<Right>, x, l\tGo forward in history list"
429 msgstr "<Destra>, x, l\tVai avanti nella cronologia"
430
423 -#: gitk:3053
431 +#: gitk:3056
432 #, tcl-format
433 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
434 msgstr ""
435
428 -#: gitk:3054
436 +#: gitk:3057
437 msgid "<PageUp>\tMove up one page in commit list"
438 msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni"
439
432 -#: gitk:3055
440 +#: gitk:3058
441 msgid "<PageDown>\tMove down one page in commit list"
442 msgstr ""
443 "<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni"
444
437 -#: gitk:3056
445 +#: gitk:3059
446 #, tcl-format
447 msgid "<%s-Home>\tScroll to top of commit list"
448 msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni"
449
442 -#: gitk:3057
450 +#: gitk:3060
451 #, tcl-format
452 msgid "<%s-End>\tScroll to bottom of commit list"
453 msgstr "<%s-End>\tScorri alla fine della lista delle revisioni"
454
447 -#: gitk:3058
455 +#: gitk:3061
456 #, tcl-format
457 msgid "<%s-Up>\tScroll commit list up one line"
458 msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga"
459
452 -#: gitk:3059
460 +#: gitk:3062
461 #, tcl-format
462 msgid "<%s-Down>\tScroll commit list down one line"
463 msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga"
464
457 -#: gitk:3060
465 +#: gitk:3063
466 #, tcl-format
467 msgid "<%s-PageUp>\tScroll commit list up one page"
468 msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina"
469
462 -#: gitk:3061
470 +#: gitk:3064
471 #, tcl-format
472 msgid "<%s-PageDown>\tScroll commit list down one page"
473 msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina"
474
467 -#: gitk:3062
475 +#: gitk:3065
476 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
477 msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)"
478
471 -#: gitk:3063
479 +#: gitk:3066
480 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
481 msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)"
482
475 -#: gitk:3064
483 +#: gitk:3067
484 msgid "<Delete>, b\tScroll diff view up one page"
485 msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina"
486
479 -#: gitk:3065
487 +#: gitk:3068
488 msgid "<Backspace>\tScroll diff view up one page"
489 msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina"
490
483 -#: gitk:3066
491 +#: gitk:3069
492 msgid "<Space>\t\tScroll diff view down one page"
493 msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina"
494
487 -#: gitk:3067
495 +#: gitk:3070
496 msgid "u\t\tScroll diff view up 18 lines"
497 msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee"
498
491 -#: gitk:3068
499 +#: gitk:3071
500 msgid "d\t\tScroll diff view down 18 lines"
501 msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee"
502
495 -#: gitk:3069
503 +#: gitk:3072
504 #, tcl-format
505 msgid "<%s-F>\t\tFind"
506 msgstr "<%s-F>\t\tTrova"
507
500 -#: gitk:3070
508 +#: gitk:3073
509 #, tcl-format
510 msgid "<%s-G>\t\tMove to next find hit"
511 msgstr "<%s-G>\t\tTrova in avanti"
512
505 -#: gitk:3071
513 +#: gitk:3074
514 msgid "<Return>\tMove to next find hit"
515 msgstr "<Invio>\tTrova in avanti"
516
509 -#: gitk:3072
517 +#: gitk:3075
518 +#, fuzzy
519 +msgid "g\t\tGo to commit"
520 +msgstr "<End>\t\tVai all'ultima revisione"
521 +
522 +#: gitk:3076
523 msgid "/\t\tFocus the search box"
524 msgstr "/\t\tCursore nel box di ricerca"
525
513 -#: gitk:3073
526 +#: gitk:3077
527 msgid "?\t\tMove to previous find hit"
528 msgstr "?\t\tTrova all'indietro"
529
517 -#: gitk:3074
530 +#: gitk:3078
531 msgid "f\t\tScroll diff view to next file"
532 msgstr "f\t\tScorri la vista delle differenze al file successivo"
533
521 -#: gitk:3075
534 +#: gitk:3079
535 #, tcl-format
536 msgid "<%s-S>\t\tSearch for next hit in diff view"
537 msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze"
538
526 -#: gitk:3076
539 +#: gitk:3080
540 #, tcl-format
541 msgid "<%s-R>\t\tSearch for previous hit in diff view"
542 msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze"
543
531 -#: gitk:3077
544 +#: gitk:3081
545 #, tcl-format
546 msgid "<%s-KP+>\tIncrease font size"
547 msgstr "<%s-KP+>\tAumenta dimensione carattere"
548
536 -#: gitk:3078
549 +#: gitk:3082
550 #, tcl-format
551 msgid "<%s-plus>\tIncrease font size"
552 msgstr "<%s-più>\tAumenta dimensione carattere"
553
541 -#: gitk:3079
554 +#: gitk:3083
555 #, tcl-format
556 msgid "<%s-KP->\tDecrease font size"
557 msgstr "<%s-KP->\tDiminuisci dimensione carattere"
558
546 -#: gitk:3080
559 +#: gitk:3084
560 #, tcl-format
561 msgid "<%s-minus>\tDecrease font size"
562 msgstr "<%s-meno>\tDiminuisci dimensione carattere"
563
551 -#: gitk:3081
564 +#: gitk:3085
565 msgid "<F5>\t\tUpdate"
566 msgstr "<F5>\t\tAggiorna"
567
555 -#: gitk:3546 gitk:3555
568 +#: gitk:3550 gitk:3559
569 #, tcl-format
570 msgid "Error creating temporary directory %s:"
571 msgstr "Errore durante la creazione della directory temporanea %s:"
572
560 -#: gitk:3568
573 +#: gitk:3572
574 #, tcl-format
575 msgid "Error getting \"%s\" from %s:"
576 msgstr "Errore nella lettura di \"%s\" da %s:"
577
565 -#: gitk:3631
578 +#: gitk:3635
579 msgid "command failed:"
580 msgstr "impossibile eseguire il comando:"
581
569 -#: gitk:3780
582 +#: gitk:3784
583 msgid "No such commit"
584 msgstr "Revisione inesistente"
585
573 -#: gitk:3794
586 +#: gitk:3798
587 msgid "git gui blame: command failed:"
588 msgstr "git gui blame: impossibile eseguire il comando:"
589
577 -#: gitk:3825
590 +#: gitk:3829
591 #, tcl-format
592 msgid "Couldn't read merge head: %s"
593 msgstr "Impossibile leggere merge head: %s"
594
582 -#: gitk:3833
595 +#: gitk:3837
596 #, tcl-format
597 msgid "Error reading index: %s"
598 msgstr "Errore nella lettura dell'indice: %s"
599
587 -#: gitk:3858
600 +#: gitk:3862
601 #, tcl-format
602 msgid "Couldn't start git blame: %s"
603 msgstr "Impossibile eseguire git blame: %s"
604
592 -#: gitk:3861 gitk:6735
605 +#: gitk:3865 gitk:6754
606 msgid "Searching"
607 msgstr "Ricerca in corso"
608
596 -#: gitk:3893
609 +#: gitk:3897
610 #, tcl-format
611 msgid "Error running git blame: %s"
612 msgstr "Errore nell'esecuzione di git blame: %s"
613
601 -#: gitk:3921
614 +#: gitk:3925
615 #, tcl-format
616 msgid "That line comes from commit %s, which is not in this view"
617 msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista"
618
606 -#: gitk:3935
619 +#: gitk:3939
620 msgid "External diff viewer failed:"
621 msgstr "Impossibile eseguire il visualizzatore di differenze:"
622
610 -#: gitk:4053
623 +#: gitk:4070
624 msgid "Gitk view definition"
625 msgstr "Scelta vista Gitk"
626
614 -#: gitk:4057
627 +#: gitk:4074
628 msgid "Remember this view"
629 msgstr "Ricorda questa vista"
630
618 -#: gitk:4058
631 +#: gitk:4075
632 msgid "References (space separated list):"
633 msgstr "Riferimenti (lista di elementi separati da spazi)"
634
622 -#: gitk:4059
635 +#: gitk:4076
636 msgid "Branches & tags:"
637 msgstr "Rami ed etichette"
638
626 -#: gitk:4060
639 +#: gitk:4077
640 msgid "All refs"
641 msgstr "Tutti i riferimenti"
642
630 -#: gitk:4061
643 +#: gitk:4078
644 msgid "All (local) branches"
645 msgstr "Tutti i rami (locali)"
646
634 -#: gitk:4062
647 +#: gitk:4079
648 msgid "All tags"
649 msgstr "Tutte le etichette"
650
638 -#: gitk:4063
651 +#: gitk:4080
652 msgid "All remote-tracking branches"
653 msgstr "Tutti i rami remoti"
654
642 -#: gitk:4064
655 +#: gitk:4081
656 msgid "Commit Info (regular expressions):"
657 msgstr "Informazioni sulla revisione (espressioni regolari):"
658
646 -#: gitk:4065
659 +#: gitk:4082
660 msgid "Author:"
661 msgstr "Autore:"
662
650 -#: gitk:4066
663 +#: gitk:4083
664 msgid "Committer:"
665 msgstr "Revisione creata da:"
666
654 -#: gitk:4067
667 +#: gitk:4084
668 msgid "Commit Message:"
669 msgstr "Messaggio di revisione:"
670
658 -#: gitk:4068
671 +#: gitk:4085
672 msgid "Matches all Commit Info criteria"
673 msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
674
662 -#: gitk:4069
675 +#: gitk:4086
676 #, fuzzy
664 -msgid "Matches none Commit Info criteria"
677 +msgid "Matches no Commit Info criteria"
678 msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
679
667 -#: gitk:4070
680 +#: gitk:4087
681 msgid "Changes to Files:"
682 msgstr "Modifiche ai file:"
683
671 -#: gitk:4071
684 +#: gitk:4088
685 msgid "Fixed String"
686 msgstr "Stringa fissa"
687
675 -#: gitk:4072
688 +#: gitk:4089
689 msgid "Regular Expression"
690 msgstr "Espressione regolare"
691
679 -#: gitk:4073
692 +#: gitk:4090
693 msgid "Search string:"
694 msgstr "Cerca stringa:"
695
683 -#: gitk:4074
696 +#: gitk:4091
697 msgid ""
698 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
699 "15:27:38\"):"
@@ -688,201 +701,201 @@ msgstr ""
701 "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
702 "2009 15:27:38\"):"
703
691 -#: gitk:4075
704 +#: gitk:4092
705 msgid "Since:"
706 msgstr "Da:"
707
695 -#: gitk:4076
708 +#: gitk:4093
709 msgid "Until:"
710 msgstr "A:"
711
699 -#: gitk:4077
712 +#: gitk:4094
713 msgid "Limit and/or skip a number of revisions (positive integer):"
714 msgstr "Limita e/o salta N revisioni (intero positivo):"
715
703 -#: gitk:4078
716 +#: gitk:4095
717 msgid "Number to show:"
718 msgstr "Numero di revisioni da mostrare:"
719
707 -#: gitk:4079
720 +#: gitk:4096
721 msgid "Number to skip:"
722 msgstr "Numero di revisioni da saltare:"
723
711 -#: gitk:4080
724 +#: gitk:4097
725 msgid "Miscellaneous options:"
726 msgstr "Altre opzioni:"
727
715 -#: gitk:4081
728 +#: gitk:4098
729 msgid "Strictly sort by date"
730 msgstr "Ordina solo per data"
731
719 -#: gitk:4082
732 +#: gitk:4099
733 msgid "Mark branch sides"
734 msgstr "Segna i lati del ramo"
735
723 -#: gitk:4083
736 +#: gitk:4100
737 msgid "Limit to first parent"
738 msgstr "Limita al primo genitore"
739
727 -#: gitk:4084
740 +#: gitk:4101
741 msgid "Simple history"
742 msgstr "Cronologia semplificata"
743
731 -#: gitk:4085
744 +#: gitk:4102
745 msgid "Additional arguments to git log:"
746 msgstr "Ulteriori argomenti da passare a git log:"
747
735 -#: gitk:4086
748 +#: gitk:4103
749 msgid "Enter files and directories to include, one per line:"
750 msgstr "Inserire file e directory da includere, uno per riga:"
751
739 -#: gitk:4087
752 +#: gitk:4104
753 msgid "Command to generate more commits to include:"
754 msgstr "Comando che genera altre revisioni da visualizzare:"
755
743 -#: gitk:4211
756 +#: gitk:4228
757 msgid "Gitk: edit view"
758 msgstr "Gitk: modifica vista"
759
747 -#: gitk:4219
760 +#: gitk:4236
761 msgid "-- criteria for selecting revisions"
762 msgstr "-- criteri per la scelta delle revisioni"
763
751 -#: gitk:4224
764 +#: gitk:4241
765 msgid "View Name"
766 msgstr "Nome vista"
767
755 -#: gitk:4299
768 +#: gitk:4316
769 msgid "Apply (F5)"
770 msgstr "Applica (F5)"
771
759 -#: gitk:4337
772 +#: gitk:4354
773 msgid "Error in commit selection arguments:"
774 msgstr "Errore negli argomenti di selezione delle revisioni:"
775
763 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
776 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
777 msgid "None"
778 msgstr "Nessuno"
779
767 -#: gitk:5003 gitk:5008
780 +#: gitk:5021 gitk:5026
781 msgid "Descendant"
782 msgstr "Discendente"
783
771 -#: gitk:5004
784 +#: gitk:5022
785 msgid "Not descendant"
786 msgstr "Non discendente"
787
775 -#: gitk:5011 gitk:5016
788 +#: gitk:5029 gitk:5034
789 msgid "Ancestor"
790 msgstr "Ascendente"
791
779 -#: gitk:5012
792 +#: gitk:5030
793 msgid "Not ancestor"
794 msgstr "Non ascendente"
795
783 -#: gitk:5306
796 +#: gitk:5324
797 msgid "Local changes checked in to index but not committed"
798 msgstr "Modifiche locali presenti nell'indice ma non nell'archivio"
799
787 -#: gitk:5342
800 +#: gitk:5360
801 msgid "Local uncommitted changes, not checked in to index"
802 msgstr "Modifiche locali non presenti né nell'archivio né nell'indice"
803
791 -#: gitk:7115
804 +#: gitk:7134
805 msgid "and many more"
806 msgstr ""
807
795 -#: gitk:7118
808 +#: gitk:7137
809 msgid "many"
810 msgstr "molti"
811
799 -#: gitk:7309
812 +#: gitk:7328
813 msgid "Tags:"
814 msgstr "Etichette:"
815
803 -#: gitk:7326 gitk:7332 gitk:8806
816 +#: gitk:7345 gitk:7351 gitk:8825
817 msgid "Parent"
818 msgstr "Genitore"
819
807 -#: gitk:7337
820 +#: gitk:7356
821 msgid "Child"
822 msgstr "Figlio"
823
811 -#: gitk:7346
824 +#: gitk:7365
825 msgid "Branch"
826 msgstr "Ramo"
827
815 -#: gitk:7349
828 +#: gitk:7368
829 msgid "Follows"
830 msgstr "Segue"
831
819 -#: gitk:7352
832 +#: gitk:7371
833 msgid "Precedes"
834 msgstr "Precede"
835
823 -#: gitk:7947
836 +#: gitk:7966
837 #, tcl-format
838 msgid "Error getting diffs: %s"
839 msgstr "Errore nella lettura delle differenze:"
840
828 -#: gitk:8631
841 +#: gitk:8650
842 msgid "Goto:"
843 msgstr "Vai a:"
844
832 -#: gitk:8652
845 +#: gitk:8671
846 #, tcl-format
847 msgid "Short SHA1 id %s is ambiguous"
848 msgstr "La SHA1 id abbreviata %s è ambigua"
849
837 -#: gitk:8659
850 +#: gitk:8678
851 #, tcl-format
852 msgid "Revision %s is not known"
853 msgstr "La revisione %s è sconosciuta"
854
842 -#: gitk:8669
855 +#: gitk:8688
856 #, tcl-format
857 msgid "SHA1 id %s is not known"
858 msgstr "La SHA1 id %s è sconosciuta"
859
847 -#: gitk:8671
860 +#: gitk:8690
861 #, tcl-format
862 msgid "Revision %s is not in the current view"
863 msgstr "La revisione %s non è presente nella vista attuale"
864
852 -#: gitk:8813 gitk:8828
865 +#: gitk:8832 gitk:8847
866 msgid "Date"
867 msgstr "Data"
868
856 -#: gitk:8816
869 +#: gitk:8835
870 msgid "Children"
871 msgstr "Figli"
872
860 -#: gitk:8879
873 +#: gitk:8898
874 #, tcl-format
875 msgid "Reset %s branch to here"
876 msgstr "Aggiorna il ramo %s a questa revisione"
877
865 -#: gitk:8881
878 +#: gitk:8900
879 msgid "Detached head: can't reset"
880 msgstr "Nessun ramo attivo: reset impossibile"
881
869 -#: gitk:8986 gitk:8992
882 +#: gitk:9005 gitk:9011
883 msgid "Skipping merge commit "
884 msgstr "Salto la revisione di fusione "
885
873 -#: gitk:9001 gitk:9006
886 +#: gitk:9020 gitk:9025
887 msgid "Error getting patch ID for "
888 msgstr "Errore nella identificazione della patch per "
889
877 -#: gitk:9002 gitk:9007
890 +#: gitk:9021 gitk:9026
891 msgid " - stopping\n"
892 msgstr " - fine\n"
893
881 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
894 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
895 msgid "Commit "
896 msgstr "La revisione "
897
885 -#: gitk:9016
898 +#: gitk:9035
899 msgid ""
900 " is the same patch as\n"
901 " "
@@ -890,7 +903,7 @@ msgstr ""
903 " ha le stesse differenze di\n"
904 " "
905
893 -#: gitk:9024
906 +#: gitk:9043
907 msgid ""
908 " differs from\n"
909 " "
@@ -898,7 +911,7 @@ msgstr ""
911 " è diversa da\n"
912 " "
913
901 -#: gitk:9026
914 +#: gitk:9045
915 msgid ""
916 "Diff of commits:\n"
917 "\n"
@@ -906,129 +919,129 @@ msgstr ""
919 "Differenze tra le revisioni:\n"
920 "\n"
921
909 -#: gitk:9038 gitk:9047
922 +#: gitk:9057 gitk:9066
923 #, tcl-format
924 msgid " has %s children - stopping\n"
925 msgstr " ha %s figli - fine\n"
926
914 -#: gitk:9066
927 +#: gitk:9085
928 #, tcl-format
929 msgid "Error writing commit to file: %s"
930 msgstr "Errore nella scrittura della revisione nel file: %s"
931
919 -#: gitk:9072
932 +#: gitk:9091
933 #, tcl-format
934 msgid "Error diffing commits: %s"
935 msgstr "Errore nelle differenze tra le revisioni: %s"
936
924 -#: gitk:9118
937 +#: gitk:9137
938 msgid "Top"
939 msgstr "Inizio"
940
928 -#: gitk:9119
941 +#: gitk:9138
942 msgid "From"
943 msgstr "Da"
944
932 -#: gitk:9124
945 +#: gitk:9143
946 msgid "To"
947 msgstr "A"
948
936 -#: gitk:9148
949 +#: gitk:9167
950 msgid "Generate patch"
951 msgstr "Genera patch"
952
940 -#: gitk:9150
953 +#: gitk:9169
954 msgid "From:"
955 msgstr "Da:"
956
944 -#: gitk:9159
957 +#: gitk:9178
958 msgid "To:"
959 msgstr "A:"
960
948 -#: gitk:9168
961 +#: gitk:9187
962 msgid "Reverse"
963 msgstr "Inverti"
964
952 -#: gitk:9170 gitk:9366
965 +#: gitk:9189 gitk:9385
966 msgid "Output file:"
967 msgstr "Scrivi sul file:"
968
956 -#: gitk:9176
969 +#: gitk:9195
970 msgid "Generate"
971 msgstr "Genera"
972
960 -#: gitk:9214
973 +#: gitk:9233
974 msgid "Error creating patch:"
975 msgstr "Errore nella creazione della patch:"
976
964 -#: gitk:9237 gitk:9354 gitk:9411
977 +#: gitk:9256 gitk:9373 gitk:9430
978 msgid "ID:"
979 msgstr "ID:"
980
968 -#: gitk:9246
981 +#: gitk:9265
982 msgid "Tag name:"
983 msgstr "Nome etichetta:"
984
972 -#: gitk:9249
985 +#: gitk:9268
986 msgid "Tag message is optional"
987 msgstr "Il messaggio dell'etichetta è opzionale"
988
976 -#: gitk:9251
989 +#: gitk:9270
990 msgid "Tag message:"
991 msgstr "Messaggio dell'etichetta:"
992
980 -#: gitk:9255 gitk:9420
993 +#: gitk:9274 gitk:9439
994 msgid "Create"
995 msgstr "Crea"
996
984 -#: gitk:9273
997 +#: gitk:9292
998 msgid "No tag name specified"
999 msgstr "Nessuna etichetta specificata"
1000
988 -#: gitk:9277
1001 +#: gitk:9296
1002 #, tcl-format
1003 msgid "Tag \"%s\" already exists"
1004 msgstr "L'etichetta \"%s\" esiste già"
1005
993 -#: gitk:9287
1006 +#: gitk:9306
1007 msgid "Error creating tag:"
1008 msgstr "Errore nella creazione dell'etichetta:"
1009
997 -#: gitk:9363
1010 +#: gitk:9382
1011 msgid "Command:"
1012 msgstr "Comando:"
1013
1001 -#: gitk:9371
1014 +#: gitk:9390
1015 msgid "Write"
1016 msgstr "Scrivi"
1017
1005 -#: gitk:9389
1018 +#: gitk:9408
1019 msgid "Error writing commit:"
1020 msgstr "Errore nella scrittura della revisione:"
1021
1009 -#: gitk:9416
1022 +#: gitk:9435
1023 msgid "Name:"
1024 msgstr "Nome:"
1025
1013 -#: gitk:9439
1026 +#: gitk:9458
1027 msgid "Please specify a name for the new branch"
1028 msgstr "Specificare un nome per il nuovo ramo"
1029
1017 -#: gitk:9444
1030 +#: gitk:9463
1031 #, tcl-format
1032 msgid "Branch '%s' already exists. Overwrite?"
1033 msgstr "Il ramo '%s' esiste già. Sovrascrivere?"
1034
1022 -#: gitk:9511
1035 +#: gitk:9530
1036 #, tcl-format
1037 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1038 msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
1039
1027 -#: gitk:9516
1040 +#: gitk:9535
1041 msgid "Cherry-picking"
1042 msgstr ""
1043
1031 -#: gitk:9525
1044 +#: gitk:9544
1045 #, tcl-format
1046 msgid ""
1047 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1039,7 +1052,7 @@ msgstr ""
1052 "Prima di riprovare, bisogna creare una nuova revisione, annullare le "
1053 "modifiche o usare 'git stash'."
1054
1042 -#: gitk:9531
1055 +#: gitk:9550
1056 msgid ""
1057 "Cherry-pick failed because of merge conflict.\n"
1058 "Do you wish to run git citool to resolve it?"
@@ -1047,21 +1060,21 @@ msgstr ""
1060 "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
1061 "Vuoi avviare git citool per risolverlo?"
1062
1050 -#: gitk:9547 gitk:9605
1063 +#: gitk:9566 gitk:9624
1064 msgid "No changes committed"
1065 msgstr "Nessuna modifica archiviata"
1066
1054 -#: gitk:9574
1067 +#: gitk:9593
1068 #, fuzzy, tcl-format
1069 msgid "Commit %s is not included in branch %s -- really revert it?"
1070 msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
1071
1059 -#: gitk:9579
1072 +#: gitk:9598
1073 #, fuzzy
1074 msgid "Reverting"
1075 msgstr "git reset in corso"
1076
1064 -#: gitk:9587
1077 +#: gitk:9606
1078 #, fuzzy, tcl-format
1079 msgid ""
1080 "Revert failed because of local changes to the following files:%s Please "
@@ -1072,7 +1085,7 @@ msgstr ""
1085 "Prima di riprovare, bisogna creare una nuova revisione, annullare le "
1086 "modifiche o usare 'git stash'."
1087
1075 -#: gitk:9591
1088 +#: gitk:9610
1089 #, fuzzy
1090 msgid ""
1091 "Revert failed because of merge conflict.\n"
@@ -1081,28 +1094,28 @@ msgstr ""
1094 "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
1095 "Vuoi avviare git citool per risolverlo?"
1096
1084 -#: gitk:9634
1097 +#: gitk:9653
1098 msgid "Confirm reset"
1099 msgstr "Conferma git reset"
1100
1088 -#: gitk:9636
1101 +#: gitk:9655
1102 #, tcl-format
1103 msgid "Reset branch %s to %s?"
1104 msgstr "Aggiornare il ramo %s a %s?"
1105
1093 -#: gitk:9638
1106 +#: gitk:9657
1107 msgid "Reset type:"
1108 msgstr "Tipo di aggiornamento:"
1109
1097 -#: gitk:9641
1110 +#: gitk:9660
1111 msgid "Soft: Leave working tree and index untouched"
1112 msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono"
1113
1101 -#: gitk:9644
1114 +#: gitk:9663
1115 msgid "Mixed: Leave working tree untouched, reset index"
1116 msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice"
1117
1105 -#: gitk:9647
1118 +#: gitk:9666
1119 msgid ""
1120 "Hard: Reset working tree and index\n"
1121 "(discard ALL local changes)"
@@ -1110,19 +1123,19 @@ msgstr ""
1123 "Hard: Aggiorna la directory di lavoro e l'indice\n"
1124 "(abbandona TUTTE le modifiche locali)"
1125
1113 -#: gitk:9664
1126 +#: gitk:9683
1127 msgid "Resetting"
1128 msgstr "git reset in corso"
1129
1117 -#: gitk:9724
1130 +#: gitk:9743
1131 msgid "Checking out"
1132 msgstr "Attivazione in corso"
1133
1121 -#: gitk:9777
1134 +#: gitk:9796
1135 msgid "Cannot delete the currently checked-out branch"
1136 msgstr "Impossibile cancellare il ramo attualmente attivo"
1137
1125 -#: gitk:9783
1138 +#: gitk:9802
1139 #, tcl-format
1140 msgid ""
1141 "The commits on branch %s aren't on any other branch.\n"
@@ -1131,16 +1144,16 @@ msgstr ""
1144 "Le revisioni nel ramo %s non sono presenti su altri rami.\n"
1145 "Cancellare il ramo %s?"
1146
1134 -#: gitk:9814
1147 +#: gitk:9833
1148 #, tcl-format
1149 msgid "Tags and heads: %s"
1150 msgstr "Etichette e rami: %s"
1151
1139 -#: gitk:9829
1152 +#: gitk:9850
1153 msgid "Filter"
1154 msgstr "Filtro"
1155
1143 -#: gitk:10125
1156 +#: gitk:10146
1157 msgid ""
1158 "Error reading commit topology information; branch and preceding/following "
1159 "tag information will be incomplete."
@@ -1148,220 +1161,222 @@ msgstr ""
1161 "Errore nella lettura della topologia delle revisioni: le informazioni sul "
1162 "ramo e le etichette precedenti e seguenti saranno incomplete."
1163
1151 -#: gitk:11102
1164 +#: gitk:11123
1165 msgid "Tag"
1166 msgstr "Etichetta"
1167
1155 -#: gitk:11106
1168 +#: gitk:11127
1169 msgid "Id"
1170 msgstr "Id"
1171
1159 -#: gitk:11189
1172 +#: gitk:11210
1173 msgid "Gitk font chooser"
1174 msgstr "Scelta caratteri gitk"
1175
1163 -#: gitk:11206
1176 +#: gitk:11227
1177 msgid "B"
1178 msgstr "B"
1179
1167 -#: gitk:11209
1180 +#: gitk:11230
1181 msgid "I"
1182 msgstr "I"
1183
1171 -#: gitk:11327
1184 +#: gitk:11348
1185 msgid "Commit list display options"
1186 msgstr "Opzioni visualizzazione dell'elenco revisioni"
1187
1175 -#: gitk:11330
1188 +#: gitk:11351
1189 msgid "Maximum graph width (lines)"
1190 msgstr "Larghezza massima del grafico (in linee)"
1191
1179 -#: gitk:11334
1192 +#: gitk:11355
1193 #, no-tcl-format
1194 msgid "Maximum graph width (% of pane)"
1195 msgstr "Larghezza massima del grafico (% del pannello)"
1196
1184 -#: gitk:11337
1197 +#: gitk:11358
1198 msgid "Show local changes"
1199 msgstr "Mostra modifiche locali"
1200
1188 -#: gitk:11340
1201 +#: gitk:11361
1202 #, fuzzy
1203 msgid "Auto-select SHA1 (length)"
1204 msgstr "Seleziona automaticamente SHA1 hash"
1205
1193 -#: gitk:11344
1206 +#: gitk:11365
1207 msgid "Hide remote refs"
1208 msgstr "Nascondi i riferimenti remoti"
1209
1197 -#: gitk:11348
1210 +#: gitk:11369
1211 msgid "Diff display options"
1212 msgstr "Opzioni di visualizzazione delle differenze"
1213
1201 -#: gitk:11350
1214 +#: gitk:11371
1215 msgid "Tab spacing"
1216 msgstr "Spaziatura tabulazioni"
1217
1205 -#: gitk:11353
1218 +#: gitk:11374
1219 #, fuzzy
1220 msgid "Display nearby tags/heads"
1221 msgstr "Mostra etichette vicine"
1222
1210 -#: gitk:11356
1223 +#: gitk:11377
1224 msgid "Maximum # tags/heads to show"
1225 msgstr ""
1226
1214 -#: gitk:11359
1227 +#: gitk:11380
1228 msgid "Limit diffs to listed paths"
1229 msgstr "Limita le differenze ai percorsi elencati"
1230
1218 -#: gitk:11362
1231 +#: gitk:11383
1232 msgid "Support per-file encodings"
1233 msgstr "Attiva codifica file per file"
1234
1222 -#: gitk:11368 gitk:11515
1235 +#: gitk:11389 gitk:11536
1236 msgid "External diff tool"
1237 msgstr "Visualizzatore di differenze"
1238
1226 -#: gitk:11369
1239 +#: gitk:11390
1240 msgid "Choose..."
1241 msgstr "Scegli..."
1242
1230 -#: gitk:11374
1243 +#: gitk:11395
1244 msgid "General options"
1245 msgstr "Opzioni generali"
1246
1234 -#: gitk:11377
1247 +#: gitk:11398
1248 msgid "Use themed widgets"
1249 msgstr "Utilizza interfaccia a tema"
1250
1238 -#: gitk:11379
1251 +#: gitk:11400
1252 msgid "(change requires restart)"
1253 msgstr "(una modifica richiede il riavvio)"
1254
1242 -#: gitk:11381
1255 +#: gitk:11402
1256 msgid "(currently unavailable)"
1257 msgstr "(momentaneamente non disponibile)"
1258
1246 -#: gitk:11392
1259 +#: gitk:11413
1260 msgid "Colors: press to choose"
1261 msgstr "Colori: premere per scegliere"
1262
1250 -#: gitk:11395
1263 +#: gitk:11416
1264 msgid "Interface"
1265 msgstr "Interfaccia"
1266
1254 -#: gitk:11396
1267 +#: gitk:11417
1268 msgid "interface"
1269 msgstr "interfaccia"
1270
1258 -#: gitk:11399
1271 +#: gitk:11420
1272 msgid "Background"
1273 msgstr "Sfondo"
1274
1262 -#: gitk:11400 gitk:11430
1275 +#: gitk:11421 gitk:11451
1276 msgid "background"
1277 msgstr "sfondo"
1278
1266 -#: gitk:11403
1279 +#: gitk:11424
1280 msgid "Foreground"
1281 msgstr "Primo piano"
1282
1270 -#: gitk:11404
1283 +#: gitk:11425
1284 msgid "foreground"
1285 msgstr "primo piano"
1286
1274 -#: gitk:11407
1287 +#: gitk:11428
1288 msgid "Diff: old lines"
1289 msgstr "Diff: vecchie linee"
1290
1278 -#: gitk:11408
1291 +#: gitk:11429
1292 msgid "diff old lines"
1293 msgstr "vecchie linee"
1294
1282 -#: gitk:11412
1295 +#: gitk:11433
1296 msgid "Diff: new lines"
1297 msgstr "Diff: nuove linee"
1298
1286 -#: gitk:11413
1299 +#: gitk:11434
1300 msgid "diff new lines"
1301 msgstr "nuove linee"
1302
1290 -#: gitk:11417
1303 +#: gitk:11438
1304 msgid "Diff: hunk header"
1305 msgstr "Diff: intestazione della sezione"
1306
1294 -#: gitk:11419
1307 +#: gitk:11440
1308 msgid "diff hunk header"
1309 msgstr "intestazione della sezione"
1310
1298 -#: gitk:11423
1311 +#: gitk:11444
1312 msgid "Marked line bg"
1313 msgstr "Sfondo riga selezionata"
1314
1302 -#: gitk:11425
1315 +#: gitk:11446
1316 msgid "marked line background"
1317 msgstr "sfondo riga selezionata"
1318
1306 -#: gitk:11429
1319 +#: gitk:11450
1320 msgid "Select bg"
1321 msgstr "Sfondo"
1322
1310 -#: gitk:11438
1323 +#: gitk:11459
1324 msgid "Fonts: press to choose"
1325 msgstr "Carattere: premere per scegliere"
1326
1314 -#: gitk:11440
1327 +#: gitk:11461
1328 msgid "Main font"
1329 msgstr "Carattere principale"
1330
1318 -#: gitk:11441
1331 +#: gitk:11462
1332 msgid "Diff display font"
1333 msgstr "Carattere per differenze"
1334
1322 -#: gitk:11442
1335 +#: gitk:11463
1336 msgid "User interface font"
1337 msgstr "Carattere per interfaccia utente"
1338
1326 -#: gitk:11464
1339 +#: gitk:11485
1340 msgid "Gitk preferences"
1341 msgstr "Preferenze gitk"
1342
1330 -#: gitk:11473
1343 +#: gitk:11494
1344 #, fuzzy
1345 msgid "General"
1346 msgstr "Genera"
1347
1335 -#: gitk:11474
1348 +#: gitk:11495
1349 msgid "Colors"
1350 msgstr ""
1351
1339 -#: gitk:11475
1352 +#: gitk:11496
1353 msgid "Fonts"
1354 msgstr ""
1355
1343 -#: gitk:11525
1356 +#: gitk:11546
1357 #, tcl-format
1358 msgid "Gitk: choose color for %s"
1359 msgstr "Gitk: scegliere un colore per %s"
1360
1348 -#: gitk:12242
1361 +#: gitk:12059
1362 +msgid ""
1363 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1364 +" Gitk requires at least Tcl/Tk 8.4."
1365 +msgstr ""
1366 +
1367 +#: gitk:12269
1368 msgid "Cannot find a git repository here."
1369 msgstr "Archivio git non trovato."
1370
1352 -#: gitk:12289
1371 +#: gitk:12316
1372 #, tcl-format
1373 msgid "Ambiguous argument '%s': both revision and filename"
1374 msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file"
1375
1357 -#: gitk:12301
1376 +#: gitk:12328
1377 msgid "Bad arguments to gitk:"
1378 msgstr "Gitk: argomenti errati:"
1379
1361 -#: gitk:12405
1362 -msgid "Command line"
1363 -msgstr "Linea di comando"
1364 -
1380 #~ msgid "next"
1381 #~ msgstr "succ"
1382
po/ja.po
+297 -279
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
11 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
12 "PO-Revision-Date: 2009-11-06 01:45+0900\n"
13 "Last-Translator: Mizar <mizar.jp@gmail.com>\n"
14 "Language-Team: Japanese\n"
@@ -26,7 +26,7 @@ msgstr "マージされていないファイルのリストを取得できませ
26 msgid "Color words"
27 msgstr ""
28
29 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
30 msgid "Markup words"
31 msgstr ""
32
@@ -60,14 +60,18 @@ msgstr "git log 実行エラー:"
60 msgid "Reading"
61 msgstr "読み込み中"
62
63 -#: gitk:496 gitk:4508
63 +#: gitk:496 gitk:4525
64 msgid "Reading commits..."
65 msgstr "コミット読み込み中..."
66
67 -#: gitk:499 gitk:1637 gitk:4511
67 +#: gitk:499 gitk:1637 gitk:4528
68 msgid "No commits selected"
69 msgstr "コミットが選択されていません"
70
71 +#: gitk:1445 gitk:4045 gitk:12432
72 +msgid "Command line"
73 +msgstr "コマンド行"
74 +
75 #: gitk:1511
76 msgid "Can't parse git log output:"
77 msgstr "git log の出力を解析できません:"
@@ -76,16 +80,12 @@ msgstr "git log の出力を解析できません:"
80 msgid "No commit information available"
81 msgstr "有効なコミットの情報がありません"
82
79 -#: gitk:1897
80 -msgid "mc"
81 -msgstr "mc"
82 -
83 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
83 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
84 msgid "OK"
85 msgstr "OK"
86
87 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
88 -#: gitk:11221 gitk:11501
87 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
88 +#: gitk:11242 gitk:11522
89 msgid "Cancel"
90 msgstr "キャンセル"
91
@@ -137,15 +137,15 @@ msgstr "ビュー編集..."
137 msgid "Delete view"
138 msgstr "ビュー削除"
139
140 -#: gitk:2088
140 +#: gitk:2088 gitk:4043
141 msgid "All files"
142 msgstr "全てのファイル"
143
144 -#: gitk:2083 gitk:4050
144 +#: gitk:2083 gitk:4067
145 msgid "View"
146 msgstr "ビュー"
147
148 -#: gitk:2093 gitk:2103 gitk:3009
148 +#: gitk:2093 gitk:2103 gitk:3012
149 msgid "About gitk"
150 msgstr "gitk について"
151
@@ -157,7 +157,7 @@ msgstr "キーバインディング"
157 msgid "Help"
158 msgstr "ヘルプ"
159
160 -#: gitk:2185 gitk:8633
160 +#: gitk:2185 gitk:8652
161 msgid "SHA1 ID:"
162 msgstr "SHA1 ID:"
163
@@ -173,53 +173,53 @@ msgstr "検索"
173 msgid "commit"
174 msgstr "コミット"
175
176 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
177 -#: gitk:6893
176 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
177 +#: gitk:6912
178 msgid "containing:"
179 msgstr "含む:"
180
181 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
181 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
182 msgid "touching paths:"
183 msgstr "パスの一部:"
184
185 -#: gitk:2303 gitk:4759
185 +#: gitk:2303 gitk:4777
186 msgid "adding/removing string:"
187 msgstr "追加/除去する文字列:"
188
189 -#: gitk:2304 gitk:4761
189 +#: gitk:2304 gitk:4779
190 msgid "changing lines matching:"
191 msgstr ""
192
193 -#: gitk:2313 gitk:2315 gitk:4748
193 +#: gitk:2313 gitk:2315 gitk:4766
194 msgid "Exact"
195 msgstr "英字の大小を区別する"
196
197 -#: gitk:2315 gitk:4836 gitk:6704
197 +#: gitk:2315 gitk:4854 gitk:6723
198 msgid "IgnCase"
199 msgstr "英字の大小を区別しない"
200
201 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
201 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
202 msgid "Regexp"
203 msgstr "正規表現"
204
205 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
205 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
206 msgid "All fields"
207 msgstr "全ての項目"
208
209 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
209 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
210 msgid "Headline"
211 msgstr "ヘッドライン"
212
213 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
213 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
214 msgid "Comments"
215 msgstr "コメント"
216
217 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
218 -#: gitk:8826
217 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
218 +#: gitk:8845
219 msgid "Author"
220 msgstr "作者"
221
222 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
222 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
223 msgid "Committer"
224 msgstr "コミット者"
225
@@ -247,7 +247,7 @@ msgstr "文脈行数"
247 msgid "Ignore space change"
248 msgstr "空白の違いを無視"
249
250 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
250 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
251 msgid "Line diff"
252 msgstr ""
253
@@ -259,102 +259,110 @@ msgstr "パッチ"
259 msgid "Tree"
260 msgstr "ツリー"
261
262 -#: gitk:2616 gitk:2636
262 +#: gitk:2617 gitk:2637
263 msgid "Diff this -> selected"
264 msgstr "これと選択したコミットのdiffを見る"
265
266 -#: gitk:2617 gitk:2637
266 +#: gitk:2618 gitk:2638
267 msgid "Diff selected -> this"
268 msgstr "選択したコミットとこれのdiffを見る"
269
270 -#: gitk:2618 gitk:2638
270 +#: gitk:2619 gitk:2639
271 msgid "Make patch"
272 msgstr "パッチ作成"
273
274 -#: gitk:2619 gitk:9235
274 +#: gitk:2620 gitk:9254
275 msgid "Create tag"
276 msgstr "タグ生成"
277
278 -#: gitk:2620 gitk:9352
278 +#: gitk:2621 gitk:9371
279 msgid "Write commit to file"
280 msgstr "コミットをファイルに書き出す"
281
282 -#: gitk:2621 gitk:9409
282 +#: gitk:2622 gitk:9428
283 msgid "Create new branch"
284 msgstr "新規ブランチ生成"
285
286 -#: gitk:2622
286 +#: gitk:2623
287 msgid "Cherry-pick this commit"
288 msgstr "このコミットをチェリーピックする"
289
290 -#: gitk:2623
290 +#: gitk:2624
291 msgid "Reset HEAD branch to here"
292 msgstr "ブランチのHEADをここにリセットする"
293
294 -#: gitk:2624
294 +#: gitk:2625
295 msgid "Mark this commit"
296 msgstr "このコミットにマークをつける"
297
298 -#: gitk:2625
298 +#: gitk:2626
299 msgid "Return to mark"
300 msgstr "マークを付けた所に戻る"
301
302 -#: gitk:2626
302 +#: gitk:2627
303 msgid "Find descendant of this and mark"
304 msgstr "これとマークをつけた所との子孫を見つける"
305
306 -#: gitk:2627
306 +#: gitk:2628
307 msgid "Compare with marked commit"
308 msgstr "マークを付けたコミットと比較する"
309
310 -#: gitk:2628 gitk:2639
310 +#: gitk:2629 gitk:2640
311 #, fuzzy
312 msgid "Diff this -> marked commit"
313 msgstr "これと選択したコミットのdiffを見る"
314
315 -#: gitk:2629 gitk:2640
315 +#: gitk:2630 gitk:2641
316 #, fuzzy
317 msgid "Diff marked commit -> this"
318 msgstr "選択したコミットとこれのdiffを見る"
319
320 -#: gitk:2630
320 +#: gitk:2631
321 #, fuzzy
322 msgid "Revert this commit"
323 msgstr "このコミットにマークをつける"
324
325 -#: gitk:2646
325 +#: gitk:2647
326 msgid "Check out this branch"
327 msgstr "このブランチをチェックアウトする"
328
329 -#: gitk:2647
329 +#: gitk:2648
330 msgid "Remove this branch"
331 msgstr "このブランチを除去する"
332
333 -#: gitk:2654
333 +#: gitk:2649
334 +msgid "Copy branch name"
335 +msgstr ""
336 +
337 +#: gitk:2656
338 msgid "Highlight this too"
339 msgstr "これもハイライトさせる"
340
337 -#: gitk:2655
341 +#: gitk:2657
342 msgid "Highlight this only"
343 msgstr "これだけをハイライトさせる"
344
341 -#: gitk:2656
345 +#: gitk:2658
346 msgid "External diff"
347 msgstr "外部diffツール"
348
345 -#: gitk:2657
349 +#: gitk:2659
350 msgid "Blame parent commit"
351 msgstr "親コミットから blame をかける"
352
349 -#: gitk:2664
353 +#: gitk:2660
354 +msgid "Copy path"
355 +msgstr ""
356 +
357 +#: gitk:2667
358 msgid "Show origin of this line"
359 msgstr "この行の出自を表示する"
360
353 -#: gitk:2665
361 +#: gitk:2668
362 msgid "Run git gui blame on this line"
363 msgstr "この行に git gui で blame をかける"
364
357 -#: gitk:3011
365 +#: gitk:3014
366 #, fuzzy
367 msgid ""
368 "\n"
@@ -371,315 +379,320 @@ msgstr ""
379 "\n"
380 "使用および再配布は GNU General Public License に従ってください"
381
374 -#: gitk:3019 gitk:3085 gitk:9836
382 +#: gitk:3022 gitk:3089 gitk:9857
383 msgid "Close"
384 msgstr "閉じる"
385
378 -#: gitk:3040
386 +#: gitk:3043
387 msgid "Gitk key bindings"
388 msgstr "Gitk キーバインディング"
389
382 -#: gitk:3043
390 +#: gitk:3046
391 msgid "Gitk key bindings:"
392 msgstr "Gitk キーバインディング:"
393
386 -#: gitk:3045
394 +#: gitk:3048
395 #, tcl-format
396 msgid "<%s-Q>\t\tQuit"
397 msgstr "<%s-Q>\t\t終了"
398
391 -#: gitk:3046
399 +#: gitk:3049
400 #, fuzzy, tcl-format
401 msgid "<%s-W>\t\tClose window"
402 msgstr "<%s-F>\t\t検索"
403
396 -#: gitk:3047
404 +#: gitk:3050
405 msgid "<Home>\t\tMove to first commit"
406 msgstr "<Home>\t\t最初のコミットに移動"
407
400 -#: gitk:3048
408 +#: gitk:3051
409 msgid "<End>\t\tMove to last commit"
410 msgstr "<End>\t\t最後のコミットに移動"
411
404 -#: gitk:3049
412 +#: gitk:3052
413 #, fuzzy
414 msgid "<Up>, p, k\tMove up one commit"
415 msgstr "<Up>, p, i\t一つ上のコミットに移動"
416
409 -#: gitk:3050
417 +#: gitk:3053
418 #, fuzzy
419 msgid "<Down>, n, j\tMove down one commit"
420 msgstr "<Down>, n, k\t一つ下のコミットに移動"
421
414 -#: gitk:3051
422 +#: gitk:3054
423 #, fuzzy
424 msgid "<Left>, z, h\tGo back in history list"
425 msgstr "<Left>, z, j\t履歴の前に戻る"
426
419 -#: gitk:3052
427 +#: gitk:3055
428 msgid "<Right>, x, l\tGo forward in history list"
429 msgstr "<Right>, x, l\t履歴の次へ進む"
430
423 -#: gitk:3053
431 +#: gitk:3056
432 #, tcl-format
433 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
434 msgstr ""
435
428 -#: gitk:3054
436 +#: gitk:3057
437 msgid "<PageUp>\tMove up one page in commit list"
438 msgstr "<PageUp>\tコミットリストの一つ上のページに移動"
439
432 -#: gitk:3055
440 +#: gitk:3058
441 msgid "<PageDown>\tMove down one page in commit list"
442 msgstr "<PageDown>\tコミットリストの一つ下のページに移動"
443
436 -#: gitk:3056
444 +#: gitk:3059
445 #, tcl-format
446 msgid "<%s-Home>\tScroll to top of commit list"
447 msgstr "<%s-Home>\tコミットリストの一番上にスクロールする"
448
441 -#: gitk:3057
449 +#: gitk:3060
450 #, tcl-format
451 msgid "<%s-End>\tScroll to bottom of commit list"
452 msgstr "<%s-End>\tコミットリストの一番下にスクロールする"
453
446 -#: gitk:3058
454 +#: gitk:3061
455 #, tcl-format
456 msgid "<%s-Up>\tScroll commit list up one line"
457 msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする"
458
451 -#: gitk:3059
459 +#: gitk:3062
460 #, tcl-format
461 msgid "<%s-Down>\tScroll commit list down one line"
462 msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする"
463
456 -#: gitk:3060
464 +#: gitk:3063
465 #, tcl-format
466 msgid "<%s-PageUp>\tScroll commit list up one page"
467 msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする"
468
461 -#: gitk:3061
469 +#: gitk:3064
470 #, tcl-format
471 msgid "<%s-PageDown>\tScroll commit list down one page"
472 msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする"
473
466 -#: gitk:3062
474 +#: gitk:3065
475 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
476 msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)"
477
470 -#: gitk:3063
478 +#: gitk:3066
479 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
480 msgstr "<Shift-Down>\t前方を検索（下方の・古いコミット）"
481
474 -#: gitk:3064
482 +#: gitk:3067
483 msgid "<Delete>, b\tScroll diff view up one page"
484 msgstr "<Delete>, b\tdiff画面を上のページにスクロールする"
485
478 -#: gitk:3065
486 +#: gitk:3068
487 msgid "<Backspace>\tScroll diff view up one page"
488 msgstr "<Backspace>\tdiff画面を上のページにスクロールする"
489
482 -#: gitk:3066
490 +#: gitk:3069
491 msgid "<Space>\t\tScroll diff view down one page"
492 msgstr "<Space>\t\tdiff画面を下のページにスクロールする"
493
486 -#: gitk:3067
494 +#: gitk:3070
495 msgid "u\t\tScroll diff view up 18 lines"
496 msgstr "u\t\tdiff画面を上に18行スクロールする"
497
490 -#: gitk:3068
498 +#: gitk:3071
499 msgid "d\t\tScroll diff view down 18 lines"
500 msgstr "d\t\tdiff画面を下に18行スクロールする"
501
494 -#: gitk:3069
502 +#: gitk:3072
503 #, tcl-format
504 msgid "<%s-F>\t\tFind"
505 msgstr "<%s-F>\t\t検索"
506
499 -#: gitk:3070
507 +#: gitk:3073
508 #, tcl-format
509 msgid "<%s-G>\t\tMove to next find hit"
510 msgstr "<%s-G>\t\t次を検索して移動"
511
504 -#: gitk:3071
512 +#: gitk:3074
513 msgid "<Return>\tMove to next find hit"
514 msgstr "<Return>\t次を検索して移動"
515
508 -#: gitk:3072
516 +#: gitk:3075
517 +#, fuzzy
518 +msgid "g\t\tGo to commit"
519 +msgstr "<End>\t\t最後のコミットに移動"
520 +
521 +#: gitk:3076
522 msgid "/\t\tFocus the search box"
523 msgstr "/\t\t検索ボックスにフォーカス"
524
512 -#: gitk:3073
525 +#: gitk:3077
526 msgid "?\t\tMove to previous find hit"
527 msgstr "?\t\t前を検索して移動"
528
516 -#: gitk:3074
529 +#: gitk:3078
530 msgid "f\t\tScroll diff view to next file"
531 msgstr "f\t\t次のファイルにdiff画面をスクロールする"
532
520 -#: gitk:3075
533 +#: gitk:3079
534 #, tcl-format
535 msgid "<%s-S>\t\tSearch for next hit in diff view"
536 msgstr "<%s-S>\t\tdiff画面の次を検索"
537
525 -#: gitk:3076
538 +#: gitk:3080
539 #, tcl-format
540 msgid "<%s-R>\t\tSearch for previous hit in diff view"
541 msgstr "<%s-R>\t\tdiff画面の前を検索"
542
530 -#: gitk:3077
543 +#: gitk:3081
544 #, tcl-format
545 msgid "<%s-KP+>\tIncrease font size"
546 msgstr "<%s-KP+>\t文字サイズを拡大"
547
535 -#: gitk:3078
548 +#: gitk:3082
549 #, tcl-format
550 msgid "<%s-plus>\tIncrease font size"
551 msgstr "<%s-plus>\t文字サイズを拡大"
552
540 -#: gitk:3079
553 +#: gitk:3083
554 #, tcl-format
555 msgid "<%s-KP->\tDecrease font size"
556 msgstr "<%s-KP->\t文字サイズを縮小"
557
545 -#: gitk:3080
558 +#: gitk:3084
559 #, tcl-format
560 msgid "<%s-minus>\tDecrease font size"
561 msgstr "<%s-minus>\t文字サイズを縮小"
562
550 -#: gitk:3081
563 +#: gitk:3085
564 msgid "<F5>\t\tUpdate"
565 msgstr "<F5>\t\t更新"
566
554 -#: gitk:3546 gitk:3555
567 +#: gitk:3550 gitk:3559
568 #, tcl-format
569 msgid "Error creating temporary directory %s:"
570 msgstr "一時ディレクトリ %s 生成時エラー:"
571
559 -#: gitk:3568
572 +#: gitk:3572
573 #, tcl-format
574 msgid "Error getting \"%s\" from %s:"
575 msgstr "\"%s\" のエラーが %s に発生:"
576
564 -#: gitk:3631
577 +#: gitk:3635
578 msgid "command failed:"
579 msgstr "コマンド失敗:"
580
568 -#: gitk:3780
581 +#: gitk:3784
582 msgid "No such commit"
583 msgstr "そのようなコミットはありません"
584
572 -#: gitk:3794
585 +#: gitk:3798
586 msgid "git gui blame: command failed:"
587 msgstr "git gui blame: コマンド失敗:"
588
576 -#: gitk:3825
589 +#: gitk:3829
590 #, tcl-format
591 msgid "Couldn't read merge head: %s"
592 msgstr "マージする HEAD を読み込めません: %s"
593
581 -#: gitk:3833
594 +#: gitk:3837
595 #, tcl-format
596 msgid "Error reading index: %s"
597 msgstr "インデックス読み込みエラー: %s"
598
586 -#: gitk:3858
599 +#: gitk:3862
600 #, tcl-format
601 msgid "Couldn't start git blame: %s"
602 msgstr "git blame を始められません: %s"
603
591 -#: gitk:3861 gitk:6735
604 +#: gitk:3865 gitk:6754
605 msgid "Searching"
606 msgstr "検索中"
607
595 -#: gitk:3893
608 +#: gitk:3897
609 #, tcl-format
610 msgid "Error running git blame: %s"
611 msgstr "git blame 実行エラー: %s"
612
600 -#: gitk:3921
613 +#: gitk:3925
614 #, tcl-format
615 msgid "That line comes from commit %s, which is not in this view"
616 msgstr "コミット %s に由来するその行は、このビューに表示されていません"
617
605 -#: gitk:3935
618 +#: gitk:3939
619 msgid "External diff viewer failed:"
620 msgstr "外部diffビューアが失敗:"
621
609 -#: gitk:4053
622 +#: gitk:4070
623 msgid "Gitk view definition"
624 msgstr "Gitk ビュー定義"
625
613 -#: gitk:4057
626 +#: gitk:4074
627 msgid "Remember this view"
628 msgstr "このビューを記憶する"
629
617 -#: gitk:4058
630 +#: gitk:4075
631 msgid "References (space separated list):"
632 msgstr "リファレンス（スペース区切りのリスト）:"
633
621 -#: gitk:4059
634 +#: gitk:4076
635 msgid "Branches & tags:"
636 msgstr "ブランチ＆タグ:"
637
625 -#: gitk:4060
638 +#: gitk:4077
639 msgid "All refs"
640 msgstr "全てのリファレンス"
641
629 -#: gitk:4061
642 +#: gitk:4078
643 msgid "All (local) branches"
644 msgstr "全ての（ローカルな）ブランチ"
645
633 -#: gitk:4062
646 +#: gitk:4079
647 msgid "All tags"
648 msgstr "全てのタグ"
649
637 -#: gitk:4063
650 +#: gitk:4080
651 msgid "All remote-tracking branches"
652 msgstr "全てのリモート追跡ブランチ"
653
641 -#: gitk:4064
654 +#: gitk:4081
655 msgid "Commit Info (regular expressions):"
656 msgstr "コミット情報（正規表現）:"
657
645 -#: gitk:4065
658 +#: gitk:4082
659 msgid "Author:"
660 msgstr "作者:"
661
649 -#: gitk:4066
662 +#: gitk:4083
663 msgid "Committer:"
664 msgstr "コミット者:"
665
653 -#: gitk:4067
666 +#: gitk:4084
667 msgid "Commit Message:"
668 msgstr "コミットメッセージ:"
669
657 -#: gitk:4068
670 +#: gitk:4085
671 msgid "Matches all Commit Info criteria"
672 msgstr "コミット情報の全ての条件に一致"
673
661 -#: gitk:4069
674 +#: gitk:4086
675 #, fuzzy
663 -msgid "Matches none Commit Info criteria"
676 +msgid "Matches no Commit Info criteria"
677 msgstr "コミット情報の全ての条件に一致"
678
666 -#: gitk:4070
679 +#: gitk:4087
680 msgid "Changes to Files:"
681 msgstr "変更したファイル:"
682
670 -#: gitk:4071
683 +#: gitk:4088
684 msgid "Fixed String"
685 msgstr "固定文字列"
686
674 -#: gitk:4072
687 +#: gitk:4089
688 msgid "Regular Expression"
689 msgstr "正規表現"
690
678 -#: gitk:4073
691 +#: gitk:4090
692 msgid "Search string:"
693 msgstr "検索文字列:"
694
682 -#: gitk:4074
695 +#: gitk:4091
696 msgid ""
697 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
698 "15:27:38\"):"
@@ -687,202 +700,202 @@ msgstr ""
700 "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
701 "15:27:38\"):"
702
690 -#: gitk:4075
703 +#: gitk:4092
704 msgid "Since:"
705 msgstr "期間の始め:"
706
694 -#: gitk:4076
707 +#: gitk:4093
708 msgid "Until:"
709 msgstr "期間の終わり:"
710
698 -#: gitk:4077
711 +#: gitk:4094
712 msgid "Limit and/or skip a number of revisions (positive integer):"
713 msgstr "制限・省略するリビジョンの数（正の整数）:"
714
702 -#: gitk:4078
715 +#: gitk:4095
716 msgid "Number to show:"
717 msgstr "表示する数:"
718
706 -#: gitk:4079
719 +#: gitk:4096
720 msgid "Number to skip:"
721 msgstr "省略する数:"
722
710 -#: gitk:4080
723 +#: gitk:4097
724 msgid "Miscellaneous options:"
725 msgstr "その他のオプション:"
726
714 -#: gitk:4081
727 +#: gitk:4098
728 msgid "Strictly sort by date"
729 msgstr "厳密に日付順で並び替え"
730
718 -#: gitk:4082
731 +#: gitk:4099
732 msgid "Mark branch sides"
733 msgstr "側枝マーク"
734
722 -#: gitk:4083
735 +#: gitk:4100
736 msgid "Limit to first parent"
737 msgstr "最初の親に制限"
738
726 -#: gitk:4084
739 +#: gitk:4101
740 msgid "Simple history"
741 msgstr "簡易な履歴"
742
730 -#: gitk:4085
743 +#: gitk:4102
744 msgid "Additional arguments to git log:"
745 msgstr "git log への追加の引数:"
746
734 -#: gitk:4086
747 +#: gitk:4103
748 msgid "Enter files and directories to include, one per line:"
749 msgstr "含まれるファイル・ディレクトリを一行ごとに入力:"
750
738 -#: gitk:4087
751 +#: gitk:4104
752 msgid "Command to generate more commits to include:"
753 msgstr "コミット追加コマンド:"
754
742 -#: gitk:4211
755 +#: gitk:4228
756 msgid "Gitk: edit view"
757 msgstr "Gitk: ビュー編集"
758
746 -#: gitk:4219
759 +#: gitk:4236
760 msgid "-- criteria for selecting revisions"
761 msgstr "― リビジョンの選択条件"
762
750 -#: gitk:4224
763 +#: gitk:4241
764 #, fuzzy
765 msgid "View Name"
766 msgstr "ビュー名:"
767
755 -#: gitk:4299
768 +#: gitk:4316
769 msgid "Apply (F5)"
770 msgstr "適用 (F5)"
771
759 -#: gitk:4337
772 +#: gitk:4354
773 msgid "Error in commit selection arguments:"
774 msgstr "コミット選択引数のエラー:"
775
763 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
776 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
777 msgid "None"
778 msgstr "無し"
779
767 -#: gitk:5003 gitk:5008
780 +#: gitk:5021 gitk:5026
781 msgid "Descendant"
782 msgstr "子孫"
783
771 -#: gitk:5004
784 +#: gitk:5022
785 msgid "Not descendant"
786 msgstr "非子孫"
787
775 -#: gitk:5011 gitk:5016
788 +#: gitk:5029 gitk:5034
789 msgid "Ancestor"
790 msgstr "祖先"
791
779 -#: gitk:5012
792 +#: gitk:5030
793 msgid "Not ancestor"
794 msgstr "非祖先"
795
783 -#: gitk:5306
796 +#: gitk:5324
797 msgid "Local changes checked in to index but not committed"
798 msgstr "ステージされた、コミット前のローカルな変更"
799
787 -#: gitk:5342
800 +#: gitk:5360
801 msgid "Local uncommitted changes, not checked in to index"
802 msgstr "ステージされていない、コミット前のローカルな変更"
803
791 -#: gitk:7115
804 +#: gitk:7134
805 msgid "and many more"
806 msgstr ""
807
795 -#: gitk:7118
808 +#: gitk:7137
809 msgid "many"
810 msgstr "多数"
811
799 -#: gitk:7309
812 +#: gitk:7328
813 msgid "Tags:"
814 msgstr "タグ:"
815
803 -#: gitk:7326 gitk:7332 gitk:8806
816 +#: gitk:7345 gitk:7351 gitk:8825
817 msgid "Parent"
818 msgstr "親"
819
807 -#: gitk:7337
820 +#: gitk:7356
821 msgid "Child"
822 msgstr "子"
823
811 -#: gitk:7346
824 +#: gitk:7365
825 msgid "Branch"
826 msgstr "ブランチ"
827
815 -#: gitk:7349
828 +#: gitk:7368
829 msgid "Follows"
830 msgstr "下位"
831
819 -#: gitk:7352
832 +#: gitk:7371
833 msgid "Precedes"
834 msgstr "上位"
835
823 -#: gitk:7947
836 +#: gitk:7966
837 #, tcl-format
838 msgid "Error getting diffs: %s"
839 msgstr "diff取得エラー: %s"
840
828 -#: gitk:8631
841 +#: gitk:8650
842 msgid "Goto:"
843 msgstr "Goto:"
844
832 -#: gitk:8652
845 +#: gitk:8671
846 #, tcl-format
847 msgid "Short SHA1 id %s is ambiguous"
848 msgstr "%s を含む SHA1 ID は複数存在します"
849
837 -#: gitk:8659
850 +#: gitk:8678
851 #, tcl-format
852 msgid "Revision %s is not known"
853 msgstr "リビジョン %s は不明です"
854
842 -#: gitk:8669
855 +#: gitk:8688
856 #, tcl-format
857 msgid "SHA1 id %s is not known"
858 msgstr "SHA1 id %s は不明です"
859
847 -#: gitk:8671
860 +#: gitk:8690
861 #, tcl-format
862 msgid "Revision %s is not in the current view"
863 msgstr "リビジョン %s は現在のビューにはありません"
864
852 -#: gitk:8813 gitk:8828
865 +#: gitk:8832 gitk:8847
866 msgid "Date"
867 msgstr "日付"
868
856 -#: gitk:8816
869 +#: gitk:8835
870 msgid "Children"
871 msgstr "子"
872
860 -#: gitk:8879
873 +#: gitk:8898
874 #, tcl-format
875 msgid "Reset %s branch to here"
876 msgstr "%s ブランチをここにリセットする"
877
865 -#: gitk:8881
878 +#: gitk:8900
879 msgid "Detached head: can't reset"
880 msgstr "切り離されたHEAD: リセットできません"
881
869 -#: gitk:8986 gitk:8992
882 +#: gitk:9005 gitk:9011
883 msgid "Skipping merge commit "
884 msgstr "コミットマージをスキップ: "
885
873 -#: gitk:9001 gitk:9006
886 +#: gitk:9020 gitk:9025
887 msgid "Error getting patch ID for "
888 msgstr "パッチ取得エラー: ID "
889
877 -#: gitk:9002 gitk:9007
890 +#: gitk:9021 gitk:9026
891 msgid " - stopping\n"
892 msgstr " - 停止\n"
893
881 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
894 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
895 msgid "Commit "
896 msgstr "コミット "
897
885 -#: gitk:9016
898 +#: gitk:9035
899 msgid ""
900 " is the same patch as\n"
901 " "
@@ -890,7 +903,7 @@ msgstr ""
903 " は下記のパッチと同等\n"
904 " "
905
893 -#: gitk:9024
906 +#: gitk:9043
907 msgid ""
908 " differs from\n"
909 " "
@@ -898,7 +911,7 @@ msgstr ""
911 " 下記からのdiff\n"
912 " "
913
901 -#: gitk:9026
914 +#: gitk:9045
915 msgid ""
916 "Diff of commits:\n"
917 "\n"
@@ -906,131 +919,131 @@ msgstr ""
919 "コミットのdiff:\n"
920 "\n"
921
909 -#: gitk:9038 gitk:9047
922 +#: gitk:9057 gitk:9066
923 #, tcl-format
924 msgid " has %s children - stopping\n"
925 msgstr " には %s の子があります - 停止\n"
926
914 -#: gitk:9066
927 +#: gitk:9085
928 #, tcl-format
929 msgid "Error writing commit to file: %s"
930 msgstr "ファイルへのコミット書き出しエラー: %s"
931
919 -#: gitk:9072
932 +#: gitk:9091
933 #, tcl-format
934 msgid "Error diffing commits: %s"
935 msgstr "コミットのdiff実行エラー: %s"
936
924 -#: gitk:9118
937 +#: gitk:9137
938 msgid "Top"
939 msgstr "Top"
940
928 -#: gitk:9119
941 +#: gitk:9138
942 msgid "From"
943 msgstr "From"
944
932 -#: gitk:9124
945 +#: gitk:9143
946 msgid "To"
947 msgstr "To"
948
936 -#: gitk:9148
949 +#: gitk:9167
950 msgid "Generate patch"
951 msgstr "パッチ生成"
952
940 -#: gitk:9150
953 +#: gitk:9169
954 msgid "From:"
955 msgstr "From:"
956
944 -#: gitk:9159
957 +#: gitk:9178
958 msgid "To:"
959 msgstr "To:"
960
948 -#: gitk:9168
961 +#: gitk:9187
962 msgid "Reverse"
963 msgstr "逆"
964
952 -#: gitk:9170 gitk:9366
965 +#: gitk:9189 gitk:9385
966 msgid "Output file:"
967 msgstr "出力ファイル:"
968
956 -#: gitk:9176
969 +#: gitk:9195
970 msgid "Generate"
971 msgstr "生成"
972
960 -#: gitk:9214
973 +#: gitk:9233
974 msgid "Error creating patch:"
975 msgstr "パッチ生成エラー:"
976
964 -#: gitk:9237 gitk:9354 gitk:9411
977 +#: gitk:9256 gitk:9373 gitk:9430
978 msgid "ID:"
979 msgstr "ID:"
980
968 -#: gitk:9246
981 +#: gitk:9265
982 msgid "Tag name:"
983 msgstr "タグ名:"
984
972 -#: gitk:9249
985 +#: gitk:9268
986 msgid "Tag message is optional"
987 msgstr ""
988
976 -#: gitk:9251
989 +#: gitk:9270
990 #, fuzzy
991 msgid "Tag message:"
992 msgstr "タグ名:"
993
981 -#: gitk:9255 gitk:9420
994 +#: gitk:9274 gitk:9439
995 msgid "Create"
996 msgstr "生成"
997
985 -#: gitk:9273
998 +#: gitk:9292
999 msgid "No tag name specified"
1000 msgstr "タグの名称が指定されていません"
1001
989 -#: gitk:9277
1002 +#: gitk:9296
1003 #, tcl-format
1004 msgid "Tag \"%s\" already exists"
1005 msgstr "タグ \"%s\" は既に存在します"
1006
994 -#: gitk:9287
1007 +#: gitk:9306
1008 msgid "Error creating tag:"
1009 msgstr "タグ生成エラー:"
1010
998 -#: gitk:9363
1011 +#: gitk:9382
1012 msgid "Command:"
1013 msgstr "コマンド:"
1014
1002 -#: gitk:9371
1015 +#: gitk:9390
1016 msgid "Write"
1017 msgstr "書き出し"
1018
1006 -#: gitk:9389
1019 +#: gitk:9408
1020 msgid "Error writing commit:"
1021 msgstr "コミット書き出しエラー:"
1022
1010 -#: gitk:9416
1023 +#: gitk:9435
1024 msgid "Name:"
1025 msgstr "名前:"
1026
1014 -#: gitk:9439
1027 +#: gitk:9458
1028 msgid "Please specify a name for the new branch"
1029 msgstr "新しいブランチの名前を指定してください"
1030
1018 -#: gitk:9444
1031 +#: gitk:9463
1032 #, tcl-format
1033 msgid "Branch '%s' already exists. Overwrite?"
1034 msgstr "ブランチ '%s' は既に存在します。上書きしますか？"
1035
1023 -#: gitk:9511
1036 +#: gitk:9530
1037 #, tcl-format
1038 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1039 msgstr ""
1040 "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？"
1041
1029 -#: gitk:9516
1042 +#: gitk:9535
1043 msgid "Cherry-picking"
1044 msgstr "チェリーピック中"
1045
1033 -#: gitk:9525
1046 +#: gitk:9544
1047 #, tcl-format
1048 msgid ""
1049 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1040,7 +1053,7 @@ msgstr ""
1053 "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ"
1054 "い。"
1055
1043 -#: gitk:9531
1056 +#: gitk:9550
1057 msgid ""
1058 "Cherry-pick failed because of merge conflict.\n"
1059 "Do you wish to run git citool to resolve it?"
@@ -1048,22 +1061,22 @@ msgstr ""
1061 "マージの衝突によってチェリーピックは失敗しました。\n"
1062 "この解決のために git citool を実行したいですか？"
1063
1051 -#: gitk:9547 gitk:9605
1064 +#: gitk:9566 gitk:9624
1065 msgid "No changes committed"
1066 msgstr "何の変更もコミットされていません"
1067
1055 -#: gitk:9574
1068 +#: gitk:9593
1069 #, fuzzy, tcl-format
1070 msgid "Commit %s is not included in branch %s -- really revert it?"
1071 msgstr ""
1072 "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？"
1073
1061 -#: gitk:9579
1074 +#: gitk:9598
1075 #, fuzzy
1076 msgid "Reverting"
1077 msgstr "リセット中"
1078
1066 -#: gitk:9587
1079 +#: gitk:9606
1080 #, fuzzy, tcl-format
1081 msgid ""
1082 "Revert failed because of local changes to the following files:%s Please "
@@ -1073,7 +1086,7 @@ msgstr ""
1086 "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ"
1087 "い。"
1088
1076 -#: gitk:9591
1089 +#: gitk:9610
1090 #, fuzzy
1091 msgid ""
1092 "Revert failed because of merge conflict.\n"
@@ -1082,28 +1095,28 @@ msgstr ""
1095 "マージの衝突によってチェリーピックは失敗しました。\n"
1096 "この解決のために git citool を実行したいですか？"
1097
1085 -#: gitk:9634
1098 +#: gitk:9653
1099 msgid "Confirm reset"
1100 msgstr "確認を取り消す"
1101
1089 -#: gitk:9636
1102 +#: gitk:9655
1103 #, tcl-format
1104 msgid "Reset branch %s to %s?"
1105 msgstr "ブランチ %s を %s にリセットしますか？"
1106
1094 -#: gitk:9638
1107 +#: gitk:9657
1108 msgid "Reset type:"
1109 msgstr "Reset タイプ:"
1110
1098 -#: gitk:9641
1111 +#: gitk:9660
1112 msgid "Soft: Leave working tree and index untouched"
1113 msgstr "Soft: 作業ツリーもインデックスもそのままにする"
1114
1102 -#: gitk:9644
1115 +#: gitk:9663
1116 msgid "Mixed: Leave working tree untouched, reset index"
1117 msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット"
1118
1106 -#: gitk:9647
1119 +#: gitk:9666
1120 msgid ""
1121 "Hard: Reset working tree and index\n"
1122 "(discard ALL local changes)"
@@ -1111,19 +1124,19 @@ msgstr ""
1124 "Hard: 作業ツリーやインデックスをリセット\n"
1125 "（「全ての」ローカルな変更を破棄）"
1126
1114 -#: gitk:9664
1127 +#: gitk:9683
1128 msgid "Resetting"
1129 msgstr "リセット中"
1130
1118 -#: gitk:9724
1131 +#: gitk:9743
1132 msgid "Checking out"
1133 msgstr "チェックアウト"
1134
1122 -#: gitk:9777
1135 +#: gitk:9796
1136 msgid "Cannot delete the currently checked-out branch"
1137 msgstr "現在チェックアウトされているブランチを削除することはできません"
1138
1126 -#: gitk:9783
1139 +#: gitk:9802
1140 #, tcl-format
1141 msgid ""
1142 "The commits on branch %s aren't on any other branch.\n"
@@ -1132,16 +1145,16 @@ msgstr ""
1145 "ブランチ %s には他のブランチに存在しないコミットがあります。\n"
1146 "本当にブランチ %s を削除しますか？"
1147
1135 -#: gitk:9814
1148 +#: gitk:9833
1149 #, tcl-format
1150 msgid "Tags and heads: %s"
1151 msgstr "タグとHEAD: %s"
1152
1140 -#: gitk:9829
1153 +#: gitk:9850
1154 msgid "Filter"
1155 msgstr "フィルター"
1156
1144 -#: gitk:10125
1157 +#: gitk:10146
1158 msgid ""
1159 "Error reading commit topology information; branch and preceding/following "
1160 "tag information will be incomplete."
@@ -1149,220 +1162,225 @@ msgstr ""
1162 "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である"
1163 "ようです。"
1164
1152 -#: gitk:11102
1165 +#: gitk:11123
1166 msgid "Tag"
1167 msgstr "タグ"
1168
1156 -#: gitk:11106
1169 +#: gitk:11127
1170 msgid "Id"
1171 msgstr "ID"
1172
1160 -#: gitk:11189
1173 +#: gitk:11210
1174 msgid "Gitk font chooser"
1175 msgstr "Gitk フォント選択"
1176
1164 -#: gitk:11206
1177 +#: gitk:11227
1178 msgid "B"
1179 msgstr "B"
1180
1168 -#: gitk:11209
1181 +#: gitk:11230
1182 msgid "I"
1183 msgstr "I"
1184
1172 -#: gitk:11327
1185 +#: gitk:11348
1186 msgid "Commit list display options"
1187 msgstr "コミットリスト表示オプション"
1188
1176 -#: gitk:11330
1189 +#: gitk:11351
1190 msgid "Maximum graph width (lines)"
1191 msgstr "最大グラフ幅（線の本数）"
1192
1180 -#: gitk:11334
1193 +#: gitk:11355
1194 #, no-tcl-format
1195 msgid "Maximum graph width (% of pane)"
1196 msgstr "最大グラフ幅（ペインに対する％）"
1197
1185 -#: gitk:11337
1198 +#: gitk:11358
1199 msgid "Show local changes"
1200 msgstr "ローカルな変更を表示"
1201
1189 -#: gitk:11340
1202 +#: gitk:11361
1203 #, fuzzy
1204 msgid "Auto-select SHA1 (length)"
1205 msgstr "SHA1 の自動選択"
1206
1194 -#: gitk:11344
1207 +#: gitk:11365
1208 msgid "Hide remote refs"
1209 msgstr "リモートリファレンスを隠す"
1210
1198 -#: gitk:11348
1211 +#: gitk:11369
1212 msgid "Diff display options"
1213 msgstr "diff表示オプション"
1214
1202 -#: gitk:11350
1215 +#: gitk:11371
1216 msgid "Tab spacing"
1217 msgstr "タブ空白幅"
1218
1206 -#: gitk:11353
1219 +#: gitk:11374
1220 #, fuzzy
1221 msgid "Display nearby tags/heads"
1222 msgstr "近くのタグを表示する"
1223
1211 -#: gitk:11356
1224 +#: gitk:11377
1225 msgid "Maximum # tags/heads to show"
1226 msgstr ""
1227
1215 -#: gitk:11359
1228 +#: gitk:11380
1229 msgid "Limit diffs to listed paths"
1230 msgstr "diff をリストのパスに制限"
1231
1219 -#: gitk:11362
1232 +#: gitk:11383
1233 msgid "Support per-file encodings"
1234 msgstr "ファイルごとのエンコーディングのサポート"
1235
1223 -#: gitk:11368 gitk:11515
1236 +#: gitk:11389 gitk:11536
1237 msgid "External diff tool"
1238 msgstr "外部diffツール"
1239
1227 -#: gitk:11369
1240 +#: gitk:11390
1241 msgid "Choose..."
1242 msgstr "選択..."
1243
1231 -#: gitk:11374
1244 +#: gitk:11395
1245 #, fuzzy
1246 msgid "General options"
1247 msgstr "パッチ生成"
1248
1236 -#: gitk:11377
1249 +#: gitk:11398
1250 msgid "Use themed widgets"
1251 msgstr ""
1252
1240 -#: gitk:11379
1253 +#: gitk:11400
1254 msgid "(change requires restart)"
1255 msgstr ""
1256
1244 -#: gitk:11381
1257 +#: gitk:11402
1258 msgid "(currently unavailable)"
1259 msgstr ""
1260
1248 -#: gitk:11392
1261 +#: gitk:11413
1262 msgid "Colors: press to choose"
1263 msgstr "色: ボタンを押して選択"
1264
1252 -#: gitk:11395
1265 +#: gitk:11416
1266 msgid "Interface"
1267 msgstr "インターフェイス"
1268
1256 -#: gitk:11396
1269 +#: gitk:11417
1270 msgid "interface"
1271 msgstr "インターフェイス"
1272
1260 -#: gitk:11399
1273 +#: gitk:11420
1274 msgid "Background"
1275 msgstr "背景"
1276
1264 -#: gitk:11400 gitk:11430
1277 +#: gitk:11421 gitk:11451
1278 msgid "background"
1279 msgstr "背景"
1280
1268 -#: gitk:11403
1281 +#: gitk:11424
1282 msgid "Foreground"
1283 msgstr "前景"
1284
1272 -#: gitk:11404
1285 +#: gitk:11425
1286 msgid "foreground"
1287 msgstr "前景"
1288
1276 -#: gitk:11407
1289 +#: gitk:11428
1290 msgid "Diff: old lines"
1291 msgstr "Diff: 旧バージョン"
1292
1280 -#: gitk:11408
1293 +#: gitk:11429
1294 msgid "diff old lines"
1295 msgstr "diff 旧バージョン"
1296
1284 -#: gitk:11412
1297 +#: gitk:11433
1298 msgid "Diff: new lines"
1299 msgstr "Diff: 新バージョン"
1300
1288 -#: gitk:11413
1301 +#: gitk:11434
1302 msgid "diff new lines"
1303 msgstr "diff 新バージョン"
1304
1292 -#: gitk:11417
1305 +#: gitk:11438
1306 msgid "Diff: hunk header"
1307 msgstr "Diff: hunkヘッダ"
1308
1296 -#: gitk:11419
1309 +#: gitk:11440
1310 msgid "diff hunk header"
1311 msgstr "diff hunkヘッダ"
1312
1300 -#: gitk:11423
1313 +#: gitk:11444
1314 msgid "Marked line bg"
1315 msgstr "マーク行の背景"
1316
1304 -#: gitk:11425
1317 +#: gitk:11446
1318 msgid "marked line background"
1319 msgstr "マーク行の背景"
1320
1308 -#: gitk:11429
1321 +#: gitk:11450
1322 msgid "Select bg"
1323 msgstr "選択の背景"
1324
1312 -#: gitk:11438
1325 +#: gitk:11459
1326 msgid "Fonts: press to choose"
1327 msgstr "フォント: ボタンを押して選択"
1328
1316 -#: gitk:11440
1329 +#: gitk:11461
1330 msgid "Main font"
1331 msgstr "主フォント"
1332
1320 -#: gitk:11441
1333 +#: gitk:11462
1334 msgid "Diff display font"
1335 msgstr "Diff表示用フォント"
1336
1324 -#: gitk:11442
1337 +#: gitk:11463
1338 msgid "User interface font"
1339 msgstr "UI用フォント"
1340
1328 -#: gitk:11464
1341 +#: gitk:11485
1342 msgid "Gitk preferences"
1343 msgstr "Gitk 設定"
1344
1332 -#: gitk:11473
1345 +#: gitk:11494
1346 #, fuzzy
1347 msgid "General"
1348 msgstr "生成"
1349
1337 -#: gitk:11474
1350 +#: gitk:11495
1351 msgid "Colors"
1352 msgstr ""
1353
1341 -#: gitk:11475
1354 +#: gitk:11496
1355 msgid "Fonts"
1356 msgstr ""
1357
1345 -#: gitk:11525
1358 +#: gitk:11546
1359 #, tcl-format
1360 msgid "Gitk: choose color for %s"
1361 msgstr "Gitk: 「%s」 の色を選択"
1362
1350 -#: gitk:12242
1363 +#: gitk:12059
1364 +msgid ""
1365 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1366 +" Gitk requires at least Tcl/Tk 8.4."
1367 +msgstr ""
1368 +
1369 +#: gitk:12269
1370 msgid "Cannot find a git repository here."
1371 msgstr "ここにはgitリポジトリがありません。"
1372
1354 -#: gitk:12289
1373 +#: gitk:12316
1374 #, tcl-format
1375 msgid "Ambiguous argument '%s': both revision and filename"
1376 msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます"
1377
1359 -#: gitk:12301
1378 +#: gitk:12328
1379 msgid "Bad arguments to gitk:"
1380 msgstr "gitkへの不正な引数:"
1381
1363 -#: gitk:12405
1364 -msgid "Command line"
1365 -msgstr "コマンド行"
1382 +#~ msgid "mc"
1383 +#~ msgstr "mc"
1384
1385 #~ msgid "SHA1 ID: "
1386 #~ msgstr "SHA1 ID: "
po/pt_br.po
+297 -279
@@ -9,7 +9,7 @@ msgid ""
9 msgstr ""
10 "Project-Id-Version: gitk\n"
11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
12 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
13 "PO-Revision-Date: 2010-12-06 23:39-0200\n"
14 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
15 "Language-Team: Brazilian Portuguese <>\n"
@@ -26,7 +26,7 @@ msgstr "Não foi possível obter a lista dos arquivos não mesclados:"
26 msgid "Color words"
27 msgstr ""
28
29 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
30 msgid "Markup words"
31 msgstr ""
32
@@ -60,14 +60,18 @@ msgstr "Erro ao executar git log:"
60 msgid "Reading"
61 msgstr "Lendo"
62
63 -#: gitk:496 gitk:4508
63 +#: gitk:496 gitk:4525
64 msgid "Reading commits..."
65 msgstr "Lendo revisões..."
66
67 -#: gitk:499 gitk:1637 gitk:4511
67 +#: gitk:499 gitk:1637 gitk:4528
68 msgid "No commits selected"
69 msgstr "Nenhuma revisão foi selecionada"
70
71 +#: gitk:1445 gitk:4045 gitk:12432
72 +msgid "Command line"
73 +msgstr "Linha de comando"
74 +
75 #: gitk:1511
76 msgid "Can't parse git log output:"
77 msgstr "Não foi possível interpretar a saída do \"git log\":"
@@ -76,16 +80,12 @@ msgstr "Não foi possível interpretar a saída do \"git log\":"
80 msgid "No commit information available"
81 msgstr "Não há informações disponíveis sobre a revisão"
82
79 -#: gitk:1897
80 -msgid "mc"
81 -msgstr "mc"
82 -
83 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
83 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
84 msgid "OK"
85 msgstr "Ok"
86
87 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
88 -#: gitk:11221 gitk:11501
87 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
88 +#: gitk:11242 gitk:11522
89 msgid "Cancel"
90 msgstr "Cancelar"
91
@@ -137,15 +137,15 @@ msgstr "Editar vista..."
137 msgid "Delete view"
138 msgstr "Apagar vista"
139
140 -#: gitk:2088
140 +#: gitk:2088 gitk:4043
141 msgid "All files"
142 msgstr "Todos os arquivos"
143
144 -#: gitk:2083 gitk:4050
144 +#: gitk:2083 gitk:4067
145 msgid "View"
146 msgstr "Exibir"
147
148 -#: gitk:2093 gitk:2103 gitk:3009
148 +#: gitk:2093 gitk:2103 gitk:3012
149 msgid "About gitk"
150 msgstr "Sobre o gitk"
151
@@ -157,7 +157,7 @@ msgstr "Atalhos de teclado"
157 msgid "Help"
158 msgstr "Ajuda"
159
160 -#: gitk:2185 gitk:8633
160 +#: gitk:2185 gitk:8652
161 msgid "SHA1 ID:"
162 msgstr "SHA1 ID:"
163
@@ -173,53 +173,53 @@ msgstr "Encontrar"
173 msgid "commit"
174 msgstr "Revisão"
175
176 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
177 -#: gitk:6893
176 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
177 +#: gitk:6912
178 msgid "containing:"
179 msgstr "contendo:"
180
181 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
181 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
182 msgid "touching paths:"
183 msgstr "envolvendo os caminhos:"
184
185 -#: gitk:2303 gitk:4759
185 +#: gitk:2303 gitk:4777
186 msgid "adding/removing string:"
187 msgstr "Adicionando/removendo texto:"
188
189 -#: gitk:2304 gitk:4761
189 +#: gitk:2304 gitk:4779
190 msgid "changing lines matching:"
191 msgstr ""
192
193 -#: gitk:2313 gitk:2315 gitk:4748
193 +#: gitk:2313 gitk:2315 gitk:4766
194 msgid "Exact"
195 msgstr "Exatamente"
196
197 -#: gitk:2315 gitk:4836 gitk:6704
197 +#: gitk:2315 gitk:4854 gitk:6723
198 msgid "IgnCase"
199 msgstr "Ignorar maiúsculas/minúsculas"
200
201 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
201 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
202 msgid "Regexp"
203 msgstr "Expressão regular"
204
205 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
205 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
206 msgid "All fields"
207 msgstr "Todos os campos"
208
209 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
209 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
210 msgid "Headline"
211 msgstr "Assunto"
212
213 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
213 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
214 msgid "Comments"
215 msgstr "Descrição da revisão"
216
217 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
218 -#: gitk:8826
217 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
218 +#: gitk:8845
219 msgid "Author"
220 msgstr "Autor"
221
222 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
222 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
223 msgid "Committer"
224 msgstr "Revisor"
225
@@ -247,7 +247,7 @@ msgstr "Número de linhas de contexto"
247 msgid "Ignore space change"
248 msgstr "Ignorar mudanças de caixa"
249
250 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
250 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
251 msgid "Line diff"
252 msgstr ""
253
@@ -259,102 +259,110 @@ msgstr "Diferenças"
259 msgid "Tree"
260 msgstr "Árvore"
261
262 -#: gitk:2616 gitk:2636
262 +#: gitk:2617 gitk:2637
263 msgid "Diff this -> selected"
264 msgstr "Comparar esta revisão com a selecionada"
265
266 -#: gitk:2617 gitk:2637
266 +#: gitk:2618 gitk:2638
267 msgid "Diff selected -> this"
268 msgstr "Comparar a revisão selecionada com esta"
269
270 -#: gitk:2618 gitk:2638
270 +#: gitk:2619 gitk:2639
271 msgid "Make patch"
272 msgstr "Criar patch"
273
274 -#: gitk:2619 gitk:9235
274 +#: gitk:2620 gitk:9254
275 msgid "Create tag"
276 msgstr "Criar etiqueta"
277
278 -#: gitk:2620 gitk:9352
278 +#: gitk:2621 gitk:9371
279 msgid "Write commit to file"
280 msgstr "Salvar revisão para um arquivo"
281
282 -#: gitk:2621 gitk:9409
282 +#: gitk:2622 gitk:9428
283 msgid "Create new branch"
284 msgstr "Criar novo ramo"
285
286 -#: gitk:2622
286 +#: gitk:2623
287 msgid "Cherry-pick this commit"
288 msgstr "Fazer cherry-pick desta revisão"
289
290 -#: gitk:2623
290 +#: gitk:2624
291 msgid "Reset HEAD branch to here"
292 msgstr "Redefinir HEAD para cá"
293
294 -#: gitk:2624
294 +#: gitk:2625
295 msgid "Mark this commit"
296 msgstr "Marcar esta revisão"
297
298 -#: gitk:2625
298 +#: gitk:2626
299 msgid "Return to mark"
300 msgstr "Voltar à marca"
301
302 -#: gitk:2626
302 +#: gitk:2627
303 msgid "Find descendant of this and mark"
304 msgstr "Encontrar descendente e marcar"
305
306 -#: gitk:2627
306 +#: gitk:2628
307 msgid "Compare with marked commit"
308 msgstr "Comparar com a revisão marcada"
309
310 -#: gitk:2628 gitk:2639
310 +#: gitk:2629 gitk:2640
311 #, fuzzy
312 msgid "Diff this -> marked commit"
313 msgstr "Comparar esta revisão com a selecionada"
314
315 -#: gitk:2629 gitk:2640
315 +#: gitk:2630 gitk:2641
316 #, fuzzy
317 msgid "Diff marked commit -> this"
318 msgstr "Comparar a revisão selecionada com esta"
319
320 -#: gitk:2630
320 +#: gitk:2631
321 #, fuzzy
322 msgid "Revert this commit"
323 msgstr "Marcar esta revisão"
324
325 -#: gitk:2646
325 +#: gitk:2647
326 msgid "Check out this branch"
327 msgstr "Efetuar checkout deste ramo"
328
329 -#: gitk:2647
329 +#: gitk:2648
330 msgid "Remove this branch"
331 msgstr "Excluir este ramo"
332
333 -#: gitk:2654
333 +#: gitk:2649
334 +msgid "Copy branch name"
335 +msgstr ""
336 +
337 +#: gitk:2656
338 msgid "Highlight this too"
339 msgstr "Marcar este também"
340
337 -#: gitk:2655
341 +#: gitk:2657
342 msgid "Highlight this only"
343 msgstr "Marcar apenas este"
344
341 -#: gitk:2656
345 +#: gitk:2658
346 msgid "External diff"
347 msgstr "Diff externo"
348
345 -#: gitk:2657
349 +#: gitk:2659
350 msgid "Blame parent commit"
351 msgstr "Anotar revisão anterior"
352
349 -#: gitk:2664
353 +#: gitk:2660
354 +msgid "Copy path"
355 +msgstr ""
356 +
357 +#: gitk:2667
358 msgid "Show origin of this line"
359 msgstr "Exibir origem desta linha"
360
353 -#: gitk:2665
361 +#: gitk:2668
362 msgid "Run git gui blame on this line"
363 msgstr "Executar 'git blame' nesta linha"
364
357 -#: gitk:3011
365 +#: gitk:3014
366 #, fuzzy
367 msgid ""
368 "\n"
@@ -371,315 +379,320 @@ msgstr ""
379 "\n"
380 "Uso e distribuição segundo os termos da Licença Pública Geral GNU"
381
374 -#: gitk:3019 gitk:3085 gitk:9836
382 +#: gitk:3022 gitk:3089 gitk:9857
383 msgid "Close"
384 msgstr "Fechar"
385
378 -#: gitk:3040
386 +#: gitk:3043
387 msgid "Gitk key bindings"
388 msgstr "Atalhos de teclado"
389
382 -#: gitk:3043
390 +#: gitk:3046
391 msgid "Gitk key bindings:"
392 msgstr "Atalhos de teclado:"
393
386 -#: gitk:3045
394 +#: gitk:3048
395 #, tcl-format
396 msgid "<%s-Q>\t\tQuit"
397 msgstr "<%s-Q>\t\tSair"
398
391 -#: gitk:3046
399 +#: gitk:3049
400 #, tcl-format
401 msgid "<%s-W>\t\tClose window"
402 msgstr "<%s-W>\t\tFechar janela"
403
396 -#: gitk:3047
404 +#: gitk:3050
405 msgid "<Home>\t\tMove to first commit"
406 msgstr "<Home>\t\tIr para a primeira revisão"
407
400 -#: gitk:3048
408 +#: gitk:3051
409 msgid "<End>\t\tMove to last commit"
410 msgstr "<End>\t\tIr para a última revisão"
411
404 -#: gitk:3049
412 +#: gitk:3052
413 #, fuzzy
414 msgid "<Up>, p, k\tMove up one commit"
415 msgstr "<Up>, p, i\tIr para uma revisão acima"
416
409 -#: gitk:3050
417 +#: gitk:3053
418 #, fuzzy
419 msgid "<Down>, n, j\tMove down one commit"
420 msgstr "<Down>, n, k\tIr para uma revisão abaixo"
421
414 -#: gitk:3051
422 +#: gitk:3054
423 #, fuzzy
424 msgid "<Left>, z, h\tGo back in history list"
425 msgstr "<Left>, z, j\tVoltar no histórico"
426
419 -#: gitk:3052
427 +#: gitk:3055
428 msgid "<Right>, x, l\tGo forward in history list"
429 msgstr "<Right>, x, l\tAvançar no histórico"
430
423 -#: gitk:3053
431 +#: gitk:3056
432 #, tcl-format
433 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
434 msgstr ""
435
428 -#: gitk:3054
436 +#: gitk:3057
437 msgid "<PageUp>\tMove up one page in commit list"
438 msgstr "<PageUp>\tSubir uma página na lista de revisões"
439
432 -#: gitk:3055
440 +#: gitk:3058
441 msgid "<PageDown>\tMove down one page in commit list"
442 msgstr "<PageDown>\tDescer uma página na lista de revisões"
443
436 -#: gitk:3056
444 +#: gitk:3059
445 #, tcl-format
446 msgid "<%s-Home>\tScroll to top of commit list"
447 msgstr "<%s-Home>\tRolar para o início da lista de revisões"
448
441 -#: gitk:3057
449 +#: gitk:3060
450 #, tcl-format
451 msgid "<%s-End>\tScroll to bottom of commit list"
452 msgstr "<%s-End>\tRolar para o final da lista de revisões"
453
446 -#: gitk:3058
454 +#: gitk:3061
455 #, tcl-format
456 msgid "<%s-Up>\tScroll commit list up one line"
457 msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões"
458
451 -#: gitk:3059
459 +#: gitk:3062
460 #, tcl-format
461 msgid "<%s-Down>\tScroll commit list down one line"
462 msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões"
463
456 -#: gitk:3060
464 +#: gitk:3063
465 #, tcl-format
466 msgid "<%s-PageUp>\tScroll commit list up one page"
467 msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões"
468
461 -#: gitk:3061
469 +#: gitk:3064
470 #, tcl-format
471 msgid "<%s-PageDown>\tScroll commit list down one page"
472 msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões"
473
466 -#: gitk:3062
474 +#: gitk:3065
475 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
476 msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)"
477
470 -#: gitk:3063
478 +#: gitk:3066
479 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
480 msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)"
481
474 -#: gitk:3064
482 +#: gitk:3067
483 msgid "<Delete>, b\tScroll diff view up one page"
484 msgstr "<Delete>, b\tRola alterações uma página acima"
485
478 -#: gitk:3065
486 +#: gitk:3068
487 msgid "<Backspace>\tScroll diff view up one page"
488 msgstr "<Backspace>\tRolar alterações uma página abaixo"
489
482 -#: gitk:3066
490 +#: gitk:3069
491 msgid "<Space>\t\tScroll diff view down one page"
492 msgstr "<Space>\t\tRolar alterações uma página abaixo"
493
486 -#: gitk:3067
494 +#: gitk:3070
495 msgid "u\t\tScroll diff view up 18 lines"
496 msgstr "u\t\tRolar alterações 18 linhas acima"
497
490 -#: gitk:3068
498 +#: gitk:3071
499 msgid "d\t\tScroll diff view down 18 lines"
500 msgstr "d\t\tRolar alterações 18 linhas abaixo"
501
494 -#: gitk:3069
502 +#: gitk:3072
503 #, tcl-format
504 msgid "<%s-F>\t\tFind"
505 msgstr "<%s-F>\t\tProcurar"
506
499 -#: gitk:3070
507 +#: gitk:3073
508 #, tcl-format
509 msgid "<%s-G>\t\tMove to next find hit"
510 msgstr "<%s-G>\t\tIr para a próxima ocorrência"
511
504 -#: gitk:3071
512 +#: gitk:3074
513 msgid "<Return>\tMove to next find hit"
514 msgstr "<Return>\tIr para a próxima ocorrência"
515
508 -#: gitk:3072
516 +#: gitk:3075
517 +#, fuzzy
518 +msgid "g\t\tGo to commit"
519 +msgstr "<End>\t\tIr para a última revisão"
520 +
521 +#: gitk:3076
522 msgid "/\t\tFocus the search box"
523 msgstr "/\t\tPor foco na caixa de busca"
524
512 -#: gitk:3073
525 +#: gitk:3077
526 msgid "?\t\tMove to previous find hit"
527 msgstr "?\t\tIr para a ocorrência anterior"
528
516 -#: gitk:3074
529 +#: gitk:3078
530 msgid "f\t\tScroll diff view to next file"
531 msgstr "f\t\tRolar alterações para o próximo arquivo"
532
520 -#: gitk:3075
533 +#: gitk:3079
534 #, tcl-format
535 msgid "<%s-S>\t\tSearch for next hit in diff view"
536 msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações"
537
525 -#: gitk:3076
538 +#: gitk:3080
539 #, tcl-format
540 msgid "<%s-R>\t\tSearch for previous hit in diff view"
541 msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações"
542
530 -#: gitk:3077
543 +#: gitk:3081
544 #, tcl-format
545 msgid "<%s-KP+>\tIncrease font size"
546 msgstr "<%s-KP+>\tAumentar tamanho da fonte"
547
535 -#: gitk:3078
548 +#: gitk:3082
549 #, tcl-format
550 msgid "<%s-plus>\tIncrease font size"
551 msgstr "<%s-plus>\tAumentar tamanho da fonte"
552
540 -#: gitk:3079
553 +#: gitk:3083
554 #, tcl-format
555 msgid "<%s-KP->\tDecrease font size"
556 msgstr "<%s-KP->\tReduzir tamanho da fonte"
557
545 -#: gitk:3080
558 +#: gitk:3084
559 #, tcl-format
560 msgid "<%s-minus>\tDecrease font size"
561 msgstr "<%s-minus>\tReduzir tamanho da fonte"
562
550 -#: gitk:3081
563 +#: gitk:3085
564 msgid "<F5>\t\tUpdate"
565 msgstr "<F5>\t\tAtualizar"
566
554 -#: gitk:3546 gitk:3555
567 +#: gitk:3550 gitk:3559
568 #, tcl-format
569 msgid "Error creating temporary directory %s:"
570 msgstr "Erro ao criar o diretório temporário %s:"
571
559 -#: gitk:3568
572 +#: gitk:3572
573 #, tcl-format
574 msgid "Error getting \"%s\" from %s:"
575 msgstr "Erro ao ler \"%s\" de %s:"
576
564 -#: gitk:3631
577 +#: gitk:3635
578 msgid "command failed:"
579 msgstr "O comando falhou:"
580
568 -#: gitk:3780
581 +#: gitk:3784
582 msgid "No such commit"
583 msgstr "Revisão não encontrada"
584
572 -#: gitk:3794
585 +#: gitk:3798
586 msgid "git gui blame: command failed:"
587 msgstr "Comando 'git gui blame' falhou:"
588
576 -#: gitk:3825
589 +#: gitk:3829
590 #, tcl-format
591 msgid "Couldn't read merge head: %s"
592 msgstr "Impossível ler merge head: %s"
593
581 -#: gitk:3833
594 +#: gitk:3837
595 #, tcl-format
596 msgid "Error reading index: %s"
597 msgstr "Erro ao ler o índice: %s"
598
586 -#: gitk:3858
599 +#: gitk:3862
600 #, tcl-format
601 msgid "Couldn't start git blame: %s"
602 msgstr "Não foi possível inciar o 'git blame': %s"
603
591 -#: gitk:3861 gitk:6735
604 +#: gitk:3865 gitk:6754
605 msgid "Searching"
606 msgstr "Procurando"
607
595 -#: gitk:3893
608 +#: gitk:3897
609 #, tcl-format
610 msgid "Error running git blame: %s"
611 msgstr "Erro ao executar 'git blame': %s"
612
600 -#: gitk:3921
613 +#: gitk:3925
614 #, tcl-format
615 msgid "That line comes from commit %s, which is not in this view"
616 msgstr "Esta linha vem da revisão %s, que não está nesta vista"
617
605 -#: gitk:3935
618 +#: gitk:3939
619 msgid "External diff viewer failed:"
620 msgstr "Erro do visualizador de alterações externo:"
621
609 -#: gitk:4053
622 +#: gitk:4070
623 msgid "Gitk view definition"
624 msgstr "Definir vista"
625
613 -#: gitk:4057
626 +#: gitk:4074
627 msgid "Remember this view"
628 msgstr "Lembrar esta vista"
629
617 -#: gitk:4058
630 +#: gitk:4075
631 msgid "References (space separated list):"
632 msgstr "Referências (separar a lista com um espaço):"
633
621 -#: gitk:4059
634 +#: gitk:4076
635 msgid "Branches & tags:"
636 msgstr "Ramos & etiquetas:"
637
625 -#: gitk:4060
638 +#: gitk:4077
639 msgid "All refs"
640 msgstr "Todas as referências"
641
629 -#: gitk:4061
642 +#: gitk:4078
643 msgid "All (local) branches"
644 msgstr "Todos os ramos locais"
645
633 -#: gitk:4062
646 +#: gitk:4079
647 msgid "All tags"
648 msgstr "Todas as etiquetas"
649
637 -#: gitk:4063
650 +#: gitk:4080
651 msgid "All remote-tracking branches"
652 msgstr "Todos os ramos de rastreio"
653
641 -#: gitk:4064
654 +#: gitk:4081
655 msgid "Commit Info (regular expressions):"
656 msgstr "Informações da revisão (expressões regulares):"
657
645 -#: gitk:4065
658 +#: gitk:4082
659 msgid "Author:"
660 msgstr "Autor:"
661
649 -#: gitk:4066
662 +#: gitk:4083
663 msgid "Committer:"
664 msgstr "Revisor:"
665
653 -#: gitk:4067
666 +#: gitk:4084
667 msgid "Commit Message:"
668 msgstr "Descrição da revisão:"
669
657 -#: gitk:4068
670 +#: gitk:4085
671 msgid "Matches all Commit Info criteria"
672 msgstr "Coincidir todos os critérios de informações da revisão"
673
661 -#: gitk:4069
674 +#: gitk:4086
675 #, fuzzy
663 -msgid "Matches none Commit Info criteria"
676 +msgid "Matches no Commit Info criteria"
677 msgstr "Coincidir todos os critérios de informações da revisão"
678
666 -#: gitk:4070
679 +#: gitk:4087
680 msgid "Changes to Files:"
681 msgstr "Mudanças para os arquivos:"
682
670 -#: gitk:4071
683 +#: gitk:4088
684 msgid "Fixed String"
685 msgstr "Texto fixo"
686
674 -#: gitk:4072
687 +#: gitk:4089
688 msgid "Regular Expression"
689 msgstr "Expressão regular"
690
678 -#: gitk:4073
691 +#: gitk:4090
692 msgid "Search string:"
693 msgstr "Texto de busca"
694
682 -#: gitk:4074
695 +#: gitk:4091
696 msgid ""
697 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
698 "15:27:38\"):"
@@ -687,201 +700,201 @@ msgstr ""
700 "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
701 "15:27:38\"):"
702
690 -#: gitk:4075
703 +#: gitk:4092
704 msgid "Since:"
705 msgstr "Desde:"
706
694 -#: gitk:4076
707 +#: gitk:4093
708 msgid "Until:"
709 msgstr "Até:"
710
698 -#: gitk:4077
711 +#: gitk:4094
712 msgid "Limit and/or skip a number of revisions (positive integer):"
713 msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):"
714
702 -#: gitk:4078
715 +#: gitk:4095
716 msgid "Number to show:"
717 msgstr "Número para mostrar:"
718
706 -#: gitk:4079
719 +#: gitk:4096
720 msgid "Number to skip:"
721 msgstr "Número para ignorar:"
722
710 -#: gitk:4080
723 +#: gitk:4097
724 msgid "Miscellaneous options:"
725 msgstr "Opções diversas:"
726
714 -#: gitk:4081
727 +#: gitk:4098
728 msgid "Strictly sort by date"
729 msgstr "Ordenar estritamente pela data"
730
718 -#: gitk:4082
731 +#: gitk:4099
732 msgid "Mark branch sides"
733 msgstr "Marcar os dois lados do ramo"
734
722 -#: gitk:4083
735 +#: gitk:4100
736 msgid "Limit to first parent"
737 msgstr "Limitar ao primeiro antecessor"
738
726 -#: gitk:4084
739 +#: gitk:4101
740 msgid "Simple history"
741 msgstr "Histórico simplificado"
742
730 -#: gitk:4085
743 +#: gitk:4102
744 msgid "Additional arguments to git log:"
745 msgstr "Argumentos adicionais para o 'git log':"
746
734 -#: gitk:4086
747 +#: gitk:4103
748 msgid "Enter files and directories to include, one per line:"
749 msgstr "Arquivos e diretórios para incluir, um por linha"
750
738 -#: gitk:4087
751 +#: gitk:4104
752 msgid "Command to generate more commits to include:"
753 msgstr "Comando para gerar mais revisões para incluir:"
754
742 -#: gitk:4211
755 +#: gitk:4228
756 msgid "Gitk: edit view"
757 msgstr "Gitk: editar vista"
758
746 -#: gitk:4219
759 +#: gitk:4236
760 msgid "-- criteria for selecting revisions"
761 msgstr "-- critérios para selecionar revisões"
762
750 -#: gitk:4224
763 +#: gitk:4241
764 msgid "View Name"
765 msgstr "Nome da vista"
766
754 -#: gitk:4299
767 +#: gitk:4316
768 msgid "Apply (F5)"
769 msgstr "Aplicar (F5)"
770
758 -#: gitk:4337
771 +#: gitk:4354
772 msgid "Error in commit selection arguments:"
773 msgstr "Erro nos argumentos de seleção de revisões:"
774
762 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
775 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
776 msgid "None"
777 msgstr "Nenhum"
778
766 -#: gitk:5003 gitk:5008
779 +#: gitk:5021 gitk:5026
780 msgid "Descendant"
781 msgstr "Descendente de"
782
770 -#: gitk:5004
783 +#: gitk:5022
784 msgid "Not descendant"
785 msgstr "Não descendente de"
786
774 -#: gitk:5011 gitk:5016
787 +#: gitk:5029 gitk:5034
788 msgid "Ancestor"
789 msgstr "Antecessor de"
790
778 -#: gitk:5012
791 +#: gitk:5030
792 msgid "Not ancestor"
793 msgstr "Não antecessor de"
794
782 -#: gitk:5306
795 +#: gitk:5324
796 msgid "Local changes checked in to index but not committed"
797 msgstr "Mudanças locais marcadas, porém não salvas"
798
786 -#: gitk:5342
799 +#: gitk:5360
800 msgid "Local uncommitted changes, not checked in to index"
801 msgstr "Mudanças locais não marcadas"
802
790 -#: gitk:7115
803 +#: gitk:7134
804 msgid "and many more"
805 msgstr ""
806
794 -#: gitk:7118
807 +#: gitk:7137
808 msgid "many"
809 msgstr "muitas"
810
798 -#: gitk:7309
811 +#: gitk:7328
812 msgid "Tags:"
813 msgstr "Etiquetas:"
814
802 -#: gitk:7326 gitk:7332 gitk:8806
815 +#: gitk:7345 gitk:7351 gitk:8825
816 msgid "Parent"
817 msgstr "Antecessor"
818
806 -#: gitk:7337
819 +#: gitk:7356
820 msgid "Child"
821 msgstr "Descendente"
822
810 -#: gitk:7346
823 +#: gitk:7365
824 msgid "Branch"
825 msgstr "Ramo"
826
814 -#: gitk:7349
827 +#: gitk:7368
828 msgid "Follows"
829 msgstr "Segue"
830
818 -#: gitk:7352
831 +#: gitk:7371
832 msgid "Precedes"
833 msgstr "Precede"
834
822 -#: gitk:7947
835 +#: gitk:7966
836 #, tcl-format
837 msgid "Error getting diffs: %s"
838 msgstr "Erro ao obter diferenças: %s"
839
827 -#: gitk:8631
840 +#: gitk:8650
841 msgid "Goto:"
842 msgstr "Ir para:"
843
831 -#: gitk:8652
844 +#: gitk:8671
845 #, tcl-format
846 msgid "Short SHA1 id %s is ambiguous"
847 msgstr "O id SHA1 %s é ambíguo"
848
836 -#: gitk:8659
849 +#: gitk:8678
850 #, tcl-format
851 msgid "Revision %s is not known"
852 msgstr "Revisão %s desconhecida"
853
841 -#: gitk:8669
854 +#: gitk:8688
855 #, tcl-format
856 msgid "SHA1 id %s is not known"
857 msgstr "Id SHA1 %s desconhecido"
858
846 -#: gitk:8671
859 +#: gitk:8690
860 #, tcl-format
861 msgid "Revision %s is not in the current view"
862 msgstr "A revisão %s não está na vista atual"
863
851 -#: gitk:8813 gitk:8828
864 +#: gitk:8832 gitk:8847
865 msgid "Date"
866 msgstr "Data"
867
855 -#: gitk:8816
868 +#: gitk:8835
869 msgid "Children"
870 msgstr "Descendentes"
871
859 -#: gitk:8879
872 +#: gitk:8898
873 #, tcl-format
874 msgid "Reset %s branch to here"
875 msgstr "Redefinir ramo %s para este ponto"
876
864 -#: gitk:8881
877 +#: gitk:8900
878 msgid "Detached head: can't reset"
879 msgstr "Detached head: impossível redefinir"
880
868 -#: gitk:8986 gitk:8992
881 +#: gitk:9005 gitk:9011
882 msgid "Skipping merge commit "
883 msgstr "Saltando revisão de mesclagem"
884
872 -#: gitk:9001 gitk:9006
885 +#: gitk:9020 gitk:9025
886 msgid "Error getting patch ID for "
887 msgstr "Erro ao obter patch ID para"
888
876 -#: gitk:9002 gitk:9007
889 +#: gitk:9021 gitk:9026
890 msgid " - stopping\n"
891 msgstr "- parando\n"
892
880 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
893 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
894 msgid "Commit "
895 msgstr "Revisão"
896
884 -#: gitk:9016
897 +#: gitk:9035
898 msgid ""
899 " is the same patch as\n"
900 " "
@@ -889,13 +902,13 @@ msgstr ""
902 "é o mesmo patch que\n"
903 " "
904
892 -#: gitk:9024
905 +#: gitk:9043
906 msgid ""
907 " differs from\n"
908 " "
909 msgstr "difere de"
910
898 -#: gitk:9026
911 +#: gitk:9045
912 msgid ""
913 "Diff of commits:\n"
914 "\n"
@@ -903,129 +916,129 @@ msgstr ""
916 "Diferença de revisões:\n"
917 "\n"
918
906 -#: gitk:9038 gitk:9047
919 +#: gitk:9057 gitk:9066
920 #, tcl-format
921 msgid " has %s children - stopping\n"
922 msgstr "possui %s descendentes - parando\n"
923
911 -#: gitk:9066
924 +#: gitk:9085
925 #, tcl-format
926 msgid "Error writing commit to file: %s"
927 msgstr "Erro ao salvar revisão para o arquivo: %s"
928
916 -#: gitk:9072
929 +#: gitk:9091
930 #, tcl-format
931 msgid "Error diffing commits: %s"
932 msgstr "Erro ao comparar revisões: %s"
933
921 -#: gitk:9118
934 +#: gitk:9137
935 msgid "Top"
936 msgstr "Início"
937
925 -#: gitk:9119
938 +#: gitk:9138
939 msgid "From"
940 msgstr "De"
941
929 -#: gitk:9124
942 +#: gitk:9143
943 msgid "To"
944 msgstr "Para"
945
933 -#: gitk:9148
946 +#: gitk:9167
947 msgid "Generate patch"
948 msgstr "Gerar patch"
949
937 -#: gitk:9150
950 +#: gitk:9169
951 msgid "From:"
952 msgstr "De:"
953
941 -#: gitk:9159
954 +#: gitk:9178
955 msgid "To:"
956 msgstr "Para:"
957
945 -#: gitk:9168
958 +#: gitk:9187
959 msgid "Reverse"
960 msgstr "Inverter"
961
949 -#: gitk:9170 gitk:9366
962 +#: gitk:9189 gitk:9385
963 msgid "Output file:"
964 msgstr "Arquivo de saída:"
965
953 -#: gitk:9176
966 +#: gitk:9195
967 msgid "Generate"
968 msgstr "Gerar"
969
957 -#: gitk:9214
970 +#: gitk:9233
971 msgid "Error creating patch:"
972 msgstr "Erro ao criar patch:"
973
961 -#: gitk:9237 gitk:9354 gitk:9411
974 +#: gitk:9256 gitk:9373 gitk:9430
975 msgid "ID:"
976 msgstr "ID:"
977
965 -#: gitk:9246
978 +#: gitk:9265
979 msgid "Tag name:"
980 msgstr "Nome da etiqueta:"
981
969 -#: gitk:9249
982 +#: gitk:9268
983 msgid "Tag message is optional"
984 msgstr "A descrição da etiqueta é opcional"
985
973 -#: gitk:9251
986 +#: gitk:9270
987 msgid "Tag message:"
988 msgstr "Descrição da etiqueta"
989
977 -#: gitk:9255 gitk:9420
990 +#: gitk:9274 gitk:9439
991 msgid "Create"
992 msgstr "Criar"
993
981 -#: gitk:9273
994 +#: gitk:9292
995 msgid "No tag name specified"
996 msgstr "Nome da etiqueta não indicado"
997
985 -#: gitk:9277
998 +#: gitk:9296
999 #, tcl-format
1000 msgid "Tag \"%s\" already exists"
1001 msgstr "Etiqueta \"%s\" já existe"
1002
990 -#: gitk:9287
1003 +#: gitk:9306
1004 msgid "Error creating tag:"
1005 msgstr "Erro ao criar etiqueta:"
1006
994 -#: gitk:9363
1007 +#: gitk:9382
1008 msgid "Command:"
1009 msgstr "Comando:"
1010
998 -#: gitk:9371
1011 +#: gitk:9390
1012 msgid "Write"
1013 msgstr "Exportar"
1014
1002 -#: gitk:9389
1015 +#: gitk:9408
1016 msgid "Error writing commit:"
1017 msgstr "Erro ao exportar revisão"
1018
1006 -#: gitk:9416
1019 +#: gitk:9435
1020 msgid "Name:"
1021 msgstr "Nome:"
1022
1010 -#: gitk:9439
1023 +#: gitk:9458
1024 msgid "Please specify a name for the new branch"
1025 msgstr "Indique um nome para o novo ramo"
1026
1014 -#: gitk:9444
1027 +#: gitk:9463
1028 #, tcl-format
1029 msgid "Branch '%s' already exists. Overwrite?"
1030 msgstr "O ramo \"%s\" já existe. Sobrescrever?"
1031
1019 -#: gitk:9511
1032 +#: gitk:9530
1033 #, tcl-format
1034 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1035 msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?"
1036
1024 -#: gitk:9516
1037 +#: gitk:9535
1038 msgid "Cherry-picking"
1039 msgstr "Cherry-picking"
1040
1028 -#: gitk:9525
1041 +#: gitk:9544
1042 #, tcl-format
1043 msgid ""
1044 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1035,7 +1048,7 @@ msgstr ""
1048 "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente "
1049 "novamente."
1050
1038 -#: gitk:9531
1051 +#: gitk:9550
1052 msgid ""
1053 "Cherry-pick failed because of merge conflict.\n"
1054 "Do you wish to run git citool to resolve it?"
@@ -1043,21 +1056,21 @@ msgstr ""
1056 "O cherry-pick falhou porque houve um conflito na mesclagem.\n"
1057 "Executar o 'git citool' para resolvê-lo?"
1058
1046 -#: gitk:9547 gitk:9605
1059 +#: gitk:9566 gitk:9624
1060 msgid "No changes committed"
1061 msgstr "Nenhuma revisão foi salva"
1062
1050 -#: gitk:9574
1063 +#: gitk:9593
1064 #, fuzzy, tcl-format
1065 msgid "Commit %s is not included in branch %s -- really revert it?"
1066 msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?"
1067
1055 -#: gitk:9579
1068 +#: gitk:9598
1069 #, fuzzy
1070 msgid "Reverting"
1071 msgstr "Redefinindo"
1072
1060 -#: gitk:9587
1073 +#: gitk:9606
1074 #, fuzzy, tcl-format
1075 msgid ""
1076 "Revert failed because of local changes to the following files:%s Please "
@@ -1067,7 +1080,7 @@ msgstr ""
1080 "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente "
1081 "novamente."
1082
1070 -#: gitk:9591
1083 +#: gitk:9610
1084 #, fuzzy
1085 msgid ""
1086 "Revert failed because of merge conflict.\n"
@@ -1076,28 +1089,28 @@ msgstr ""
1089 "O cherry-pick falhou porque houve um conflito na mesclagem.\n"
1090 "Executar o 'git citool' para resolvê-lo?"
1091
1079 -#: gitk:9634
1092 +#: gitk:9653
1093 msgid "Confirm reset"
1094 msgstr "Confirmar redefinição"
1095
1083 -#: gitk:9636
1096 +#: gitk:9655
1097 #, tcl-format
1098 msgid "Reset branch %s to %s?"
1099 msgstr "Você realmente deseja redefinir o ramo %s para %s?"
1100
1088 -#: gitk:9638
1101 +#: gitk:9657
1102 msgid "Reset type:"
1103 msgstr "Tipo de redefinição"
1104
1092 -#: gitk:9641
1105 +#: gitk:9660
1106 msgid "Soft: Leave working tree and index untouched"
1107 msgstr "Soft: deixa a árvore de trabalho e o índice intocados"
1108
1096 -#: gitk:9644
1109 +#: gitk:9663
1110 msgid "Mixed: Leave working tree untouched, reset index"
1111 msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice"
1112
1100 -#: gitk:9647
1113 +#: gitk:9666
1114 msgid ""
1115 "Hard: Reset working tree and index\n"
1116 "(discard ALL local changes)"
@@ -1105,19 +1118,19 @@ msgstr ""
1118 "Hard: Redefine a árvore de trabalho e o índice\n"
1119 "(descarta TODAS as mudanças locais)"
1120
1108 -#: gitk:9664
1121 +#: gitk:9683
1122 msgid "Resetting"
1123 msgstr "Redefinindo"
1124
1112 -#: gitk:9724
1125 +#: gitk:9743
1126 msgid "Checking out"
1127 msgstr "Abrindo"
1128
1116 -#: gitk:9777
1129 +#: gitk:9796
1130 msgid "Cannot delete the currently checked-out branch"
1131 msgstr "Impossível excluir o ramo atualmente aberto"
1132
1120 -#: gitk:9783
1133 +#: gitk:9802
1134 #, tcl-format
1135 msgid ""
1136 "The commits on branch %s aren't on any other branch.\n"
@@ -1126,16 +1139,16 @@ msgstr ""
1139 "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n"
1140 "Você realmente deseja excluir ramo \"%s\"?"
1141
1129 -#: gitk:9814
1142 +#: gitk:9833
1143 #, tcl-format
1144 msgid "Tags and heads: %s"
1145 msgstr "Referências: %s"
1146
1134 -#: gitk:9829
1147 +#: gitk:9850
1148 msgid "Filter"
1149 msgstr "Filtro"
1150
1138 -#: gitk:10125
1151 +#: gitk:10146
1152 msgid ""
1153 "Error reading commit topology information; branch and preceding/following "
1154 "tag information will be incomplete."
@@ -1143,221 +1156,226 @@ msgstr ""
1156 "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas "
1157 "antecessoras/sucessoras estarão incompletas"
1158
1146 -#: gitk:11102
1159 +#: gitk:11123
1160 msgid "Tag"
1161 msgstr "Etiqueta"
1162
1150 -#: gitk:11106
1163 +#: gitk:11127
1164 msgid "Id"
1165 msgstr "Id"
1166
1154 -#: gitk:11189
1167 +#: gitk:11210
1168 msgid "Gitk font chooser"
1169 msgstr "Selecionar fontes do Gitk"
1170
1158 -#: gitk:11206
1171 +#: gitk:11227
1172 msgid "B"
1173 msgstr "B"
1174
1162 -#: gitk:11209
1175 +#: gitk:11230
1176 msgid "I"
1177 msgstr "I"
1178
1166 -#: gitk:11327
1179 +#: gitk:11348
1180 msgid "Commit list display options"
1181 msgstr "Opções da lista de revisões"
1182
1170 -#: gitk:11330
1183 +#: gitk:11351
1184 msgid "Maximum graph width (lines)"
1185 msgstr "Largura máxima do grafo (linhas)"
1186
1174 -#: gitk:11334
1187 +#: gitk:11355
1188 #, no-tcl-format
1189 msgid "Maximum graph width (% of pane)"
1190 msgstr "Largura máxima do grafo (% do painel)"
1191
1179 -#: gitk:11337
1192 +#: gitk:11358
1193 msgid "Show local changes"
1194 msgstr "Exibir mudanças locais"
1195
1183 -#: gitk:11340
1196 +#: gitk:11361
1197 #, fuzzy
1198 msgid "Auto-select SHA1 (length)"
1199 msgstr "Selecionar o SHA1 automaticamente"
1200
1188 -#: gitk:11344
1201 +#: gitk:11365
1202 msgid "Hide remote refs"
1203 msgstr "Ocultar referências remotas"
1204
1192 -#: gitk:11348
1205 +#: gitk:11369
1206 msgid "Diff display options"
1207 msgstr "Opções de exibição das alterações"
1208
1196 -#: gitk:11350
1209 +#: gitk:11371
1210 msgid "Tab spacing"
1211 msgstr "Espaços por tabulação"
1212
1200 -#: gitk:11353
1213 +#: gitk:11374
1214 #, fuzzy
1215 msgid "Display nearby tags/heads"
1216 msgstr "Exibir etiquetas próximas"
1217
1205 -#: gitk:11356
1218 +#: gitk:11377
1219 msgid "Maximum # tags/heads to show"
1220 msgstr ""
1221
1209 -#: gitk:11359
1222 +#: gitk:11380
1223 msgid "Limit diffs to listed paths"
1224 msgstr "Limitar diferenças aos caminhos listados"
1225
1213 -#: gitk:11362
1226 +#: gitk:11383
1227 msgid "Support per-file encodings"
1228 msgstr "Usar codificações distintas por arquivo"
1229
1217 -#: gitk:11368 gitk:11515
1230 +#: gitk:11389 gitk:11536
1231 msgid "External diff tool"
1232 msgstr "Ferramenta 'diff' externa"
1233
1221 -#: gitk:11369
1234 +#: gitk:11390
1235 msgid "Choose..."
1236 msgstr "Selecionar..."
1237
1225 -#: gitk:11374
1238 +#: gitk:11395
1239 msgid "General options"
1240 msgstr "Opções gerais"
1241
1229 -#: gitk:11377
1242 +#: gitk:11398
1243 msgid "Use themed widgets"
1244 msgstr "Usar temas para as janelas"
1245
1233 -#: gitk:11379
1246 +#: gitk:11400
1247 msgid "(change requires restart)"
1248 msgstr "(exige reinicialização)"
1249
1237 -#: gitk:11381
1250 +#: gitk:11402
1251 msgid "(currently unavailable)"
1252 msgstr "(atualmente indisponível)"
1253
1241 -#: gitk:11392
1254 +#: gitk:11413
1255 msgid "Colors: press to choose"
1256 msgstr "Cores: clique para escolher"
1257
1245 -#: gitk:11395
1258 +#: gitk:11416
1259 msgid "Interface"
1260 msgstr "Interface"
1261
1249 -#: gitk:11396
1262 +#: gitk:11417
1263 msgid "interface"
1264 msgstr "interface"
1265
1253 -#: gitk:11399
1266 +#: gitk:11420
1267 msgid "Background"
1268 msgstr "Segundo plano"
1269
1257 -#: gitk:11400 gitk:11430
1270 +#: gitk:11421 gitk:11451
1271 msgid "background"
1272 msgstr "segundo plano"
1273
1261 -#: gitk:11403
1274 +#: gitk:11424
1275 msgid "Foreground"
1276 msgstr "Primeiro plano"
1277
1265 -#: gitk:11404
1278 +#: gitk:11425
1279 msgid "foreground"
1280 msgstr "primeiro plano"
1281
1269 -#: gitk:11407
1282 +#: gitk:11428
1283 msgid "Diff: old lines"
1284 msgstr "Diff: linhas excluídas"
1285
1273 -#: gitk:11408
1286 +#: gitk:11429
1287 msgid "diff old lines"
1288 msgstr "linhas excluídas"
1289
1277 -#: gitk:11412
1290 +#: gitk:11433
1291 msgid "Diff: new lines"
1292 msgstr "Diff: linhas adicionadas"
1293
1281 -#: gitk:11413
1294 +#: gitk:11434
1295 msgid "diff new lines"
1296 msgstr "linhas adicionadas"
1297
1285 -#: gitk:11417
1298 +#: gitk:11438
1299 msgid "Diff: hunk header"
1300 msgstr "Diff: cabeçalho do bloco"
1301
1289 -#: gitk:11419
1302 +#: gitk:11440
1303 msgid "diff hunk header"
1304 msgstr "cabeçalho do bloco"
1305
1293 -#: gitk:11423
1306 +#: gitk:11444
1307 msgid "Marked line bg"
1308 msgstr "2º plano da linha marcada"
1309
1297 -#: gitk:11425
1310 +#: gitk:11446
1311 msgid "marked line background"
1312 msgstr "segundo plano da linha marcada"
1313
1301 -#: gitk:11429
1314 +#: gitk:11450
1315 msgid "Select bg"
1316 msgstr "2º plano da seleção"
1317
1305 -#: gitk:11438
1318 +#: gitk:11459
1319 msgid "Fonts: press to choose"
1320 msgstr "Fontes: clique para escolher"
1321
1309 -#: gitk:11440
1322 +#: gitk:11461
1323 msgid "Main font"
1324 msgstr "Fonte principal"
1325
1313 -#: gitk:11441
1326 +#: gitk:11462
1327 msgid "Diff display font"
1328 msgstr "Fonte da lista de mudanças"
1329
1317 -#: gitk:11442
1330 +#: gitk:11463
1331 msgid "User interface font"
1332 msgstr "Fonte da interface"
1333
1321 -#: gitk:11464
1334 +#: gitk:11485
1335 msgid "Gitk preferences"
1336 msgstr "Preferências do Gitk"
1337
1325 -#: gitk:11473
1338 +#: gitk:11494
1339 #, fuzzy
1340 msgid "General"
1341 msgstr "Gerar"
1342
1330 -#: gitk:11474
1343 +#: gitk:11495
1344 msgid "Colors"
1345 msgstr ""
1346
1334 -#: gitk:11475
1347 +#: gitk:11496
1348 msgid "Fonts"
1349 msgstr ""
1350
1338 -#: gitk:11525
1351 +#: gitk:11546
1352 #, tcl-format
1353 msgid "Gitk: choose color for %s"
1354 msgstr "Gitk: selecionar cor para %s"
1355
1343 -#: gitk:12242
1356 +#: gitk:12059
1357 +msgid ""
1358 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1359 +" Gitk requires at least Tcl/Tk 8.4."
1360 +msgstr ""
1361 +
1362 +#: gitk:12269
1363 msgid "Cannot find a git repository here."
1364 msgstr "Não há nenhum repositório git aqui."
1365
1347 -#: gitk:12289
1366 +#: gitk:12316
1367 #, tcl-format
1368 msgid "Ambiguous argument '%s': both revision and filename"
1369 msgstr ""
1370 "O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de "
1371 "arquivo)"
1372
1354 -#: gitk:12301
1373 +#: gitk:12328
1374 msgid "Bad arguments to gitk:"
1375 msgstr "Argumentos incorretos para o gitk:"
1376
1358 -#: gitk:12405
1359 -msgid "Command line"
1360 -msgstr "Linha de comando"
1377 +#~ msgid "mc"
1378 +#~ msgstr "mc"
1379
1380 #~ msgid "next"
1381 #~ msgstr "Próximo"
po/ru.po
+297 -287
@@ -5,7 +5,7 @@ msgid ""
5 msgstr ""
6 "Project-Id-Version: gitk\n"
7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
8 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
9 "PO-Revision-Date: 2009-04-24 16:00+0200\n"
10 "Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n"
11 "Language-Team: Russian\n"
@@ -22,7 +22,7 @@ msgstr "Невозможно получить список файлов неза
22 msgid "Color words"
23 msgstr ""
24
25 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
25 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
26 msgid "Markup words"
27 msgstr ""
28
@@ -56,14 +56,18 @@ msgstr "Ошибка запуска git log:"
56 msgid "Reading"
57 msgstr "Чтение"
58
59 -#: gitk:496 gitk:4508
59 +#: gitk:496 gitk:4525
60 msgid "Reading commits..."
61 msgstr "Чтение версий..."
62
63 -#: gitk:499 gitk:1637 gitk:4511
63 +#: gitk:499 gitk:1637 gitk:4528
64 msgid "No commits selected"
65 msgstr "Ничего не выбрано"
66
67 +#: gitk:1445 gitk:4045 gitk:12432
68 +msgid "Command line"
69 +msgstr "Командная строка"
70 +
71 #: gitk:1511
72 msgid "Can't parse git log output:"
73 msgstr "Ошибка обработки вывода команды git log:"
@@ -72,16 +76,12 @@ msgstr "Ошибка обработки вывода команды git log:"
76 msgid "No commit information available"
77 msgstr "Нет информации о состоянии"
78
75 -#: gitk:1897
76 -msgid "mc"
77 -msgstr ""
78 -
79 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
79 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
80 msgid "OK"
81 msgstr "Ok"
82
83 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
84 -#: gitk:11221 gitk:11501
83 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
84 +#: gitk:11242 gitk:11522
85 msgid "Cancel"
86 msgstr "Отмена"
87
@@ -133,15 +133,15 @@ msgstr "Редактировать представление..."
133 msgid "Delete view"
134 msgstr "Удалить представление"
135
136 -#: gitk:2088
136 +#: gitk:2088 gitk:4043
137 msgid "All files"
138 msgstr "Все файлы"
139
140 -#: gitk:2083 gitk:4050
140 +#: gitk:2083 gitk:4067
141 msgid "View"
142 msgstr "Представление"
143
144 -#: gitk:2093 gitk:2103 gitk:3009
144 +#: gitk:2093 gitk:2103 gitk:3012
145 msgid "About gitk"
146 msgstr "О gitk"
147
@@ -153,7 +153,7 @@ msgstr "Назначения клавиатуры"
153 msgid "Help"
154 msgstr "Подсказка"
155
156 -#: gitk:2185 gitk:8633
156 +#: gitk:2185 gitk:8652
157 msgid "SHA1 ID:"
158 msgstr "SHA1 ID:"
159
@@ -169,53 +169,53 @@ msgstr "Поиск"
169 msgid "commit"
170 msgstr "состояние"
171
172 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
173 -#: gitk:6893
172 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
173 +#: gitk:6912
174 msgid "containing:"
175 msgstr "содержащее:"
176
177 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
177 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
178 msgid "touching paths:"
179 msgstr "касательно файлов:"
180
181 -#: gitk:2303 gitk:4759
181 +#: gitk:2303 gitk:4777
182 msgid "adding/removing string:"
183 msgstr "добавив/удалив строку:"
184
185 -#: gitk:2304 gitk:4761
185 +#: gitk:2304 gitk:4779
186 msgid "changing lines matching:"
187 msgstr ""
188
189 -#: gitk:2313 gitk:2315 gitk:4748
189 +#: gitk:2313 gitk:2315 gitk:4766
190 msgid "Exact"
191 msgstr "Точно"
192
193 -#: gitk:2315 gitk:4836 gitk:6704
193 +#: gitk:2315 gitk:4854 gitk:6723
194 msgid "IgnCase"
195 msgstr "Игнорировать большие/маленькие"
196
197 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
197 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
198 msgid "Regexp"
199 msgstr "Регулярные выражения"
200
201 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
201 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
202 msgid "All fields"
203 msgstr "Во всех полях"
204
205 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
205 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
206 msgid "Headline"
207 msgstr "Заголовок"
208
209 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
209 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
210 msgid "Comments"
211 msgstr "Комментарии"
212
213 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
214 -#: gitk:8826
213 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
214 +#: gitk:8845
215 msgid "Author"
216 msgstr "Автор"
217
218 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
218 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
219 msgid "Committer"
220 msgstr "Сохранивший состояние"
221
@@ -243,7 +243,7 @@ msgstr "Строк контекста"
243 msgid "Ignore space change"
244 msgstr "Игнорировать пробелы"
245
246 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
246 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
247 msgid "Line diff"
248 msgstr ""
249
@@ -255,103 +255,111 @@ msgstr "Патч"
255 msgid "Tree"
256 msgstr "Файлы"
257
258 -#: gitk:2616 gitk:2636
258 +#: gitk:2617 gitk:2637
259 msgid "Diff this -> selected"
260 msgstr "Сравнить это состояние с выделенным"
261
262 -#: gitk:2617 gitk:2637
262 +#: gitk:2618 gitk:2638
263 msgid "Diff selected -> this"
264 msgstr "Сравнить выделенное с этим состоянием"
265
266 -#: gitk:2618 gitk:2638
266 +#: gitk:2619 gitk:2639
267 msgid "Make patch"
268 msgstr "Создать патч"
269
270 -#: gitk:2619 gitk:9235
270 +#: gitk:2620 gitk:9254
271 msgid "Create tag"
272 msgstr "Создать метку"
273
274 -#: gitk:2620 gitk:9352
274 +#: gitk:2621 gitk:9371
275 msgid "Write commit to file"
276 msgstr "Сохранить изменения в файл"
277
278 -#: gitk:2621 gitk:9409
278 +#: gitk:2622 gitk:9428
279 msgid "Create new branch"
280 msgstr "Создать ветвь"
281
282 -#: gitk:2622
282 +#: gitk:2623
283 msgid "Cherry-pick this commit"
284 msgstr "Скопировать это состояние"
285
286 -#: gitk:2623
286 +#: gitk:2624
287 msgid "Reset HEAD branch to here"
288 msgstr "Установить HEAD на это состояние"
289
290 -#: gitk:2624
290 +#: gitk:2625
291 #, fuzzy
292 msgid "Mark this commit"
293 msgstr "Скопировать это состояние"
294
295 -#: gitk:2625
295 +#: gitk:2626
296 msgid "Return to mark"
297 msgstr ""
298
299 -#: gitk:2626
299 +#: gitk:2627
300 msgid "Find descendant of this and mark"
301 msgstr ""
302
303 -#: gitk:2627
303 +#: gitk:2628
304 msgid "Compare with marked commit"
305 msgstr ""
306
307 -#: gitk:2628 gitk:2639
307 +#: gitk:2629 gitk:2640
308 #, fuzzy
309 msgid "Diff this -> marked commit"
310 msgstr "Сравнить это состояние с выделенным"
311
312 -#: gitk:2629 gitk:2640
312 +#: gitk:2630 gitk:2641
313 #, fuzzy
314 msgid "Diff marked commit -> this"
315 msgstr "Сравнить выделенное с этим состоянием"
316
317 -#: gitk:2630
317 +#: gitk:2631
318 #, fuzzy
319 msgid "Revert this commit"
320 msgstr "Скопировать это состояние"
321
322 -#: gitk:2646
322 +#: gitk:2647
323 msgid "Check out this branch"
324 msgstr "Перейти на эту ветвь"
325
326 -#: gitk:2647
326 +#: gitk:2648
327 msgid "Remove this branch"
328 msgstr "Удалить эту ветвь"
329
330 -#: gitk:2654
330 +#: gitk:2649
331 +msgid "Copy branch name"
332 +msgstr ""
333 +
334 +#: gitk:2656
335 msgid "Highlight this too"
336 msgstr "Подсветить этот тоже"
337
334 -#: gitk:2655
338 +#: gitk:2657
339 msgid "Highlight this only"
340 msgstr "Подсветить только этот"
341
338 -#: gitk:2656
342 +#: gitk:2658
343 msgid "External diff"
344 msgstr "Программа сравнения"
345
342 -#: gitk:2657
346 +#: gitk:2659
347 msgid "Blame parent commit"
348 msgstr "Аннотировать родительское состояние"
349
346 -#: gitk:2664
350 +#: gitk:2660
351 +msgid "Copy path"
352 +msgstr ""
353 +
354 +#: gitk:2667
355 msgid "Show origin of this line"
356 msgstr "Показать источник этой строки"
357
350 -#: gitk:2665
358 +#: gitk:2668
359 msgid "Run git gui blame on this line"
360 msgstr "Запустить git gui blame для этой строки"
361
354 -#: gitk:3011
362 +#: gitk:3014
363 #, fuzzy
364 msgid ""
365 "\n"
@@ -368,667 +376,672 @@ msgstr ""
376 "\n"
377 "Использование и распространение согласно условиям GNU General Public License"
378
371 -#: gitk:3019 gitk:3085 gitk:9836
379 +#: gitk:3022 gitk:3089 gitk:9857
380 msgid "Close"
381 msgstr "Закрыть"
382
375 -#: gitk:3040
383 +#: gitk:3043
384 msgid "Gitk key bindings"
385 msgstr "Назначения клавиатуры в Gitk"
386
379 -#: gitk:3043
387 +#: gitk:3046
388 msgid "Gitk key bindings:"
389 msgstr "Назначения клавиатуры в Gitk:"
390
383 -#: gitk:3045
391 +#: gitk:3048
392 #, tcl-format
393 msgid "<%s-Q>\t\tQuit"
394 msgstr "<%s-Q>\t\tЗавершить"
395
388 -#: gitk:3046
396 +#: gitk:3049
397 #, fuzzy, tcl-format
398 msgid "<%s-W>\t\tClose window"
399 msgstr "<%s-F>\t\tПоиск"
400
393 -#: gitk:3047
401 +#: gitk:3050
402 msgid "<Home>\t\tMove to first commit"
403 msgstr "<Home>\t\tПерейти к первому состоянию"
404
397 -#: gitk:3048
405 +#: gitk:3051
406 msgid "<End>\t\tMove to last commit"
407 msgstr "<End>\t\tПерейти к последнему состоянию"
408
401 -#: gitk:3049
409 +#: gitk:3052
410 #, fuzzy
411 msgid "<Up>, p, k\tMove up one commit"
412 msgstr "<Up>, p, i\tПерейти к следующему состоянию"
413
406 -#: gitk:3050
414 +#: gitk:3053
415 #, fuzzy
416 msgid "<Down>, n, j\tMove down one commit"
417 msgstr "<Down>, n, k\tПерейти к предыдущему состоянию"
418
411 -#: gitk:3051
419 +#: gitk:3054
420 #, fuzzy
421 msgid "<Left>, z, h\tGo back in history list"
422 msgstr "<Left>, z, j\tПоказать ранее посещённое состояние"
423
416 -#: gitk:3052
424 +#: gitk:3055
425 msgid "<Right>, x, l\tGo forward in history list"
426 msgstr "<Right>, x, l\tПоказать следующее посещённое состояние"
427
420 -#: gitk:3053
428 +#: gitk:3056
429 #, tcl-format
430 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
431 msgstr ""
432
425 -#: gitk:3054
433 +#: gitk:3057
434 msgid "<PageUp>\tMove up one page in commit list"
435 msgstr "<PageUp>\tПерейти на страницу выше в списке состояний"
436
429 -#: gitk:3055
437 +#: gitk:3058
438 msgid "<PageDown>\tMove down one page in commit list"
439 msgstr "<PageDown>\tПерейти на страницу ниже в списке состояний"
440
433 -#: gitk:3056
441 +#: gitk:3059
442 #, tcl-format
443 msgid "<%s-Home>\tScroll to top of commit list"
444 msgstr "<%s-Home>\tПоказать начало списка состояний"
445
438 -#: gitk:3057
446 +#: gitk:3060
447 #, tcl-format
448 msgid "<%s-End>\tScroll to bottom of commit list"
449 msgstr "<%s-End>\tПоказать конец списка состояний"
450
443 -#: gitk:3058
451 +#: gitk:3061
452 #, tcl-format
453 msgid "<%s-Up>\tScroll commit list up one line"
454 msgstr "<%s-Up>\tПровернуть список состояний вверх"
455
448 -#: gitk:3059
456 +#: gitk:3062
457 #, tcl-format
458 msgid "<%s-Down>\tScroll commit list down one line"
459 msgstr "<%s-Down>\tПровернуть список состояний вниз"
460
453 -#: gitk:3060
461 +#: gitk:3063
462 #, tcl-format
463 msgid "<%s-PageUp>\tScroll commit list up one page"
464 msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх"
465
458 -#: gitk:3061
466 +#: gitk:3064
467 #, tcl-format
468 msgid "<%s-PageDown>\tScroll commit list down one page"
469 msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз"
470
463 -#: gitk:3062
471 +#: gitk:3065
472 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
473 msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)"
474
467 -#: gitk:3063
475 +#: gitk:3066
476 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
477 msgstr "<Shift-Down>\tПоиск (вниз, среди старых состояний)"
478
471 -#: gitk:3064
479 +#: gitk:3067
480 msgid "<Delete>, b\tScroll diff view up one page"
481 msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше"
482
475 -#: gitk:3065
483 +#: gitk:3068
484 msgid "<Backspace>\tScroll diff view up one page"
485 msgstr "<Backspace>\tПрокрутить список изменений на страницу выше"
486
479 -#: gitk:3066
487 +#: gitk:3069
488 msgid "<Space>\t\tScroll diff view down one page"
489 msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже"
490
483 -#: gitk:3067
491 +#: gitk:3070
492 msgid "u\t\tScroll diff view up 18 lines"
493 msgstr "u\t\tПрокрутить список изменений на 18 строк вверх"
494
487 -#: gitk:3068
495 +#: gitk:3071
496 msgid "d\t\tScroll diff view down 18 lines"
497 msgstr "d\t\tПрокрутить список изменений на 18 строк вниз"
498
491 -#: gitk:3069
499 +#: gitk:3072
500 #, tcl-format
501 msgid "<%s-F>\t\tFind"
502 msgstr "<%s-F>\t\tПоиск"
503
496 -#: gitk:3070
504 +#: gitk:3073
505 #, tcl-format
506 msgid "<%s-G>\t\tMove to next find hit"
507 msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию"
508
501 -#: gitk:3071
509 +#: gitk:3074
510 msgid "<Return>\tMove to next find hit"
511 msgstr "<Return>\tПерейти к следующему найденному состоянию"
512
505 -#: gitk:3072
513 +#: gitk:3075
514 +#, fuzzy
515 +msgid "g\t\tGo to commit"
516 +msgstr "<End>\t\tПерейти к последнему состоянию"
517 +
518 +#: gitk:3076
519 msgid "/\t\tFocus the search box"
520 msgstr "/\t\tПерейти к полю поиска"
521
509 -#: gitk:3073
522 +#: gitk:3077
523 msgid "?\t\tMove to previous find hit"
524 msgstr "?\t\tПерейти к предыдущему найденному состоянию"
525
513 -#: gitk:3074
526 +#: gitk:3078
527 msgid "f\t\tScroll diff view to next file"
528 msgstr "f\t\tПрокрутить список изменений к следующему файлу"
529
517 -#: gitk:3075
530 +#: gitk:3079
531 #, tcl-format
532 msgid "<%s-S>\t\tSearch for next hit in diff view"
533 msgstr "<%s-S>\t\tПродолжить поиск в списке изменений"
534
522 -#: gitk:3076
535 +#: gitk:3080
536 #, tcl-format
537 msgid "<%s-R>\t\tSearch for previous hit in diff view"
538 msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений"
539
527 -#: gitk:3077
540 +#: gitk:3081
541 #, tcl-format
542 msgid "<%s-KP+>\tIncrease font size"
543 msgstr "<%s-KP+>\tУвеличить размер шрифта"
544
532 -#: gitk:3078
545 +#: gitk:3082
546 #, tcl-format
547 msgid "<%s-plus>\tIncrease font size"
548 msgstr "<%s-plus>\tУвеличить размер шрифта"
549
537 -#: gitk:3079
550 +#: gitk:3083
551 #, tcl-format
552 msgid "<%s-KP->\tDecrease font size"
553 msgstr "<%s-KP->\tУменьшить размер шрифта"
554
542 -#: gitk:3080
555 +#: gitk:3084
556 #, tcl-format
557 msgid "<%s-minus>\tDecrease font size"
558 msgstr "<%s-minus>\tУменьшить размер шрифта"
559
547 -#: gitk:3081
560 +#: gitk:3085
561 msgid "<F5>\t\tUpdate"
562 msgstr "<F5>\t\tОбновить"
563
551 -#: gitk:3546 gitk:3555
564 +#: gitk:3550 gitk:3559
565 #, tcl-format
566 msgid "Error creating temporary directory %s:"
567 msgstr "Ошибка создания временного каталога %s:"
568
556 -#: gitk:3568
569 +#: gitk:3572
570 #, tcl-format
571 msgid "Error getting \"%s\" from %s:"
572 msgstr "Ошибка получения \"%s\" из %s:"
573
561 -#: gitk:3631
574 +#: gitk:3635
575 msgid "command failed:"
576 msgstr "ошибка выполнения команды:"
577
565 -#: gitk:3780
578 +#: gitk:3784
579 msgid "No such commit"
580 msgstr "Состояние не найдено"
581
569 -#: gitk:3794
582 +#: gitk:3798
583 msgid "git gui blame: command failed:"
584 msgstr "git gui blame: ошибка выполнения команды:"
585
573 -#: gitk:3825
586 +#: gitk:3829
587 #, tcl-format
588 msgid "Couldn't read merge head: %s"
589 msgstr "Ошибка чтения MERGE_HEAD: %s"
590
578 -#: gitk:3833
591 +#: gitk:3837
592 #, tcl-format
593 msgid "Error reading index: %s"
594 msgstr "Ошибка чтения индекса: %s"
595
583 -#: gitk:3858
596 +#: gitk:3862
597 #, tcl-format
598 msgid "Couldn't start git blame: %s"
599 msgstr "Ошибка запуска git blame: %s"
600
588 -#: gitk:3861 gitk:6735
601 +#: gitk:3865 gitk:6754
602 msgid "Searching"
603 msgstr "Поиск"
604
592 -#: gitk:3893
605 +#: gitk:3897
606 #, tcl-format
607 msgid "Error running git blame: %s"
608 msgstr "Ошибка выполнения git blame: %s"
609
597 -#: gitk:3921
610 +#: gitk:3925
611 #, tcl-format
612 msgid "That line comes from commit %s, which is not in this view"
613 msgstr ""
614 "Эта строка принадлежит состоянию %s, которое не показано в этом представлении"
615
603 -#: gitk:3935
616 +#: gitk:3939
617 msgid "External diff viewer failed:"
618 msgstr "Ошибка выполнения программы сравнения:"
619
607 -#: gitk:4053
620 +#: gitk:4070
621 msgid "Gitk view definition"
622 msgstr "Gitk определение представлений"
623
611 -#: gitk:4057
624 +#: gitk:4074
625 msgid "Remember this view"
626 msgstr "Запомнить представление"
627
615 -#: gitk:4058
628 +#: gitk:4075
629 msgid "References (space separated list):"
630 msgstr ""
631
619 -#: gitk:4059
632 +#: gitk:4076
633 msgid "Branches & tags:"
634 msgstr ""
635
623 -#: gitk:4060
636 +#: gitk:4077
637 #, fuzzy
638 msgid "All refs"
639 msgstr "Все файлы"
640
628 -#: gitk:4061
641 +#: gitk:4078
642 msgid "All (local) branches"
643 msgstr ""
644
632 -#: gitk:4062
645 +#: gitk:4079
646 msgid "All tags"
647 msgstr ""
648
636 -#: gitk:4063
649 +#: gitk:4080
650 msgid "All remote-tracking branches"
651 msgstr ""
652
640 -#: gitk:4064
653 +#: gitk:4081
654 msgid "Commit Info (regular expressions):"
655 msgstr ""
656
644 -#: gitk:4065
657 +#: gitk:4082
658 #, fuzzy
659 msgid "Author:"
660 msgstr "Автор"
661
649 -#: gitk:4066
662 +#: gitk:4083
663 #, fuzzy
664 msgid "Committer:"
665 msgstr "Сохранивший состояние"
666
654 -#: gitk:4067
667 +#: gitk:4084
668 msgid "Commit Message:"
669 msgstr ""
670
658 -#: gitk:4068
671 +#: gitk:4085
672 msgid "Matches all Commit Info criteria"
673 msgstr ""
674
662 -#: gitk:4069
663 -msgid "Matches none Commit Info criteria"
675 +#: gitk:4086
676 +msgid "Matches no Commit Info criteria"
677 msgstr ""
678
666 -#: gitk:4070
679 +#: gitk:4087
680 msgid "Changes to Files:"
681 msgstr ""
682
670 -#: gitk:4071
683 +#: gitk:4088
684 msgid "Fixed String"
685 msgstr ""
686
674 -#: gitk:4072
687 +#: gitk:4089
688 msgid "Regular Expression"
689 msgstr ""
690
678 -#: gitk:4073
691 +#: gitk:4090
692 #, fuzzy
693 msgid "Search string:"
694 msgstr "Поиск"
695
683 -#: gitk:4074
696 +#: gitk:4091
697 msgid ""
698 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
699 "15:27:38\"):"
700 msgstr ""
701
689 -#: gitk:4075
702 +#: gitk:4092
703 #, fuzzy
704 msgid "Since:"
705 msgstr "С даты:"
706
694 -#: gitk:4076
707 +#: gitk:4093
708 #, fuzzy
709 msgid "Until:"
710 msgstr "По дату:"
711
699 -#: gitk:4077
712 +#: gitk:4094
713 msgid "Limit and/or skip a number of revisions (positive integer):"
714 msgstr ""
715
703 -#: gitk:4078
716 +#: gitk:4095
717 msgid "Number to show:"
718 msgstr ""
719
707 -#: gitk:4079
720 +#: gitk:4096
721 msgid "Number to skip:"
722 msgstr ""
723
711 -#: gitk:4080
724 +#: gitk:4097
725 msgid "Miscellaneous options:"
726 msgstr ""
727
715 -#: gitk:4081
728 +#: gitk:4098
729 msgid "Strictly sort by date"
730 msgstr "Строгая сортировка по дате"
731
719 -#: gitk:4082
732 +#: gitk:4099
733 msgid "Mark branch sides"
734 msgstr "Отметить стороны ветвей"
735
723 -#: gitk:4083
736 +#: gitk:4100
737 msgid "Limit to first parent"
738 msgstr "Ограничить первым предком"
739
727 -#: gitk:4084
740 +#: gitk:4101
741 msgid "Simple history"
742 msgstr ""
743
731 -#: gitk:4085
744 +#: gitk:4102
745 #, fuzzy
746 msgid "Additional arguments to git log:"
747 msgstr "Включить состояния (аргументы для git-log):"
748
736 -#: gitk:4086
749 +#: gitk:4103
750 msgid "Enter files and directories to include, one per line:"
751 msgstr "Файлы и каталоги для ограничения истории, по одному на строку:"
752
740 -#: gitk:4087
753 +#: gitk:4104
754 msgid "Command to generate more commits to include:"
755 msgstr "Дополнительная команда для списка состояний:"
756
744 -#: gitk:4211
757 +#: gitk:4228
758 msgid "Gitk: edit view"
759 msgstr ""
760
748 -#: gitk:4219
761 +#: gitk:4236
762 #, fuzzy
763 msgid "-- criteria for selecting revisions"
764 msgstr "Ошибка в идентификаторе версии:"
765
753 -#: gitk:4224
766 +#: gitk:4241
767 #, fuzzy
768 msgid "View Name"
769 msgstr "Представление"
770
758 -#: gitk:4299
771 +#: gitk:4316
772 msgid "Apply (F5)"
773 msgstr "Применить (F5)"
774
762 -#: gitk:4337
775 +#: gitk:4354
776 msgid "Error in commit selection arguments:"
777 msgstr "Ошибка в параметрах выбора состояний:"
778
766 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
779 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
780 msgid "None"
781 msgstr "Ни одного"
782
770 -#: gitk:5003 gitk:5008
783 +#: gitk:5021 gitk:5026
784 msgid "Descendant"
785 msgstr "Порождённое"
786
774 -#: gitk:5004
787 +#: gitk:5022
788 msgid "Not descendant"
789 msgstr "Не порождённое"
790
778 -#: gitk:5011 gitk:5016
791 +#: gitk:5029 gitk:5034
792 msgid "Ancestor"
793 msgstr "Предок"
794
782 -#: gitk:5012
795 +#: gitk:5030
796 msgid "Not ancestor"
797 msgstr "Не предок"
798
786 -#: gitk:5306
799 +#: gitk:5324
800 msgid "Local changes checked in to index but not committed"
801 msgstr "Изменения зарегистрированные в индексе, но не сохранённые"
802
790 -#: gitk:5342
803 +#: gitk:5360
804 msgid "Local uncommitted changes, not checked in to index"
805 msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе"
806
794 -#: gitk:7115
807 +#: gitk:7134
808 msgid "and many more"
809 msgstr ""
810
798 -#: gitk:7118
811 +#: gitk:7137
812 msgid "many"
813 msgstr ""
814
802 -#: gitk:7309
815 +#: gitk:7328
816 msgid "Tags:"
817 msgstr "Таги:"
818
806 -#: gitk:7326 gitk:7332 gitk:8806
819 +#: gitk:7345 gitk:7351 gitk:8825
820 msgid "Parent"
821 msgstr "Предок"
822
810 -#: gitk:7337
823 +#: gitk:7356
824 msgid "Child"
825 msgstr "Потомок"
826
814 -#: gitk:7346
827 +#: gitk:7365
828 msgid "Branch"
829 msgstr "Ветвь"
830
818 -#: gitk:7349
831 +#: gitk:7368
832 msgid "Follows"
833 msgstr "Следует за"
834
822 -#: gitk:7352
835 +#: gitk:7371
836 msgid "Precedes"
837 msgstr "Предшествует"
838
826 -#: gitk:7947
839 +#: gitk:7966
840 #, tcl-format
841 msgid "Error getting diffs: %s"
842 msgstr "Ошибка получения изменений: %s"
843
831 -#: gitk:8631
844 +#: gitk:8650
845 msgid "Goto:"
846 msgstr "Перейти к:"
847
835 -#: gitk:8652
848 +#: gitk:8671
849 #, tcl-format
850 msgid "Short SHA1 id %s is ambiguous"
851 msgstr "Сокращённый SHA1 идентификатор %s неоднозначен"
852
840 -#: gitk:8659
853 +#: gitk:8678
854 #, fuzzy, tcl-format
855 msgid "Revision %s is not known"
856 msgstr "SHA1 идентификатор %s не найден"
857
845 -#: gitk:8669
858 +#: gitk:8688
859 #, tcl-format
860 msgid "SHA1 id %s is not known"
861 msgstr "SHA1 идентификатор %s не найден"
862
850 -#: gitk:8671
863 +#: gitk:8690
864 #, tcl-format
865 msgid "Revision %s is not in the current view"
866 msgstr ""
867
855 -#: gitk:8813 gitk:8828
868 +#: gitk:8832 gitk:8847
869 msgid "Date"
870 msgstr "Дата"
871
859 -#: gitk:8816
872 +#: gitk:8835
873 msgid "Children"
874 msgstr "Потомки"
875
863 -#: gitk:8879
876 +#: gitk:8898
877 #, tcl-format
878 msgid "Reset %s branch to here"
879 msgstr "Установить ветвь %s на это состояние"
880
868 -#: gitk:8881
881 +#: gitk:8900
882 msgid "Detached head: can't reset"
883 msgstr "Состояние не принадлежит ни одной ветви, переход невозможен"
884
872 -#: gitk:8986 gitk:8992
885 +#: gitk:9005 gitk:9011
886 msgid "Skipping merge commit "
887 msgstr ""
888
876 -#: gitk:9001 gitk:9006
889 +#: gitk:9020 gitk:9025
890 #, fuzzy
891 msgid "Error getting patch ID for "
892 msgstr "Ошибка создания патча:"
893
881 -#: gitk:9002 gitk:9007
894 +#: gitk:9021 gitk:9026
895 msgid " - stopping\n"
896 msgstr ""
897
885 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
898 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
899 #, fuzzy
900 msgid "Commit "
901 msgstr "состояние"
902
890 -#: gitk:9016
903 +#: gitk:9035
904 msgid ""
905 " is the same patch as\n"
906 " "
907 msgstr ""
908
896 -#: gitk:9024
909 +#: gitk:9043
910 msgid ""
911 " differs from\n"
912 " "
913 msgstr ""
914
902 -#: gitk:9026
915 +#: gitk:9045
916 msgid ""
917 "Diff of commits:\n"
918 "\n"
919 msgstr ""
920
908 -#: gitk:9038 gitk:9047
921 +#: gitk:9057 gitk:9066
922 #, tcl-format
923 msgid " has %s children - stopping\n"
924 msgstr ""
925
913 -#: gitk:9066
926 +#: gitk:9085
927 #, fuzzy, tcl-format
928 msgid "Error writing commit to file: %s"
929 msgstr "Ошибка сохранения состояния:"
930
918 -#: gitk:9072
931 +#: gitk:9091
932 #, fuzzy, tcl-format
933 msgid "Error diffing commits: %s"
934 msgstr "Ошибка сохранения состояния:"
935
923 -#: gitk:9118
936 +#: gitk:9137
937 msgid "Top"
938 msgstr "Верх"
939
927 -#: gitk:9119
940 +#: gitk:9138
941 msgid "From"
942 msgstr "От"
943
931 -#: gitk:9124
944 +#: gitk:9143
945 msgid "To"
946 msgstr "До"
947
935 -#: gitk:9148
948 +#: gitk:9167
949 msgid "Generate patch"
950 msgstr "Создать патч"
951
939 -#: gitk:9150
952 +#: gitk:9169
953 msgid "From:"
954 msgstr "От:"
955
943 -#: gitk:9159
956 +#: gitk:9178
957 msgid "To:"
958 msgstr "До:"
959
947 -#: gitk:9168
960 +#: gitk:9187
961 msgid "Reverse"
962 msgstr "В обратном порядке"
963
951 -#: gitk:9170 gitk:9366
964 +#: gitk:9189 gitk:9385
965 msgid "Output file:"
966 msgstr "Файл для сохранения:"
967
955 -#: gitk:9176
968 +#: gitk:9195
969 msgid "Generate"
970 msgstr "Создать"
971
959 -#: gitk:9214
972 +#: gitk:9233
973 msgid "Error creating patch:"
974 msgstr "Ошибка создания патча:"
975
963 -#: gitk:9237 gitk:9354 gitk:9411
976 +#: gitk:9256 gitk:9373 gitk:9430
977 msgid "ID:"
978 msgstr "ID:"
979
967 -#: gitk:9246
980 +#: gitk:9265
981 msgid "Tag name:"
982 msgstr "Имя метки:"
983
971 -#: gitk:9249
984 +#: gitk:9268
985 msgid "Tag message is optional"
986 msgstr ""
987
975 -#: gitk:9251
988 +#: gitk:9270
989 #, fuzzy
990 msgid "Tag message:"
991 msgstr "Имя метки:"
992
980 -#: gitk:9255 gitk:9420
993 +#: gitk:9274 gitk:9439
994 msgid "Create"
995 msgstr "Создать"
996
984 -#: gitk:9273
997 +#: gitk:9292
998 msgid "No tag name specified"
999 msgstr "Не задано имя метки"
1000
988 -#: gitk:9277
1001 +#: gitk:9296
1002 #, tcl-format
1003 msgid "Tag \"%s\" already exists"
1004 msgstr "Метка \"%s\" уже существует"
1005
993 -#: gitk:9287
1006 +#: gitk:9306
1007 msgid "Error creating tag:"
1008 msgstr "Ошибка создания метки:"
1009
997 -#: gitk:9363
1010 +#: gitk:9382
1011 msgid "Command:"
1012 msgstr "Команда:"
1013
1001 -#: gitk:9371
1014 +#: gitk:9390
1015 msgid "Write"
1016 msgstr "Запись"
1017
1005 -#: gitk:9389
1018 +#: gitk:9408
1019 msgid "Error writing commit:"
1020 msgstr "Ошибка сохранения состояния:"
1021
1009 -#: gitk:9416
1022 +#: gitk:9435
1023 msgid "Name:"
1024 msgstr "Имя:"
1025
1013 -#: gitk:9439
1026 +#: gitk:9458
1027 msgid "Please specify a name for the new branch"
1028 msgstr "Укажите имя для новой ветви"
1029
1017 -#: gitk:9444
1030 +#: gitk:9463
1031 #, tcl-format
1032 msgid "Branch '%s' already exists. Overwrite?"
1033 msgstr "Ветвь '%s' уже существует. Переписать?"
1034
1022 -#: gitk:9511
1035 +#: gitk:9530
1036 #, tcl-format
1037 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1038 msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
1039
1027 -#: gitk:9516
1040 +#: gitk:9535
1041 msgid "Cherry-picking"
1042 msgstr "Копирование изменений"
1043
1031 -#: gitk:9525
1044 +#: gitk:9544
1045 #, tcl-format
1046 msgid ""
1047 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1037,7 +1050,7 @@ msgstr ""
1050 "Копирование невозможно из-за изменений в файле '%s'.\n"
1051 "Сохраните или отмените изменения и повторите операцию."
1052
1040 -#: gitk:9531
1053 +#: gitk:9550
1054 msgid ""
1055 "Cherry-pick failed because of merge conflict.\n"
1056 "Do you wish to run git citool to resolve it?"
@@ -1045,21 +1058,21 @@ msgstr ""
1058 "Копирование изменений невозможно из-за незавершённой операции слияния.\n"
1059 "Запустить git citool для завершения этой операции?"
1060
1048 -#: gitk:9547 gitk:9605
1061 +#: gitk:9566 gitk:9624
1062 msgid "No changes committed"
1063 msgstr "Изменения не сохранены"
1064
1052 -#: gitk:9574
1065 +#: gitk:9593
1066 #, fuzzy, tcl-format
1067 msgid "Commit %s is not included in branch %s -- really revert it?"
1068 msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
1069
1057 -#: gitk:9579
1070 +#: gitk:9598
1071 #, fuzzy
1072 msgid "Reverting"
1073 msgstr "Установка"
1074
1062 -#: gitk:9587
1075 +#: gitk:9606
1076 #, fuzzy, tcl-format
1077 msgid ""
1078 "Revert failed because of local changes to the following files:%s Please "
@@ -1068,7 +1081,7 @@ msgstr ""
1081 "Копирование невозможно из-за изменений в файле '%s'.\n"
1082 "Сохраните или отмените изменения и повторите операцию."
1083
1071 -#: gitk:9591
1084 +#: gitk:9610
1085 #, fuzzy
1086 msgid ""
1087 "Revert failed because of merge conflict.\n"
@@ -1077,28 +1090,28 @@ msgstr ""
1090 "Копирование изменений невозможно из-за незавершённой операции слияния.\n"
1091 "Запустить git citool для завершения этой операции?"
1092
1080 -#: gitk:9634
1093 +#: gitk:9653
1094 msgid "Confirm reset"
1095 msgstr "Подтвердите операцию перехода"
1096
1084 -#: gitk:9636
1097 +#: gitk:9655
1098 #, tcl-format
1099 msgid "Reset branch %s to %s?"
1100 msgstr "Установить ветвь %s на состояние %s?"
1101
1089 -#: gitk:9638
1102 +#: gitk:9657
1103 msgid "Reset type:"
1104 msgstr "Тип операции перехода:"
1105
1093 -#: gitk:9641
1106 +#: gitk:9660
1107 msgid "Soft: Leave working tree and index untouched"
1108 msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными"
1109
1097 -#: gitk:9644
1110 +#: gitk:9663
1111 msgid "Mixed: Leave working tree untouched, reset index"
1112 msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс"
1113
1101 -#: gitk:9647
1114 +#: gitk:9666
1115 msgid ""
1116 "Hard: Reset working tree and index\n"
1117 "(discard ALL local changes)"
@@ -1106,19 +1119,19 @@ msgstr ""
1119 "Жесткий: переписать индекс и рабочий каталог\n"
1120 "(все изменения в рабочем каталоге будут потеряны)"
1121
1109 -#: gitk:9664
1122 +#: gitk:9683
1123 msgid "Resetting"
1124 msgstr "Установка"
1125
1113 -#: gitk:9724
1126 +#: gitk:9743
1127 msgid "Checking out"
1128 msgstr "Переход"
1129
1117 -#: gitk:9777
1130 +#: gitk:9796
1131 msgid "Cannot delete the currently checked-out branch"
1132 msgstr "Активная ветвь не может быть удалена"
1133
1121 -#: gitk:9783
1134 +#: gitk:9802
1135 #, tcl-format
1136 msgid ""
1137 "The commits on branch %s aren't on any other branch.\n"
@@ -1127,16 +1140,16 @@ msgstr ""
1140 "Состояния ветви %s больше не принадлежат никакой другой ветви.\n"
1141 "Действительно удалить ветвь %s?"
1142
1130 -#: gitk:9814
1143 +#: gitk:9833
1144 #, tcl-format
1145 msgid "Tags and heads: %s"
1146 msgstr "Метки и ветви: %s"
1147
1135 -#: gitk:9829
1148 +#: gitk:9850
1149 msgid "Filter"
1150 msgstr "Фильтровать"
1151
1139 -#: gitk:10125
1152 +#: gitk:10146
1153 msgid ""
1154 "Error reading commit topology information; branch and preceding/following "
1155 "tag information will be incomplete."
@@ -1144,222 +1157,226 @@ msgstr ""
1157 "Ошибка чтения истории проекта; информация о ветвях и состояниях вокруг меток "
1158 "(до/после) может быть неполной."
1159
1147 -#: gitk:11102
1160 +#: gitk:11123
1161 msgid "Tag"
1162 msgstr "Метка"
1163
1151 -#: gitk:11106
1164 +#: gitk:11127
1165 msgid "Id"
1166 msgstr "Id"
1167
1155 -#: gitk:11189
1168 +#: gitk:11210
1169 msgid "Gitk font chooser"
1170 msgstr "Шрифт Gitk"
1171
1159 -#: gitk:11206
1172 +#: gitk:11227
1173 msgid "B"
1174 msgstr "Ж"
1175
1163 -#: gitk:11209
1176 +#: gitk:11230
1177 msgid "I"
1178 msgstr "К"
1179
1167 -#: gitk:11327
1180 +#: gitk:11348
1181 msgid "Commit list display options"
1182 msgstr "Параметры показа списка состояний"
1183
1171 -#: gitk:11330
1184 +#: gitk:11351
1185 msgid "Maximum graph width (lines)"
1186 msgstr "Макс. ширина графа (строк)"
1187
1175 -#: gitk:11334
1188 +#: gitk:11355
1189 #, no-tcl-format
1190 msgid "Maximum graph width (% of pane)"
1191 msgstr "Макс. ширина графа (% ширины панели)"
1192
1180 -#: gitk:11337
1193 +#: gitk:11358
1194 msgid "Show local changes"
1195 msgstr "Показывать изменения в рабочем каталоге"
1196
1184 -#: gitk:11340
1197 +#: gitk:11361
1198 #, fuzzy
1199 msgid "Auto-select SHA1 (length)"
1200 msgstr "Выделить SHA1"
1201
1189 -#: gitk:11344
1202 +#: gitk:11365
1203 msgid "Hide remote refs"
1204 msgstr ""
1205
1193 -#: gitk:11348
1206 +#: gitk:11369
1207 msgid "Diff display options"
1208 msgstr "Параметры показа изменений"
1209
1197 -#: gitk:11350
1210 +#: gitk:11371
1211 msgid "Tab spacing"
1212 msgstr "Ширина табуляции"
1213
1201 -#: gitk:11353
1214 +#: gitk:11374
1215 #, fuzzy
1216 msgid "Display nearby tags/heads"
1217 msgstr "Показывать близкие метки"
1218
1206 -#: gitk:11356
1219 +#: gitk:11377
1220 msgid "Maximum # tags/heads to show"
1221 msgstr ""
1222
1210 -#: gitk:11359
1223 +#: gitk:11380
1224 msgid "Limit diffs to listed paths"
1225 msgstr "Ограничить показ изменений выбранными файлами"
1226
1214 -#: gitk:11362
1227 +#: gitk:11383
1228 msgid "Support per-file encodings"
1229 msgstr "Поддержка кодировок в отдельных файлах"
1230
1218 -#: gitk:11368 gitk:11515
1231 +#: gitk:11389 gitk:11536
1232 msgid "External diff tool"
1233 msgstr "Программа для показа изменений"
1234
1222 -#: gitk:11369
1235 +#: gitk:11390
1236 msgid "Choose..."
1237 msgstr "Выберите..."
1238
1226 -#: gitk:11374
1239 +#: gitk:11395
1240 #, fuzzy
1241 msgid "General options"
1242 msgstr "Создать патч"
1243
1231 -#: gitk:11377
1244 +#: gitk:11398
1245 msgid "Use themed widgets"
1246 msgstr ""
1247
1235 -#: gitk:11379
1248 +#: gitk:11400
1249 msgid "(change requires restart)"
1250 msgstr ""
1251
1239 -#: gitk:11381
1252 +#: gitk:11402
1253 msgid "(currently unavailable)"
1254 msgstr ""
1255
1243 -#: gitk:11392
1256 +#: gitk:11413
1257 msgid "Colors: press to choose"
1258 msgstr "Цвета: нажмите для выбора"
1259
1247 -#: gitk:11395
1260 +#: gitk:11416
1261 msgid "Interface"
1262 msgstr ""
1263
1251 -#: gitk:11396
1264 +#: gitk:11417
1265 #, fuzzy
1266 msgid "interface"
1267 msgstr "Шрифт интерфейса"
1268
1256 -#: gitk:11399
1269 +#: gitk:11420
1270 msgid "Background"
1271 msgstr "Фон"
1272
1260 -#: gitk:11400 gitk:11430
1273 +#: gitk:11421 gitk:11451
1274 msgid "background"
1275 msgstr "фон"
1276
1264 -#: gitk:11403
1277 +#: gitk:11424
1278 msgid "Foreground"
1279 msgstr "Передний план"
1280
1268 -#: gitk:11404
1281 +#: gitk:11425
1282 msgid "foreground"
1283 msgstr "передний план"
1284
1272 -#: gitk:11407
1285 +#: gitk:11428
1286 msgid "Diff: old lines"
1287 msgstr "Изменения: старый текст"
1288
1276 -#: gitk:11408
1289 +#: gitk:11429
1290 msgid "diff old lines"
1291 msgstr "старый текст изменения"
1292
1280 -#: gitk:11412
1293 +#: gitk:11433
1294 msgid "Diff: new lines"
1295 msgstr "Изменения: новый текст"
1296
1284 -#: gitk:11413
1297 +#: gitk:11434
1298 msgid "diff new lines"
1299 msgstr "новый текст изменения"
1300
1288 -#: gitk:11417
1301 +#: gitk:11438
1302 msgid "Diff: hunk header"
1303 msgstr "Изменения: заголовок блока"
1304
1292 -#: gitk:11419
1305 +#: gitk:11440
1306 msgid "diff hunk header"
1307 msgstr "заголовок блока изменений"
1308
1296 -#: gitk:11423
1309 +#: gitk:11444
1310 msgid "Marked line bg"
1311 msgstr "Фон выбранной строки"
1312
1300 -#: gitk:11425
1313 +#: gitk:11446
1314 msgid "marked line background"
1315 msgstr "фон выбранной строки"
1316
1304 -#: gitk:11429
1317 +#: gitk:11450
1318 msgid "Select bg"
1319 msgstr "Выберите фон"
1320
1308 -#: gitk:11438
1321 +#: gitk:11459
1322 msgid "Fonts: press to choose"
1323 msgstr "Шрифт: нажмите для выбора"
1324
1312 -#: gitk:11440
1325 +#: gitk:11461
1326 msgid "Main font"
1327 msgstr "Основной шрифт"
1328
1316 -#: gitk:11441
1329 +#: gitk:11462
1330 msgid "Diff display font"
1331 msgstr "Шрифт показа изменений"
1332
1320 -#: gitk:11442
1333 +#: gitk:11463
1334 msgid "User interface font"
1335 msgstr "Шрифт интерфейса"
1336
1324 -#: gitk:11464
1337 +#: gitk:11485
1338 msgid "Gitk preferences"
1339 msgstr "Настройки Gitk"
1340
1328 -#: gitk:11473
1341 +#: gitk:11494
1342 #, fuzzy
1343 msgid "General"
1344 msgstr "Создать"
1345
1333 -#: gitk:11474
1346 +#: gitk:11495
1347 msgid "Colors"
1348 msgstr ""
1349
1337 -#: gitk:11475
1350 +#: gitk:11496
1351 msgid "Fonts"
1352 msgstr ""
1353
1341 -#: gitk:11525
1354 +#: gitk:11546
1355 #, tcl-format
1356 msgid "Gitk: choose color for %s"
1357 msgstr "Gitk: выберите цвет для %s"
1358
1346 -#: gitk:12242
1359 +#: gitk:12059
1360 +msgid ""
1361 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1362 +" Gitk requires at least Tcl/Tk 8.4."
1363 +msgstr ""
1364 +"К сожалению gitk не может работать с этой версий Tcl/Tk.\n"
1365 +"Требуется как минимум Tcl/Tk 8.4."
1366 +
1367 +#: gitk:12269
1368 msgid "Cannot find a git repository here."
1369 msgstr "Git-репозитарий не найден в текущем каталоге."
1370
1350 -#: gitk:12289
1371 +#: gitk:12316
1372 #, tcl-format
1373 msgid "Ambiguous argument '%s': both revision and filename"
1374 msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла"
1375
1355 -#: gitk:12301
1376 +#: gitk:12328
1377 msgid "Bad arguments to gitk:"
1378 msgstr "Неправильные аргументы для gitk:"
1379
1359 -#: gitk:12405
1360 -msgid "Command line"
1361 -msgstr "Командная строка"
1362 -
1380 #~ msgid "SHA1 ID: "
1381 #~ msgstr "SHA1:"
1382
@@ -1387,12 +1404,5 @@ msgstr "Командная строка"
1404 #~ msgid "Tag/Head %s is not known"
1405 #~ msgstr "Метка или ветвь %s не найдена"
1406
1390 -#~ msgid ""
1391 -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1392 -#~ " Gitk requires at least Tcl/Tk 8.4."
1393 -#~ msgstr ""
1394 -#~ "К сожалению gitk не может работать с этой версий Tcl/Tk.\n"
1395 -#~ "Требуется как минимум Tcl/Tk 8.4."
1396 -
1407 #~ msgid "Cannot find the git directory \"%s\"."
1408 #~ msgstr "Git-репозитарий \"%s\" не найден."
po/sv.po
+315 -302
@@ -9,7 +9,7 @@ msgid ""
9 msgstr ""
10 "Project-Id-Version: sv\n"
11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
12 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
13 "PO-Revision-Date: 2015-03-27 10:31+0100\n"
14 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
15 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -28,7 +28,7 @@ msgstr "Kunde inte hämta lista över ej sammanslagna filer:"
28 msgid "Color words"
29 msgstr "Färga ord"
30
31 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
31 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
32 msgid "Markup words"
33 msgstr "Märk upp ord"
34
@@ -62,14 +62,18 @@ msgstr "Fel vid körning av git log:"
62 msgid "Reading"
63 msgstr "Läser"
64
65 -#: gitk:496 gitk:4508
65 +#: gitk:496 gitk:4525
66 msgid "Reading commits..."
67 msgstr "Läser incheckningar..."
68
69 -#: gitk:499 gitk:1637 gitk:4511
69 +#: gitk:499 gitk:1637 gitk:4528
70 msgid "No commits selected"
71 msgstr "Inga incheckningar markerade"
72
73 +#: gitk:1445 gitk:4045 gitk:12432
74 +msgid "Command line"
75 +msgstr "Kommandorad"
76 +
77 #: gitk:1511
78 msgid "Can't parse git log output:"
79 msgstr "Kan inte tolka utdata från git log:"
@@ -78,16 +82,12 @@ msgstr "Kan inte tolka utdata från git log:"
82 msgid "No commit information available"
83 msgstr "Ingen incheckningsinformation är tillgänglig"
84
81 -#: gitk:1897
82 -msgid "mc"
83 -msgstr "mc"
84 -
85 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
85 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
86 msgid "OK"
87 msgstr "OK"
88
89 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
90 -#: gitk:11221 gitk:11501
89 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
90 +#: gitk:11242 gitk:11522
91 msgid "Cancel"
92 msgstr "Avbryt"
93
@@ -139,15 +139,15 @@ msgstr "Ändra vy..."
139 msgid "Delete view"
140 msgstr "Ta bort vy"
141
142 -#: gitk:2088
142 +#: gitk:2088 gitk:4043
143 msgid "All files"
144 msgstr "Alla filer"
145
146 -#: gitk:2083 gitk:4050
146 +#: gitk:2083 gitk:4067
147 msgid "View"
148 msgstr "Visa"
149
150 -#: gitk:2093 gitk:2103 gitk:3009
150 +#: gitk:2093 gitk:2103 gitk:3012
151 msgid "About gitk"
152 msgstr "Om gitk"
153
@@ -159,7 +159,7 @@ msgstr "Tangentbordsbindningar"
159 msgid "Help"
160 msgstr "Hjälp"
161
162 -#: gitk:2185 gitk:8633
162 +#: gitk:2185 gitk:8652
163 msgid "SHA1 ID:"
164 msgstr "SHA1-id:"
165
@@ -175,53 +175,53 @@ msgstr "Sök"
175 msgid "commit"
176 msgstr "incheckning"
177
178 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
179 -#: gitk:6893
178 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
179 +#: gitk:6912
180 msgid "containing:"
181 msgstr "som innehåller:"
182
183 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
183 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
184 msgid "touching paths:"
185 msgstr "som rör sökväg:"
186
187 -#: gitk:2303 gitk:4759
187 +#: gitk:2303 gitk:4777
188 msgid "adding/removing string:"
189 msgstr "som lägger/till tar bort sträng:"
190
191 -#: gitk:2304 gitk:4761
191 +#: gitk:2304 gitk:4779
192 msgid "changing lines matching:"
193 msgstr "ändrar rader som matchar:"
194
195 -#: gitk:2313 gitk:2315 gitk:4748
195 +#: gitk:2313 gitk:2315 gitk:4766
196 msgid "Exact"
197 msgstr "Exakt"
198
199 -#: gitk:2315 gitk:4836 gitk:6704
199 +#: gitk:2315 gitk:4854 gitk:6723
200 msgid "IgnCase"
201 msgstr "IgnVersaler"
202
203 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
203 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
204 msgid "Regexp"
205 msgstr "Reg.uttr."
206
207 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
207 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
208 msgid "All fields"
209 msgstr "Alla fält"
210
211 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
211 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
212 msgid "Headline"
213 msgstr "Rubrik"
214
215 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
215 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
216 msgid "Comments"
217 msgstr "Kommentarer"
218
219 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
220 -#: gitk:8826
219 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
220 +#: gitk:8845
221 msgid "Author"
222 msgstr "Författare"
223
224 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
224 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
225 msgid "Committer"
226 msgstr "Incheckare"
227
@@ -249,7 +249,7 @@ msgstr "Rader sammanhang"
249 msgid "Ignore space change"
250 msgstr "Ignorera ändringar i blanksteg"
251
252 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
252 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
253 msgid "Line diff"
254 msgstr "Rad-diff"
255
@@ -261,99 +261,107 @@ msgstr "Patch"
261 msgid "Tree"
262 msgstr "Träd"
263
264 -#: gitk:2616 gitk:2636
264 +#: gitk:2617 gitk:2637
265 msgid "Diff this -> selected"
266 msgstr "Diff denna -> markerad"
267
268 -#: gitk:2617 gitk:2637
268 +#: gitk:2618 gitk:2638
269 msgid "Diff selected -> this"
270 msgstr "Diff markerad -> denna"
271
272 -#: gitk:2618 gitk:2638
272 +#: gitk:2619 gitk:2639
273 msgid "Make patch"
274 msgstr "Skapa patch"
275
276 -#: gitk:2619 gitk:9235
276 +#: gitk:2620 gitk:9254
277 msgid "Create tag"
278 msgstr "Skapa tagg"
279
280 -#: gitk:2620 gitk:9352
280 +#: gitk:2621 gitk:9371
281 msgid "Write commit to file"
282 msgstr "Skriv incheckning till fil"
283
284 -#: gitk:2621 gitk:9409
284 +#: gitk:2622 gitk:9428
285 msgid "Create new branch"
286 msgstr "Skapa ny gren"
287
288 -#: gitk:2622
288 +#: gitk:2623
289 msgid "Cherry-pick this commit"
290 msgstr "Plocka denna incheckning"
291
292 -#: gitk:2623
292 +#: gitk:2624
293 msgid "Reset HEAD branch to here"
294 msgstr "Återställ HEAD-grenen hit"
295
296 -#: gitk:2624
296 +#: gitk:2625
297 msgid "Mark this commit"
298 msgstr "Markera denna incheckning"
299
300 -#: gitk:2625
300 +#: gitk:2626
301 msgid "Return to mark"
302 msgstr "Återgå till markering"
303
304 -#: gitk:2626
304 +#: gitk:2627
305 msgid "Find descendant of this and mark"
306 msgstr "Hitta efterföljare till denna och markera"
307
308 -#: gitk:2627
308 +#: gitk:2628
309 msgid "Compare with marked commit"
310 msgstr "Jämför med markerad incheckning"
311
312 -#: gitk:2628 gitk:2639
312 +#: gitk:2629 gitk:2640
313 msgid "Diff this -> marked commit"
314 msgstr "Diff denna -> markerad incheckning"
315
316 -#: gitk:2629 gitk:2640
316 +#: gitk:2630 gitk:2641
317 msgid "Diff marked commit -> this"
318 msgstr "Diff markerad incheckning -> denna"
319
320 -#: gitk:2630
320 +#: gitk:2631
321 msgid "Revert this commit"
322 msgstr "Ångra denna incheckning"
323
324 -#: gitk:2646
324 +#: gitk:2647
325 msgid "Check out this branch"
326 msgstr "Checka ut denna gren"
327
328 -#: gitk:2647
328 +#: gitk:2648
329 msgid "Remove this branch"
330 msgstr "Ta bort denna gren"
331
332 -#: gitk:2654
332 +#: gitk:2649
333 +msgid "Copy branch name"
334 +msgstr ""
335 +
336 +#: gitk:2656
337 msgid "Highlight this too"
338 msgstr "Markera även detta"
339
336 -#: gitk:2655
340 +#: gitk:2657
341 msgid "Highlight this only"
342 msgstr "Markera bara detta"
343
340 -#: gitk:2656
344 +#: gitk:2658
345 msgid "External diff"
346 msgstr "Extern diff"
347
344 -#: gitk:2657
348 +#: gitk:2659
349 msgid "Blame parent commit"
350 msgstr "Klandra föräldraincheckning"
351
348 -#: gitk:2664
352 +#: gitk:2660
353 +msgid "Copy path"
354 +msgstr ""
355 +
356 +#: gitk:2667
357 msgid "Show origin of this line"
358 msgstr "Visa ursprunget för den här raden"
359
352 -#: gitk:2665
360 +#: gitk:2668
361 msgid "Run git gui blame on this line"
362 msgstr "Kör git gui blame på den här raden"
363
356 -#: gitk:3011
364 +#: gitk:3014
365 msgid ""
366 "\n"
367 "Gitk - a commit viewer for git\n"
@@ -369,327 +377,317 @@ msgstr ""
377 "\n"
378 "Använd och vidareförmedla enligt villkoren i GNU General Public License"
379
372 -#: gitk:3011
373 -msgid ""
374 -"\n"
375 -"Gitk - a commit viewer for git\n"
376 -"\n"
377 -"Copyright © 2005-2015 Paul Mackerras\n"
378 -"\n"
379 -"Use and redistribute under the terms of the GNU General Public License"
380 -msgstr ""
381 -"\n"
382 -"Gitk - en incheckningsvisare för git\n"
383 -"\n"
384 -"Copyright © 2005-2015 Paul Mackerras\n"
385 -"\n"
386 -"Använd och vidareförmedla enligt villkoren i GNU General Public License"
387 -
388 -#: gitk:3019 gitk:3085 gitk:9836
380 +#: gitk:3022 gitk:3089 gitk:9857
381 msgid "Close"
382 msgstr "Stäng"
383
392 -#: gitk:3040
384 +#: gitk:3043
385 msgid "Gitk key bindings"
386 msgstr "Tangentbordsbindningar för Gitk"
387
396 -#: gitk:3043
388 +#: gitk:3046
389 msgid "Gitk key bindings:"
390 msgstr "Tangentbordsbindningar för Gitk:"
391
400 -#: gitk:3045
392 +#: gitk:3048
393 #, tcl-format
394 msgid "<%s-Q>\t\tQuit"
395 msgstr "<%s-Q>\t\tAvsluta"
396
405 -#: gitk:3046
397 +#: gitk:3049
398 #, tcl-format
399 msgid "<%s-W>\t\tClose window"
400 msgstr "<%s-W>\t\tStäng fönster"
401
410 -#: gitk:3047
402 +#: gitk:3050
403 msgid "<Home>\t\tMove to first commit"
404 msgstr "<Home>\t\tGå till första incheckning"
405
414 -#: gitk:3048
406 +#: gitk:3051
407 msgid "<End>\t\tMove to last commit"
408 msgstr "<End>\t\tGå till sista incheckning"
409
418 -#: gitk:3049
410 +#: gitk:3052
411 msgid "<Up>, p, k\tMove up one commit"
412 msgstr "<Upp>, p, k\tGå en incheckning upp"
413
422 -#: gitk:3050
414 +#: gitk:3053
415 msgid "<Down>, n, j\tMove down one commit"
416 msgstr "<Ned>, n, j\tGå en incheckning ned"
417
426 -#: gitk:3051
418 +#: gitk:3054
419 msgid "<Left>, z, h\tGo back in history list"
420 msgstr "<Vänster>, z, h\tGå bakåt i historiken"
421
430 -#: gitk:3052
422 +#: gitk:3055
423 msgid "<Right>, x, l\tGo forward in history list"
424 msgstr "<Höger>, x, l\tGå framåt i historiken"
425
434 -#: gitk:3053
426 +#: gitk:3056
427 #, tcl-format
428 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
429 msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan"
430
439 -#: gitk:3054
431 +#: gitk:3057
432 msgid "<PageUp>\tMove up one page in commit list"
433 msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
434
443 -#: gitk:3055
435 +#: gitk:3058
436 msgid "<PageDown>\tMove down one page in commit list"
437 msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
438
447 -#: gitk:3056
439 +#: gitk:3059
440 #, tcl-format
441 msgid "<%s-Home>\tScroll to top of commit list"
442 msgstr "<%s-Home>\tRulla till början av incheckningslistan"
443
452 -#: gitk:3057
444 +#: gitk:3060
445 #, tcl-format
446 msgid "<%s-End>\tScroll to bottom of commit list"
447 msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
448
457 -#: gitk:3058
449 +#: gitk:3061
450 #, tcl-format
451 msgid "<%s-Up>\tScroll commit list up one line"
452 msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
453
462 -#: gitk:3059
454 +#: gitk:3062
455 #, tcl-format
456 msgid "<%s-Down>\tScroll commit list down one line"
457 msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
458
467 -#: gitk:3060
459 +#: gitk:3063
460 #, tcl-format
461 msgid "<%s-PageUp>\tScroll commit list up one page"
462 msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
463
472 -#: gitk:3061
464 +#: gitk:3064
465 #, tcl-format
466 msgid "<%s-PageDown>\tScroll commit list down one page"
467 msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
468
477 -#: gitk:3062
469 +#: gitk:3065
470 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
471 msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
472
481 -#: gitk:3063
473 +#: gitk:3066
474 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
475 msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
476
485 -#: gitk:3064
477 +#: gitk:3067
478 msgid "<Delete>, b\tScroll diff view up one page"
479 msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
480
489 -#: gitk:3065
481 +#: gitk:3068
482 msgid "<Backspace>\tScroll diff view up one page"
483 msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
484
493 -#: gitk:3066
485 +#: gitk:3069
486 msgid "<Space>\t\tScroll diff view down one page"
487 msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
488
497 -#: gitk:3067
489 +#: gitk:3070
490 msgid "u\t\tScroll diff view up 18 lines"
491 msgstr "u\t\tRulla diffvisningen upp 18 rader"
492
501 -#: gitk:3068
493 +#: gitk:3071
494 msgid "d\t\tScroll diff view down 18 lines"
495 msgstr "d\t\tRulla diffvisningen ned 18 rader"
496
505 -#: gitk:3069
497 +#: gitk:3072
498 #, tcl-format
499 msgid "<%s-F>\t\tFind"
500 msgstr "<%s-F>\t\tSök"
501
510 -#: gitk:3070
502 +#: gitk:3073
503 #, tcl-format
504 msgid "<%s-G>\t\tMove to next find hit"
505 msgstr "<%s-G>\t\tGå till nästa sökträff"
506
515 -#: gitk:3071
507 +#: gitk:3074
508 msgid "<Return>\tMove to next find hit"
509 msgstr "<Return>\t\tGå till nästa sökträff"
510
519 -#: gitk:3072
511 +#: gitk:3075
512 +#, fuzzy
513 +msgid "g\t\tGo to commit"
514 +msgstr "<End>\t\tGå till sista incheckning"
515 +
516 +#: gitk:3076
517 msgid "/\t\tFocus the search box"
518 msgstr "/\t\tFokusera sökrutan"
519
523 -#: gitk:3073
520 +#: gitk:3077
521 msgid "?\t\tMove to previous find hit"
522 msgstr "?\t\tGå till föregående sökträff"
523
527 -#: gitk:3074
524 +#: gitk:3078
525 msgid "f\t\tScroll diff view to next file"
526 msgstr "f\t\tRulla diffvisningen till nästa fil"
527
531 -#: gitk:3075
528 +#: gitk:3079
529 #, tcl-format
530 msgid "<%s-S>\t\tSearch for next hit in diff view"
531 msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
532
536 -#: gitk:3076
533 +#: gitk:3080
534 #, tcl-format
535 msgid "<%s-R>\t\tSearch for previous hit in diff view"
536 msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
537
541 -#: gitk:3077
538 +#: gitk:3081
539 #, tcl-format
540 msgid "<%s-KP+>\tIncrease font size"
541 msgstr "<%s-Num+>\tÖka teckenstorlek"
542
546 -#: gitk:3078
543 +#: gitk:3082
544 #, tcl-format
545 msgid "<%s-plus>\tIncrease font size"
546 msgstr "<%s-plus>\tÖka teckenstorlek"
547
551 -#: gitk:3079
548 +#: gitk:3083
549 #, tcl-format
550 msgid "<%s-KP->\tDecrease font size"
551 msgstr "<%s-Num->\tMinska teckenstorlek"
552
556 -#: gitk:3080
553 +#: gitk:3084
554 #, tcl-format
555 msgid "<%s-minus>\tDecrease font size"
556 msgstr "<%s-minus>\tMinska teckenstorlek"
557
561 -#: gitk:3081
558 +#: gitk:3085
559 msgid "<F5>\t\tUpdate"
560 msgstr "<F5>\t\tUppdatera"
561
565 -#: gitk:3546 gitk:3555
562 +#: gitk:3550 gitk:3559
563 #, tcl-format
564 msgid "Error creating temporary directory %s:"
565 msgstr "Fel vid skapande av temporär katalog %s:"
566
570 -#: gitk:3568
567 +#: gitk:3572
568 #, tcl-format
569 msgid "Error getting \"%s\" from %s:"
570 msgstr "Fel vid hämtning av \"%s\" från %s:"
571
575 -#: gitk:3631
572 +#: gitk:3635
573 msgid "command failed:"
574 msgstr "kommando misslyckades:"
575
579 -#: gitk:3780
576 +#: gitk:3784
577 msgid "No such commit"
578 msgstr "Incheckning saknas"
579
583 -#: gitk:3794
580 +#: gitk:3798
581 msgid "git gui blame: command failed:"
582 msgstr "git gui blame: kommando misslyckades:"
583
587 -#: gitk:3825
584 +#: gitk:3829
585 #, tcl-format
586 msgid "Couldn't read merge head: %s"
587 msgstr "Kunde inte läsa sammanslagningshuvud: %s"
588
592 -#: gitk:3833
589 +#: gitk:3837
590 #, tcl-format
591 msgid "Error reading index: %s"
592 msgstr "Fel vid läsning av index: %s"
593
597 -#: gitk:3858
594 +#: gitk:3862
595 #, tcl-format
596 msgid "Couldn't start git blame: %s"
597 msgstr "Kunde inte starta git blame: %s"
598
602 -#: gitk:3861 gitk:6735
599 +#: gitk:3865 gitk:6754
600 msgid "Searching"
601 msgstr "Söker"
602
606 -#: gitk:3893
603 +#: gitk:3897
604 #, tcl-format
605 msgid "Error running git blame: %s"
606 msgstr "Fel vid körning av git blame: %s"
607
611 -#: gitk:3921
608 +#: gitk:3925
609 #, tcl-format
610 msgid "That line comes from commit %s, which is not in this view"
611 msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy"
612
616 -#: gitk:3935
613 +#: gitk:3939
614 msgid "External diff viewer failed:"
615 msgstr "Externt diff-verktyg misslyckades:"
616
620 -#: gitk:4053
617 +#: gitk:4070
618 msgid "Gitk view definition"
619 msgstr "Definition av Gitk-vy"
620
624 -#: gitk:4057
621 +#: gitk:4074
622 msgid "Remember this view"
623 msgstr "Spara denna vy"
624
628 -#: gitk:4058
625 +#: gitk:4075
626 msgid "References (space separated list):"
627 msgstr "Referenser (blankstegsavdelad lista):"
628
632 -#: gitk:4059
629 +#: gitk:4076
630 msgid "Branches & tags:"
631 msgstr "Grenar & taggar:"
632
636 -#: gitk:4060
633 +#: gitk:4077
634 msgid "All refs"
635 msgstr "Alla referenser"
636
640 -#: gitk:4061
637 +#: gitk:4078
638 msgid "All (local) branches"
639 msgstr "Alla (lokala) grenar"
640
644 -#: gitk:4062
641 +#: gitk:4079
642 msgid "All tags"
643 msgstr "Alla taggar"
644
648 -#: gitk:4063
645 +#: gitk:4080
646 msgid "All remote-tracking branches"
647 msgstr "Alla fjärrspårande grenar"
648
652 -#: gitk:4064
649 +#: gitk:4081
650 msgid "Commit Info (regular expressions):"
651 msgstr "Incheckningsinfo (reguljära uttryck):"
652
656 -#: gitk:4065
653 +#: gitk:4082
654 msgid "Author:"
655 msgstr "Författare:"
656
660 -#: gitk:4066
657 +#: gitk:4083
658 msgid "Committer:"
659 msgstr "Incheckare:"
660
664 -#: gitk:4067
661 +#: gitk:4084
662 msgid "Commit Message:"
663 msgstr "Incheckningsmeddelande:"
664
668 -#: gitk:4068
665 +#: gitk:4085
666 msgid "Matches all Commit Info criteria"
667 msgstr "Motsvarar alla kriterier för incheckningsinfo"
668
672 -#: gitk:4069
673 -msgid "Matches none Commit Info criteria"
669 +#: gitk:4086
670 +#, fuzzy
671 +msgid "Matches no Commit Info criteria"
672 msgstr "Motsvarar inga kriterier för incheckningsinfo"
673
676 -#: gitk:4070
674 +#: gitk:4087
675 msgid "Changes to Files:"
676 msgstr "Ändringar av filer:"
677
680 -#: gitk:4071
678 +#: gitk:4088
679 msgid "Fixed String"
680 msgstr "Fast sträng"
681
684 -#: gitk:4072
682 +#: gitk:4089
683 msgid "Regular Expression"
684 msgstr "Reguljärt uttryck"
685
688 -#: gitk:4073
686 +#: gitk:4090
687 msgid "Search string:"
688 msgstr "Söksträng:"
689
692 -#: gitk:4074
690 +#: gitk:4091
691 msgid ""
692 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
693 "15:27:38\"):"
@@ -697,201 +695,201 @@ msgstr ""
695 "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
696 "15:27:38\"):"
697
700 -#: gitk:4075
698 +#: gitk:4092
699 msgid "Since:"
700 msgstr "Från:"
701
704 -#: gitk:4076
702 +#: gitk:4093
703 msgid "Until:"
704 msgstr "Till:"
705
708 -#: gitk:4077
706 +#: gitk:4094
707 msgid "Limit and/or skip a number of revisions (positive integer):"
708 msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):"
709
712 -#: gitk:4078
710 +#: gitk:4095
711 msgid "Number to show:"
712 msgstr "Antal att visa:"
713
716 -#: gitk:4079
714 +#: gitk:4096
715 msgid "Number to skip:"
716 msgstr "Antal att hoppa över:"
717
720 -#: gitk:4080
718 +#: gitk:4097
719 msgid "Miscellaneous options:"
720 msgstr "Diverse alternativ:"
721
724 -#: gitk:4081
722 +#: gitk:4098
723 msgid "Strictly sort by date"
724 msgstr "Strikt datumsortering"
725
728 -#: gitk:4082
726 +#: gitk:4099
727 msgid "Mark branch sides"
728 msgstr "Markera sidogrenar"
729
732 -#: gitk:4083
730 +#: gitk:4100
731 msgid "Limit to first parent"
732 msgstr "Begränsa till första förälder"
733
736 -#: gitk:4084
734 +#: gitk:4101
735 msgid "Simple history"
736 msgstr "Enkel historik"
737
740 -#: gitk:4085
738 +#: gitk:4102
739 msgid "Additional arguments to git log:"
740 msgstr "Ytterligare argument till git log:"
741
744 -#: gitk:4086
742 +#: gitk:4103
743 msgid "Enter files and directories to include, one per line:"
744 msgstr "Ange filer och kataloger att ta med, en per rad:"
745
748 -#: gitk:4087
746 +#: gitk:4104
747 msgid "Command to generate more commits to include:"
748 msgstr "Kommando för att generera fler incheckningar att ta med:"
749
752 -#: gitk:4211
750 +#: gitk:4228
751 msgid "Gitk: edit view"
752 msgstr "Gitk: redigera vy"
753
756 -#: gitk:4219
754 +#: gitk:4236
755 msgid "-- criteria for selecting revisions"
756 msgstr " - kriterier för val av revisioner"
757
760 -#: gitk:4224
758 +#: gitk:4241
759 msgid "View Name"
760 msgstr "Namn på vy"
761
764 -#: gitk:4299
762 +#: gitk:4316
763 msgid "Apply (F5)"
764 msgstr "Använd (F5)"
765
768 -#: gitk:4337
766 +#: gitk:4354
767 msgid "Error in commit selection arguments:"
768 msgstr "Fel i argument för val av incheckningar:"
769
772 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
770 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
771 msgid "None"
772 msgstr "Inget"
773
776 -#: gitk:5003 gitk:5008
774 +#: gitk:5021 gitk:5026
775 msgid "Descendant"
776 msgstr "Avkomling"
777
780 -#: gitk:5004
778 +#: gitk:5022
779 msgid "Not descendant"
780 msgstr "Inte avkomling"
781
784 -#: gitk:5011 gitk:5016
782 +#: gitk:5029 gitk:5034
783 msgid "Ancestor"
784 msgstr "Förfader"
785
788 -#: gitk:5012
786 +#: gitk:5030
787 msgid "Not ancestor"
788 msgstr "Inte förfader"
789
792 -#: gitk:5306
790 +#: gitk:5324
791 msgid "Local changes checked in to index but not committed"
792 msgstr "Lokala ändringar sparade i indexet men inte incheckade"
793
796 -#: gitk:5342
794 +#: gitk:5360
795 msgid "Local uncommitted changes, not checked in to index"
796 msgstr "Lokala ändringar, ej sparade i indexet"
797
800 -#: gitk:7115
798 +#: gitk:7134
799 msgid "and many more"
800 msgstr "med många flera"
801
804 -#: gitk:7118
802 +#: gitk:7137
803 msgid "many"
804 msgstr "många"
805
808 -#: gitk:7309
806 +#: gitk:7328
807 msgid "Tags:"
808 msgstr "Taggar:"
809
812 -#: gitk:7326 gitk:7332 gitk:8806
810 +#: gitk:7345 gitk:7351 gitk:8825
811 msgid "Parent"
812 msgstr "Förälder"
813
816 -#: gitk:7337
814 +#: gitk:7356
815 msgid "Child"
816 msgstr "Barn"
817
820 -#: gitk:7346
818 +#: gitk:7365
819 msgid "Branch"
820 msgstr "Gren"
821
824 -#: gitk:7349
822 +#: gitk:7368
823 msgid "Follows"
824 msgstr "Följer"
825
828 -#: gitk:7352
826 +#: gitk:7371
827 msgid "Precedes"
828 msgstr "Föregår"
829
832 -#: gitk:7947
830 +#: gitk:7966
831 #, tcl-format
832 msgid "Error getting diffs: %s"
833 msgstr "Fel vid hämtning av diff: %s"
834
837 -#: gitk:8631
835 +#: gitk:8650
836 msgid "Goto:"
837 msgstr "Gå till:"
838
841 -#: gitk:8652
839 +#: gitk:8671
840 #, tcl-format
841 msgid "Short SHA1 id %s is ambiguous"
842 msgstr "Förkortat SHA1-id %s är tvetydigt"
843
846 -#: gitk:8659
844 +#: gitk:8678
845 #, tcl-format
846 msgid "Revision %s is not known"
847 msgstr "Revisionen %s är inte känd"
848
851 -#: gitk:8669
849 +#: gitk:8688
850 #, tcl-format
851 msgid "SHA1 id %s is not known"
852 msgstr "SHA-id:t %s är inte känt"
853
856 -#: gitk:8671
854 +#: gitk:8690
855 #, tcl-format
856 msgid "Revision %s is not in the current view"
857 msgstr "Revisionen %s finns inte i den nuvarande vyn"
858
861 -#: gitk:8813 gitk:8828
859 +#: gitk:8832 gitk:8847
860 msgid "Date"
861 msgstr "Datum"
862
865 -#: gitk:8816
863 +#: gitk:8835
864 msgid "Children"
865 msgstr "Barn"
866
869 -#: gitk:8879
867 +#: gitk:8898
868 #, tcl-format
869 msgid "Reset %s branch to here"
870 msgstr "Återställ grenen %s hit"
871
874 -#: gitk:8881
872 +#: gitk:8900
873 msgid "Detached head: can't reset"
874 msgstr "Frånkopplad head: kan inte återställa"
875
878 -#: gitk:8986 gitk:8992
876 +#: gitk:9005 gitk:9011
877 msgid "Skipping merge commit "
878 msgstr "Hoppar över sammanslagningsincheckning "
879
882 -#: gitk:9001 gitk:9006
880 +#: gitk:9020 gitk:9025
881 msgid "Error getting patch ID for "
882 msgstr "Fel vid hämtning av patch-id för "
883
886 -#: gitk:9002 gitk:9007
884 +#: gitk:9021 gitk:9026
885 msgid " - stopping\n"
886 msgstr " - stannar\n"
887
890 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
888 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
889 msgid "Commit "
890 msgstr "Incheckning "
891
894 -#: gitk:9016
892 +#: gitk:9035
893 msgid ""
894 " is the same patch as\n"
895 " "
@@ -899,7 +897,7 @@ msgstr ""
897 " är samma patch som\n"
898 " "
899
902 -#: gitk:9024
900 +#: gitk:9043
901 msgid ""
902 " differs from\n"
903 " "
@@ -907,7 +905,7 @@ msgstr ""
905 " skiljer sig från\n"
906 " "
907
910 -#: gitk:9026
908 +#: gitk:9045
909 msgid ""
910 "Diff of commits:\n"
911 "\n"
@@ -915,131 +913,131 @@ msgstr ""
913 "Skillnad mellan incheckningar:\n"
914 "\n"
915
918 -#: gitk:9038 gitk:9047
916 +#: gitk:9057 gitk:9066
917 #, tcl-format
918 msgid " has %s children - stopping\n"
919 msgstr " har %s barn - stannar\n"
920
923 -#: gitk:9066
921 +#: gitk:9085
922 #, tcl-format
923 msgid "Error writing commit to file: %s"
924 msgstr "Fel vid skrivning av incheckning till fil: %s"
925
928 -#: gitk:9072
926 +#: gitk:9091
927 #, tcl-format
928 msgid "Error diffing commits: %s"
929 msgstr "Fel vid jämförelse av incheckningar: %s"
930
933 -#: gitk:9118
931 +#: gitk:9137
932 msgid "Top"
933 msgstr "Topp"
934
937 -#: gitk:9119
935 +#: gitk:9138
936 msgid "From"
937 msgstr "Från"
938
941 -#: gitk:9124
939 +#: gitk:9143
940 msgid "To"
941 msgstr "Till"
942
945 -#: gitk:9148
943 +#: gitk:9167
944 msgid "Generate patch"
945 msgstr "Generera patch"
946
949 -#: gitk:9150
947 +#: gitk:9169
948 msgid "From:"
949 msgstr "Från:"
950
953 -#: gitk:9159
951 +#: gitk:9178
952 msgid "To:"
953 msgstr "Till:"
954
957 -#: gitk:9168
955 +#: gitk:9187
956 msgid "Reverse"
957 msgstr "Vänd"
958
961 -#: gitk:9170 gitk:9366
959 +#: gitk:9189 gitk:9385
960 msgid "Output file:"
961 msgstr "Utdatafil:"
962
965 -#: gitk:9176
963 +#: gitk:9195
964 msgid "Generate"
965 msgstr "Generera"
966
969 -#: gitk:9214
967 +#: gitk:9233
968 msgid "Error creating patch:"
969 msgstr "Fel vid generering av patch:"
970
973 -#: gitk:9237 gitk:9354 gitk:9411
971 +#: gitk:9256 gitk:9373 gitk:9430
972 msgid "ID:"
973 msgstr "Id:"
974
977 -#: gitk:9246
975 +#: gitk:9265
976 msgid "Tag name:"
977 msgstr "Taggnamn:"
978
981 -#: gitk:9249
979 +#: gitk:9268
980 msgid "Tag message is optional"
981 msgstr "Taggmeddelandet är valfritt"
982
985 -#: gitk:9251
983 +#: gitk:9270
984 msgid "Tag message:"
985 msgstr "Taggmeddelande:"
986
989 -#: gitk:9255 gitk:9420
987 +#: gitk:9274 gitk:9439
988 msgid "Create"
989 msgstr "Skapa"
990
993 -#: gitk:9273
991 +#: gitk:9292
992 msgid "No tag name specified"
993 msgstr "Inget taggnamn angavs"
994
997 -#: gitk:9277
995 +#: gitk:9296
996 #, tcl-format
997 msgid "Tag \"%s\" already exists"
998 msgstr "Taggen \"%s\" finns redan"
999
1002 -#: gitk:9287
1000 +#: gitk:9306
1001 msgid "Error creating tag:"
1002 msgstr "Fel vid skapande av tagg:"
1003
1006 -#: gitk:9363
1004 +#: gitk:9382
1005 msgid "Command:"
1006 msgstr "Kommando:"
1007
1010 -#: gitk:9371
1008 +#: gitk:9390
1009 msgid "Write"
1010 msgstr "Skriv"
1011
1014 -#: gitk:9389
1012 +#: gitk:9408
1013 msgid "Error writing commit:"
1014 msgstr "Fel vid skrivning av incheckning:"
1015
1018 -#: gitk:9416
1016 +#: gitk:9435
1017 msgid "Name:"
1018 msgstr "Namn:"
1019
1022 -#: gitk:9439
1020 +#: gitk:9458
1021 msgid "Please specify a name for the new branch"
1022 msgstr "Ange ett namn för den nya grenen"
1023
1026 -#: gitk:9444
1024 +#: gitk:9463
1025 #, tcl-format
1026 msgid "Branch '%s' already exists. Overwrite?"
1027 msgstr "Grenen \"%s\" finns redan. Skriva över?"
1028
1031 -#: gitk:9511
1029 +#: gitk:9530
1030 #, tcl-format
1031 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1032 msgstr ""
1033 "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
1034 "på nytt?"
1035
1038 -#: gitk:9516
1036 +#: gitk:9535
1037 msgid "Cherry-picking"
1038 msgstr "Plockar"
1039
1042 -#: gitk:9525
1040 +#: gitk:9544
1041 #, tcl-format
1042 msgid ""
1043 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1049,7 +1047,7 @@ msgstr ""
1047 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
1048 "igen."
1049
1052 -#: gitk:9531
1050 +#: gitk:9550
1051 msgid ""
1052 "Cherry-pick failed because of merge conflict.\n"
1053 "Do you wish to run git citool to resolve it?"
@@ -1057,20 +1055,20 @@ msgstr ""
1055 "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n"
1056 "Vill du köra git citool för att lösa den?"
1057
1060 -#: gitk:9547 gitk:9605
1058 +#: gitk:9566 gitk:9624
1059 msgid "No changes committed"
1060 msgstr "Inga ändringar incheckade"
1061
1064 -#: gitk:9574
1062 +#: gitk:9593
1063 #, tcl-format
1064 msgid "Commit %s is not included in branch %s -- really revert it?"
1065 msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?"
1066
1069 -#: gitk:9579
1067 +#: gitk:9598
1068 msgid "Reverting"
1069 msgstr "Ångrar"
1070
1073 -#: gitk:9587
1071 +#: gitk:9606
1072 #, tcl-format
1073 msgid ""
1074 "Revert failed because of local changes to the following files:%s Please "
@@ -1080,7 +1078,7 @@ msgstr ""
1078 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
1079 "igen."
1080
1083 -#: gitk:9591
1081 +#: gitk:9610
1082 msgid ""
1083 "Revert failed because of merge conflict.\n"
1084 " Do you wish to run git citool to resolve it?"
@@ -1088,28 +1086,28 @@ msgstr ""
1086 "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n"
1087 " Vill du köra git citool för att lösa den?"
1088
1091 -#: gitk:9634
1089 +#: gitk:9653
1090 msgid "Confirm reset"
1091 msgstr "Bekräfta återställning"
1092
1095 -#: gitk:9636
1093 +#: gitk:9655
1094 #, tcl-format
1095 msgid "Reset branch %s to %s?"
1096 msgstr "Återställa grenen %s till %s?"
1097
1100 -#: gitk:9638
1098 +#: gitk:9657
1099 msgid "Reset type:"
1100 msgstr "Typ av återställning:"
1101
1104 -#: gitk:9641
1102 +#: gitk:9660
1103 msgid "Soft: Leave working tree and index untouched"
1104 msgstr "Mjuk: Rör inte utcheckning och index"
1105
1108 -#: gitk:9644
1106 +#: gitk:9663
1107 msgid "Mixed: Leave working tree untouched, reset index"
1108 msgstr "Blandad: Rör inte utcheckning, återställ index"
1109
1112 -#: gitk:9647
1110 +#: gitk:9666
1111 msgid ""
1112 "Hard: Reset working tree and index\n"
1113 "(discard ALL local changes)"
@@ -1117,19 +1115,19 @@ msgstr ""
1115 "Hård: Återställ utcheckning och index\n"
1116 "(förkastar ALLA lokala ändringar)"
1117
1120 -#: gitk:9664
1118 +#: gitk:9683
1119 msgid "Resetting"
1120 msgstr "Återställer"
1121
1124 -#: gitk:9724
1122 +#: gitk:9743
1123 msgid "Checking out"
1124 msgstr "Checkar ut"
1125
1128 -#: gitk:9777
1126 +#: gitk:9796
1127 msgid "Cannot delete the currently checked-out branch"
1128 msgstr "Kan inte ta bort den just nu utcheckade grenen"
1129
1132 -#: gitk:9783
1130 +#: gitk:9802
1131 #, tcl-format
1132 msgid ""
1133 "The commits on branch %s aren't on any other branch.\n"
@@ -1138,16 +1136,16 @@ msgstr ""
1136 "Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
1137 "Vill du verkligen ta bort grenen %s?"
1138
1141 -#: gitk:9814
1139 +#: gitk:9833
1140 #, tcl-format
1141 msgid "Tags and heads: %s"
1142 msgstr "Taggar och huvuden: %s"
1143
1146 -#: gitk:9829
1144 +#: gitk:9850
1145 msgid "Filter"
1146 msgstr "Filter"
1147
1150 -#: gitk:10125
1148 +#: gitk:10146
1149 msgid ""
1150 "Error reading commit topology information; branch and preceding/following "
1151 "tag information will be incomplete."
@@ -1155,216 +1153,238 @@ msgstr ""
1153 "Fel vid läsning av information om incheckningstopologi; information om "
1154 "grenar och föregående/senare taggar kommer inte vara komplett."
1155
1158 -#: gitk:11102
1156 +#: gitk:11123
1157 msgid "Tag"
1158 msgstr "Tagg"
1159
1162 -#: gitk:11106
1160 +#: gitk:11127
1161 msgid "Id"
1162 msgstr "Id"
1163
1166 -#: gitk:11189
1164 +#: gitk:11210
1165 msgid "Gitk font chooser"
1166 msgstr "Teckensnittsväljare för Gitk"
1167
1170 -#: gitk:11206
1168 +#: gitk:11227
1169 msgid "B"
1170 msgstr "F"
1171
1174 -#: gitk:11209
1172 +#: gitk:11230
1173 msgid "I"
1174 msgstr "K"
1175
1178 -#: gitk:11327
1176 +#: gitk:11348
1177 msgid "Commit list display options"
1178 msgstr "Alternativ för incheckningslistvy"
1179
1182 -#: gitk:11330
1180 +#: gitk:11351
1181 msgid "Maximum graph width (lines)"
1182 msgstr "Maximal grafbredd (rader)"
1183
1186 -#: gitk:11334
1184 +#: gitk:11355
1185 #, no-tcl-format
1186 msgid "Maximum graph width (% of pane)"
1187 msgstr "Maximal grafbredd (% av ruta)"
1188
1191 -#: gitk:11337
1189 +#: gitk:11358
1190 msgid "Show local changes"
1191 msgstr "Visa lokala ändringar"
1192
1195 -#: gitk:11340
1193 +#: gitk:11361
1194 msgid "Auto-select SHA1 (length)"
1195 msgstr "Välj SHA1 (längd) automatiskt"
1196
1199 -#: gitk:11344
1197 +#: gitk:11365
1198 msgid "Hide remote refs"
1199 msgstr "Dölj fjärr-referenser"
1200
1203 -#: gitk:11348
1201 +#: gitk:11369
1202 msgid "Diff display options"
1203 msgstr "Alternativ för diffvy"
1204
1207 -#: gitk:11350
1205 +#: gitk:11371
1206 msgid "Tab spacing"
1207 msgstr "Blanksteg för tabulatortecken"
1208
1211 -#: gitk:11353
1209 +#: gitk:11374
1210 msgid "Display nearby tags/heads"
1211 msgstr "Visa närliggande taggar/huvuden"
1212
1215 -#: gitk:11356
1213 +#: gitk:11377
1214 msgid "Maximum # tags/heads to show"
1215 msgstr "Maximalt antal taggar/huvuden att visa"
1216
1219 -#: gitk:11359
1217 +#: gitk:11380
1218 msgid "Limit diffs to listed paths"
1219 msgstr "Begränsa diff till listade sökvägar"
1220
1223 -#: gitk:11362
1221 +#: gitk:11383
1222 msgid "Support per-file encodings"
1223 msgstr "Stöd för filspecifika teckenkodningar"
1224
1227 -#: gitk:11368 gitk:11515
1225 +#: gitk:11389 gitk:11536
1226 msgid "External diff tool"
1227 msgstr "Externt diff-verktyg"
1228
1231 -#: gitk:11369
1229 +#: gitk:11390
1230 msgid "Choose..."
1231 msgstr "Välj..."
1232
1235 -#: gitk:11374
1233 +#: gitk:11395
1234 msgid "General options"
1235 msgstr "Allmänna inställningar"
1236
1239 -#: gitk:11377
1237 +#: gitk:11398
1238 msgid "Use themed widgets"
1239 msgstr "Använd tema på fönsterelement"
1240
1243 -#: gitk:11379
1241 +#: gitk:11400
1242 msgid "(change requires restart)"
1243 msgstr "(ändringen kräver omstart)"
1244
1247 -#: gitk:11381
1245 +#: gitk:11402
1246 msgid "(currently unavailable)"
1247 msgstr "(för närvarande inte tillgängligt)"
1248
1251 -#: gitk:11392
1249 +#: gitk:11413
1250 msgid "Colors: press to choose"
1251 msgstr "Färger: tryck för att välja"
1252
1255 -#: gitk:11395
1253 +#: gitk:11416
1254 msgid "Interface"
1255 msgstr "Gränssnitt"
1256
1259 -#: gitk:11396
1257 +#: gitk:11417
1258 msgid "interface"
1259 msgstr "gränssnitt"
1260
1263 -#: gitk:11399
1261 +#: gitk:11420
1262 msgid "Background"
1263 msgstr "Bakgrund"
1264
1267 -#: gitk:11400 gitk:11430
1265 +#: gitk:11421 gitk:11451
1266 msgid "background"
1267 msgstr "bakgrund"
1268
1271 -#: gitk:11403
1269 +#: gitk:11424
1270 msgid "Foreground"
1271 msgstr "Förgrund"
1272
1275 -#: gitk:11404
1273 +#: gitk:11425
1274 msgid "foreground"
1275 msgstr "förgrund"
1276
1279 -#: gitk:11407
1277 +#: gitk:11428
1278 msgid "Diff: old lines"
1279 msgstr "Diff: gamla rader"
1280
1283 -#: gitk:11408
1281 +#: gitk:11429
1282 msgid "diff old lines"
1283 msgstr "diff gamla rader"
1284
1287 -#: gitk:11412
1285 +#: gitk:11433
1286 msgid "Diff: new lines"
1287 msgstr "Diff: nya rader"
1288
1291 -#: gitk:11413
1289 +#: gitk:11434
1290 msgid "diff new lines"
1291 msgstr "diff nya rader"
1292
1295 -#: gitk:11417
1293 +#: gitk:11438
1294 msgid "Diff: hunk header"
1295 msgstr "Diff: delhuvud"
1296
1299 -#: gitk:11419
1297 +#: gitk:11440
1298 msgid "diff hunk header"
1299 msgstr "diff delhuvud"
1300
1303 -#: gitk:11423
1301 +#: gitk:11444
1302 msgid "Marked line bg"
1303 msgstr "Markerad rad bakgrund"
1304
1307 -#: gitk:11425
1305 +#: gitk:11446
1306 msgid "marked line background"
1307 msgstr "markerad rad bakgrund"
1308
1311 -#: gitk:11429
1309 +#: gitk:11450
1310 msgid "Select bg"
1311 msgstr "Markerad bakgrund"
1312
1315 -#: gitk:11438
1313 +#: gitk:11459
1314 msgid "Fonts: press to choose"
1315 msgstr "Teckensnitt: tryck för att välja"
1316
1319 -#: gitk:11440
1317 +#: gitk:11461
1318 msgid "Main font"
1319 msgstr "Huvudteckensnitt"
1320
1323 -#: gitk:11441
1321 +#: gitk:11462
1322 msgid "Diff display font"
1323 msgstr "Teckensnitt för diffvisning"
1324
1327 -#: gitk:11442
1325 +#: gitk:11463
1326 msgid "User interface font"
1327 msgstr "Teckensnitt för användargränssnitt"
1328
1331 -#: gitk:11464
1329 +#: gitk:11485
1330 msgid "Gitk preferences"
1331 msgstr "Inställningar för Gitk"
1332
1335 -#: gitk:11473
1333 +#: gitk:11494
1334 msgid "General"
1335 msgstr "Allmänt"
1336
1339 -#: gitk:11474
1337 +#: gitk:11495
1338 msgid "Colors"
1339 msgstr "Färger"
1340
1343 -#: gitk:11475
1341 +#: gitk:11496
1342 msgid "Fonts"
1343 msgstr "Teckensnitt"
1344
1347 -#: gitk:11525
1345 +#: gitk:11546
1346 #, tcl-format
1347 msgid "Gitk: choose color for %s"
1348 msgstr "Gitk: välj färg för %s"
1349
1352 -#: gitk:12242
1350 +#: gitk:12059
1351 +msgid ""
1352 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1353 +" Gitk requires at least Tcl/Tk 8.4."
1354 +msgstr ""
1355 +"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
1356 +" Gitk kräver åtminstone Tcl/Tk 8.4."
1357 +
1358 +#: gitk:12269
1359 msgid "Cannot find a git repository here."
1360 msgstr "Hittar inget git-arkiv här."
1361
1356 -#: gitk:12289
1362 +#: gitk:12316
1363 #, tcl-format
1364 msgid "Ambiguous argument '%s': both revision and filename"
1365 msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
1366
1361 -#: gitk:12301
1367 +#: gitk:12328
1368 msgid "Bad arguments to gitk:"
1369 msgstr "Felaktiga argument till gitk:"
1370
1365 -#: gitk:12405
1366 -msgid "Command line"
1367 -msgstr "Kommandorad"
1371 +#~ msgid "mc"
1372 +#~ msgstr "mc"
1373 +
1374 +#~ msgid ""
1375 +#~ "\n"
1376 +#~ "Gitk - a commit viewer for git\n"
1377 +#~ "\n"
1378 +#~ "Copyright © 2005-2015 Paul Mackerras\n"
1379 +#~ "\n"
1380 +#~ "Use and redistribute under the terms of the GNU General Public License"
1381 +#~ msgstr ""
1382 +#~ "\n"
1383 +#~ "Gitk - en incheckningsvisare för git\n"
1384 +#~ "\n"
1385 +#~ "Copyright © 2005-2015 Paul Mackerras\n"
1386 +#~ "\n"
1387 +#~ "Använd och vidareförmedla enligt villkoren i GNU General Public License"
1388
1389 #~ msgid "next"
1390 #~ msgstr "nästa"
@@ -1384,13 +1404,6 @@ msgstr "Kommandorad"
1404 #~ msgid "- stopping\n"
1405 #~ msgstr "- stannar\n"
1406
1387 -#~ msgid ""
1388 -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1389 -#~ " Gitk requires at least Tcl/Tk 8.4."
1390 -#~ msgstr ""
1391 -#~ "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
1392 -#~ " Gitk kräver åtminstone Tcl/Tk 8.4."
1393 -
1407 #~ msgid "Tag/Head %s is not known"
1408 #~ msgstr "Tagg/huvud %s är okänt"
1409
po/vi.po
+297 -279
@@ -7,7 +7,7 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: gitk @@GIT_VERSION@@\n"
9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2015-03-15 14:37+1100\n"
10 +"POT-Creation-Date: 2015-05-17 14:32+1000\n"
11 "PO-Revision-Date: 2013-12-14 14:40+0700\n"
12 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
13 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -25,7 +25,7 @@ msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn:
25 msgid "Color words"
26 msgstr "Tô màu chữ"
27
28 -#: gitk:217 gitk:2381 gitk:8201 gitk:8234
28 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253
29 msgid "Markup words"
30 msgstr "Đánh dấu chữ"
31
@@ -58,14 +58,18 @@ msgstr "Gặp lỗi khi thực hiện lệnh git log:"
58 msgid "Reading"
59 msgstr "Đang đọc"
60
61 -#: gitk:496 gitk:4508
61 +#: gitk:496 gitk:4525
62 msgid "Reading commits..."
63 msgstr "Đang đọc các lần chuyển giao..."
64
65 -#: gitk:499 gitk:1637 gitk:4511
65 +#: gitk:499 gitk:1637 gitk:4528
66 msgid "No commits selected"
67 msgstr "Chưa chọn các lần chuyển giao"
68
69 +#: gitk:1445 gitk:4045 gitk:12432
70 +msgid "Command line"
71 +msgstr "Dòng lệnh"
72 +
73 #: gitk:1511
74 msgid "Can't parse git log output:"
75 msgstr "Không thể phân tích kết xuất từ lệnh git log:"
@@ -74,16 +78,12 @@ msgstr "Không thể phân tích kết xuất từ lệnh git log:"
78 msgid "No commit information available"
79 msgstr "Không có thông tin về lần chuyển giao nào"
80
77 -#: gitk:1897
78 -msgid "mc"
79 -msgstr "mc"
80 -
81 -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
81 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
82 msgid "OK"
83 msgstr "Đồng ý"
84
85 -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
86 -#: gitk:11221 gitk:11501
85 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
86 +#: gitk:11242 gitk:11522
87 msgid "Cancel"
88 msgstr "Thôi"
89
@@ -135,15 +135,15 @@ msgstr "Sửa cách trình bày..."
135 msgid "Delete view"
136 msgstr "Xóa cách trình bày"
137
138 -#: gitk:2088
138 +#: gitk:2088 gitk:4043
139 msgid "All files"
140 msgstr "Mọi tập tin"
141
142 -#: gitk:2083 gitk:4050
142 +#: gitk:2083 gitk:4067
143 msgid "View"
144 msgstr "Trình bày"
145
146 -#: gitk:2093 gitk:2103 gitk:3009
146 +#: gitk:2093 gitk:2103 gitk:3012
147 msgid "About gitk"
148 msgstr "Giới thiệu về gitk"
149
@@ -155,7 +155,7 @@ msgstr "Tổ hợp phím"
155 msgid "Help"
156 msgstr "Trợ giúp"
157
158 -#: gitk:2185 gitk:8633
158 +#: gitk:2185 gitk:8652
159 msgid "SHA1 ID:"
160 msgstr "SHA1 ID:"
161
@@ -171,53 +171,53 @@ msgstr "Tìm"
171 msgid "commit"
172 msgstr "lần chuyển giao"
173
174 -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
175 -#: gitk:6893
174 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
175 +#: gitk:6912
176 msgid "containing:"
177 msgstr "có chứa:"
178
179 -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
179 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
180 msgid "touching paths:"
181 msgstr "đang chạm đường dẫn:"
182
183 -#: gitk:2303 gitk:4759
183 +#: gitk:2303 gitk:4777
184 msgid "adding/removing string:"
185 msgstr "thêm/gỡ bỏ chuỗi:"
186
187 -#: gitk:2304 gitk:4761
187 +#: gitk:2304 gitk:4779
188 msgid "changing lines matching:"
189 msgstr "những dòng thay đổi khớp mẫu:"
190
191 -#: gitk:2313 gitk:2315 gitk:4748
191 +#: gitk:2313 gitk:2315 gitk:4766
192 msgid "Exact"
193 msgstr "Chính xác"
194
195 -#: gitk:2315 gitk:4836 gitk:6704
195 +#: gitk:2315 gitk:4854 gitk:6723
196 msgid "IgnCase"
197 msgstr "BquaHt"
198
199 -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
199 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
200 msgid "Regexp"
201 msgstr "BTCQ"
202
203 -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
203 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
204 msgid "All fields"
205 msgstr "Mọi trường"
206
207 -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
207 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
208 msgid "Headline"
209 msgstr "Nội dung chính"
210
211 -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
211 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
212 msgid "Comments"
213 msgstr "Ghi chú"
214
215 -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
216 -#: gitk:8826
215 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
216 +#: gitk:8845
217 msgid "Author"
218 msgstr "Tác giả"
219
220 -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
220 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
221 msgid "Committer"
222 msgstr "Người chuyển giao"
223
@@ -245,7 +245,7 @@ msgstr "Các dòng của nội dung"
245 msgid "Ignore space change"
246 msgstr "Không xét đến thay đổi do khoảng trắng"
247
248 -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
248 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
249 msgid "Line diff"
250 msgstr "Khác biệt theo dòng"
251
@@ -257,99 +257,107 @@ msgstr "Vá"
257 msgid "Tree"
258 msgstr "Cây"
259
260 -#: gitk:2616 gitk:2636
260 +#: gitk:2617 gitk:2637
261 msgid "Diff this -> selected"
262 msgstr "So sánh cái này -> cái đã chọn"
263
264 -#: gitk:2617 gitk:2637
264 +#: gitk:2618 gitk:2638
265 msgid "Diff selected -> this"
266 msgstr "So sánh cái đã chọn -> cái này"
267
268 -#: gitk:2618 gitk:2638
268 +#: gitk:2619 gitk:2639
269 msgid "Make patch"
270 msgstr "Tạo miếng vá"
271
272 -#: gitk:2619 gitk:9235
272 +#: gitk:2620 gitk:9254
273 msgid "Create tag"
274 msgstr "Tạo thẻ"
275
276 -#: gitk:2620 gitk:9352
276 +#: gitk:2621 gitk:9371
277 msgid "Write commit to file"
278 msgstr "Ghi lần chuyển giao ra tập tin"
279
280 -#: gitk:2621 gitk:9409
280 +#: gitk:2622 gitk:9428
281 msgid "Create new branch"
282 msgstr "Tạo nhánh mới"
283
284 -#: gitk:2622
284 +#: gitk:2623
285 msgid "Cherry-pick this commit"
286 msgstr "Cherry-pick lần chuyển giao này"
287
288 -#: gitk:2623
288 +#: gitk:2624
289 msgid "Reset HEAD branch to here"
290 msgstr "Đặt lại HEAD của nhánh vào đây"
291
292 -#: gitk:2624
292 +#: gitk:2625
293 msgid "Mark this commit"
294 msgstr "Đánh dấu lần chuyển giao này"
295
296 -#: gitk:2625
296 +#: gitk:2626
297 msgid "Return to mark"
298 msgstr "Quay lại vị trí dấu"
299
300 -#: gitk:2626
300 +#: gitk:2627
301 msgid "Find descendant of this and mark"
302 msgstr "Tìm con cháu của cái này và cái đã đánh dấu"
303
304 -#: gitk:2627
304 +#: gitk:2628
305 msgid "Compare with marked commit"
306 msgstr "So sánh với lần chuyển giao đã đánh dấu"
307
308 -#: gitk:2628 gitk:2639
308 +#: gitk:2629 gitk:2640
309 msgid "Diff this -> marked commit"
310 msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu"
311
312 -#: gitk:2629 gitk:2640
312 +#: gitk:2630 gitk:2641
313 msgid "Diff marked commit -> this"
314 msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này"
315
316 -#: gitk:2630
316 +#: gitk:2631
317 msgid "Revert this commit"
318 msgstr "Hoàn lại lần chuyển giao này"
319
320 -#: gitk:2646
320 +#: gitk:2647
321 msgid "Check out this branch"
322 msgstr "Checkout nhánh này"
323
324 -#: gitk:2647
324 +#: gitk:2648
325 msgid "Remove this branch"
326 msgstr "Gỡ bỏ nhánh này"
327
328 -#: gitk:2654
328 +#: gitk:2649
329 +msgid "Copy branch name"
330 +msgstr ""
331 +
332 +#: gitk:2656
333 msgid "Highlight this too"
334 msgstr "Cũng tô sáng nó"
335
332 -#: gitk:2655
336 +#: gitk:2657
337 msgid "Highlight this only"
338 msgstr "Chỉ tô sáng cái này"
339
336 -#: gitk:2656
340 +#: gitk:2658
341 msgid "External diff"
342 msgstr "diff từ bên ngoài"
343
340 -#: gitk:2657
344 +#: gitk:2659
345 msgid "Blame parent commit"
346 msgstr "Xem công trạng lần chuyển giao cha mẹ"
347
344 -#: gitk:2664
348 +#: gitk:2660
349 +msgid "Copy path"
350 +msgstr ""
351 +
352 +#: gitk:2667
353 msgid "Show origin of this line"
354 msgstr "Hiển thị nguyên gốc của dòng này"
355
348 -#: gitk:2665
356 +#: gitk:2668
357 msgid "Run git gui blame on this line"
358 msgstr "Chạy lệnh git gui blame cho dòng này"
359
352 -#: gitk:3011
360 +#: gitk:3014
361 #, fuzzy
362 msgid ""
363 "\n"
@@ -366,314 +374,319 @@ msgstr ""
374 "\n"
375 "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"
376
369 -#: gitk:3019 gitk:3085 gitk:9836
377 +#: gitk:3022 gitk:3089 gitk:9857
378 msgid "Close"
379 msgstr "Đóng"
380
373 -#: gitk:3040
381 +#: gitk:3043
382 msgid "Gitk key bindings"
383 msgstr "Tổ hợp phím gitk"
384
377 -#: gitk:3043
385 +#: gitk:3046
386 msgid "Gitk key bindings:"
387 msgstr "Tổ hợp phím gitk:"
388
381 -#: gitk:3045
389 +#: gitk:3048
390 #, tcl-format
391 msgid "<%s-Q>\t\tQuit"
392 msgstr "<%s-Q>\t\tThoát"
393
386 -#: gitk:3046
394 +#: gitk:3049
395 #, tcl-format
396 msgid "<%s-W>\t\tClose window"
397 msgstr "<%s-W>\t\tĐóng cửa sổ"
398
391 -#: gitk:3047
399 +#: gitk:3050
400 msgid "<Home>\t\tMove to first commit"
401 msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên"
402
395 -#: gitk:3048
403 +#: gitk:3051
404 msgid "<End>\t\tMove to last commit"
405 msgstr "<End>\t\tChuyển đến lần chuyển giao cuối"
406
399 -#: gitk:3049
407 +#: gitk:3052
408 msgid "<Up>, p, k\tMove up one commit"
409 msgstr "<Up>, p, k\tDi chuyển lên một lần chuyển giao"
410
403 -#: gitk:3050
411 +#: gitk:3053
412 msgid "<Down>, n, j\tMove down one commit"
413 msgstr "<Down>, n, j\tDi chuyển xuống một lần chuyển giao"
414
407 -#: gitk:3051
415 +#: gitk:3054
416 msgid "<Left>, z, h\tGo back in history list"
417 msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sử"
418
411 -#: gitk:3052
419 +#: gitk:3055
420 msgid "<Right>, x, l\tGo forward in history list"
421 msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sử"
422
415 -#: gitk:3053
423 +#: gitk:3056
424 #, tcl-format
425 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
426 msgstr ""
427
420 -#: gitk:3054
428 +#: gitk:3057
429 msgid "<PageUp>\tMove up one page in commit list"
430 msgstr "<PageUp>\tDi chuyển lên một trang trong danh sách lần chuyển giao"
431
424 -#: gitk:3055
432 +#: gitk:3058
433 msgid "<PageDown>\tMove down one page in commit list"
434 msgstr "<PageDown>\tDi chuyển xuống một trang trong danh sách lần chuyển giao"
435
428 -#: gitk:3056
436 +#: gitk:3059
437 #, tcl-format
438 msgid "<%s-Home>\tScroll to top of commit list"
439 msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao"
440
433 -#: gitk:3057
441 +#: gitk:3060
442 #, tcl-format
443 msgid "<%s-End>\tScroll to bottom of commit list"
444 msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao"
445
438 -#: gitk:3058
446 +#: gitk:3061
447 #, tcl-format
448 msgid "<%s-Up>\tScroll commit list up one line"
449 msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng"
450
443 -#: gitk:3059
451 +#: gitk:3062
452 #, tcl-format
453 msgid "<%s-Down>\tScroll commit list down one line"
454 msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng"
455
448 -#: gitk:3060
456 +#: gitk:3063
457 #, tcl-format
458 msgid "<%s-PageUp>\tScroll commit list up one page"
459 msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang"
460
453 -#: gitk:3061
461 +#: gitk:3064
462 #, tcl-format
463 msgid "<%s-PageDown>\tScroll commit list down one page"
464 msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang"
465
458 -#: gitk:3062
466 +#: gitk:3065
467 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
468 msgstr "<Shift-Up>\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)"
469
462 -#: gitk:3063
470 +#: gitk:3066
471 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
472 msgstr ""
473 "<Shift-Down>\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)"
474
467 -#: gitk:3064
475 +#: gitk:3067
476 msgid "<Delete>, b\tScroll diff view up one page"
477 msgstr "<Delete>, b\tCuộn phần trình bày diff lên một trang"
478
471 -#: gitk:3065
479 +#: gitk:3068
480 msgid "<Backspace>\tScroll diff view up one page"
481 msgstr "<Backspace>\tCuộn phần trình bày diff lên một trang"
482
475 -#: gitk:3066
483 +#: gitk:3069
484 msgid "<Space>\t\tScroll diff view down one page"
485 msgstr "<Space>\t\tCuộn phần trình bày diff xuống một trang"
486
479 -#: gitk:3067
487 +#: gitk:3070
488 msgid "u\t\tScroll diff view up 18 lines"
489 msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng"
490
483 -#: gitk:3068
491 +#: gitk:3071
492 msgid "d\t\tScroll diff view down 18 lines"
493 msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng"
494
487 -#: gitk:3069
495 +#: gitk:3072
496 #, tcl-format
497 msgid "<%s-F>\t\tFind"
498 msgstr "<%s-F>\t\tTìm kiếm"
499
492 -#: gitk:3070
500 +#: gitk:3073
501 #, tcl-format
502 msgid "<%s-G>\t\tMove to next find hit"
503 msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp"
504
497 -#: gitk:3071
505 +#: gitk:3074
506 msgid "<Return>\tMove to next find hit"
507 msgstr "<Return>\t\tDi chuyển đến chỗ gặp kế tiếp"
508
501 -#: gitk:3072
509 +#: gitk:3075
510 +#, fuzzy
511 +msgid "g\t\tGo to commit"
512 +msgstr "<End>\t\tChuyển đến lần chuyển giao cuối"
513 +
514 +#: gitk:3076
515 msgid "/\t\tFocus the search box"
516 msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm"
517
505 -#: gitk:3073
518 +#: gitk:3077
519 msgid "?\t\tMove to previous find hit"
520 msgstr "?\t\tDi chuyển đến chỗ gặp kế trước"
521
509 -#: gitk:3074
522 +#: gitk:3078
523 msgid "f\t\tScroll diff view to next file"
524 msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế"
525
513 -#: gitk:3075
526 +#: gitk:3079
527 #, tcl-format
528 msgid "<%s-S>\t\tSearch for next hit in diff view"
529 msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp"
530
518 -#: gitk:3076
531 +#: gitk:3080
532 #, tcl-format
533 msgid "<%s-R>\t\tSearch for previous hit in diff view"
534 msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước"
535
523 -#: gitk:3077
536 +#: gitk:3081
537 #, tcl-format
538 msgid "<%s-KP+>\tIncrease font size"
539 msgstr "<%s-KP+>\tTăng cỡ chữ"
540
528 -#: gitk:3078
541 +#: gitk:3082
542 #, tcl-format
543 msgid "<%s-plus>\tIncrease font size"
544 msgstr "<%s-plus>\tTăng cỡ chữ"
545
533 -#: gitk:3079
546 +#: gitk:3083
547 #, tcl-format
548 msgid "<%s-KP->\tDecrease font size"
549 msgstr "<%s-KP->\tGiảm cỡ chữ"
550
538 -#: gitk:3080
551 +#: gitk:3084
552 #, tcl-format
553 msgid "<%s-minus>\tDecrease font size"
554 msgstr "<%s-minus>\tGiảm cỡ chữ"
555
543 -#: gitk:3081
556 +#: gitk:3085
557 msgid "<F5>\t\tUpdate"
558 msgstr "<F5>\t\tCập nhật"
559
547 -#: gitk:3546 gitk:3555
560 +#: gitk:3550 gitk:3559
561 #, tcl-format
562 msgid "Error creating temporary directory %s:"
563 msgstr "Gặp lỗi khi tạo thư mục tạm %s:"
564
552 -#: gitk:3568
565 +#: gitk:3572
566 #, tcl-format
567 msgid "Error getting \"%s\" from %s:"
568 msgstr "Lỗi chào hỏi \"%s\" từ %s:"
569
557 -#: gitk:3631
570 +#: gitk:3635
571 msgid "command failed:"
572 msgstr "lệnh gặp lỗi:"
573
561 -#: gitk:3780
574 +#: gitk:3784
575 msgid "No such commit"
576 msgstr "Không có lần chuyển giao như vậy"
577
565 -#: gitk:3794
578 +#: gitk:3798
579 msgid "git gui blame: command failed:"
580 msgstr "git gui blame: lệnh gặp lỗi:"
581
569 -#: gitk:3825
582 +#: gitk:3829
583 #, tcl-format
584 msgid "Couldn't read merge head: %s"
585 msgstr "Không thể độc đầu của hòa trộn: %s"
586
587 # tcl-format
575 -#: gitk:3833
588 +#: gitk:3837
589 #, tcl-format
590 msgid "Error reading index: %s"
591 msgstr "Gặp lỗi khi đọc chỉ mục: %s"
592
580 -#: gitk:3858
593 +#: gitk:3862
594 #, tcl-format
595 msgid "Couldn't start git blame: %s"
596 msgstr "Không thể khởi chạy git blame: %s"
597
585 -#: gitk:3861 gitk:6735
598 +#: gitk:3865 gitk:6754
599 msgid "Searching"
600 msgstr "Đang tìm kiếm"
601
589 -#: gitk:3893
602 +#: gitk:3897
603 #, tcl-format
604 msgid "Error running git blame: %s"
605 msgstr "Gặp lỗi khi chạy git blame: %s"
606
594 -#: gitk:3921
607 +#: gitk:3925
608 #, tcl-format
609 msgid "That line comes from commit %s, which is not in this view"
610 msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này"
611
599 -#: gitk:3935
612 +#: gitk:3939
613 msgid "External diff viewer failed:"
614 msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:"
615
603 -#: gitk:4053
616 +#: gitk:4070
617 msgid "Gitk view definition"
618 msgstr "Định nghĩa cách trình bày gitk"
619
607 -#: gitk:4057
620 +#: gitk:4074
621 msgid "Remember this view"
622 msgstr "Nhớ cách trình bày này"
623
611 -#: gitk:4058
624 +#: gitk:4075
625 msgid "References (space separated list):"
626 msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):"
627
615 -#: gitk:4059
628 +#: gitk:4076
629 msgid "Branches & tags:"
630 msgstr "Nhánh & thẻ:"
631
619 -#: gitk:4060
632 +#: gitk:4077
633 msgid "All refs"
634 msgstr "Mọi tham chiếu"
635
623 -#: gitk:4061
636 +#: gitk:4078
637 msgid "All (local) branches"
638 msgstr "Mọi nhánh (nội bộ)"
639
627 -#: gitk:4062
640 +#: gitk:4079
641 msgid "All tags"
642 msgstr "Mọi thẻ"
643
631 -#: gitk:4063
644 +#: gitk:4080
645 msgid "All remote-tracking branches"
646 msgstr "Mọi nhánh remote-tracking"
647
635 -#: gitk:4064
648 +#: gitk:4081
649 msgid "Commit Info (regular expressions):"
650 msgstr "Thông tin chuyển giao (biểu thức chính quy):"
651
639 -#: gitk:4065
652 +#: gitk:4082
653 msgid "Author:"
654 msgstr "Tác giả:"
655
643 -#: gitk:4066
656 +#: gitk:4083
657 msgid "Committer:"
658 msgstr "Người chuyển giao:"
659
647 -#: gitk:4067
660 +#: gitk:4084
661 msgid "Commit Message:"
662 msgstr "Chú thích của lần chuyển giao:"
663
651 -#: gitk:4068
664 +#: gitk:4085
665 msgid "Matches all Commit Info criteria"
666 msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
667
655 -#: gitk:4069
668 +#: gitk:4086
669 #, fuzzy
657 -msgid "Matches none Commit Info criteria"
670 +msgid "Matches no Commit Info criteria"
671 msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
672
660 -#: gitk:4070
673 +#: gitk:4087
674 msgid "Changes to Files:"
675 msgstr "Đổi thành Tập tin:"
676
664 -#: gitk:4071
677 +#: gitk:4088
678 msgid "Fixed String"
679 msgstr "Chuỗi cố định"
680
668 -#: gitk:4072
681 +#: gitk:4089
682 msgid "Regular Expression"
683 msgstr "Biểu thức chính quy"
684
672 -#: gitk:4073
685 +#: gitk:4090
686 msgid "Search string:"
687 msgstr "Chuỗi tìm kiếm:"
688
676 -#: gitk:4074
689 +#: gitk:4091
690 msgid ""
691 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
692 "15:27:38\"):"
@@ -681,203 +694,203 @@ msgstr ""
694 "Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
695 "15:27:38\"):"
696
684 -#: gitk:4075
697 +#: gitk:4092
698 msgid "Since:"
699 msgstr "Kể từ:"
700
688 -#: gitk:4076
701 +#: gitk:4093
702 msgid "Until:"
703 msgstr "Đến:"
704
692 -#: gitk:4077
705 +#: gitk:4094
706 msgid "Limit and/or skip a number of revisions (positive integer):"
707 msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):"
708
696 -#: gitk:4078
709 +#: gitk:4095
710 msgid "Number to show:"
711 msgstr "Số lượng hiển thị:"
712
700 -#: gitk:4079
713 +#: gitk:4096
714 msgid "Number to skip:"
715 msgstr "Số lượng sẽ bỏ qua:"
716
704 -#: gitk:4080
717 +#: gitk:4097
718 msgid "Miscellaneous options:"
719 msgstr "Tuỳ chọn hỗn hợp:"
720
708 -#: gitk:4081
721 +#: gitk:4098
722 msgid "Strictly sort by date"
723 msgstr "Sắp xếp chặt chẽ theo ngày"
724
712 -#: gitk:4082
725 +#: gitk:4099
726 msgid "Mark branch sides"
727 msgstr "Đánh dấu các cạnh nhánh"
728
716 -#: gitk:4083
729 +#: gitk:4100
730 msgid "Limit to first parent"
731 msgstr "Giới hạn thành cha mẹ đầu tiên"
732
720 -#: gitk:4084
733 +#: gitk:4101
734 msgid "Simple history"
735 msgstr "Lịch sử dạng đơn giản"
736
724 -#: gitk:4085
737 +#: gitk:4102
738 msgid "Additional arguments to git log:"
739 msgstr "Đối số bổ xung cho lệnh git log:"
740
728 -#: gitk:4086
741 +#: gitk:4103
742 msgid "Enter files and directories to include, one per line:"
743 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:"
744
732 -#: gitk:4087
745 +#: gitk:4104
746 msgid "Command to generate more commits to include:"
747 msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:"
748
736 -#: gitk:4211
749 +#: gitk:4228
750 msgid "Gitk: edit view"
751 msgstr "Gitk: sửa cách trình bày"
752
740 -#: gitk:4219
753 +#: gitk:4236
754 msgid "-- criteria for selecting revisions"
755 msgstr "-- tiêu chuẩn chọn điểm xét duyệt"
756
744 -#: gitk:4224
757 +#: gitk:4241
758 msgid "View Name"
759 msgstr "Tên cách trình bày"
760
748 -#: gitk:4299
761 +#: gitk:4316
762 msgid "Apply (F5)"
763 msgstr "Áp dụng (F5)"
764
752 -#: gitk:4337
765 +#: gitk:4354
766 msgid "Error in commit selection arguments:"
767 msgstr "Lỗi trong các đối số chọn chuyển giao:"
768
756 -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
769 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
770 msgid "None"
771 msgstr "Không"
772
760 -#: gitk:5003 gitk:5008
773 +#: gitk:5021 gitk:5026
774 msgid "Descendant"
775 msgstr "Con cháu"
776
764 -#: gitk:5004
777 +#: gitk:5022
778 msgid "Not descendant"
779 msgstr "Không có con cháu"
780
768 -#: gitk:5011 gitk:5016
781 +#: gitk:5029 gitk:5034
782 msgid "Ancestor"
783 msgstr "Tổ tiên chung"
784
772 -#: gitk:5012
785 +#: gitk:5030
786 msgid "Not ancestor"
787 msgstr "Không có chung tổ tiên"
788
776 -#: gitk:5306
789 +#: gitk:5324
790 msgid "Local changes checked in to index but not committed"
791 msgstr ""
792 "Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao"
793
781 -#: gitk:5342
794 +#: gitk:5360
795 msgid "Local uncommitted changes, not checked in to index"
796 msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục"
797
785 -#: gitk:7115
798 +#: gitk:7134
799 msgid "and many more"
800 msgstr "và nhiều nữa"
801
789 -#: gitk:7118
802 +#: gitk:7137
803 msgid "many"
804 msgstr "nhiều"
805
793 -#: gitk:7309
806 +#: gitk:7328
807 msgid "Tags:"
808 msgstr "Thẻ:"
809
797 -#: gitk:7326 gitk:7332 gitk:8806
810 +#: gitk:7345 gitk:7351 gitk:8825
811 msgid "Parent"
812 msgstr "Cha"
813
801 -#: gitk:7337
814 +#: gitk:7356
815 msgid "Child"
816 msgstr "Con"
817
805 -#: gitk:7346
818 +#: gitk:7365
819 msgid "Branch"
820 msgstr "Nhánh"
821
809 -#: gitk:7349
822 +#: gitk:7368
823 msgid "Follows"
824 msgstr "Đứng sau"
825
813 -#: gitk:7352
826 +#: gitk:7371
827 msgid "Precedes"
828 msgstr "Đứng trước"
829
830 # tcl-format
818 -#: gitk:7947
831 +#: gitk:7966
832 #, tcl-format
833 msgid "Error getting diffs: %s"
834 msgstr "Lỗi lấy diff: %s"
835
823 -#: gitk:8631
836 +#: gitk:8650
837 msgid "Goto:"
838 msgstr "Nhảy tới:"
839
827 -#: gitk:8652
840 +#: gitk:8671
841 #, tcl-format
842 msgid "Short SHA1 id %s is ambiguous"
843 msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng"
844
832 -#: gitk:8659
845 +#: gitk:8678
846 #, tcl-format
847 msgid "Revision %s is not known"
848 msgstr "Không hiểu điểm xét duyệt %s"
849
837 -#: gitk:8669
850 +#: gitk:8688
851 #, tcl-format
852 msgid "SHA1 id %s is not known"
853 msgstr "Không hiểu định danh SHA1 %s"
854
842 -#: gitk:8671
855 +#: gitk:8690
856 #, tcl-format
857 msgid "Revision %s is not in the current view"
858 msgstr "Điểm %s không ở trong phần hiển thị hiện tại"
859
847 -#: gitk:8813 gitk:8828
860 +#: gitk:8832 gitk:8847
861 msgid "Date"
862 msgstr "Ngày"
863
851 -#: gitk:8816
864 +#: gitk:8835
865 msgid "Children"
866 msgstr "Con cháu"
867
855 -#: gitk:8879
868 +#: gitk:8898
869 #, tcl-format
870 msgid "Reset %s branch to here"
871 msgstr "Đặt lại nhánh %s tại đây"
872
860 -#: gitk:8881
873 +#: gitk:8900
874 msgid "Detached head: can't reset"
875 msgstr "Head đã bị tách rời: không thể đặt lại"
876
864 -#: gitk:8986 gitk:8992
877 +#: gitk:9005 gitk:9011
878 msgid "Skipping merge commit "
879 msgstr "Bỏ qua lần chuyển giao hòa trộn "
880
868 -#: gitk:9001 gitk:9006
881 +#: gitk:9020 gitk:9025
882 msgid "Error getting patch ID for "
883 msgstr "Gặp lỗi khi lấy ID miếng vá cho "
884
872 -#: gitk:9002 gitk:9007
885 +#: gitk:9021 gitk:9026
886 msgid " - stopping\n"
887 msgstr " - dừng\n"
888
876 -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
889 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
890 msgid "Commit "
891 msgstr "Commit "
892
880 -#: gitk:9016
893 +#: gitk:9035
894 msgid ""
895 " is the same patch as\n"
896 " "
@@ -885,7 +898,7 @@ msgstr ""
898 " là cùng một miếng vá với\n"
899 " "
900
888 -#: gitk:9024
901 +#: gitk:9043
902 msgid ""
903 " differs from\n"
904 " "
@@ -893,7 +906,7 @@ msgstr ""
906 " khác biệt từ\n"
907 " "
908
896 -#: gitk:9026
909 +#: gitk:9045
910 msgid ""
911 "Diff of commits:\n"
912 "\n"
@@ -901,131 +914,131 @@ msgstr ""
914 "Khác biệt của lần chuyển giao (commit):\n"
915 "\n"
916
904 -#: gitk:9038 gitk:9047
917 +#: gitk:9057 gitk:9066
918 #, tcl-format
919 msgid " has %s children - stopping\n"
920 msgstr " có %s con - dừng\n"
921
909 -#: gitk:9066
922 +#: gitk:9085
923 #, tcl-format
924 msgid "Error writing commit to file: %s"
925 msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s"
926
914 -#: gitk:9072
927 +#: gitk:9091
928 #, tcl-format
929 msgid "Error diffing commits: %s"
930 msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s"
931
919 -#: gitk:9118
932 +#: gitk:9137
933 msgid "Top"
934 msgstr "Đỉnh"
935
923 -#: gitk:9119
936 +#: gitk:9138
937 msgid "From"
938 msgstr "Từ"
939
927 -#: gitk:9124
940 +#: gitk:9143
941 msgid "To"
942 msgstr "Đến"
943
931 -#: gitk:9148
944 +#: gitk:9167
945 msgid "Generate patch"
946 msgstr "Tạo miếng vá"
947
935 -#: gitk:9150
948 +#: gitk:9169
949 msgid "From:"
950 msgstr "Từ:"
951
939 -#: gitk:9159
952 +#: gitk:9178
953 msgid "To:"
954 msgstr "Đến:"
955
943 -#: gitk:9168
956 +#: gitk:9187
957 msgid "Reverse"
958 msgstr "Đảo ngược"
959
947 -#: gitk:9170 gitk:9366
960 +#: gitk:9189 gitk:9385
961 msgid "Output file:"
962 msgstr "Tập tin kết xuất:"
963
951 -#: gitk:9176
964 +#: gitk:9195
965 msgid "Generate"
966 msgstr "Tạo"
967
955 -#: gitk:9214
968 +#: gitk:9233
969 msgid "Error creating patch:"
970 msgstr "Gặp lỗi khi tạo miếng vá:"
971
959 -#: gitk:9237 gitk:9354 gitk:9411
972 +#: gitk:9256 gitk:9373 gitk:9430
973 msgid "ID:"
974 msgstr "ID:"
975
963 -#: gitk:9246
976 +#: gitk:9265
977 msgid "Tag name:"
978 msgstr "Tên thẻ:"
979
967 -#: gitk:9249
980 +#: gitk:9268
981 msgid "Tag message is optional"
982 msgstr "Ghi chú thẻ chỉ là tùy chọn"
983
971 -#: gitk:9251
984 +#: gitk:9270
985 msgid "Tag message:"
986 msgstr "Ghi chú cho thẻ:"
987
975 -#: gitk:9255 gitk:9420
988 +#: gitk:9274 gitk:9439
989 msgid "Create"
990 msgstr "Tạo"
991
979 -#: gitk:9273
992 +#: gitk:9292
993 msgid "No tag name specified"
994 msgstr "Chưa chỉ ra tên của thẻ"
995
983 -#: gitk:9277
996 +#: gitk:9296
997 #, tcl-format
998 msgid "Tag \"%s\" already exists"
999 msgstr "Thẻ “%s” đã có sẵn rồi"
1000
988 -#: gitk:9287
1001 +#: gitk:9306
1002 msgid "Error creating tag:"
1003 msgstr "Gặp lỗi khi tạo thẻ:"
1004
992 -#: gitk:9363
1005 +#: gitk:9382
1006 msgid "Command:"
1007 msgstr "Lệnh:"
1008
996 -#: gitk:9371
1009 +#: gitk:9390
1010 msgid "Write"
1011 msgstr "Ghi"
1012
1000 -#: gitk:9389
1013 +#: gitk:9408
1014 msgid "Error writing commit:"
1015 msgstr "Gặp lỗi trong quá trình ghi chuyển giao:"
1016
1004 -#: gitk:9416
1017 +#: gitk:9435
1018 msgid "Name:"
1019 msgstr "Tên:"
1020
1008 -#: gitk:9439
1021 +#: gitk:9458
1022 msgid "Please specify a name for the new branch"
1023 msgstr "Vui lòng chỉ định tên cho nhánh mới"
1024
1012 -#: gitk:9444
1025 +#: gitk:9463
1026 #, tcl-format
1027 msgid "Branch '%s' already exists. Overwrite?"
1028 msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?"
1029
1017 -#: gitk:9511
1030 +#: gitk:9530
1031 #, tcl-format
1032 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1033 msgstr ""
1034 "Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn "
1035 "áp dụng lại nó không?"
1036
1024 -#: gitk:9516
1037 +#: gitk:9535
1038 msgid "Cherry-picking"
1039 msgstr "Đang cherry-pick"
1040
1028 -#: gitk:9525
1041 +#: gitk:9544
1042 #, tcl-format
1043 msgid ""
1044 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1034,7 +1047,7 @@ msgstr ""
1047 "Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n"
1048 "Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại."
1049
1037 -#: gitk:9531
1050 +#: gitk:9550
1051 msgid ""
1052 "Cherry-pick failed because of merge conflict.\n"
1053 "Do you wish to run git citool to resolve it?"
@@ -1042,22 +1055,22 @@ msgstr ""
1055 "Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n"
1056 "Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?"
1057
1045 -#: gitk:9547 gitk:9605
1058 +#: gitk:9566 gitk:9624
1059 msgid "No changes committed"
1060 msgstr "Không có thay đổi nào cần chuyển giao"
1061
1049 -#: gitk:9574
1062 +#: gitk:9593
1063 #, tcl-format
1064 msgid "Commit %s is not included in branch %s -- really revert it?"
1065 msgstr ""
1066 "Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn "
1067 "“revert” nó không?"
1068
1056 -#: gitk:9579
1069 +#: gitk:9598
1070 msgid "Reverting"
1071 msgstr "Đang hoàn tác"
1072
1060 -#: gitk:9587
1073 +#: gitk:9606
1074 #, tcl-format
1075 msgid ""
1076 "Revert failed because of local changes to the following files:%s Please "
@@ -1066,7 +1079,7 @@ msgstr ""
1079 "Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n"
1080 "Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại."
1081
1069 -#: gitk:9591
1082 +#: gitk:9610
1083 msgid ""
1084 "Revert failed because of merge conflict.\n"
1085 " Do you wish to run git citool to resolve it?"
@@ -1074,29 +1087,29 @@ msgstr ""
1087 "Revert gặp lỗi bởi vì xung đột hòa trộn.\n"
1088 " Bạn có muốn chạy lệnh “git citool” để phân giải nó không?"
1089
1077 -#: gitk:9634
1090 +#: gitk:9653
1091 msgid "Confirm reset"
1092 msgstr "Xác nhật đặt lại"
1093
1081 -#: gitk:9636
1094 +#: gitk:9655
1095 #, tcl-format
1096 msgid "Reset branch %s to %s?"
1097 msgstr "Đặt lại nhánh “%s” thành “%s”?"
1098
1086 -#: gitk:9638
1099 +#: gitk:9657
1100 msgid "Reset type:"
1101 msgstr "Kiểu đặt lại:"
1102
1090 -#: gitk:9641
1103 +#: gitk:9660
1104 msgid "Soft: Leave working tree and index untouched"
1105 msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục"
1106
1094 -#: gitk:9644
1107 +#: gitk:9663
1108 msgid "Mixed: Leave working tree untouched, reset index"
1109 msgstr ""
1110 "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"
1111
1099 -#: gitk:9647
1112 +#: gitk:9666
1113 msgid ""
1114 "Hard: Reset working tree and index\n"
1115 "(discard ALL local changes)"
@@ -1104,19 +1117,19 @@ msgstr ""
1117 "Hard: Đặt lại cây làm việc và mục lục\n"
1118 "(hủy bỏ MỌI thay đổi nội bộ)"
1119
1107 -#: gitk:9664
1120 +#: gitk:9683
1121 msgid "Resetting"
1122 msgstr "Đang đặt lại"
1123
1111 -#: gitk:9724
1124 +#: gitk:9743
1125 msgid "Checking out"
1126 msgstr "Đang checkout"
1127
1115 -#: gitk:9777
1128 +#: gitk:9796
1129 msgid "Cannot delete the currently checked-out branch"
1130 msgstr "Không thể xóa nhánh hiện tại đang được lấy ra"
1131
1119 -#: gitk:9783
1132 +#: gitk:9802
1133 #, tcl-format
1134 msgid ""
1135 "The commits on branch %s aren't on any other branch.\n"
@@ -1125,16 +1138,16 @@ msgstr ""
1138 "Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n"
1139 "Thực sự muốn xóa nhánh %s?"
1140
1128 -#: gitk:9814
1141 +#: gitk:9833
1142 #, tcl-format
1143 msgid "Tags and heads: %s"
1144 msgstr "Thẻ và Đầu: %s"
1145
1133 -#: gitk:9829
1146 +#: gitk:9850
1147 msgid "Filter"
1148 msgstr "Bộ lọc"
1149
1137 -#: gitk:10125
1150 +#: gitk:10146
1151 msgid ""
1152 "Error reading commit topology information; branch and preceding/following "
1153 "tag information will be incomplete."
@@ -1142,216 +1155,221 @@ msgstr ""
1155 "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ẻ "
1156 "trước/sau sẽ không hoàn thiện."
1157
1145 -#: gitk:11102
1158 +#: gitk:11123
1159 msgid "Tag"
1160 msgstr "Thẻ"
1161
1149 -#: gitk:11106
1162 +#: gitk:11127
1163 msgid "Id"
1164 msgstr "Id"
1165
1153 -#: gitk:11189
1166 +#: gitk:11210
1167 msgid "Gitk font chooser"
1168 msgstr "Hộp thoại chọn phông Gitk"
1169
1157 -#: gitk:11206
1170 +#: gitk:11227
1171 msgid "B"
1172 msgstr "B"
1173
1161 -#: gitk:11209
1174 +#: gitk:11230
1175 msgid "I"
1176 msgstr "I"
1177
1165 -#: gitk:11327
1178 +#: gitk:11348
1179 msgid "Commit list display options"
1180 msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao"
1181
1169 -#: gitk:11330
1182 +#: gitk:11351
1183 msgid "Maximum graph width (lines)"
1184 msgstr "Độ rộng biểu đồ tối đa (dòng)"
1185
1173 -#: gitk:11334
1186 +#: gitk:11355
1187 #, no-tcl-format
1188 msgid "Maximum graph width (% of pane)"
1189 msgstr "Độ rộng biểu đồ tối đa (% của bảng)"
1190
1178 -#: gitk:11337
1191 +#: gitk:11358
1192 msgid "Show local changes"
1193 msgstr "Hiển thị các thay đổi nội bộ"
1194
1182 -#: gitk:11340
1195 +#: gitk:11361
1196 msgid "Auto-select SHA1 (length)"
1197 msgstr "Tự chọn SHA1 (độ dài)"
1198
1186 -#: gitk:11344
1199 +#: gitk:11365
1200 msgid "Hide remote refs"
1201 msgstr "Ẩn tham chiếu đến máy chủ"
1202
1190 -#: gitk:11348
1203 +#: gitk:11369
1204 msgid "Diff display options"
1205 msgstr "Các tùy chọn trình bày các khác biệt"
1206
1194 -#: gitk:11350
1207 +#: gitk:11371
1208 msgid "Tab spacing"
1209 msgstr "Khoảng cách tab"
1210
1198 -#: gitk:11353
1211 +#: gitk:11374
1212 msgid "Display nearby tags/heads"
1213 msgstr "Hiển thị các thẻ/đầu xung quanh"
1214
1202 -#: gitk:11356
1215 +#: gitk:11377
1216 msgid "Maximum # tags/heads to show"
1217 msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị"
1218
1206 -#: gitk:11359
1219 +#: gitk:11380
1220 msgid "Limit diffs to listed paths"
1221 msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê"
1222
1210 -#: gitk:11362
1223 +#: gitk:11383
1224 msgid "Support per-file encodings"
1225 msgstr "Hỗ trợ mã hóa mỗi-dòng"
1226
1214 -#: gitk:11368 gitk:11515
1227 +#: gitk:11389 gitk:11536
1228 msgid "External diff tool"
1229 msgstr "Công cụ so sánh từ bên ngoài"
1230
1218 -#: gitk:11369
1231 +#: gitk:11390
1232 msgid "Choose..."
1233 msgstr "Chọn..."
1234
1222 -#: gitk:11374
1235 +#: gitk:11395
1236 msgid "General options"
1237 msgstr "Các tùy chọn chung"
1238
1226 -#: gitk:11377
1239 +#: gitk:11398
1240 msgid "Use themed widgets"
1241 msgstr "Dùng các widget chủ đề"
1242
1230 -#: gitk:11379
1243 +#: gitk:11400
1244 msgid "(change requires restart)"
1245 msgstr "(để thay đổi cần khởi động lại)"
1246
1234 -#: gitk:11381
1247 +#: gitk:11402
1248 msgid "(currently unavailable)"
1249 msgstr "(hiện tại không sẵn sàng)"
1250
1238 -#: gitk:11392
1251 +#: gitk:11413
1252 msgid "Colors: press to choose"
1253 msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu"
1254
1242 -#: gitk:11395
1255 +#: gitk:11416
1256 msgid "Interface"
1257 msgstr "Giao diện"
1258
1246 -#: gitk:11396
1259 +#: gitk:11417
1260 msgid "interface"
1261 msgstr "giao diện"
1262
1250 -#: gitk:11399
1263 +#: gitk:11420
1264 msgid "Background"
1265 msgstr "Nền"
1266
1254 -#: gitk:11400 gitk:11430
1267 +#: gitk:11421 gitk:11451
1268 msgid "background"
1269 msgstr "nền"
1270
1258 -#: gitk:11403
1271 +#: gitk:11424
1272 msgid "Foreground"
1273 msgstr "Tiền cảnh"
1274
1262 -#: gitk:11404
1275 +#: gitk:11425
1276 msgid "foreground"
1277 msgstr "tiền cảnh"
1278
1266 -#: gitk:11407
1279 +#: gitk:11428
1280 msgid "Diff: old lines"
1281 msgstr "So sánh: dòng cũ"
1282
1270 -#: gitk:11408
1283 +#: gitk:11429
1284 msgid "diff old lines"
1285 msgstr "diff dòng cũ"
1286
1274 -#: gitk:11412
1287 +#: gitk:11433
1288 msgid "Diff: new lines"
1289 msgstr "So sánh: dòng mới"
1290
1278 -#: gitk:11413
1291 +#: gitk:11434
1292 msgid "diff new lines"
1293 msgstr "màu dòng mới"
1294
1282 -#: gitk:11417
1295 +#: gitk:11438
1296 msgid "Diff: hunk header"
1297 msgstr "So sánh: phần đầu của đoạn"
1298
1286 -#: gitk:11419
1299 +#: gitk:11440
1300 msgid "diff hunk header"
1301 msgstr "màu của phần đầu của đoạn khi so sánh"
1302
1290 -#: gitk:11423
1303 +#: gitk:11444
1304 msgid "Marked line bg"
1305 msgstr "Nền dòng đánh dấu"
1306
1294 -#: gitk:11425
1307 +#: gitk:11446
1308 msgid "marked line background"
1309 msgstr "nền dòng được đánh dấu"
1310
1298 -#: gitk:11429
1311 +#: gitk:11450
1312 msgid "Select bg"
1313 msgstr "Màu nền"
1314
1302 -#: gitk:11438
1315 +#: gitk:11459
1316 msgid "Fonts: press to choose"
1317 msgstr "Phông chữ: bấm vào các nút ở dưới để chọn"
1318
1306 -#: gitk:11440
1319 +#: gitk:11461
1320 msgid "Main font"
1321 msgstr "Phông chữ chính"
1322
1310 -#: gitk:11441
1323 +#: gitk:11462
1324 msgid "Diff display font"
1325 msgstr "Phông chữ dùng khi so sánh"
1326
1314 -#: gitk:11442
1327 +#: gitk:11463
1328 msgid "User interface font"
1329 msgstr "Phông chữ giao diện"
1330
1318 -#: gitk:11464
1331 +#: gitk:11485
1332 msgid "Gitk preferences"
1333 msgstr "Cá nhân hóa các cài đặt cho Gitk"
1334
1322 -#: gitk:11473
1335 +#: gitk:11494
1336 msgid "General"
1337 msgstr "Chung"
1338
1326 -#: gitk:11474
1339 +#: gitk:11495
1340 msgid "Colors"
1341 msgstr "Màu sắc"
1342
1330 -#: gitk:11475
1343 +#: gitk:11496
1344 msgid "Fonts"
1345 msgstr "Phông chữ"
1346
1334 -#: gitk:11525
1347 +#: gitk:11546
1348 #, tcl-format
1349 msgid "Gitk: choose color for %s"
1350 msgstr "Gitk: chọn màu cho %s"
1351
1339 -#: gitk:12242
1352 +#: gitk:12059
1353 +msgid ""
1354 +"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1355 +" Gitk requires at least Tcl/Tk 8.4."
1356 +msgstr ""
1357 +
1358 +#: gitk:12269
1359 msgid "Cannot find a git repository here."
1360 msgstr "Không thể tìm thấy kho git ở đây."
1361
1343 -#: gitk:12289
1362 +#: gitk:12316
1363 #, tcl-format
1364 msgid "Ambiguous argument '%s': both revision and filename"
1365 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"
1366
1348 -#: gitk:12301
1367 +#: gitk:12328
1368 msgid "Bad arguments to gitk:"
1369 msgstr "Đối số không hợp lệ cho gitk:"
1370
1352 -#: gitk:12405
1353 -msgid "Command line"
1354 -msgstr "Dòng lệnh"
1371 +#~ msgid "mc"
1372 +#~ msgstr "mc"
1373
1374 #~ msgid "next"
1375 #~ msgstr "tiếp"