@matheusbsbs / matheus-bagliano / commits / c846920f23

gitk: Update .po files

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

Paul Mackerras committed Mar 15, 2015 at 17:25 UTC c846920f23704ece225cc5b6c7566777fb561502
12 files changed +5253 -3737
po/bg.po
+316 -306
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk master\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2014-08-03 11:17+0300\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\n"
12 "PO-Revision-Date: 2014-07-28 07:32+0300\n"
13 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
14 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -22,28 +22,28 @@ msgstr ""
22 msgid "Couldn't get list of unmerged files:"
23 msgstr "Списъкът с неслети файлове не може да бъде получен:"
24
25 -#: gitk:212 gitk:2379
25 +#: gitk:212 gitk:2381
26 msgid "Color words"
27 msgstr "Оцветяване на думите"
28
29 -#: gitk:217 gitk:2379 gitk:8155 gitk:8188
29 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
30 msgid "Markup words"
31 msgstr "Отбелязване на думите"
32
33 -#: gitk:322
33 +#: gitk:324
34 msgid "Error parsing revisions:"
35 msgstr "Грешка при разбор на версиите:"
36
37 -#: gitk:378
37 +#: gitk:380
38 msgid "Error executing --argscmd command:"
39 msgstr "Грешка при изпълнение на командата с „--argscmd“."
40
41 -#: gitk:391
41 +#: gitk:393
42 msgid "No files selected: --merge specified but no files are unmerged."
43 msgstr ""
44 "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове."
45
46 -#: gitk:394
46 +#: gitk:396
47 msgid ""
48 "No files selected: --merge specified but no unmerged files are within file "
49 "limit."
@@ -51,306 +51,306 @@ msgstr ""
51 "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове "
52 "в ограниченията."
53
54 -#: gitk:416 gitk:564
54 +#: gitk:418 gitk:566
55 msgid "Error executing git log:"
56 msgstr "Грешка при изпълнение на „git log“:"
57
58 -#: gitk:434 gitk:580
58 +#: gitk:436 gitk:582
59 msgid "Reading"
60 msgstr "Прочитане"
61
62 -#: gitk:494 gitk:4470
62 +#: gitk:496 gitk:4508
63 msgid "Reading commits..."
64 msgstr "Прочитане на подаванията…"
65
66 -#: gitk:497 gitk:1635 gitk:4473
66 +#: gitk:499 gitk:1637 gitk:4511
67 msgid "No commits selected"
68 msgstr "Не са избрани подавания"
69
70 -#: gitk:1509
70 +#: gitk:1511
71 msgid "Can't parse git log output:"
72 msgstr "Изходът от „git log“ не може да се анализира:"
73
74 -#: gitk:1738
74 +#: gitk:1740
75 msgid "No commit information available"
76 msgstr "Липсва информация за подавания"
77
78 -#: gitk:1895
78 +#: gitk:1897
79 msgid "mc"
80 msgstr "mc"
81
82 -#: gitk:1930 gitk:4263 gitk:9604 gitk:11174 gitk:11453
82 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
83 msgid "OK"
84 msgstr "Добре"
85
86 -#: gitk:1932 gitk:4265 gitk:9131 gitk:9210 gitk:9326 gitk:9375 gitk:9606
87 -#: gitk:11175 gitk:11454
86 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
87 +#: gitk:11221 gitk:11501
88 msgid "Cancel"
89 msgstr "Отказ"
90
91 -#: gitk:2067
91 +#: gitk:2069
92 msgid "Update"
93 msgstr "Обновяване"
94
95 -#: gitk:2068
95 +#: gitk:2070
96 msgid "Reload"
97 msgstr "Презареждане"
98
99 -#: gitk:2069
99 +#: gitk:2071
100 msgid "Reread references"
101 msgstr "Наново прочитане на настройките"
102
103 -#: gitk:2070
103 +#: gitk:2072
104 msgid "List references"
105 msgstr "Изброяване на указателите"
106
107 -#: gitk:2072
107 +#: gitk:2074
108 msgid "Start git gui"
109 msgstr "Стартиране на „git gui“"
110
111 -#: gitk:2074
111 +#: gitk:2076
112 msgid "Quit"
113 msgstr "Спиране на програмата"
114
115 -#: gitk:2066
115 +#: gitk:2068
116 msgid "File"
117 msgstr "Файл"
118
119 -#: gitk:2078
119 +#: gitk:2080
120 msgid "Preferences"
121 msgstr "Настройки"
122
123 -#: gitk:2077
123 +#: gitk:2079
124 msgid "Edit"
125 msgstr "Редактиране"
126
127 -#: gitk:2082
127 +#: gitk:2084
128 msgid "New view..."
129 msgstr "Нов изглед…"
130
131 -#: gitk:2083
131 +#: gitk:2085
132 msgid "Edit view..."
133 msgstr "Редактиране на изгледа…"
134
135 -#: gitk:2084
135 +#: gitk:2086
136 msgid "Delete view"
137 msgstr "Изтриване на изгледа"
138
139 -#: gitk:2086
139 +#: gitk:2088
140 msgid "All files"
141 msgstr "Всички файлове"
142
143 -#: gitk:2081 gitk:4016
143 +#: gitk:2083 gitk:4050
144 msgid "View"
145 msgstr "Изглед"
146
147 -#: gitk:2091 gitk:2101 gitk:2976
147 +#: gitk:2093 gitk:2103 gitk:3009
148 msgid "About gitk"
149 msgstr "Относно gitk"
150
151 -#: gitk:2092 gitk:2106
151 +#: gitk:2094 gitk:2108
152 msgid "Key bindings"
153 msgstr "Клавишни комбинации"
154
155 -#: gitk:2090 gitk:2105
155 +#: gitk:2092 gitk:2107
156 msgid "Help"
157 msgstr "Помощ"
158
159 -#: gitk:2183 gitk:8587
159 +#: gitk:2185 gitk:8633
160 msgid "SHA1 ID:"
161 msgstr "SHA1:"
162
163 -#: gitk:2227
163 +#: gitk:2229
164 msgid "Row"
165 msgstr "Ред"
166
167 -#: gitk:2265
167 +#: gitk:2267
168 msgid "Find"
169 msgstr "Търсене"
170
171 -#: gitk:2293
171 +#: gitk:2295
172 msgid "commit"
173 msgstr "подаване"
174
175 -#: gitk:2297 gitk:2299 gitk:4631 gitk:4654 gitk:4678 gitk:6698 gitk:6770
176 -#: gitk:6855
175 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
176 +#: gitk:6893
177 msgid "containing:"
178 msgstr "съдържащо:"
179
180 -#: gitk:2300 gitk:3488 gitk:3493 gitk:4707
180 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
181 msgid "touching paths:"
182 msgstr "засягащо пътищата:"
183
184 -#: gitk:2301 gitk:4721
184 +#: gitk:2303 gitk:4759
185 msgid "adding/removing string:"
186 msgstr "добавящо/премахващо низ"
187
188 -#: gitk:2302 gitk:4723
188 +#: gitk:2304 gitk:4761
189 msgid "changing lines matching:"
190 msgstr "променящо редове напасващи:"
191
192 -#: gitk:2311 gitk:2313 gitk:4710
192 +#: gitk:2313 gitk:2315 gitk:4748
193 msgid "Exact"
194 msgstr "Точно"
195
196 -#: gitk:2313 gitk:4798 gitk:6666
196 +#: gitk:2315 gitk:4836 gitk:6704
197 msgid "IgnCase"
198 msgstr "Без регистър"
199
200 -#: gitk:2313 gitk:4680 gitk:4796 gitk:6662
200 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
201 msgid "Regexp"
202 msgstr "Рег. израз"
203
204 -#: gitk:2315 gitk:2316 gitk:4818 gitk:4848 gitk:4855 gitk:6791 gitk:6859
204 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
205 msgid "All fields"
206 msgstr "Всички полета"
207
208 -#: gitk:2316 gitk:4815 gitk:4848 gitk:6729
208 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
209 msgid "Headline"
210 msgstr "Първи ред"
211
212 -#: gitk:2317 gitk:4815 gitk:6729 gitk:6859 gitk:7332
212 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
213 msgid "Comments"
214 msgstr "Коментари"
215
216 -#: gitk:2317 gitk:4815 gitk:4820 gitk:4855 gitk:6729 gitk:7267 gitk:8765
217 -#: gitk:8780
216 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
217 +#: gitk:8826
218 msgid "Author"
219 msgstr "Автор"
220
221 -#: gitk:2317 gitk:4815 gitk:6729 gitk:7269
221 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
222 msgid "Committer"
223 msgstr "Подаващ"
224
225 -#: gitk:2348
225 +#: gitk:2350
226 msgid "Search"
227 msgstr "Търсене"
228
229 -#: gitk:2356
229 +#: gitk:2358
230 msgid "Diff"
231 msgstr "Разлики"
232
233 -#: gitk:2358
233 +#: gitk:2360
234 msgid "Old version"
235 msgstr "Стара версия"
236
237 -#: gitk:2360
237 +#: gitk:2362
238 msgid "New version"
239 msgstr "Нова версия"
240
241 -#: gitk:2362
241 +#: gitk:2364
242 msgid "Lines of context"
243 msgstr "Контекст в редове"
244
245 -#: gitk:2372
245 +#: gitk:2374
246 msgid "Ignore space change"
247 msgstr "Празните знаци без значение"
248
249 -#: gitk:2376 gitk:2378 gitk:7894 gitk:8141
249 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
250 msgid "Line diff"
251 msgstr "Поредови разлики"
252
253 -#: gitk:2443
253 +#: gitk:2445
254 msgid "Patch"
255 msgstr "Кръпка"
256
257 -#: gitk:2445
257 +#: gitk:2447
258 msgid "Tree"
259 msgstr "Дърво"
260
261 -#: gitk:2604 gitk:2624
261 +#: gitk:2616 gitk:2636
262 msgid "Diff this -> selected"
263 msgstr "Разлики между това и избраното"
264
265 -#: gitk:2605 gitk:2625
265 +#: gitk:2617 gitk:2637
266 msgid "Diff selected -> this"
267 msgstr "Разлики между избраното и това"
268
269 -#: gitk:2606 gitk:2626
269 +#: gitk:2618 gitk:2638
270 msgid "Make patch"
271 msgstr "Създаване на кръпка"
272
273 -#: gitk:2607 gitk:9189
273 +#: gitk:2619 gitk:9235
274 msgid "Create tag"
275 msgstr "Създаване на етикет"
276
277 -#: gitk:2608 gitk:9306
277 +#: gitk:2620 gitk:9352
278 msgid "Write commit to file"
279 msgstr "Запазване на подаването във файл"
280
281 -#: gitk:2609 gitk:9363
281 +#: gitk:2621 gitk:9409
282 msgid "Create new branch"
283 msgstr "Създаване на нов клон"
284
285 -#: gitk:2610
285 +#: gitk:2622
286 msgid "Cherry-pick this commit"
287 msgstr "Отбиране на това подаване"
288
289 -#: gitk:2611
289 +#: gitk:2623
290 msgid "Reset HEAD branch to here"
291 msgstr "Привеждане на върха на клона към текущото подаване"
292
293 -#: gitk:2612
293 +#: gitk:2624
294 msgid "Mark this commit"
295 msgstr "Отбелязване на това подаване"
296
297 -#: gitk:2613
297 +#: gitk:2625
298 msgid "Return to mark"
299 msgstr "Връщане към отбелязаното подаване"
300
301 -#: gitk:2614
301 +#: gitk:2626
302 msgid "Find descendant of this and mark"
303 msgstr "Откриване и отбелязване на наследниците"
304
305 -#: gitk:2615
305 +#: gitk:2627
306 msgid "Compare with marked commit"
307 msgstr "Сравнение с отбелязаното подаване"
308
309 -#: gitk:2616 gitk:2627
309 +#: gitk:2628 gitk:2639
310 msgid "Diff this -> marked commit"
311 msgstr "Разлики между това и отбелязаното"
312
313 -#: gitk:2617 gitk:2628
313 +#: gitk:2629 gitk:2640
314 msgid "Diff marked commit -> this"
315 msgstr "Разлики между отбелязаното и това"
316
317 -#: gitk:2618
317 +#: gitk:2630
318 msgid "Revert this commit"
319 msgstr "Отмяна на това подаване"
320
321 -#: gitk:2634
321 +#: gitk:2646
322 msgid "Check out this branch"
323 msgstr "Изтегляне на този клон"
324
325 -#: gitk:2635
325 +#: gitk:2647
326 msgid "Remove this branch"
327 msgstr "Изтриване на този клон"
328
329 -#: gitk:2642
329 +#: gitk:2654
330 msgid "Highlight this too"
331 msgstr "Отбелязване и на това"
332
333 -#: gitk:2643
333 +#: gitk:2655
334 msgid "Highlight this only"
335 msgstr "Отбелязване само на това"
336
337 -#: gitk:2644
337 +#: gitk:2656
338 msgid "External diff"
339 msgstr "Външна програма за разлики"
340
341 -#: gitk:2645
341 +#: gitk:2657
342 msgid "Blame parent commit"
343 msgstr "Анотиране на родителското подаване"
344
345 -#: gitk:2652
345 +#: gitk:2664
346 msgid "Show origin of this line"
347 msgstr "Показване на произхода на този ред"
348
349 -#: gitk:2653
349 +#: gitk:2665
350 msgid "Run git gui blame on this line"
351 msgstr "Изпълнение на „git gui blame“ върху този ред"
352
353 -#: gitk:2978
353 +#: gitk:3011
354 msgid ""
355 "\n"
356 "Gitk - a commit viewer for git\n"
@@ -366,303 +366,313 @@ msgstr ""
366 "\n"
367 "Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
368
369 -#: gitk:2986 gitk:3051 gitk:9790
369 +#: gitk:3019 gitk:3085 gitk:9836
370 msgid "Close"
371 msgstr "Затваряне"
372
373 -#: gitk:3007
373 +#: gitk:3040
374 msgid "Gitk key bindings"
375 msgstr "Клавишни комбинации"
376
377 -#: gitk:3010
377 +#: gitk:3043
378 msgid "Gitk key bindings:"
379 msgstr "Клавишни комбинации:"
380
381 -#: gitk:3012
381 +#: gitk:3045
382 #, tcl-format
383 msgid "<%s-Q>\t\tQuit"
384 msgstr "<%s-Q>\t\tСпиране на програмата"
385
386 -#: gitk:3013
386 +#: gitk:3046
387 #, tcl-format
388 msgid "<%s-W>\t\tClose window"
389 msgstr "<%s-W>\t\tЗатваряне на прозореца"
390
391 -#: gitk:3014
391 +#: gitk:3047
392 msgid "<Home>\t\tMove to first commit"
393 msgstr "<Home>\t\tКъм първото подаване"
394
395 -#: gitk:3015
395 +#: gitk:3048
396 msgid "<End>\t\tMove to last commit"
397 msgstr "<End>\t\tКъм последното подаване"
398
399 -#: gitk:3016
399 +#: gitk:3049
400 msgid "<Up>, p, k\tMove up one commit"
401 msgstr "<Up>, p, k\tЕдно подаване нагоре"
402
403 -#: gitk:3017
403 +#: gitk:3050
404 msgid "<Down>, n, j\tMove down one commit"
405 msgstr "<Down>, n, j\tЕдно подаване надолу"
406
407 -#: gitk:3018
407 +#: gitk:3051
408 msgid "<Left>, z, h\tGo back in history list"
409 msgstr "<Left>, z, h\tНазад в историята"
410
411 -#: gitk:3019
411 +#: gitk:3052
412 msgid "<Right>, x, l\tGo forward in history list"
413 msgstr "<Right>, x, l\tНапред в историята"
414
415 -#: gitk:3020
415 +#: gitk:3053
416 +#, tcl-format
417 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
418 +msgstr ""
419 +
420 +#: gitk:3054
421 msgid "<PageUp>\tMove up one page in commit list"
422 msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
423
419 -#: gitk:3021
424 +#: gitk:3055
425 msgid "<PageDown>\tMove down one page in commit list"
426 msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
427
423 -#: gitk:3022
428 +#: gitk:3056
429 #, tcl-format
430 msgid "<%s-Home>\tScroll to top of commit list"
431 msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
432
428 -#: gitk:3023
433 +#: gitk:3057
434 #, tcl-format
435 msgid "<%s-End>\tScroll to bottom of commit list"
436 msgstr "<%s-End>\tКъм края на списъка с подаванията"
437
433 -#: gitk:3024
438 +#: gitk:3058
439 #, tcl-format
440 msgid "<%s-Up>\tScroll commit list up one line"
441 msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
442
438 -#: gitk:3025
443 +#: gitk:3059
444 #, tcl-format
445 msgid "<%s-Down>\tScroll commit list down one line"
446 msgstr "<%s-Down>\tРед надолу в списъка с подавания"
447
443 -#: gitk:3026
448 +#: gitk:3060
449 #, tcl-format
450 msgid "<%s-PageUp>\tScroll commit list up one page"
451 msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
452
448 -#: gitk:3027
453 +#: gitk:3061
454 #, tcl-format
455 msgid "<%s-PageDown>\tScroll commit list down one page"
456 msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
457
453 -#: gitk:3028
458 +#: gitk:3062
459 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
460 msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
461
457 -#: gitk:3029
462 +#: gitk:3063
463 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
464 msgstr ""
465 "<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
466
462 -#: gitk:3030
467 +#: gitk:3064
468 msgid "<Delete>, b\tScroll diff view up one page"
469 msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
470
466 -#: gitk:3031
471 +#: gitk:3065
472 msgid "<Backspace>\tScroll diff view up one page"
473 msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
474
470 -#: gitk:3032
475 +#: gitk:3066
476 msgid "<Space>\t\tScroll diff view down one page"
477 msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
478
474 -#: gitk:3033
479 +#: gitk:3067
480 msgid "u\t\tScroll diff view up 18 lines"
481 msgstr "u\t\t18 реда нагоре в изгледа за разлики"
482
478 -#: gitk:3034
483 +#: gitk:3068
484 msgid "d\t\tScroll diff view down 18 lines"
485 msgstr "d\t\t18 реда надолу в изгледа за разлики"
486
482 -#: gitk:3035
487 +#: gitk:3069
488 #, tcl-format
489 msgid "<%s-F>\t\tFind"
490 msgstr "<%s-F>\t\tТърсене"
491
487 -#: gitk:3036
492 +#: gitk:3070
493 #, tcl-format
494 msgid "<%s-G>\t\tMove to next find hit"
495 msgstr "<%s-G>\t\tКъм следващата поява"
496
492 -#: gitk:3037
497 +#: gitk:3071
498 msgid "<Return>\tMove to next find hit"
499 msgstr "<Return>\tКъм следващата поява"
500
496 -#: gitk:3038
501 +#: gitk:3072
502 msgid "/\t\tFocus the search box"
503 msgstr "/\t\tФокус върху полето за търсене"
504
500 -#: gitk:3039
505 +#: gitk:3073
506 msgid "?\t\tMove to previous find hit"
507 msgstr "?\t\tКъм предишната поява"
508
504 -#: gitk:3040
509 +#: gitk:3074
510 msgid "f\t\tScroll diff view to next file"
511 msgstr "f\t\tСледващ файл в изгледа за разлики"
512
508 -#: gitk:3041
513 +#: gitk:3075
514 #, tcl-format
515 msgid "<%s-S>\t\tSearch for next hit in diff view"
516 msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
517
513 -#: gitk:3042
518 +#: gitk:3076
519 #, tcl-format
520 msgid "<%s-R>\t\tSearch for previous hit in diff view"
521 msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
522
518 -#: gitk:3043
523 +#: gitk:3077
524 #, tcl-format
525 msgid "<%s-KP+>\tIncrease font size"
526 msgstr "<%s-KP+>\tПо-голям размер на шрифта"
527
523 -#: gitk:3044
528 +#: gitk:3078
529 #, tcl-format
530 msgid "<%s-plus>\tIncrease font size"
531 msgstr "<%s-plus>\tПо-голям размер на шрифта"
532
528 -#: gitk:3045
533 +#: gitk:3079
534 #, tcl-format
535 msgid "<%s-KP->\tDecrease font size"
536 msgstr "<%s-KP->\tПо-малък размер на шрифта"
537
533 -#: gitk:3046
538 +#: gitk:3080
539 #, tcl-format
540 msgid "<%s-minus>\tDecrease font size"
541 msgstr "<%s-minus>\tПо-малък размер на шрифта"
542
538 -#: gitk:3047
543 +#: gitk:3081
544 msgid "<F5>\t\tUpdate"
545 msgstr "<F5>\t\tОбновяване"
546
542 -#: gitk:3512 gitk:3521
547 +#: gitk:3546 gitk:3555
548 #, tcl-format
549 msgid "Error creating temporary directory %s:"
550 msgstr "Грешка при създаването на временната директория „%s“:"
551
547 -#: gitk:3534
552 +#: gitk:3568
553 #, tcl-format
554 msgid "Error getting \"%s\" from %s:"
555 msgstr "Грешка при получаването на „%s“ от %s:"
556
552 -#: gitk:3597
557 +#: gitk:3631
558 msgid "command failed:"
559 msgstr "неуспешно изпълнение на команда:"
560
556 -#: gitk:3746
561 +#: gitk:3780
562 msgid "No such commit"
563 msgstr "Такова подаване няма"
564
560 -#: gitk:3760
565 +#: gitk:3794
566 msgid "git gui blame: command failed:"
567 msgstr "„git gui blame“: неуспешно изпълнение на команда:"
568
564 -#: gitk:3791
569 +#: gitk:3825
570 #, tcl-format
571 msgid "Couldn't read merge head: %s"
572 msgstr "Върхът за сливане не може да бъде прочетен: %s"
573
569 -#: gitk:3799
574 +#: gitk:3833
575 #, tcl-format
576 msgid "Error reading index: %s"
577 msgstr "Грешка при прочитане на индекса: %s"
578
574 -#: gitk:3824
579 +#: gitk:3858
580 #, tcl-format
581 msgid "Couldn't start git blame: %s"
582 msgstr "Командата „git blame“ не може да бъде стартирана: %s"
583
579 -#: gitk:3827 gitk:6697
584 +#: gitk:3861 gitk:6735
585 msgid "Searching"
586 msgstr "Търсене"
587
583 -#: gitk:3859
588 +#: gitk:3893
589 #, tcl-format
590 msgid "Error running git blame: %s"
591 msgstr "Грешка при изпълнението на „git blame“: %s"
592
588 -#: gitk:3887
593 +#: gitk:3921
594 #, tcl-format
595 msgid "That line comes from commit %s, which is not in this view"
596 msgstr "Този ред идва от подаването %s, което не е в изгледа"
597
593 -#: gitk:3901
598 +#: gitk:3935
599 msgid "External diff viewer failed:"
600 msgstr "Неуспешно изпълнение на външната програма за разлики:"
601
597 -#: gitk:4019
602 +#: gitk:4053
603 msgid "Gitk view definition"
604 msgstr "Дефиниция на изглед в Gitk"
605
601 -#: gitk:4023
606 +#: gitk:4057
607 msgid "Remember this view"
608 msgstr "Запазване на този изглед"
609
605 -#: gitk:4024
610 +#: gitk:4058
611 msgid "References (space separated list):"
612 msgstr "Указатели (списък с разделител интервал):"
613
609 -#: gitk:4025
614 +#: gitk:4059
615 msgid "Branches & tags:"
616 msgstr "Клони и етикети:"
617
613 -#: gitk:4026
618 +#: gitk:4060
619 msgid "All refs"
620 msgstr "Всички указатели"
621
617 -#: gitk:4027
622 +#: gitk:4061
623 msgid "All (local) branches"
624 msgstr "Всички (локални) клони"
625
621 -#: gitk:4028
626 +#: gitk:4062
627 msgid "All tags"
628 msgstr "Всички етикети"
629
625 -#: gitk:4029
630 +#: gitk:4063
631 msgid "All remote-tracking branches"
632 msgstr "Всички следящи клони"
633
629 -#: gitk:4030
634 +#: gitk:4064
635 msgid "Commit Info (regular expressions):"
636 msgstr "Информация за подаване (рег. изр.):"
637
633 -#: gitk:4031
638 +#: gitk:4065
639 msgid "Author:"
640 msgstr "Автор:"
641
637 -#: gitk:4032
642 +#: gitk:4066
643 msgid "Committer:"
644 msgstr "Подал:"
645
641 -#: gitk:4033
646 +#: gitk:4067
647 msgid "Commit Message:"
648 msgstr "Съобщение при подаване:"
649
645 -#: gitk:4034
650 +#: gitk:4068
651 msgid "Matches all Commit Info criteria"
652 msgstr "Съвпадение по коя да е информация за подаването"
653
649 -#: gitk:4035
654 +#: gitk:4069
655 +#, fuzzy
656 +msgid "Matches none Commit Info criteria"
657 +msgstr "Съвпадение по коя да е информация за подаването"
658 +
659 +#: gitk:4070
660 msgid "Changes to Files:"
661 msgstr "Промени по файловете:"
662
653 -#: gitk:4036
663 +#: gitk:4071
664 msgid "Fixed String"
665 msgstr "Дословен низ"
666
657 -#: gitk:4037
667 +#: gitk:4072
668 msgid "Regular Expression"
669 msgstr "Регулярен израз"
670
661 -#: gitk:4038
671 +#: gitk:4073
672 msgid "Search string:"
673 msgstr "Низ за търсене:"
674
665 -#: gitk:4039
675 +#: gitk:4074
676 msgid ""
677 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
678 "15:27:38\"):"
@@ -670,204 +680,204 @@ msgstr ""
680 "Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
681 "„March 17, 2009 15:27:38“):"
682
673 -#: gitk:4040
683 +#: gitk:4075
684 msgid "Since:"
685 msgstr "От:"
686
677 -#: gitk:4041
687 +#: gitk:4076
688 msgid "Until:"
689 msgstr "До:"
690
681 -#: gitk:4042
691 +#: gitk:4077
692 msgid "Limit and/or skip a number of revisions (positive integer):"
693 msgstr ""
694 "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
695 "число):"
696
687 -#: gitk:4043
697 +#: gitk:4078
698 msgid "Number to show:"
699 msgstr "Брой показани:"
700
691 -#: gitk:4044
701 +#: gitk:4079
702 msgid "Number to skip:"
703 msgstr "Брой прескочени:"
704
695 -#: gitk:4045
705 +#: gitk:4080
706 msgid "Miscellaneous options:"
707 msgstr "Разни:"
708
699 -#: gitk:4046
709 +#: gitk:4081
710 msgid "Strictly sort by date"
711 msgstr "Подреждане по дата"
712
703 -#: gitk:4047
713 +#: gitk:4082
714 msgid "Mark branch sides"
715 msgstr "Отбелязване на страните по клона"
716
707 -#: gitk:4048
717 +#: gitk:4083
718 msgid "Limit to first parent"
719 msgstr "Само първия родител"
720
711 -#: gitk:4049
721 +#: gitk:4084
722 msgid "Simple history"
723 msgstr "Опростена история"
724
715 -#: gitk:4050
725 +#: gitk:4085
726 msgid "Additional arguments to git log:"
727 msgstr "Допълнителни аргументи към „git log“:"
728
719 -#: gitk:4051
729 +#: gitk:4086
730 msgid "Enter files and directories to include, one per line:"
731 msgstr "Въведете файловете и директориите за включване, по елемент на ред"
732
723 -#: gitk:4052
733 +#: gitk:4087
734 msgid "Command to generate more commits to include:"
735 msgstr ""
736 "Команда за генерирането на допълнителни подавания, които да бъдат включени:"
737
728 -#: gitk:4176
738 +#: gitk:4211
739 msgid "Gitk: edit view"
740 msgstr "Gitk: редактиране на изглед"
741
732 -#: gitk:4184
742 +#: gitk:4219
743 msgid "-- criteria for selecting revisions"
744 msgstr "— критерии за избор на версии"
745
736 -#: gitk:4189
746 +#: gitk:4224
747 msgid "View Name"
748 msgstr "Име на изглед"
749
740 -#: gitk:4264
750 +#: gitk:4299
751 msgid "Apply (F5)"
752 msgstr "Прилагане (F5)"
753
744 -#: gitk:4302
754 +#: gitk:4337
755 msgid "Error in commit selection arguments:"
756 msgstr "Грешка в аргументите за избор на подавания:"
757
748 -#: gitk:4355 gitk:4407 gitk:4868 gitk:4882 gitk:6152 gitk:12281 gitk:12282
758 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
759 msgid "None"
760 msgstr "Няма"
761
752 -#: gitk:4965 gitk:4970
762 +#: gitk:5003 gitk:5008
763 msgid "Descendant"
764 msgstr "Наследник"
765
756 -#: gitk:4966
766 +#: gitk:5004
767 msgid "Not descendant"
768 msgstr "Не е наследник"
769
760 -#: gitk:4973 gitk:4978
770 +#: gitk:5011 gitk:5016
771 msgid "Ancestor"
772 msgstr "Предшественик"
773
764 -#: gitk:4974
774 +#: gitk:5012
775 msgid "Not ancestor"
776 msgstr "Не е предшественик"
777
768 -#: gitk:5268
778 +#: gitk:5306
779 msgid "Local changes checked in to index but not committed"
780 msgstr "Локални промени добавени към индекса, но неподадени"
781
772 -#: gitk:5304
782 +#: gitk:5342
783 msgid "Local uncommitted changes, not checked in to index"
784 msgstr "Локални промени извън индекса"
785
776 -#: gitk:7077
786 +#: gitk:7115
787 msgid "and many more"
788 msgstr "и още много"
789
780 -#: gitk:7080
790 +#: gitk:7118
791 msgid "many"
792 msgstr "много"
793
784 -#: gitk:7271
794 +#: gitk:7309
795 msgid "Tags:"
796 msgstr "Етикети:"
797
788 -#: gitk:7288 gitk:7294 gitk:8760
798 +#: gitk:7326 gitk:7332 gitk:8806
799 msgid "Parent"
800 msgstr "Родител"
801
792 -#: gitk:7299
802 +#: gitk:7337
803 msgid "Child"
804 msgstr "Дете"
805
796 -#: gitk:7308
806 +#: gitk:7346
807 msgid "Branch"
808 msgstr "Клон"
809
800 -#: gitk:7311
810 +#: gitk:7349
811 msgid "Follows"
812 msgstr "Следва"
813
804 -#: gitk:7314
814 +#: gitk:7352
815 msgid "Precedes"
816 msgstr "Предшества"
817
808 -#: gitk:7901
818 +#: gitk:7947
819 #, tcl-format
820 msgid "Error getting diffs: %s"
821 msgstr "Грешка при получаването на разликите: %s"
822
813 -#: gitk:8585
823 +#: gitk:8631
824 msgid "Goto:"
825 msgstr "Към ред:"
826
817 -#: gitk:8606
827 +#: gitk:8652
828 #, tcl-format
829 msgid "Short SHA1 id %s is ambiguous"
830 msgstr "Съкратената сума по SHA1 %s не е еднозначна"
831
822 -#: gitk:8613
832 +#: gitk:8659
833 #, tcl-format
834 msgid "Revision %s is not known"
835 msgstr "Непозната версия %s"
836
827 -#: gitk:8623
837 +#: gitk:8669
838 #, tcl-format
839 msgid "SHA1 id %s is not known"
840 msgstr "Непозната сума по SHA1 %s"
841
832 -#: gitk:8625
842 +#: gitk:8671
843 #, tcl-format
844 msgid "Revision %s is not in the current view"
845 msgstr "Версия %s не е в текущия изглед"
846
837 -#: gitk:8767 gitk:8782
847 +#: gitk:8813 gitk:8828
848 msgid "Date"
849 msgstr "Дата"
850
841 -#: gitk:8770
851 +#: gitk:8816
852 msgid "Children"
853 msgstr "Деца"
854
845 -#: gitk:8833
855 +#: gitk:8879
856 #, tcl-format
857 msgid "Reset %s branch to here"
858 msgstr "Зануляване на клона „%s“ към текущото подаване"
859
850 -#: gitk:8835
860 +#: gitk:8881
861 msgid "Detached head: can't reset"
862 msgstr "Несвързан връх: невъзможно зануляване"
863
854 -#: gitk:8940 gitk:8946
864 +#: gitk:8986 gitk:8992
865 msgid "Skipping merge commit "
866 msgstr "Пропускане на подаването на сливането"
867
858 -#: gitk:8955 gitk:8960
868 +#: gitk:9001 gitk:9006
869 msgid "Error getting patch ID for "
870 msgstr "Грешка при получаването на идентификатора на "
871
862 -#: gitk:8956 gitk:8961
872 +#: gitk:9002 gitk:9007
873 msgid " - stopping\n"
874 msgstr " — спиране\n"
875
866 -#: gitk:8966 gitk:8969 gitk:8977 gitk:8991 gitk:9000
876 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
877 msgid "Commit "
878 msgstr "Подаване"
879
870 -#: gitk:8970
880 +#: gitk:9016
881 msgid ""
882 " is the same patch as\n"
883 " "
@@ -875,7 +885,7 @@ msgstr ""
885 " е същата кръпка като\n"
886 " "
887
878 -#: gitk:8978
888 +#: gitk:9024
889 msgid ""
890 " differs from\n"
891 " "
@@ -883,7 +893,7 @@ msgstr ""
893 " се различава от\n"
894 " "
895
886 -#: gitk:8980
896 +#: gitk:9026
897 msgid ""
898 "Diff of commits:\n"
899 "\n"
@@ -891,130 +901,130 @@ msgstr ""
901 "Разлика между подаванията:\n"
902 "\n"
903
894 -#: gitk:8992 gitk:9001
904 +#: gitk:9038 gitk:9047
905 #, tcl-format
906 msgid " has %s children - stopping\n"
907 msgstr " има %s деца — спиране\n"
908
899 -#: gitk:9020
909 +#: gitk:9066
910 #, tcl-format
911 msgid "Error writing commit to file: %s"
912 msgstr "Грешка при запазването на подаването във файл: %s"
913
904 -#: gitk:9026
914 +#: gitk:9072
915 #, tcl-format
916 msgid "Error diffing commits: %s"
917 msgstr "Грешка при изчисляването на разликите между подаванията: %s"
918
909 -#: gitk:9072
919 +#: gitk:9118
920 msgid "Top"
921 msgstr "Най-горе"
922
913 -#: gitk:9073
923 +#: gitk:9119
924 msgid "From"
925 msgstr "От"
926
917 -#: gitk:9078
927 +#: gitk:9124
928 msgid "To"
929 msgstr "До"
930
921 -#: gitk:9102
931 +#: gitk:9148
932 msgid "Generate patch"
933 msgstr "Генериране на кръпка"
934
925 -#: gitk:9104
935 +#: gitk:9150
936 msgid "From:"
937 msgstr "От:"
938
929 -#: gitk:9113
939 +#: gitk:9159
940 msgid "To:"
941 msgstr "До:"
942
933 -#: gitk:9122
943 +#: gitk:9168
944 msgid "Reverse"
945 msgstr "Обръщане"
946
937 -#: gitk:9124 gitk:9320
947 +#: gitk:9170 gitk:9366
948 msgid "Output file:"
949 msgstr "Запазване във файла:"
950
941 -#: gitk:9130
951 +#: gitk:9176
952 msgid "Generate"
953 msgstr "Генериране"
954
945 -#: gitk:9168
955 +#: gitk:9214
956 msgid "Error creating patch:"
957 msgstr "Грешка при създаването на кръпка:"
958
949 -#: gitk:9191 gitk:9308 gitk:9365
959 +#: gitk:9237 gitk:9354 gitk:9411
960 msgid "ID:"
961 msgstr "Идентификатор:"
962
953 -#: gitk:9200
963 +#: gitk:9246
964 msgid "Tag name:"
965 msgstr "Име на етикет:"
966
957 -#: gitk:9203
967 +#: gitk:9249
968 msgid "Tag message is optional"
969 msgstr "Съобщението за етикет е незадължително"
970
961 -#: gitk:9205
971 +#: gitk:9251
972 msgid "Tag message:"
973 msgstr "Съобщение за етикет:"
974
965 -#: gitk:9209 gitk:9374
975 +#: gitk:9255 gitk:9420
976 msgid "Create"
977 msgstr "Създаване"
978
969 -#: gitk:9227
979 +#: gitk:9273
980 msgid "No tag name specified"
981 msgstr "Липсва име на етикет"
982
973 -#: gitk:9231
983 +#: gitk:9277
984 #, tcl-format
985 msgid "Tag \"%s\" already exists"
986 msgstr "Етикетът „%s“ вече съществува"
987
978 -#: gitk:9241
988 +#: gitk:9287
989 msgid "Error creating tag:"
990 msgstr "Грешка при създаването на етикет:"
991
982 -#: gitk:9317
992 +#: gitk:9363
993 msgid "Command:"
994 msgstr "Команда:"
995
986 -#: gitk:9325
996 +#: gitk:9371
997 msgid "Write"
998 msgstr "Запазване"
999
990 -#: gitk:9343
1000 +#: gitk:9389
1001 msgid "Error writing commit:"
1002 msgstr "Грешка при запазването на подаването:"
1003
994 -#: gitk:9370
1004 +#: gitk:9416
1005 msgid "Name:"
1006 msgstr "Име:"
1007
998 -#: gitk:9393
1008 +#: gitk:9439
1009 msgid "Please specify a name for the new branch"
1010 msgstr "Укажете име за новия клон"
1011
1002 -#: gitk:9398
1012 +#: gitk:9444
1013 #, tcl-format
1014 msgid "Branch '%s' already exists. Overwrite?"
1015 msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?"
1016
1007 -#: gitk:9465
1017 +#: gitk:9511
1018 #, tcl-format
1019 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1020 msgstr ""
1021 "Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?"
1022
1013 -#: gitk:9470
1023 +#: gitk:9516
1024 msgid "Cherry-picking"
1025 msgstr "Отбиране"
1026
1017 -#: gitk:9479
1027 +#: gitk:9525
1028 #, tcl-format
1029 msgid ""
1030 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1023,7 +1033,7 @@ msgstr ""
1033 "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
1034 "Подайте, занулете или ги скатайте и пробвайте отново."
1035
1026 -#: gitk:9485
1036 +#: gitk:9531
1037 msgid ""
1038 "Cherry-pick failed because of merge conflict.\n"
1039 "Do you wish to run git citool to resolve it?"
@@ -1031,20 +1041,20 @@ msgstr ""
1041 "Неуспешно отбиране поради конфликти при сливане.\n"
1042 "Искате ли да ги коригирате чрез „git citool“?"
1043
1034 -#: gitk:9501 gitk:9559
1044 +#: gitk:9547 gitk:9605
1045 msgid "No changes committed"
1046 msgstr "Не са подадени промени"
1047
1038 -#: gitk:9528
1048 +#: gitk:9574
1049 #, tcl-format
1050 msgid "Commit %s is not included in branch %s -- really revert it?"
1051 msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?"
1052
1043 -#: gitk:9533
1053 +#: gitk:9579
1054 msgid "Reverting"
1055 msgstr "Отмяна"
1056
1047 -#: gitk:9541
1057 +#: gitk:9587
1058 #, tcl-format
1059 msgid ""
1060 "Revert failed because of local changes to the following files:%s Please "
@@ -1053,7 +1063,7 @@ msgstr ""
1063 "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
1064 "Подайте, занулете или ги скатайте и пробвайте отново.<"
1065
1056 -#: gitk:9545
1066 +#: gitk:9591
1067 msgid ""
1068 "Revert failed because of merge conflict.\n"
1069 " Do you wish to run git citool to resolve it?"
@@ -1061,28 +1071,28 @@ msgstr ""
1071 "Неуспешно отмяна поради конфликти при сливане.\n"
1072 "Искате ли да ги коригирате чрез „git citool“?"
1073
1064 -#: gitk:9588
1074 +#: gitk:9634
1075 msgid "Confirm reset"
1076 msgstr "Потвърждаване на зануляването"
1077
1068 -#: gitk:9590
1078 +#: gitk:9636
1079 #, tcl-format
1080 msgid "Reset branch %s to %s?"
1081 msgstr "Да се занули ли клонът „%s“ към „%s“?"
1082
1073 -#: gitk:9592
1083 +#: gitk:9638
1084 msgid "Reset type:"
1085 msgstr "Вид зануляване:"
1086
1077 -#: gitk:9595
1087 +#: gitk:9641
1088 msgid "Soft: Leave working tree and index untouched"
1089 msgstr "Слабо: работното дърво и индекса остават същите"
1090
1081 -#: gitk:9598
1091 +#: gitk:9644
1092 msgid "Mixed: Leave working tree untouched, reset index"
1093 msgstr "Смесено: работното дърво остава същото, индексът се занулява"
1094
1085 -#: gitk:9601
1095 +#: gitk:9647
1096 msgid ""
1097 "Hard: Reset working tree and index\n"
1098 "(discard ALL local changes)"
@@ -1090,19 +1100,19 @@ msgstr ""
1100 "Силно: зануляване и на работното дърво, и на индекса\n"
1101 "(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)"
1102
1093 -#: gitk:9618
1103 +#: gitk:9664
1104 msgid "Resetting"
1105 msgstr "Зануляване"
1106
1097 -#: gitk:9678
1107 +#: gitk:9724
1108 msgid "Checking out"
1109 msgstr "Изтегляне"
1110
1101 -#: gitk:9731
1111 +#: gitk:9777
1112 msgid "Cannot delete the currently checked-out branch"
1113 msgstr "Текущо изтегленият клон не може да бъде изтрит"
1114
1105 -#: gitk:9737
1115 +#: gitk:9783
1116 #, tcl-format
1117 msgid ""
1118 "The commits on branch %s aren't on any other branch.\n"
@@ -1111,16 +1121,16 @@ msgstr ""
1121 "Подаванията на клона „%s“ не са на никой друг клон.\n"
1122 "Наистина ли да се изтрие клонът „%s“?"
1123
1114 -#: gitk:9768
1124 +#: gitk:9814
1125 #, tcl-format
1126 msgid "Tags and heads: %s"
1127 msgstr "Етикети и върхове: %s"
1128
1119 -#: gitk:9783
1129 +#: gitk:9829
1130 msgid "Filter"
1131 msgstr "Филтриране"
1132
1123 -#: gitk:10079
1133 +#: gitk:10125
1134 msgid ""
1135 "Error reading commit topology information; branch and preceding/following "
1136 "tag information will be incomplete."
@@ -1128,213 +1138,213 @@ msgstr ""
1138 "Грешка при прочитането на топологията на подаванията. Информацията за клона "
1139 "и предшестващите/следващите етикети ще е непълна."
1140
1131 -#: gitk:11056
1141 +#: gitk:11102
1142 msgid "Tag"
1143 msgstr "Етикет"
1144
1135 -#: gitk:11060
1145 +#: gitk:11106
1146 msgid "Id"
1147 msgstr "Идентификатор"
1148
1139 -#: gitk:11143
1149 +#: gitk:11189
1150 msgid "Gitk font chooser"
1151 msgstr "Избор на шрифт за Gitk"
1152
1143 -#: gitk:11160
1153 +#: gitk:11206
1154 msgid "B"
1155 msgstr "Ч"
1156
1147 -#: gitk:11163
1157 +#: gitk:11209
1158 msgid "I"
1159 msgstr "К"
1160
1151 -#: gitk:11281
1161 +#: gitk:11327
1162 msgid "Commit list display options"
1163 msgstr "Настройки на списъка с подавания"
1164
1155 -#: gitk:11284
1165 +#: gitk:11330
1166 msgid "Maximum graph width (lines)"
1167 msgstr "Максимална широчина на графа (в редове)"
1168
1159 -#: gitk:11287
1160 -#, tcl-format
1169 +#: gitk:11334
1170 +#, no-tcl-format
1171 msgid "Maximum graph width (% of pane)"
1172 msgstr "Максимална широчина на графа (% от панела)"
1173
1164 -#: gitk:11290
1174 +#: gitk:11337
1175 msgid "Show local changes"
1176 msgstr "Показване на локалните промени"
1177
1168 -#: gitk:11293
1178 +#: gitk:11340
1179 msgid "Auto-select SHA1 (length)"
1180 msgstr "Автоматично избиране на SHA1 (дължина)"
1181
1172 -#: gitk:11297
1182 +#: gitk:11344
1183 msgid "Hide remote refs"
1184 msgstr "Скриване на отдалечените указатели"
1185
1176 -#: gitk:11301
1186 +#: gitk:11348
1187 msgid "Diff display options"
1188 msgstr "Настройки на показването на разликите"
1189
1180 -#: gitk:11303
1190 +#: gitk:11350
1191 msgid "Tab spacing"
1192 msgstr "Широчина на табулатора"
1193
1184 -#: gitk:11306
1194 +#: gitk:11353
1195 msgid "Display nearby tags/heads"
1196 msgstr "Извеждане на близките етикети и върхове"
1197
1188 -#: gitk:11309
1198 +#: gitk:11356
1199 msgid "Maximum # tags/heads to show"
1200 msgstr "Максимален брой етикети/върхове за показване"
1201
1192 -#: gitk:11312
1202 +#: gitk:11359
1203 msgid "Limit diffs to listed paths"
1204 msgstr "Разлика само в избраните пътища"
1205
1196 -#: gitk:11315
1206 +#: gitk:11362
1207 msgid "Support per-file encodings"
1208 msgstr "Поддръжка на различни кодирания за всеки файл"
1209
1200 -#: gitk:11321 gitk:11468
1210 +#: gitk:11368 gitk:11515
1211 msgid "External diff tool"
1212 msgstr "Външен инструмент за разлики"
1213
1204 -#: gitk:11322
1214 +#: gitk:11369
1215 msgid "Choose..."
1216 msgstr "Избор…"
1217
1208 -#: gitk:11327
1218 +#: gitk:11374
1219 msgid "General options"
1220 msgstr "Общи настройки"
1221
1212 -#: gitk:11330
1222 +#: gitk:11377
1223 msgid "Use themed widgets"
1224 msgstr "Използване на тема за графичните обекти"
1225
1216 -#: gitk:11332
1226 +#: gitk:11379
1227 msgid "(change requires restart)"
1228 msgstr "(промяната изисква рестартиране на Gitk)"
1229
1220 -#: gitk:11334
1230 +#: gitk:11381
1231 msgid "(currently unavailable)"
1232 msgstr "(в момента недостъпно)"
1233
1224 -#: gitk:11345
1234 +#: gitk:11392
1235 msgid "Colors: press to choose"
1236 msgstr "Цветове: избира се с натискане"
1237
1228 -#: gitk:11348
1238 +#: gitk:11395
1239 msgid "Interface"
1240 msgstr "Интерфейс"
1241
1232 -#: gitk:11349
1242 +#: gitk:11396
1243 msgid "interface"
1244 msgstr "интерфейс"
1245
1236 -#: gitk:11352
1246 +#: gitk:11399
1247 msgid "Background"
1248 msgstr "Фон"
1249
1240 -#: gitk:11353 gitk:11383
1250 +#: gitk:11400 gitk:11430
1251 msgid "background"
1252 msgstr "фон"
1253
1244 -#: gitk:11356
1254 +#: gitk:11403
1255 msgid "Foreground"
1256 msgstr "Знаци"
1257
1248 -#: gitk:11357
1258 +#: gitk:11404
1259 msgid "foreground"
1260 msgstr "знаци"
1261
1252 -#: gitk:11360
1262 +#: gitk:11407
1263 msgid "Diff: old lines"
1264 msgstr "Разлика: стари редове"
1265
1256 -#: gitk:11361
1266 +#: gitk:11408
1267 msgid "diff old lines"
1268 msgstr "разлика, стари редове"
1269
1260 -#: gitk:11365
1270 +#: gitk:11412
1271 msgid "Diff: new lines"
1272 msgstr "Разлика: нови редове"
1273
1264 -#: gitk:11366
1274 +#: gitk:11413
1275 msgid "diff new lines"
1276 msgstr "разлика, нови редове"
1277
1268 -#: gitk:11370
1278 +#: gitk:11417
1279 msgid "Diff: hunk header"
1280 msgstr "Разлика: начало на парче"
1281
1272 -#: gitk:11372
1282 +#: gitk:11419
1283 msgid "diff hunk header"
1284 msgstr "разлика, начало на парче"
1285
1276 -#: gitk:11376
1286 +#: gitk:11423
1287 msgid "Marked line bg"
1288 msgstr "Фон на отбелязан ред"
1289
1280 -#: gitk:11378
1290 +#: gitk:11425
1291 msgid "marked line background"
1292 msgstr "фон на отбелязан ред"
1293
1284 -#: gitk:11382
1294 +#: gitk:11429
1295 msgid "Select bg"
1296 msgstr "Избор на фон"
1297
1288 -#: gitk:11391
1298 +#: gitk:11438
1299 msgid "Fonts: press to choose"
1300 msgstr "Шрифтове: избира се с натискане"
1301
1292 -#: gitk:11393
1302 +#: gitk:11440
1303 msgid "Main font"
1304 msgstr "Основен шрифт"
1305
1296 -#: gitk:11394
1306 +#: gitk:11441
1307 msgid "Diff display font"
1308 msgstr "Шрифт за разликите"
1309
1300 -#: gitk:11395
1310 +#: gitk:11442
1311 msgid "User interface font"
1312 msgstr "Шрифт на интерфейса"
1313
1304 -#: gitk:11417
1314 +#: gitk:11464
1315 msgid "Gitk preferences"
1316 msgstr "Настройки на Gitk"
1317
1308 -#: gitk:11426
1318 +#: gitk:11473
1319 msgid "General"
1320 msgstr "Общи"
1321
1312 -#: gitk:11427
1322 +#: gitk:11474
1323 msgid "Colors"
1324 msgstr "Цветове"
1325
1316 -#: gitk:11428
1326 +#: gitk:11475
1327 msgid "Fonts"
1328 msgstr "Шрифтове"
1329
1320 -#: gitk:11478
1330 +#: gitk:11525
1331 #, tcl-format
1332 msgid "Gitk: choose color for %s"
1333 msgstr "Gitk: избор на цвят на „%s“"
1334
1325 -#: gitk:12177
1335 +#: gitk:12242
1336 msgid "Cannot find a git repository here."
1337 msgstr "Тук липсва хранилище на Git."
1338
1329 -#: gitk:12224
1339 +#: gitk:12289
1340 #, tcl-format
1341 msgid "Ambiguous argument '%s': both revision and filename"
1342 msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
1343
1334 -#: gitk:12236
1344 +#: gitk:12301
1345 msgid "Bad arguments to gitk:"
1346 msgstr "Неправилни аргументи на gitk:"
1347
1338 -#: gitk:12339
1348 +#: gitk:12405
1349 msgid "Command line"
1350 msgstr "Команден ред"
po/ca.po
+276 -271
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2015-01-22 00:45-0700\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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:8108 gitk:8141
30 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
31 msgid "Markup words"
32 msgstr "Marca les paraules"
33
@@ -61,11 +61,11 @@ msgstr "Error en executar git log:"
61 msgid "Reading"
62 msgstr "Llegint"
63
64 -#: gitk:496 gitk:4415
64 +#: gitk:496 gitk:4508
65 msgid "Reading commits..."
66 msgstr "Llegint les revisions..."
67
68 -#: gitk:499 gitk:1637 gitk:4418
68 +#: gitk:499 gitk:1637 gitk:4511
69 msgid "No commits selected"
70 msgstr "Cap comissió seleccionada"
71
@@ -81,12 +81,12 @@ msgstr "Cap informació de comissió disponible"
81 msgid "mc"
82 msgstr "mc"
83
84 -#: gitk:1932 gitk:4208 gitk:9557 gitk:11127 gitk:11406
84 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
85 msgid "OK"
86 msgstr "D'acord"
87
88 -#: gitk:1934 gitk:4210 gitk:9084 gitk:9163 gitk:9279 gitk:9328 gitk:9559
89 -#: gitk:11128 gitk:11407
88 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
89 +#: gitk:11221 gitk:11501
90 msgid "Cancel"
91 msgstr "Cancel·la"
92
@@ -142,11 +142,11 @@ msgstr "Suprimeix vista"
142 msgid "All files"
143 msgstr "Tots els fitxers"
144
145 -#: gitk:2083 gitk:3961
145 +#: gitk:2083 gitk:4050
146 msgid "View"
147 msgstr "Vista"
148
149 -#: gitk:2093 gitk:2103 gitk:2920
149 +#: gitk:2093 gitk:2103 gitk:3009
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:8540
161 +#: gitk:2185 gitk:8633
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:4576 gitk:4599 gitk:4623 gitk:6643 gitk:6715
178 -#: gitk:6800
177 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
178 +#: gitk:6893
179 msgid "containing:"
180 msgstr "que contingui:"
181
182 -#: gitk:2302 gitk:3433 gitk:3438 gitk:4652
182 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
183 msgid "touching paths:"
184 msgstr "que toqui els camins:"
185
186 -#: gitk:2303 gitk:4666
186 +#: gitk:2303 gitk:4759
187 msgid "adding/removing string:"
188 msgstr "que afegeixi/elimini la cadena:"
189
190 -#: gitk:2304 gitk:4668
190 +#: gitk:2304 gitk:4761
191 msgid "changing lines matching:"
192 msgstr "que tingui línies canviades coincidents amb:"
193
194 -#: gitk:2313 gitk:2315 gitk:4655
194 +#: gitk:2313 gitk:2315 gitk:4748
195 msgid "Exact"
196 msgstr "Exacte"
197
198 -#: gitk:2315 gitk:4743 gitk:6611
198 +#: gitk:2315 gitk:4836 gitk:6704
199 msgid "IgnCase"
200 msgstr "Ignora majúscula i minúscula"
201
202 -#: gitk:2315 gitk:4625 gitk:4741 gitk:6607
202 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
203 msgid "Regexp"
204 msgstr "Regexp"
205
206 -#: gitk:2317 gitk:2318 gitk:4763 gitk:4793 gitk:4800 gitk:6736 gitk:6804
206 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
207 msgid "All fields"
208 msgstr "Tots els camps"
209
210 -#: gitk:2318 gitk:4760 gitk:4793 gitk:6674
210 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
211 msgid "Headline"
212 msgstr "Titular"
213
214 -#: gitk:2319 gitk:4760 gitk:6674 gitk:6804 gitk:7277
214 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
215 msgid "Comments"
216 msgstr "Comentaris"
217
218 -#: gitk:2319 gitk:4760 gitk:4765 gitk:4800 gitk:6674 gitk:7212 gitk:8718
219 -#: gitk:8733
218 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
219 +#: gitk:8826
220 msgid "Author"
221 msgstr "Autor"
222
223 -#: gitk:2319 gitk:4760 gitk:6674 gitk:7214
223 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
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:7847 gitk:8094
251 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
252 msgid "Line diff"
253 msgstr "Diferència de línies"
254
@@ -260,99 +260,99 @@ msgstr "Pedaç"
260 msgid "Tree"
261 msgstr "Arbre"
262
263 -#: gitk:2609 gitk:2629
263 +#: gitk:2616 gitk:2636
264 msgid "Diff this -> selected"
265 msgstr "Diferencia aquesta -> la seleccionada"
266
267 -#: gitk:2610 gitk:2630
267 +#: gitk:2617 gitk:2637
268 msgid "Diff selected -> this"
269 msgstr "Diferencia la seleccionada -> aquesta"
270
271 -#: gitk:2611 gitk:2631
271 +#: gitk:2618 gitk:2638
272 msgid "Make patch"
273 msgstr "Fes pedaç"
274
275 -#: gitk:2612 gitk:9142
275 +#: gitk:2619 gitk:9235
276 msgid "Create tag"
277 msgstr "Crea etiqueta"
278
279 -#: gitk:2613 gitk:9259
279 +#: gitk:2620 gitk:9352
280 msgid "Write commit to file"
281 msgstr "Escriu la comissió a un fitxer"
282
283 -#: gitk:2614 gitk:9316
283 +#: gitk:2621 gitk:9409
284 msgid "Create new branch"
285 msgstr "Crea una branca nova"
286
287 -#: gitk:2615
287 +#: gitk:2622
288 msgid "Cherry-pick this commit"
289 msgstr "Recull aquesta comissió com a cirera"
290
291 -#: gitk:2616
291 +#: gitk:2623
292 msgid "Reset HEAD branch to here"
293 msgstr "Restableix la branca HEAD aquí"
294
295 -#: gitk:2617
295 +#: gitk:2624
296 msgid "Mark this commit"
297 msgstr "Marca aquesta comissió"
298
299 -#: gitk:2618
299 +#: gitk:2625
300 msgid "Return to mark"
301 msgstr "Torna a la marca"
302
303 -#: gitk:2619
303 +#: gitk:2626
304 msgid "Find descendant of this and mark"
305 msgstr "Troba la descendent d'aquesta i marca-la"
306
307 -#: gitk:2620
307 +#: gitk:2627
308 msgid "Compare with marked commit"
309 msgstr "Compara amb la comissió marcada"
310
311 -#: gitk:2621 gitk:2632
311 +#: gitk:2628 gitk:2639
312 msgid "Diff this -> marked commit"
313 msgstr "Diferencia aquesta -> la comissió marcada"
314
315 -#: gitk:2622 gitk:2633
315 +#: gitk:2629 gitk:2640
316 msgid "Diff marked commit -> this"
317 msgstr "Diferencia la comissió seleccionada -> aquesta"
318
319 -#: gitk:2623
319 +#: gitk:2630
320 msgid "Revert this commit"
321 msgstr "Reverteix aquesta comissió"
322
323 -#: gitk:2639
323 +#: gitk:2646
324 msgid "Check out this branch"
325 msgstr "Agafa aquesta branca"
326
327 -#: gitk:2640
327 +#: gitk:2647
328 msgid "Remove this branch"
329 msgstr "Elimina aquesta branca"
330
331 -#: gitk:2647
331 +#: gitk:2654
332 msgid "Highlight this too"
333 msgstr "Ressalta aquest també"
334
335 -#: gitk:2648
335 +#: gitk:2655
336 msgid "Highlight this only"
337 msgstr "Ressalta només aquest"
338
339 -#: gitk:2649
339 +#: gitk:2656
340 msgid "External diff"
341 msgstr "Diferència externa"
342
343 -#: gitk:2650
343 +#: gitk:2657
344 msgid "Blame parent commit"
345 msgstr "Culpabilitat de la comissió mare"
346
347 -#: gitk:2657
347 +#: gitk:2664
348 msgid "Show origin of this line"
349 msgstr "Mostra l'origen d'aquesta línia"
350
351 -#: gitk:2658
351 +#: gitk:2665
352 msgid "Run git gui blame on this line"
353 msgstr "Executa git gui blame en aquesta línia"
354
355 -#: gitk:2922
355 +#: gitk:3011
356 msgid ""
357 "\n"
358 "Gitk - a commit viewer for git\n"
@@ -368,309 +368,314 @@ msgstr ""
368 "\n"
369 "Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU"
370
371 -#: gitk:2930 gitk:2996 gitk:9743
371 +#: gitk:3019 gitk:3085 gitk:9836
372 msgid "Close"
373 msgstr "Tanca"
374
375 -#: gitk:2951
375 +#: gitk:3040
376 msgid "Gitk key bindings"
377 msgstr "Associacions de tecles del Gitk"
378
379 -#: gitk:2954
379 +#: gitk:3043
380 msgid "Gitk key bindings:"
381 msgstr "Associacions de tecles del Gitk:"
382
383 -#: gitk:2956
383 +#: gitk:3045
384 #, tcl-format
385 msgid "<%s-Q>\t\tQuit"
386 msgstr "<%s-Q>\t\tSurt"
387
388 -#: gitk:2957
388 +#: gitk:3046
389 #, tcl-format
390 msgid "<%s-W>\t\tClose window"
391 msgstr "<%s-W>\t\tTanca la finestra"
392
393 -#: gitk:2958
393 +#: gitk:3047
394 msgid "<Home>\t\tMove to first commit"
395 msgstr "<Inici>\t\tVés a la primera comissió"
396
397 -#: gitk:2959
397 +#: gitk:3048
398 msgid "<End>\t\tMove to last commit"
399 msgstr "<Fi>\t\tVés a l'última comissió"
400
401 -#: gitk:2960
401 +#: gitk:3049
402 msgid "<Up>, p, k\tMove up one commit"
403 msgstr "<Amunt>, p, k\tMou-te una comissió amunt"
404
405 -#: gitk:2961
405 +#: gitk:3050
406 msgid "<Down>, n, j\tMove down one commit"
407 msgstr "<Avall>, n, j\tMou-te una comissió avall"
408
409 -#: gitk:2962
409 +#: gitk:3051
410 msgid "<Left>, z, h\tGo back in history list"
411 msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història"
412
413 -#: gitk:2963
413 +#: gitk:3052
414 msgid "<Right>, x, l\tGo forward in history list"
415 msgstr "<Dreta>, x, l\tAvança en la llista d'història"
416
417 -#: gitk:2964
417 +#: gitk:3053
418 #, tcl-format
419 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
420 msgstr ""
421 "<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història"
422
423 -#: gitk:2965
423 +#: gitk:3054
424 msgid "<PageUp>\tMove up one page in commit list"
425 msgstr "<RePàg>\tBaixa una pàgina en la llista de comissions"
426
427 -#: gitk:2966
427 +#: gitk:3055
428 msgid "<PageDown>\tMove down one page in commit list"
429 msgstr "<AvPàg>\tBaixa per una pàgina en la llista de comissions"
430
431 -#: gitk:2967
431 +#: gitk:3056
432 #, tcl-format
433 msgid "<%s-Home>\tScroll to top of commit list"
434 msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions"
435
436 -#: gitk:2968
436 +#: gitk:3057
437 #, tcl-format
438 msgid "<%s-End>\tScroll to bottom of commit list"
439 msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions"
440
441 -#: gitk:2969
441 +#: gitk:3058
442 #, tcl-format
443 msgid "<%s-Up>\tScroll commit list up one line"
444 msgstr "<%s-Amunt>\tDesplaça la llista de comissions una línia cap amunt"
445
446 -#: gitk:2970
446 +#: gitk:3059
447 #, tcl-format
448 msgid "<%s-Down>\tScroll commit list down one line"
449 msgstr "<%s-Avall>\tDesplaça la llista de comissions una línia cap avall"
450
451 -#: gitk:2971
451 +#: gitk:3060
452 #, tcl-format
453 msgid "<%s-PageUp>\tScroll commit list up one page"
454 msgstr "<%s-RePàg>\tDesplaça la llista de comissions amunt per una pàgina"
455
456 -#: gitk:2972
456 +#: gitk:3061
457 #, tcl-format
458 msgid "<%s-PageDown>\tScroll commit list down one page"
459 msgstr "<%s-AvPàg>\tDesplaça la llista de comissions una pàgina cap avall"
460
461 -#: gitk:2973
461 +#: gitk:3062
462 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
463 msgstr "<Maj-Amunt>\tCerca cap enrere (amunt, les comissions més noves)"
464
465 -#: gitk:2974
465 +#: gitk:3063
466 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
467 msgstr "<Maj-Avall>\tCerca cap endavant (avall, les comissions més velles)"
468
469 -#: gitk:2975
469 +#: gitk:3064
470 msgid "<Delete>, b\tScroll diff view up one page"
471 msgstr "<Supr>, b\tDesplaça la vista de diferència una pàgina cap amunt"
472
473 -#: gitk:2976
473 +#: gitk:3065
474 msgid "<Backspace>\tScroll diff view up one page"
475 msgstr "<Retrocés>\tDesplaça la vista de diferència una pàgina cap amunt"
476
477 -#: gitk:2977
477 +#: gitk:3066
478 msgid "<Space>\t\tScroll diff view down one page"
479 msgstr "<Espai>\t\tDesplaça la vista de diferència una pàgina cap avall"
480
481 -#: gitk:2978
481 +#: gitk:3067
482 msgid "u\t\tScroll diff view up 18 lines"
483 msgstr "u\t\tDesplaça la vista de diferència 18 línies cap amunt"
484
485 -#: gitk:2979
485 +#: gitk:3068
486 msgid "d\t\tScroll diff view down 18 lines"
487 msgstr "d\t\tDesplaça la vista de diferència 18 línies cap avall "
488
489 -#: gitk:2980
489 +#: gitk:3069
490 #, tcl-format
491 msgid "<%s-F>\t\tFind"
492 msgstr "<%s-F>\t\tCerca"
493
494 -#: gitk:2981
494 +#: gitk:3070
495 #, tcl-format
496 msgid "<%s-G>\t\tMove to next find hit"
497 msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca"
498
499 -#: gitk:2982
499 +#: gitk:3071
500 msgid "<Return>\tMove to next find hit"
501 msgstr "<Retorn>\tMou-te a la propera coincidència de la cerca"
502
503 -#: gitk:2983
503 +#: gitk:3072
504 msgid "/\t\tFocus the search box"
505 msgstr "/\t\tPosa el focus a la caixa de cerca"
506
507 -#: gitk:2984
507 +#: gitk:3073
508 msgid "?\t\tMove to previous find hit"
509 msgstr "?\t\tMou a la coincidència prèvia de la cerca"
510
511 -#: gitk:2985
511 +#: gitk:3074
512 msgid "f\t\tScroll diff view to next file"
513 msgstr "f\t\tDesplaça la vista de diferència al proper fitxer"
514
515 -#: gitk:2986
515 +#: gitk:3075
516 #, tcl-format
517 msgid "<%s-S>\t\tSearch for next hit in diff view"
518 msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència"
519
520 -#: gitk:2987
520 +#: gitk:3076
521 #, tcl-format
522 msgid "<%s-R>\t\tSearch for previous hit in diff view"
523 msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència"
524
525 -#: gitk:2988
525 +#: gitk:3077
526 #, tcl-format
527 msgid "<%s-KP+>\tIncrease font size"
528 msgstr "<%s-KP+>\tAugmenta la mida de lletra"
529
530 -#: gitk:2989
530 +#: gitk:3078
531 #, tcl-format
532 msgid "<%s-plus>\tIncrease font size"
533 msgstr "<%s-més>\tAugmenta la mida de lletra"
534
535 -#: gitk:2990
535 +#: gitk:3079
536 #, tcl-format
537 msgid "<%s-KP->\tDecrease font size"
538 msgstr "<%s-KP->\tDisminueix la mida de lletra"
539
540 -#: gitk:2991
540 +#: gitk:3080
541 #, tcl-format
542 msgid "<%s-minus>\tDecrease font size"
543 msgstr "<%s-menys>\tDisminueix la mida de lletra"
544
545 -#: gitk:2992
545 +#: gitk:3081
546 msgid "<F5>\t\tUpdate"
547 msgstr "<F5>\t\tActualitza"
548
549 -#: gitk:3457 gitk:3466
549 +#: gitk:3546 gitk:3555
550 #, tcl-format
551 msgid "Error creating temporary directory %s:"
552 msgstr "Error en crear el directori temporal %s:"
553
554 -#: gitk:3479
554 +#: gitk:3568
555 #, tcl-format
556 msgid "Error getting \"%s\" from %s:"
557 msgstr "Error en obtenir \"%s\" de %s:"
558
559 -#: gitk:3542
559 +#: gitk:3631
560 msgid "command failed:"
561 msgstr "l'ordre ha fallat:"
562
563 -#: gitk:3691
563 +#: gitk:3780
564 msgid "No such commit"
565 msgstr "Cap comissió així"
566
567 -#: gitk:3705
567 +#: gitk:3794
568 msgid "git gui blame: command failed:"
569 msgstr "git gui blame: l'ordre ha fallat:"
570
571 -#: gitk:3736
571 +#: gitk:3825
572 #, tcl-format
573 msgid "Couldn't read merge head: %s"
574 msgstr "No s'ha pogut llegir el cap de fusió: %s"
575
576 -#: gitk:3744
576 +#: gitk:3833
577 #, tcl-format
578 msgid "Error reading index: %s"
579 msgstr "Error en llegir l'índex: %s"
580
581 -#: gitk:3769
581 +#: gitk:3858
582 #, tcl-format
583 msgid "Couldn't start git blame: %s"
584 msgstr "No s'ha pogut iniciar el git blame: %s"
585
586 -#: gitk:3772 gitk:6642
586 +#: gitk:3861 gitk:6735
587 msgid "Searching"
588 msgstr "Cercant"
589
590 -#: gitk:3804
590 +#: gitk:3893
591 #, tcl-format
592 msgid "Error running git blame: %s"
593 msgstr "Error en executar el git blame: %s"
594
595 -#: gitk:3832
595 +#: gitk:3921
596 #, tcl-format
597 msgid "That line comes from commit %s, which is not in this view"
598 msgstr ""
599 "Aquella línia ve de la comissió %s, la qual no és en aquesta visualització"
600
601 -#: gitk:3846
601 +#: gitk:3935
602 msgid "External diff viewer failed:"
603 msgstr "El visualitzador de diferència extern ha fallat:"
604
605 -#: gitk:3964
605 +#: gitk:4053
606 msgid "Gitk view definition"
607 msgstr "Definició de vista del Gitk"
608
609 -#: gitk:3968
609 +#: gitk:4057
610 msgid "Remember this view"
611 msgstr "Recorda aquesta vista"
612
613 -#: gitk:3969
613 +#: gitk:4058
614 msgid "References (space separated list):"
615 msgstr "Referències (llista separada per espais)"
616
617 -#: gitk:3970
617 +#: gitk:4059
618 msgid "Branches & tags:"
619 msgstr "Branques i etiquetes:"
620
621 -#: gitk:3971
621 +#: gitk:4060
622 msgid "All refs"
623 msgstr "Totes les referències"
624
625 -#: gitk:3972
625 +#: gitk:4061
626 msgid "All (local) branches"
627 msgstr "Totes les branques (locals)"
628
629 -#: gitk:3973
629 +#: gitk:4062
630 msgid "All tags"
631 msgstr "Totes les etiquetes"
632
633 -#: gitk:3974
633 +#: gitk:4063
634 msgid "All remote-tracking branches"
635 msgstr "Totes les branques amb seguiment remot"
636
637 -#: gitk:3975
637 +#: gitk:4064
638 msgid "Commit Info (regular expressions):"
639 msgstr "Informació de comissió (expressions regulars):"
640
641 -#: gitk:3976
641 +#: gitk:4065
642 msgid "Author:"
643 msgstr "Autor:"
644
645 -#: gitk:3977
645 +#: gitk:4066
646 msgid "Committer:"
647 msgstr "Comitent:"
648
649 -#: gitk:3978
649 +#: gitk:4067
650 msgid "Commit Message:"
651 msgstr "Missatge de comissió:"
652
653 -#: gitk:3979
653 +#: gitk:4068
654 msgid "Matches all Commit Info criteria"
655 msgstr "Coincideix amb tots els criteris d'informació de comissió"
656
657 -#: gitk:3980
657 +#: gitk:4069
658 +#, fuzzy
659 +msgid "Matches none Commit Info criteria"
660 +msgstr "Coincideix amb tots els criteris d'informació de comissió"
661 +
662 +#: gitk:4070
663 msgid "Changes to Files:"
664 msgstr "Canvis als fitxers:"
665
661 -#: gitk:3981
666 +#: gitk:4071
667 msgid "Fixed String"
668 msgstr "Cadena fixa"
669
665 -#: gitk:3982
670 +#: gitk:4072
671 msgid "Regular Expression"
672 msgstr "Expressió regular"
673
669 -#: gitk:3983
674 +#: gitk:4073
675 msgid "Search string:"
676 msgstr "Cadena de cerca:"
677
673 -#: gitk:3984
678 +#: gitk:4074
679 msgid ""
680 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
681 "15:27:38\"):"
@@ -678,201 +683,201 @@ msgstr ""
683 "Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 "
684 "15:27:38\"):"
685
681 -#: gitk:3985
686 +#: gitk:4075
687 msgid "Since:"
688 msgstr "Des de:"
689
685 -#: gitk:3986
690 +#: gitk:4076
691 msgid "Until:"
692 msgstr "Fins:"
693
689 -#: gitk:3987
694 +#: gitk:4077
695 msgid "Limit and/or skip a number of revisions (positive integer):"
696 msgstr "Limita o salta un nombre de revisions (nombre enter positiu)"
697
693 -#: gitk:3988
698 +#: gitk:4078
699 msgid "Number to show:"
700 msgstr "Nombre a mostrar:"
701
697 -#: gitk:3989
702 +#: gitk:4079
703 msgid "Number to skip:"
704 msgstr "Nombre a saltar:"
705
701 -#: gitk:3990
706 +#: gitk:4080
707 msgid "Miscellaneous options:"
708 msgstr "Opcions miscel·lànies:"
709
705 -#: gitk:3991
710 +#: gitk:4081
711 msgid "Strictly sort by date"
712 msgstr "Ordena estrictament per data"
713
709 -#: gitk:3992
714 +#: gitk:4082
715 msgid "Mark branch sides"
716 msgstr "Marca els costats de les branques"
717
713 -#: gitk:3993
718 +#: gitk:4083
719 msgid "Limit to first parent"
720 msgstr "Limita a la primera mare"
721
717 -#: gitk:3994
722 +#: gitk:4084
723 msgid "Simple history"
724 msgstr "Història senzilla"
725
721 -#: gitk:3995
726 +#: gitk:4085
727 msgid "Additional arguments to git log:"
728 msgstr "Paràmetres addicionals al git log:"
729
725 -#: gitk:3996
730 +#: gitk:4086
731 msgid "Enter files and directories to include, one per line:"
732 msgstr "Introduïu els fitxers i directoris a incloure, un per línia:"
733
729 -#: gitk:3997
734 +#: gitk:4087
735 msgid "Command to generate more commits to include:"
736 msgstr "Ordre per a generar més comissions a incloure:"
737
733 -#: gitk:4121
738 +#: gitk:4211
739 msgid "Gitk: edit view"
740 msgstr "Gitk: vista d'edició"
741
737 -#: gitk:4129
742 +#: gitk:4219
743 msgid "-- criteria for selecting revisions"
744 msgstr "-- criteris per a seleccionar les revisions"
745
741 -#: gitk:4134
746 +#: gitk:4224
747 msgid "View Name"
748 msgstr "Nom de vista"
749
745 -#: gitk:4209
750 +#: gitk:4299
751 msgid "Apply (F5)"
752 msgstr "Aplica (F5)"
753
749 -#: gitk:4247
754 +#: gitk:4337
755 msgid "Error in commit selection arguments:"
756 msgstr "Error en els paràmetres de selecció de comissions:"
757
753 -#: gitk:4300 gitk:4352 gitk:4813 gitk:4827 gitk:6097 gitk:12247 gitk:12248
758 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
759 msgid "None"
760 msgstr "Cap"
761
757 -#: gitk:4910 gitk:4915
762 +#: gitk:5003 gitk:5008
763 msgid "Descendant"
764 msgstr "Descendent"
765
761 -#: gitk:4911
766 +#: gitk:5004
767 msgid "Not descendant"
768 msgstr "No descendent"
769
765 -#: gitk:4918 gitk:4923
770 +#: gitk:5011 gitk:5016
771 msgid "Ancestor"
772 msgstr "Avantpassat"
773
769 -#: gitk:4919
774 +#: gitk:5012
775 msgid "Not ancestor"
776 msgstr "No avantpassat"
777
773 -#: gitk:5213
778 +#: gitk:5306
779 msgid "Local changes checked in to index but not committed"
780 msgstr "Canvis locals registrats en l'índex però no comesos"
781
777 -#: gitk:5249
782 +#: gitk:5342
783 msgid "Local uncommitted changes, not checked in to index"
784 msgstr "Canvis locals sense cometre, no registrats en l'índex"
785
781 -#: gitk:7022
786 +#: gitk:7115
787 msgid "and many more"
788 msgstr "i moltes més"
789
785 -#: gitk:7025
790 +#: gitk:7118
791 msgid "many"
792 msgstr "moltes"
793
789 -#: gitk:7216
794 +#: gitk:7309
795 msgid "Tags:"
796 msgstr "Etiquetes:"
797
793 -#: gitk:7233 gitk:7239 gitk:8713
798 +#: gitk:7326 gitk:7332 gitk:8806
799 msgid "Parent"
800 msgstr "Mare"
801
797 -#: gitk:7244
802 +#: gitk:7337
803 msgid "Child"
804 msgstr "Filla"
805
801 -#: gitk:7253
806 +#: gitk:7346
807 msgid "Branch"
808 msgstr "Branca"
809
805 -#: gitk:7256
810 +#: gitk:7349
811 msgid "Follows"
812 msgstr "Segueix"
813
809 -#: gitk:7259
814 +#: gitk:7352
815 msgid "Precedes"
816 msgstr "Precedeix"
817
813 -#: gitk:7854
818 +#: gitk:7947
819 #, tcl-format
820 msgid "Error getting diffs: %s"
821 msgstr "Error en obtenir les diferències: %s"
822
818 -#: gitk:8538
823 +#: gitk:8631
824 msgid "Goto:"
825 msgstr "Vés a:"
826
822 -#: gitk:8559
827 +#: gitk:8652
828 #, tcl-format
829 msgid "Short SHA1 id %s is ambiguous"
830 msgstr "L'id SHA1 curta %s és ambigua"
831
827 -#: gitk:8566
832 +#: gitk:8659
833 #, tcl-format
834 msgid "Revision %s is not known"
835 msgstr "La revisió %s és desconeguda"
836
832 -#: gitk:8576
837 +#: gitk:8669
838 #, tcl-format
839 msgid "SHA1 id %s is not known"
840 msgstr "L'id SHA1 %s és desconeguda"
841
837 -#: gitk:8578
842 +#: gitk:8671
843 #, tcl-format
844 msgid "Revision %s is not in the current view"
845 msgstr "La revisió %s no és en la vista actual"
846
842 -#: gitk:8720 gitk:8735
847 +#: gitk:8813 gitk:8828
848 msgid "Date"
849 msgstr "Data"
850
846 -#: gitk:8723
851 +#: gitk:8816
852 msgid "Children"
853 msgstr "Filles"
854
850 -#: gitk:8786
855 +#: gitk:8879
856 #, tcl-format
857 msgid "Reset %s branch to here"
858 msgstr "Restableix la branca %s aquí"
859
855 -#: gitk:8788
860 +#: gitk:8881
861 msgid "Detached head: can't reset"
862 msgstr "Cap separat: no es pot restablir"
863
859 -#: gitk:8893 gitk:8899
864 +#: gitk:8986 gitk:8992
865 msgid "Skipping merge commit "
866 msgstr "Saltant la comissió de fusió "
867
863 -#: gitk:8908 gitk:8913
868 +#: gitk:9001 gitk:9006
869 msgid "Error getting patch ID for "
870 msgstr "Error en obtenir l'ID de pedaç de "
871
867 -#: gitk:8909 gitk:8914
872 +#: gitk:9002 gitk:9007
873 msgid " - stopping\n"
874 msgstr " - aturant\n"
875
871 -#: gitk:8919 gitk:8922 gitk:8930 gitk:8944 gitk:8953
876 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
877 msgid "Commit "
878 msgstr "Comissió "
879
875 -#: gitk:8923
880 +#: gitk:9016
881 msgid ""
882 " is the same patch as\n"
883 " "
@@ -880,7 +885,7 @@ msgstr ""
885 " és el mateix pedaç que\n"
886 " "
887
883 -#: gitk:8931
888 +#: gitk:9024
889 msgid ""
890 " differs from\n"
891 " "
@@ -888,7 +893,7 @@ msgstr ""
893 " difereix de\n"
894 " "
895
891 -#: gitk:8933
896 +#: gitk:9026
897 msgid ""
898 "Diff of commits:\n"
899 "\n"
@@ -896,131 +901,131 @@ msgstr ""
901 "Diferència entre comissions:\n"
902 "\n"
903
899 -#: gitk:8945 gitk:8954
904 +#: gitk:9038 gitk:9047
905 #, tcl-format
906 msgid " has %s children - stopping\n"
907 msgstr " té %s filles - aturant\n"
908
904 -#: gitk:8973
909 +#: gitk:9066
910 #, tcl-format
911 msgid "Error writing commit to file: %s"
912 msgstr "Error en escriure la comissió al fitxer: %s"
913
909 -#: gitk:8979
914 +#: gitk:9072
915 #, tcl-format
916 msgid "Error diffing commits: %s"
917 msgstr "Error en diferenciar les comissions: %s"
918
914 -#: gitk:9025
919 +#: gitk:9118
920 msgid "Top"
921 msgstr "Part superior"
922
918 -#: gitk:9026
923 +#: gitk:9119
924 msgid "From"
925 msgstr "De"
926
922 -#: gitk:9031
927 +#: gitk:9124
928 msgid "To"
929 msgstr "A"
930
926 -#: gitk:9055
931 +#: gitk:9148
932 msgid "Generate patch"
933 msgstr "Genera pedaç"
934
930 -#: gitk:9057
935 +#: gitk:9150
936 msgid "From:"
937 msgstr "De:"
938
934 -#: gitk:9066
939 +#: gitk:9159
940 msgid "To:"
941 msgstr "A:"
942
938 -#: gitk:9075
943 +#: gitk:9168
944 msgid "Reverse"
945 msgstr "Inverteix"
946
942 -#: gitk:9077 gitk:9273
947 +#: gitk:9170 gitk:9366
948 msgid "Output file:"
949 msgstr "Fitxer de sortida:"
950
946 -#: gitk:9083
951 +#: gitk:9176
952 msgid "Generate"
953 msgstr "Genera"
954
950 -#: gitk:9121
955 +#: gitk:9214
956 msgid "Error creating patch:"
957 msgstr "Error en crear el pedaç:"
958
954 -#: gitk:9144 gitk:9261 gitk:9318
959 +#: gitk:9237 gitk:9354 gitk:9411
960 msgid "ID:"
961 msgstr "ID:"
962
958 -#: gitk:9153
963 +#: gitk:9246
964 msgid "Tag name:"
965 msgstr "Nom d'etiqueta:"
966
962 -#: gitk:9156
967 +#: gitk:9249
968 msgid "Tag message is optional"
969 msgstr "El missatge d'etiqueta és opcional"
970
966 -#: gitk:9158
971 +#: gitk:9251
972 msgid "Tag message:"
973 msgstr "Missatge d'etiqueta:"
974
970 -#: gitk:9162 gitk:9327
975 +#: gitk:9255 gitk:9420
976 msgid "Create"
977 msgstr "Crea"
978
974 -#: gitk:9180
979 +#: gitk:9273
980 msgid "No tag name specified"
981 msgstr "No s'ha especificat cap nom d'etiqueta"
982
978 -#: gitk:9184
983 +#: gitk:9277
984 #, tcl-format
985 msgid "Tag \"%s\" already exists"
986 msgstr "L'etiqueta \"%s\" ja existeix"
987
983 -#: gitk:9194
988 +#: gitk:9287
989 msgid "Error creating tag:"
990 msgstr "Error en crear l'etiqueta:"
991
987 -#: gitk:9270
992 +#: gitk:9363
993 msgid "Command:"
994 msgstr "Ordre:"
995
991 -#: gitk:9278
996 +#: gitk:9371
997 msgid "Write"
998 msgstr "Escriu"
999
995 -#: gitk:9296
1000 +#: gitk:9389
1001 msgid "Error writing commit:"
1002 msgstr "Error en escriure la comissió:"
1003
999 -#: gitk:9323
1004 +#: gitk:9416
1005 msgid "Name:"
1006 msgstr "Nom:"
1007
1003 -#: gitk:9346
1008 +#: gitk:9439
1009 msgid "Please specify a name for the new branch"
1010 msgstr "Si us plau, especifiqueu un nom per a la branca nova"
1011
1007 -#: gitk:9351
1012 +#: gitk:9444
1013 #, tcl-format
1014 msgid "Branch '%s' already exists. Overwrite?"
1015 msgstr "La branca '%s' ja existeix. Voleu sobreescriure?"
1016
1012 -#: gitk:9418
1017 +#: gitk:9511
1018 #, tcl-format
1019 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1020 msgstr ""
1021 "La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a "
1022 "aplicar-la?"
1023
1019 -#: gitk:9423
1024 +#: gitk:9516
1025 msgid "Cherry-picking"
1026 msgstr "Recollint cireres"
1027
1023 -#: gitk:9432
1028 +#: gitk:9525
1029 #, tcl-format
1030 msgid ""
1031 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1030,7 +1035,7 @@ msgstr ""
1035 "Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a "
1036 "intentar."
1037
1033 -#: gitk:9438
1038 +#: gitk:9531
1039 msgid ""
1040 "Cherry-pick failed because of merge conflict.\n"
1041 "Do you wish to run git citool to resolve it?"
@@ -1038,21 +1043,21 @@ msgstr ""
1043 "El recull de cireres ha fallat a causa d'un conflicte de fusió.\n"
1044 "Voleu executar el git citool per a resoldre'l?"
1045
1041 -#: gitk:9454 gitk:9512
1046 +#: gitk:9547 gitk:9605
1047 msgid "No changes committed"
1048 msgstr "Cap canvi comès"
1049
1045 -#: gitk:9481
1050 +#: gitk:9574
1051 #, tcl-format
1052 msgid "Commit %s is not included in branch %s -- really revert it?"
1053 msgstr ""
1054 "La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?"
1055
1051 -#: gitk:9486
1056 +#: gitk:9579
1057 msgid "Reverting"
1058 msgstr "Revertint"
1059
1055 -#: gitk:9494
1060 +#: gitk:9587
1061 #, tcl-format
1062 msgid ""
1063 "Revert failed because of local changes to the following files:%s Please "
@@ -1062,7 +1067,7 @@ msgstr ""
1067 "plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a "
1068 "intentar."
1069
1065 -#: gitk:9498
1070 +#: gitk:9591
1071 msgid ""
1072 "Revert failed because of merge conflict.\n"
1073 " Do you wish to run git citool to resolve it?"
@@ -1070,28 +1075,28 @@ msgstr ""
1075 "La reversió ha fallat a causa d'un conflicte de fusió.\n"
1076 " Voleu executar el git citool per a resoldre'l?"
1077
1073 -#: gitk:9541
1078 +#: gitk:9634
1079 msgid "Confirm reset"
1080 msgstr "Confirma el restabliment"
1081
1077 -#: gitk:9543
1082 +#: gitk:9636
1083 #, tcl-format
1084 msgid "Reset branch %s to %s?"
1085 msgstr "Voleu restablir la branca %s a %s?"
1086
1082 -#: gitk:9545
1087 +#: gitk:9638
1088 msgid "Reset type:"
1089 msgstr "Tipus de restabliment:"
1090
1086 -#: gitk:9548
1091 +#: gitk:9641
1092 msgid "Soft: Leave working tree and index untouched"
1093 msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar"
1094
1090 -#: gitk:9551
1095 +#: gitk:9644
1096 msgid "Mixed: Leave working tree untouched, reset index"
1097 msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex"
1098
1094 -#: gitk:9554
1099 +#: gitk:9647
1100 msgid ""
1101 "Hard: Reset working tree and index\n"
1102 "(discard ALL local changes)"
@@ -1099,19 +1104,19 @@ msgstr ""
1104 "Dur: Restableix l'arbre de treball i l'índex\n"
1105 "(descarta TOTS els canvis locals)"
1106
1102 -#: gitk:9571
1107 +#: gitk:9664
1108 msgid "Resetting"
1109 msgstr "Restablint"
1110
1106 -#: gitk:9631
1111 +#: gitk:9724
1112 msgid "Checking out"
1113 msgstr "Agafant"
1114
1110 -#: gitk:9684
1115 +#: gitk:9777
1116 msgid "Cannot delete the currently checked-out branch"
1117 msgstr "No es pot suprimir la branca actualment agafada"
1118
1114 -#: gitk:9690
1119 +#: gitk:9783
1120 #, tcl-format
1121 msgid ""
1122 "The commits on branch %s aren't on any other branch.\n"
@@ -1120,16 +1125,16 @@ msgstr ""
1125 "Les comissions en la branca %s no són en cap altra branca.\n"
1126 "Realment voleu suprimir la branca %s?"
1127
1123 -#: gitk:9721
1128 +#: gitk:9814
1129 #, tcl-format
1130 msgid "Tags and heads: %s"
1131 msgstr "Etiquetes i caps: %s"
1132
1128 -#: gitk:9736
1133 +#: gitk:9829
1134 msgid "Filter"
1135 msgstr "Filtre"
1136
1132 -#: gitk:10032
1137 +#: gitk:10125
1138 msgid ""
1139 "Error reading commit topology information; branch and preceding/following "
1140 "tag information will be incomplete."
@@ -1137,213 +1142,213 @@ msgstr ""
1142 "Error en llegir la informació de topologia de comissió; la informació sobre "
1143 "branques i etiquetes precedents/següents serà incompleta."
1144
1140 -#: gitk:11009
1145 +#: gitk:11102
1146 msgid "Tag"
1147 msgstr "Etiqueta"
1148
1144 -#: gitk:11013
1149 +#: gitk:11106
1150 msgid "Id"
1151 msgstr "Id"
1152
1148 -#: gitk:11096
1153 +#: gitk:11189
1154 msgid "Gitk font chooser"
1155 msgstr "Selector de tipus de lletra del Gitk"
1156
1152 -#: gitk:11113
1157 +#: gitk:11206
1158 msgid "B"
1159 msgstr "B"
1160
1156 -#: gitk:11116
1161 +#: gitk:11209
1162 msgid "I"
1163 msgstr "I"
1164
1160 -#: gitk:11234
1165 +#: gitk:11327
1166 msgid "Commit list display options"
1167 msgstr "Opcions de visualització de la llista de comissions"
1168
1164 -#: gitk:11237
1169 +#: gitk:11330
1170 msgid "Maximum graph width (lines)"
1171 msgstr "Amplada màxima del gràfic (línies)"
1172
1168 -#: gitk:11240
1169 -#, tcl-format
1173 +#: gitk:11334
1174 +#, no-tcl-format
1175 msgid "Maximum graph width (% of pane)"
1176 msgstr "Amplada màxima del gràfic (% del panell)"
1177
1173 -#: gitk:11243
1178 +#: gitk:11337
1179 msgid "Show local changes"
1180 msgstr "Mostra els canvis locals"
1181
1177 -#: gitk:11246
1182 +#: gitk:11340
1183 msgid "Auto-select SHA1 (length)"
1184 msgstr "Selecciona automàticament l'SHA1 (longitud)"
1185
1181 -#: gitk:11250
1186 +#: gitk:11344
1187 msgid "Hide remote refs"
1188 msgstr "Amaga les referències remotes"
1189
1185 -#: gitk:11254
1190 +#: gitk:11348
1191 msgid "Diff display options"
1192 msgstr "Opcions de visualització de diferència"
1193
1189 -#: gitk:11256
1194 +#: gitk:11350
1195 msgid "Tab spacing"
1196 msgstr "Espaiat de tabulació"
1197
1193 -#: gitk:11259
1198 +#: gitk:11353
1199 msgid "Display nearby tags/heads"
1200 msgstr "Mostra etiquetes/caps propers"
1201
1197 -#: gitk:11262
1202 +#: gitk:11356
1203 msgid "Maximum # tags/heads to show"
1204 msgstr "Nombre màxim d'etiquetes/caps a mostrar"
1205
1201 -#: gitk:11265
1206 +#: gitk:11359
1207 msgid "Limit diffs to listed paths"
1208 msgstr "Limita les diferències als camins llistats"
1209
1205 -#: gitk:11268
1210 +#: gitk:11362
1211 msgid "Support per-file encodings"
1212 msgstr "Admet codificacions específiques per a cada fitxer"
1213
1209 -#: gitk:11274 gitk:11421
1214 +#: gitk:11368 gitk:11515
1215 msgid "External diff tool"
1216 msgstr "Eina de diferència externa"
1217
1213 -#: gitk:11275
1218 +#: gitk:11369
1219 msgid "Choose..."
1220 msgstr "Trieu..."
1221
1217 -#: gitk:11280
1222 +#: gitk:11374
1223 msgid "General options"
1224 msgstr "Opcions generals"
1225
1221 -#: gitk:11283
1226 +#: gitk:11377
1227 msgid "Use themed widgets"
1228 msgstr "Usa els ginys tematitzats"
1229
1225 -#: gitk:11285
1230 +#: gitk:11379
1231 msgid "(change requires restart)"
1232 msgstr "(el canvi requereix reiniciar)"
1233
1229 -#: gitk:11287
1234 +#: gitk:11381
1235 msgid "(currently unavailable)"
1236 msgstr "(actualment no disponible)"
1237
1233 -#: gitk:11298
1238 +#: gitk:11392
1239 msgid "Colors: press to choose"
1240 msgstr "Colors: pressiona per a triar"
1241
1237 -#: gitk:11301
1242 +#: gitk:11395
1243 msgid "Interface"
1244 msgstr "Interfície"
1245
1241 -#: gitk:11302
1246 +#: gitk:11396
1247 msgid "interface"
1248 msgstr "interfície"
1249
1245 -#: gitk:11305
1250 +#: gitk:11399
1251 msgid "Background"
1252 msgstr "Fons"
1253
1249 -#: gitk:11306 gitk:11336
1254 +#: gitk:11400 gitk:11430
1255 msgid "background"
1256 msgstr "fons"
1257
1253 -#: gitk:11309
1258 +#: gitk:11403
1259 msgid "Foreground"
1260 msgstr "Primer pla"
1261
1257 -#: gitk:11310
1262 +#: gitk:11404
1263 msgid "foreground"
1264 msgstr "primer pla"
1265
1261 -#: gitk:11313
1266 +#: gitk:11407
1267 msgid "Diff: old lines"
1268 msgstr "Diferència: línies velles"
1269
1265 -#: gitk:11314
1270 +#: gitk:11408
1271 msgid "diff old lines"
1272 msgstr "diferencia les línies velles"
1273
1269 -#: gitk:11318
1274 +#: gitk:11412
1275 msgid "Diff: new lines"
1276 msgstr "Diferència: línies noves"
1277
1273 -#: gitk:11319
1278 +#: gitk:11413
1279 msgid "diff new lines"
1280 msgstr "diferencia les línies noves"
1281
1277 -#: gitk:11323
1282 +#: gitk:11417
1283 msgid "Diff: hunk header"
1284 msgstr "Diferència: capçalera de tros"
1285
1281 -#: gitk:11325
1286 +#: gitk:11419
1287 msgid "diff hunk header"
1288 msgstr "diferencia la capçalera de tros"
1289
1285 -#: gitk:11329
1290 +#: gitk:11423
1291 msgid "Marked line bg"
1292 msgstr "Fons de la línia marcada"
1293
1289 -#: gitk:11331
1294 +#: gitk:11425
1295 msgid "marked line background"
1296 msgstr "fons de la línia marcada"
1297
1293 -#: gitk:11335
1298 +#: gitk:11429
1299 msgid "Select bg"
1300 msgstr "fons de la selecció"
1301
1297 -#: gitk:11344
1302 +#: gitk:11438
1303 msgid "Fonts: press to choose"
1304 msgstr "Tipus de lletra: pressiona per a triar"
1305
1301 -#: gitk:11346
1306 +#: gitk:11440
1307 msgid "Main font"
1308 msgstr "Tipus de lletra principal"
1309
1305 -#: gitk:11347
1310 +#: gitk:11441
1311 msgid "Diff display font"
1312 msgstr "Tipus de lletra de visualització de diferència"
1313
1309 -#: gitk:11348
1314 +#: gitk:11442
1315 msgid "User interface font"
1316 msgstr "Tipus de lletra de la interfície d'usuari"
1317
1313 -#: gitk:11370
1318 +#: gitk:11464
1319 msgid "Gitk preferences"
1320 msgstr "Preferències del Gitk"
1321
1317 -#: gitk:11379
1322 +#: gitk:11473
1323 msgid "General"
1324 msgstr "General"
1325
1321 -#: gitk:11380
1326 +#: gitk:11474
1327 msgid "Colors"
1328 msgstr "Colors"
1329
1325 -#: gitk:11381
1330 +#: gitk:11475
1331 msgid "Fonts"
1332 msgstr "Tipus de lletra"
1333
1329 -#: gitk:11431
1334 +#: gitk:11525
1335 #, tcl-format
1336 msgid "Gitk: choose color for %s"
1337 msgstr "Gitk: tria el color per a %s"
1338
1334 -#: gitk:12143
1339 +#: gitk:12242
1340 msgid "Cannot find a git repository here."
1341 msgstr "No es pot trobar cap dipòsit de git aquí."
1342
1338 -#: gitk:12190
1343 +#: gitk:12289
1344 #, tcl-format
1345 msgid "Ambiguous argument '%s': both revision and filename"
1346 msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer"
1347
1343 -#: gitk:12202
1348 +#: gitk:12301
1349 msgid "Bad arguments to gitk:"
1350 msgstr "Paràmetres dolents al gitk:"
1351
1347 -#: gitk:12305
1352 +#: gitk:12405
1353 msgid "Command line"
1354 msgstr "Línia d'ordres"
po/de.po
+426 -322
@@ -8,33 +8,42 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: git-gui\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2010-01-27 20:21+0100\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
15 +"Language: \n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
19 -#: gitk:115
20 +#: gitk:140
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
23
23 -#: gitk:274
24 +#: gitk:212 gitk:2381
25 +msgid "Color words"
26 +msgstr ""
27 +
28 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +msgid "Markup words"
30 +msgstr ""
31 +
32 +#: gitk:324
33 msgid "Error parsing revisions:"
34 msgstr "Fehler beim Laden der Versionen:"
35
27 -#: gitk:329
36 +#: gitk:380
37 msgid "Error executing --argscmd command:"
38 msgstr "Fehler beim Ausführen des --argscmd-Kommandos:"
39
31 -#: gitk:342
40 +#: gitk:393
41 msgid "No files selected: --merge specified but no files are unmerged."
42 msgstr ""
43 "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren "
44 "keine nicht zusammengeführten Dateien."
45
37 -#: gitk:345
46 +#: gitk:396
47 msgid ""
48 "No files selected: --merge specified but no unmerged files are within file "
49 "limit."
@@ -42,299 +51,315 @@ msgstr ""
51 "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine "
52 "nicht zusammengeführten Dateien in der Dateiauswahl."
53
45 -#: gitk:367 gitk:514
54 +#: gitk:418 gitk:566
55 msgid "Error executing git log:"
56 msgstr "Fehler beim Ausführen von »git log«:"
57
49 -#: gitk:385 gitk:530
58 +#: gitk:436 gitk:582
59 msgid "Reading"
60 msgstr "Lesen"
61
53 -#: gitk:445 gitk:4261
62 +#: gitk:496 gitk:4508
63 msgid "Reading commits..."
64 msgstr "Versionen werden gelesen ..."
65
57 -#: gitk:448 gitk:1578 gitk:4264
66 +#: gitk:499 gitk:1637 gitk:4511
67 msgid "No commits selected"
68 msgstr "Keine Versionen ausgewählt"
69
61 -#: gitk:1454
70 +#: gitk:1511
71 msgid "Can't parse git log output:"
72 msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
73
65 -#: gitk:1674
74 +#: gitk:1740
75 msgid "No commit information available"
76 msgstr "Keine Versionsinformation verfügbar"
77
69 -#: gitk:1816
78 +#: gitk:1897
79 msgid "mc"
80 msgstr "mc"
81
73 -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804
82 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
83 msgid "OK"
84 msgstr "Ok"
85
77 -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046
78 -#: gitk:10586 gitk:10805
86 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
87 +#: gitk:11221 gitk:11501
88 msgid "Cancel"
89 msgstr "Abbrechen"
90
82 -#: gitk:1975
91 +#: gitk:2069
92 msgid "Update"
93 msgstr "Aktualisieren"
94
86 -#: gitk:1976
95 +#: gitk:2070
96 msgid "Reload"
97 msgstr "Neu laden"
98
90 -#: gitk:1977
99 +#: gitk:2071
100 msgid "Reread references"
101 msgstr "Zweige neu laden"
102
94 -#: gitk:1978
103 +#: gitk:2072
104 msgid "List references"
105 msgstr "Zweige/Markierungen auflisten"
106
98 -#: gitk:1980
107 +#: gitk:2074
108 msgid "Start git gui"
109 msgstr "»git gui« starten"
110
102 -#: gitk:1982
111 +#: gitk:2076
112 msgid "Quit"
113 msgstr "Beenden"
114
106 -#: gitk:1974
115 +#: gitk:2068
116 msgid "File"
117 msgstr "Datei"
118
110 -#: gitk:1986
119 +#: gitk:2080
120 msgid "Preferences"
121 msgstr "Einstellungen"
122
114 -#: gitk:1985
123 +#: gitk:2079
124 msgid "Edit"
125 msgstr "Bearbeiten"
126
118 -#: gitk:1990
127 +#: gitk:2084
128 msgid "New view..."
129 msgstr "Neue Ansicht ..."
130
122 -#: gitk:1991
131 +#: gitk:2085
132 msgid "Edit view..."
133 msgstr "Ansicht bearbeiten ..."
134
126 -#: gitk:1992
135 +#: gitk:2086
136 msgid "Delete view"
137 msgstr "Ansicht entfernen"
138
130 -#: gitk:1994
139 +#: gitk:2088
140 msgid "All files"
141 msgstr "Alle Dateien"
142
134 -#: gitk:1989 gitk:3808
143 +#: gitk:2083 gitk:4050
144 msgid "View"
145 msgstr "Ansicht"
146
138 -#: gitk:1999 gitk:2009 gitk:2780
147 +#: gitk:2093 gitk:2103 gitk:3009
148 msgid "About gitk"
149 msgstr "Über gitk"
150
142 -#: gitk:2000 gitk:2014
151 +#: gitk:2094 gitk:2108
152 msgid "Key bindings"
153 msgstr "Tastenkürzel"
154
146 -#: gitk:1998 gitk:2013
155 +#: gitk:2092 gitk:2107
156 msgid "Help"
157 msgstr "Hilfe"
158
150 -#: gitk:2091 gitk:8110
159 +#: gitk:2185 gitk:8633
160 msgid "SHA1 ID:"
161 msgstr "SHA1 ID:"
162
154 -#: gitk:2122
163 +#: gitk:2229
164 msgid "Row"
165 msgstr "Zeile"
166
158 -#: gitk:2160
167 +#: gitk:2267
168 msgid "Find"
169 msgstr "Suche"
170
162 -#: gitk:2161
163 -msgid "next"
164 -msgstr "nächste"
165 -
166 -#: gitk:2162
167 -msgid "prev"
168 -msgstr "vorige"
169 -
170 -#: gitk:2163
171 +#: gitk:2295
172 msgid "commit"
173 msgstr "Version nach"
174
174 -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482
175 -#: gitk:6566
175 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
176 +#: gitk:6893
177 msgid "containing:"
178 msgstr "Beschreibung:"
179
179 -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497
180 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
181 msgid "touching paths:"
182 msgstr "Dateien:"
183
183 -#: gitk:2170 gitk:4502
184 +#: gitk:2303 gitk:4759
185 msgid "adding/removing string:"
186 msgstr "Änderungen:"
187
187 -#: gitk:2179 gitk:2181
188 +#: gitk:2304 gitk:4761
189 +msgid "changing lines matching:"
190 +msgstr ""
191 +
192 +#: gitk:2313 gitk:2315 gitk:4748
193 msgid "Exact"
194 msgstr "Exakt"
195
191 -#: gitk:2181 gitk:4577 gitk:6378
196 +#: gitk:2315 gitk:4836 gitk:6704
197 msgid "IgnCase"
198 msgstr "Kein Groß/Klein"
199
195 -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374
200 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
201 msgid "Regexp"
202 msgstr "Regexp"
203
199 -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570
204 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
205 msgid "All fields"
206 msgstr "Alle Felder"
207
203 -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441
208 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
209 msgid "Headline"
210 msgstr "Überschrift"
211
207 -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003
212 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
213 msgid "Comments"
214 msgstr "Beschreibung"
215
211 -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285
212 -#: gitk:8300
216 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
217 +#: gitk:8826
218 msgid "Author"
219 msgstr "Autor"
220
216 -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940
221 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
222 msgid "Committer"
223 msgstr "Eintragender"
224
220 -#: gitk:2216
225 +#: gitk:2350
226 msgid "Search"
227 msgstr "Suchen"
228
224 -#: gitk:2224
229 +#: gitk:2358
230 msgid "Diff"
231 msgstr "Vergleich"
232
228 -#: gitk:2226
233 +#: gitk:2360
234 msgid "Old version"
235 msgstr "Alte Version"
236
232 -#: gitk:2228
237 +#: gitk:2362
238 msgid "New version"
239 msgstr "Neue Version"
240
236 -#: gitk:2230
241 +#: gitk:2364
242 msgid "Lines of context"
243 msgstr "Kontextzeilen"
244
240 -#: gitk:2240
245 +#: gitk:2374
246 msgid "Ignore space change"
247 msgstr "Leerzeichenänderungen ignorieren"
248
244 -#: gitk:2299
249 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
250 +msgid "Line diff"
251 +msgstr ""
252 +
253 +#: gitk:2445
254 msgid "Patch"
255 msgstr "Patch"
256
248 -#: gitk:2301
257 +#: gitk:2447
258 msgid "Tree"
259 msgstr "Baum"
260
252 -#: gitk:2456 gitk:2473
261 +#: gitk:2616 gitk:2636
262 msgid "Diff this -> selected"
263 msgstr "Vergleich: diese -> gewählte"
264
256 -#: gitk:2457 gitk:2474
265 +#: gitk:2617 gitk:2637
266 msgid "Diff selected -> this"
267 msgstr "Vergleich: gewählte -> diese"
268
260 -#: gitk:2458 gitk:2475
269 +#: gitk:2618 gitk:2638
270 msgid "Make patch"
271 msgstr "Patch erstellen"
272
264 -#: gitk:2459 gitk:8692
273 +#: gitk:2619 gitk:9235
274 msgid "Create tag"
275 msgstr "Markierung erstellen"
276
268 -#: gitk:2460 gitk:8808
277 +#: gitk:2620 gitk:9352
278 msgid "Write commit to file"
279 msgstr "Version in Datei schreiben"
280
272 -#: gitk:2461 gitk:8865
281 +#: gitk:2621 gitk:9409
282 msgid "Create new branch"
283 msgstr "Neuen Zweig erstellen"
284
276 -#: gitk:2462
285 +#: gitk:2622
286 msgid "Cherry-pick this commit"
287 msgstr "Diese Version pflücken"
288
280 -#: gitk:2463
289 +#: gitk:2623
290 msgid "Reset HEAD branch to here"
291 msgstr "HEAD-Zweig auf diese Version zurücksetzen"
292
284 -#: gitk:2464
293 +#: gitk:2624
294 msgid "Mark this commit"
295 msgstr "Lesezeichen setzen"
296
288 -#: gitk:2465
297 +#: gitk:2625
298 msgid "Return to mark"
299 msgstr "Zum Lesezeichen"
300
292 -#: gitk:2466
301 +#: gitk:2626
302 msgid "Find descendant of this and mark"
303 msgstr "Abkömmling von Lesezeichen und dieser Version finden"
304
296 -#: gitk:2467
305 +#: gitk:2627
306 msgid "Compare with marked commit"
307 msgstr "Mit Lesezeichen vergleichen"
308
300 -#: gitk:2481
309 +#: gitk:2628 gitk:2639
310 +#, fuzzy
311 +msgid "Diff this -> marked commit"
312 +msgstr "Vergleich: diese -> gewählte"
313 +
314 +#: gitk:2629 gitk:2640
315 +#, fuzzy
316 +msgid "Diff marked commit -> this"
317 +msgstr "Vergleich: gewählte -> diese"
318 +
319 +#: gitk:2630
320 +#, fuzzy
321 +msgid "Revert this commit"
322 +msgstr "Lesezeichen setzen"
323 +
324 +#: gitk:2646
325 msgid "Check out this branch"
326 msgstr "Auf diesen Zweig umstellen"
327
304 -#: gitk:2482
328 +#: gitk:2647
329 msgid "Remove this branch"
330 msgstr "Zweig löschen"
331
308 -#: gitk:2489
332 +#: gitk:2654
333 msgid "Highlight this too"
334 msgstr "Diesen auch hervorheben"
335
312 -#: gitk:2490
336 +#: gitk:2655
337 msgid "Highlight this only"
338 msgstr "Nur diesen hervorheben"
339
316 -#: gitk:2491
340 +#: gitk:2656
341 msgid "External diff"
342 msgstr "Externes Diff-Programm"
343
320 -#: gitk:2492
344 +#: gitk:2657
345 msgid "Blame parent commit"
346 msgstr "Annotieren der Elternversion"
347
324 -#: gitk:2499
348 +#: gitk:2664
349 msgid "Show origin of this line"
350 msgstr "Herkunft dieser Zeile anzeigen"
351
328 -#: gitk:2500
352 +#: gitk:2665
353 msgid "Run git gui blame on this line"
354 msgstr "Diese Zeile annotieren (»git gui blame«)"
355
332 -#: gitk:2782
356 +#: gitk:3011
357 +#, fuzzy
358 msgid ""
359 "\n"
360 "Gitk - a commit viewer for git\n"
361 "\n"
337 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
362 +"Copyright © 2005-2014 Paul Mackerras\n"
363 "\n"
364 "Use and redistribute under the terms of the GNU General Public License"
365 msgstr ""
@@ -343,500 +368,520 @@ msgstr ""
368 "\n"
369 "Copyright \\u00a9 2005-2010 Paul Mackerras\n"
370 "\n"
346 -"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License"
371 +"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
372 +"License"
373
348 -#: gitk:2790 gitk:2854 gitk:9230
374 +#: gitk:3019 gitk:3085 gitk:9836
375 msgid "Close"
376 msgstr "Schließen"
377
352 -#: gitk:2811
378 +#: gitk:3040
379 msgid "Gitk key bindings"
380 msgstr "Gitk-Tastaturbelegung"
381
356 -#: gitk:2814
382 +#: gitk:3043
383 msgid "Gitk key bindings:"
384 msgstr "Gitk-Tastaturbelegung:"
385
360 -#: gitk:2816
386 +#: gitk:3045
387 #, tcl-format
388 msgid "<%s-Q>\t\tQuit"
389 msgstr "<%s-Q>\t\tBeenden"
390
365 -#: gitk:2817
391 +#: gitk:3046
392 +#, fuzzy, tcl-format
393 +msgid "<%s-W>\t\tClose window"
394 +msgstr "<%s-F>\t\tSuchen"
395 +
396 +#: gitk:3047
397 msgid "<Home>\t\tMove to first commit"
398 msgstr "<Pos1>\t\tZur neuesten Version springen"
399
369 -#: gitk:2818
400 +#: gitk:3048
401 msgid "<End>\t\tMove to last commit"
402 msgstr "<Ende>\t\tZur ältesten Version springen"
403
373 -#: gitk:2819
374 -msgid "<Up>, p, i\tMove up one commit"
404 +#: gitk:3049
405 +#, fuzzy
406 +msgid "<Up>, p, k\tMove up one commit"
407 msgstr "<Hoch>, p, i\tNächste neuere Version"
408
377 -#: gitk:2820
378 -msgid "<Down>, n, k\tMove down one commit"
409 +#: gitk:3050
410 +#, fuzzy
411 +msgid "<Down>, n, j\tMove down one commit"
412 msgstr "<Runter>, n, k\tNächste ältere Version"
413
381 -#: gitk:2821
382 -msgid "<Left>, z, j\tGo back in history list"
414 +#: gitk:3051
415 +#, fuzzy
416 +msgid "<Left>, z, h\tGo back in history list"
417 msgstr "<Links>, z, j\tEine Version zurückgehen"
418
385 -#: gitk:2822
419 +#: gitk:3052
420 msgid "<Right>, x, l\tGo forward in history list"
421 msgstr "<Rechts>, x, l\tEine Version weitergehen"
422
389 -#: gitk:2823
423 +#: gitk:3053
424 +#, tcl-format
425 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
426 +msgstr ""
427 +
428 +#: gitk:3054
429 msgid "<PageUp>\tMove up one page in commit list"
430 msgstr "<BildHoch>\tEine Seite nach oben blättern"
431
393 -#: gitk:2824
432 +#: gitk:3055
433 msgid "<PageDown>\tMove down one page in commit list"
434 msgstr "<BildRunter>\tEine Seite nach unten blättern"
435
397 -#: gitk:2825
436 +#: gitk:3056
437 #, tcl-format
438 msgid "<%s-Home>\tScroll to top of commit list"
439 msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
440
402 -#: gitk:2826
441 +#: gitk:3057
442 #, tcl-format
443 msgid "<%s-End>\tScroll to bottom of commit list"
444 msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
445
407 -#: gitk:2827
446 +#: gitk:3058
447 #, tcl-format
448 msgid "<%s-Up>\tScroll commit list up one line"
449 msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
450
412 -#: gitk:2828
451 +#: gitk:3059
452 #, tcl-format
453 msgid "<%s-Down>\tScroll commit list down one line"
454 msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
455
417 -#: gitk:2829
456 +#: gitk:3060
457 #, tcl-format
458 msgid "<%s-PageUp>\tScroll commit list up one page"
459 msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
460
422 -#: gitk:2830
461 +#: gitk:3061
462 #, tcl-format
463 msgid "<%s-PageDown>\tScroll commit list down one page"
464 msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
465
427 -#: gitk:2831
466 +#: gitk:3062
467 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
468 msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
469
431 -#: gitk:2832
470 +#: gitk:3063
471 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
472 msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
473
435 -#: gitk:2833
474 +#: gitk:3064
475 msgid "<Delete>, b\tScroll diff view up one page"
476 msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
477
439 -#: gitk:2834
478 +#: gitk:3065
479 msgid "<Backspace>\tScroll diff view up one page"
480 msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
481
443 -#: gitk:2835
482 +#: gitk:3066
483 msgid "<Space>\t\tScroll diff view down one page"
484 msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
485
447 -#: gitk:2836
486 +#: gitk:3067
487 msgid "u\t\tScroll diff view up 18 lines"
488 msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
489
451 -#: gitk:2837
490 +#: gitk:3068
491 msgid "d\t\tScroll diff view down 18 lines"
492 msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
493
455 -#: gitk:2838
494 +#: gitk:3069
495 #, tcl-format
496 msgid "<%s-F>\t\tFind"
497 msgstr "<%s-F>\t\tSuchen"
498
460 -#: gitk:2839
499 +#: gitk:3070
500 #, tcl-format
501 msgid "<%s-G>\t\tMove to next find hit"
502 msgstr "<%s-G>\t\tWeitersuchen"
503
465 -#: gitk:2840
504 +#: gitk:3071
505 msgid "<Return>\tMove to next find hit"
506 msgstr "<Eingabetaste>\tWeitersuchen"
507
469 -#: gitk:2841
508 +#: gitk:3072
509 msgid "/\t\tFocus the search box"
510 msgstr "/\t\tTastaturfokus ins Suchfeld"
511
473 -#: gitk:2842
512 +#: gitk:3073
513 msgid "?\t\tMove to previous find hit"
514 msgstr "?\t\tRückwärts weitersuchen"
515
477 -#: gitk:2843
516 +#: gitk:3074
517 msgid "f\t\tScroll diff view to next file"
518 msgstr "f\t\tVergleich zur nächsten Datei blättern"
519
481 -#: gitk:2844
520 +#: gitk:3075
521 #, tcl-format
522 msgid "<%s-S>\t\tSearch for next hit in diff view"
523 msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
524
486 -#: gitk:2845
525 +#: gitk:3076
526 #, tcl-format
527 msgid "<%s-R>\t\tSearch for previous hit in diff view"
528 msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
529
491 -#: gitk:2846
530 +#: gitk:3077
531 #, tcl-format
532 msgid "<%s-KP+>\tIncrease font size"
533 msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
534
496 -#: gitk:2847
535 +#: gitk:3078
536 #, tcl-format
537 msgid "<%s-plus>\tIncrease font size"
538 msgstr "<%s-Plus>\tSchrift vergrößern"
539
501 -#: gitk:2848
540 +#: gitk:3079
541 #, tcl-format
542 msgid "<%s-KP->\tDecrease font size"
543 msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
544
506 -#: gitk:2849
545 +#: gitk:3080
546 #, tcl-format
547 msgid "<%s-minus>\tDecrease font size"
548 msgstr "<%s-Minus>\tSchrift verkleinern"
549
511 -#: gitk:2850
550 +#: gitk:3081
551 msgid "<F5>\t\tUpdate"
552 msgstr "<F5>\t\tAktualisieren"
553
515 -#: gitk:3305 gitk:3314
554 +#: gitk:3546 gitk:3555
555 #, tcl-format
556 msgid "Error creating temporary directory %s:"
557 msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
558
520 -#: gitk:3327
559 +#: gitk:3568
560 #, tcl-format
561 msgid "Error getting \"%s\" from %s:"
562 msgstr "Fehler beim Holen von »%s« von »%s«:"
563
525 -#: gitk:3390
564 +#: gitk:3631
565 msgid "command failed:"
566 msgstr "Kommando fehlgeschlagen:"
567
529 -#: gitk:3539
568 +#: gitk:3780
569 msgid "No such commit"
570 msgstr "Version nicht gefunden"
571
533 -#: gitk:3553
572 +#: gitk:3794
573 msgid "git gui blame: command failed:"
574 msgstr "git gui blame: Kommando fehlgeschlagen:"
575
537 -#: gitk:3584
576 +#: gitk:3825
577 #, tcl-format
578 msgid "Couldn't read merge head: %s"
579 msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
580
542 -#: gitk:3592
581 +#: gitk:3833
582 #, tcl-format
583 msgid "Error reading index: %s"
584 msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
585
547 -#: gitk:3617
586 +#: gitk:3858
587 #, tcl-format
588 msgid "Couldn't start git blame: %s"
589 msgstr "»git blame« konnte nicht gestartet werden: %s"
590
552 -#: gitk:3620 gitk:6409
591 +#: gitk:3861 gitk:6735
592 msgid "Searching"
593 msgstr "Suchen"
594
556 -#: gitk:3652
595 +#: gitk:3893
596 #, tcl-format
597 msgid "Error running git blame: %s"
598 msgstr "Fehler beim Ausführen von »git blame«: %s"
599
561 -#: gitk:3680
600 +#: gitk:3921
601 #, tcl-format
602 msgid "That line comes from commit %s, which is not in this view"
603 msgstr ""
604 "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
605
567 -#: gitk:3694
606 +#: gitk:3935
607 msgid "External diff viewer failed:"
608 msgstr "Externes Diff-Programm fehlgeschlagen:"
609
571 -#: gitk:3812
610 +#: gitk:4053
611 msgid "Gitk view definition"
612 msgstr "Gitk-Ansichten"
613
575 -#: gitk:3816
614 +#: gitk:4057
615 msgid "Remember this view"
616 msgstr "Diese Ansicht speichern"
617
579 -#: gitk:3817
618 +#: gitk:4058
619 msgid "References (space separated list):"
620 msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
621
583 -#: gitk:3818
622 +#: gitk:4059
623 msgid "Branches & tags:"
624 msgstr "Zweige/Markierungen:"
625
587 -#: gitk:3819
626 +#: gitk:4060
627 msgid "All refs"
628 msgstr "Alle Markierungen und Zweige"
629
591 -#: gitk:3820
630 +#: gitk:4061
631 msgid "All (local) branches"
632 msgstr "Alle (lokalen) Zweige"
633
595 -#: gitk:3821
634 +#: gitk:4062
635 msgid "All tags"
636 msgstr "Alle Markierungen"
637
599 -#: gitk:3822
638 +#: gitk:4063
639 msgid "All remote-tracking branches"
640 msgstr "Alle Übernahmezweige"
641
603 -#: gitk:3823
642 +#: gitk:4064
643 msgid "Commit Info (regular expressions):"
644 msgstr "Versionsinformationen (reguläre Ausdrücke):"
645
607 -#: gitk:3824
646 +#: gitk:4065
647 msgid "Author:"
648 msgstr "Autor:"
649
611 -#: gitk:3825
650 +#: gitk:4066
651 msgid "Committer:"
652 msgstr "Eintragender:"
653
615 -#: gitk:3826
654 +#: gitk:4067
655 msgid "Commit Message:"
656 msgstr "Versionsbeschreibung:"
657
619 -#: gitk:3827
658 +#: gitk:4068
659 msgid "Matches all Commit Info criteria"
660 msgstr "Alle Versionsinformationen-Kriterien erfüllen"
661
623 -#: gitk:3828
662 +#: gitk:4069
663 +#, fuzzy
664 +msgid "Matches none Commit Info criteria"
665 +msgstr "Alle Versionsinformationen-Kriterien erfüllen"
666 +
667 +#: gitk:4070
668 msgid "Changes to Files:"
669 msgstr "Dateien:"
670
627 -#: gitk:3829
671 +#: gitk:4071
672 msgid "Fixed String"
673 msgstr "Zeichenkette"
674
631 -#: gitk:3830
675 +#: gitk:4072
676 msgid "Regular Expression"
677 msgstr "Regulärer Ausdruck"
678
635 -#: gitk:3831
679 +#: gitk:4073
680 msgid "Search string:"
681 msgstr "Suchausdruck:"
682
639 -#: gitk:3832
683 +#: gitk:4074
684 msgid ""
685 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
686 "15:27:38\"):"
643 -msgstr "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
687 +msgstr ""
688 +"Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
689
645 -#: gitk:3833
690 +#: gitk:4075
691 msgid "Since:"
692 msgstr "Von:"
693
649 -#: gitk:3834
694 +#: gitk:4076
695 msgid "Until:"
696 msgstr "Bis:"
697
653 -#: gitk:3835
698 +#: gitk:4077
699 msgid "Limit and/or skip a number of revisions (positive integer):"
700 msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
701
657 -#: gitk:3836
702 +#: gitk:4078
703 msgid "Number to show:"
704 msgstr "Anzeigen:"
705
661 -#: gitk:3837
706 +#: gitk:4079
707 msgid "Number to skip:"
708 msgstr "Überspringen:"
709
665 -#: gitk:3838
710 +#: gitk:4080
711 msgid "Miscellaneous options:"
712 msgstr "Sonstiges:"
713
669 -#: gitk:3839
714 +#: gitk:4081
715 msgid "Strictly sort by date"
716 msgstr "Streng nach Datum sortieren"
717
673 -#: gitk:3840
718 +#: gitk:4082
719 msgid "Mark branch sides"
720 msgstr "Zweig-Seiten markieren"
721
677 -#: gitk:3841
722 +#: gitk:4083
723 msgid "Limit to first parent"
724 msgstr "Auf erste Elternversion beschränken"
725
681 -#: gitk:3842
726 +#: gitk:4084
727 msgid "Simple history"
728 msgstr "Einfache Historie"
729
685 -#: gitk:3843
730 +#: gitk:4085
731 msgid "Additional arguments to git log:"
732 msgstr "Zusätzliche Argumente für »git log«:"
733
689 -#: gitk:3844
734 +#: gitk:4086
735 msgid "Enter files and directories to include, one per line:"
736 msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
737
693 -#: gitk:3845
738 +#: gitk:4087
739 msgid "Command to generate more commits to include:"
740 msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
741
697 -#: gitk:3967
742 +#: gitk:4211
743 msgid "Gitk: edit view"
744 msgstr "Gitk: Ansicht bearbeiten"
745
701 -#: gitk:3975
746 +#: gitk:4219
747 msgid "-- criteria for selecting revisions"
748 msgstr "-- Auswahl der angezeigten Versionen"
749
705 -#: gitk:3980
750 +#: gitk:4224
751 msgid "View Name"
752 msgstr "Ansichtsname"
753
709 -#: gitk:4055
754 +#: gitk:4299
755 msgid "Apply (F5)"
756 msgstr "Anwenden (F5)"
757
713 -#: gitk:4093
758 +#: gitk:4337
759 msgid "Error in commit selection arguments:"
760 msgstr "Fehler in den ausgewählten Versionen:"
761
717 -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535
762 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
763 msgid "None"
764 msgstr "Keine"
765
721 -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302
722 -msgid "Date"
723 -msgstr "Datum"
724 -
725 -#: gitk:4594 gitk:6441
726 -msgid "CDate"
727 -msgstr "Eintragedatum"
728 -
729 -#: gitk:4743 gitk:4748
766 +#: gitk:5003 gitk:5008
767 msgid "Descendant"
768 msgstr "Abkömmling"
769
733 -#: gitk:4744
770 +#: gitk:5004
771 msgid "Not descendant"
772 msgstr "Kein Abkömmling"
773
737 -#: gitk:4751 gitk:4756
774 +#: gitk:5011 gitk:5016
775 msgid "Ancestor"
776 msgstr "Vorgänger"
777
741 -#: gitk:4752
778 +#: gitk:5012
779 msgid "Not ancestor"
780 msgstr "Kein Vorgänger"
781
745 -#: gitk:5042
782 +#: gitk:5306
783 msgid "Local changes checked in to index but not committed"
784 msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
785
749 -#: gitk:5078
786 +#: gitk:5342
787 msgid "Local uncommitted changes, not checked in to index"
788 msgstr "Lokale Änderungen, nicht bereitgestellt"
789
753 -#: gitk:6759
790 +#: gitk:7115
791 +msgid "and many more"
792 +msgstr ""
793 +
794 +#: gitk:7118
795 msgid "many"
796 msgstr "viele"
797
757 -#: gitk:6942
798 +#: gitk:7309
799 msgid "Tags:"
800 msgstr "Markierungen:"
801
761 -#: gitk:6959 gitk:6965 gitk:8280
802 +#: gitk:7326 gitk:7332 gitk:8806
803 msgid "Parent"
804 msgstr "Eltern"
805
765 -#: gitk:6970
806 +#: gitk:7337
807 msgid "Child"
808 msgstr "Kind"
809
769 -#: gitk:6979
810 +#: gitk:7346
811 msgid "Branch"
812 msgstr "Zweig"
813
773 -#: gitk:6982
814 +#: gitk:7349
815 msgid "Follows"
816 msgstr "Folgt auf"
817
777 -#: gitk:6985
818 +#: gitk:7352
819 msgid "Precedes"
820 msgstr "Vorgänger von"
821
781 -#: gitk:7522
822 +#: gitk:7947
823 #, tcl-format
824 msgid "Error getting diffs: %s"
825 msgstr "Fehler beim Laden des Vergleichs: %s"
826
786 -#: gitk:8108
827 +#: gitk:8631
828 msgid "Goto:"
829 msgstr "Gehe zu:"
830
790 -#: gitk:8129
831 +#: gitk:8652
832 #, tcl-format
833 msgid "Short SHA1 id %s is ambiguous"
834 msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
835
795 -#: gitk:8136
836 +#: gitk:8659
837 #, tcl-format
838 msgid "Revision %s is not known"
839 msgstr "Version »%s« ist unbekannt"
840
800 -#: gitk:8146
841 +#: gitk:8669
842 #, tcl-format
843 msgid "SHA1 id %s is not known"
844 msgstr "SHA1-Hashwert »%s« ist unbekannt"
845
805 -#: gitk:8148
846 +#: gitk:8671
847 #, tcl-format
848 msgid "Revision %s is not in the current view"
849 msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
850
810 -#: gitk:8290
851 +#: gitk:8813 gitk:8828
852 +msgid "Date"
853 +msgstr "Datum"
854 +
855 +#: gitk:8816
856 msgid "Children"
857 msgstr "Kinder"
858
814 -#: gitk:8348
859 +#: gitk:8879
860 #, tcl-format
861 msgid "Reset %s branch to here"
862 msgstr "Zweig »%s« hierher zurücksetzen"
863
819 -#: gitk:8350
864 +#: gitk:8881
865 msgid "Detached head: can't reset"
866 msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
867
823 -#: gitk:8459 gitk:8465
868 +#: gitk:8986 gitk:8992
869 msgid "Skipping merge commit "
870 msgstr "Überspringe Zusammenführungs-Version "
871
827 -#: gitk:8474 gitk:8479
872 +#: gitk:9001 gitk:9006
873 msgid "Error getting patch ID for "
874 msgstr "Fehler beim Holen der Patch-ID für "
875
831 -#: gitk:8475 gitk:8480
876 +#: gitk:9002 gitk:9007
877 msgid " - stopping\n"
878 msgstr " - Abbruch.\n"
879
835 -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519
880 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
881 msgid "Commit "
882 msgstr "Version "
883
839 -#: gitk:8489
884 +#: gitk:9016
885 msgid ""
886 " is the same patch as\n"
887 " "
@@ -844,7 +889,7 @@ msgstr ""
889 " ist das gleiche Patch wie\n"
890 " "
891
847 -#: gitk:8497
892 +#: gitk:9024
893 msgid ""
894 " differs from\n"
895 " "
@@ -852,7 +897,7 @@ msgstr ""
897 " ist unterschiedlich von\n"
898 " "
899
855 -#: gitk:8499
900 +#: gitk:9026
901 msgid ""
902 "Diff of commits:\n"
903 "\n"
@@ -860,130 +905,131 @@ msgstr ""
905 "Vergleich der Versionen:\n"
906 "\n"
907
863 -#: gitk:8511 gitk:8520
908 +#: gitk:9038 gitk:9047
909 #, tcl-format
910 msgid " has %s children - stopping\n"
911 msgstr " hat %s Kinder. Abbruch\n"
912
868 -#: gitk:8539
913 +#: gitk:9066
914 #, tcl-format
915 msgid "Error writing commit to file: %s"
916 msgstr "Fehler beim Schreiben der Version in Datei: %s"
917
873 -#: gitk:8545
918 +#: gitk:9072
919 #, tcl-format
920 msgid "Error diffing commits: %s"
921 msgstr "Fehler beim Vergleichen der Versionen: %s"
922
878 -#: gitk:8575
923 +#: gitk:9118
924 msgid "Top"
925 msgstr "Oben"
926
882 -#: gitk:8576
927 +#: gitk:9119
928 msgid "From"
929 msgstr "Von"
930
886 -#: gitk:8581
931 +#: gitk:9124
932 msgid "To"
933 msgstr "bis"
934
890 -#: gitk:8605
935 +#: gitk:9148
936 msgid "Generate patch"
937 msgstr "Patch erstellen"
938
894 -#: gitk:8607
939 +#: gitk:9150
940 msgid "From:"
941 msgstr "Von:"
942
898 -#: gitk:8616
943 +#: gitk:9159
944 msgid "To:"
945 msgstr "bis:"
946
902 -#: gitk:8625
947 +#: gitk:9168
948 msgid "Reverse"
949 msgstr "Umgekehrt"
950
906 -#: gitk:8627 gitk:8822
951 +#: gitk:9170 gitk:9366
952 msgid "Output file:"
953 msgstr "Ausgabedatei:"
954
910 -#: gitk:8633
955 +#: gitk:9176
956 msgid "Generate"
957 msgstr "Erzeugen"
958
914 -#: gitk:8671
959 +#: gitk:9214
960 msgid "Error creating patch:"
961 msgstr "Fehler beim Erzeugen des Patches:"
962
918 -#: gitk:8694 gitk:8810 gitk:8867
963 +#: gitk:9237 gitk:9354 gitk:9411
964 msgid "ID:"
965 msgstr "ID:"
966
922 -#: gitk:8703
967 +#: gitk:9246
968 msgid "Tag name:"
969 msgstr "Markierungsname:"
970
926 -#: gitk:8706
971 +#: gitk:9249
972 msgid "Tag message is optional"
973 msgstr "Eine Markierungsbeschreibung ist optional"
974
930 -#: gitk:8708
975 +#: gitk:9251
976 msgid "Tag message:"
977 msgstr "Markierungsbeschreibung:"
978
934 -#: gitk:8712 gitk:8876
979 +#: gitk:9255 gitk:9420
980 msgid "Create"
981 msgstr "Erstellen"
982
938 -#: gitk:8730
983 +#: gitk:9273
984 msgid "No tag name specified"
985 msgstr "Kein Markierungsname angegeben"
986
942 -#: gitk:8734
987 +#: gitk:9277
988 #, tcl-format
989 msgid "Tag \"%s\" already exists"
990 msgstr "Markierung »%s« existiert bereits."
991
947 -#: gitk:8744
992 +#: gitk:9287
993 msgid "Error creating tag:"
994 msgstr "Fehler beim Erstellen der Markierung:"
995
951 -#: gitk:8819
996 +#: gitk:9363
997 msgid "Command:"
998 msgstr "Kommando:"
999
955 -#: gitk:8827
1000 +#: gitk:9371
1001 msgid "Write"
1002 msgstr "Schreiben"
1003
959 -#: gitk:8845
1004 +#: gitk:9389
1005 msgid "Error writing commit:"
1006 msgstr "Fehler beim Schreiben der Version:"
1007
963 -#: gitk:8872
1008 +#: gitk:9416
1009 msgid "Name:"
1010 msgstr "Name:"
1011
967 -#: gitk:8895
1012 +#: gitk:9439
1013 msgid "Please specify a name for the new branch"
1014 msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
1015
971 -#: gitk:8900
1016 +#: gitk:9444
1017 #, tcl-format
1018 msgid "Branch '%s' already exists. Overwrite?"
1019 msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
1020
976 -#: gitk:8966
1021 +#: gitk:9511
1022 #, tcl-format
1023 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1024 msgstr ""
980 -"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?"
1025 +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
1026 +"eintragen?"
1027
982 -#: gitk:8971
1028 +#: gitk:9516
1029 msgid "Cherry-picking"
1030 msgstr "Version pflücken"
1031
986 -#: gitk:8980
1032 +#: gitk:9525
1033 #, tcl-format
1034 msgid ""
1035 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -993,7 +1039,7 @@ msgstr ""
1039 "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
1040 "zwischenspeichern (»git stash«) und dann erneut versuchen."
1041
996 -#: gitk:8986
1042 +#: gitk:9531
1043 msgid ""
1044 "Cherry-pick failed because of merge conflict.\n"
1045 "Do you wish to run git citool to resolve it?"
@@ -1002,34 +1048,66 @@ msgstr ""
1048 "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
1049 "werden, um diesen Konflikt aufzulösen?"
1050
1005 -#: gitk:9002
1051 +#: gitk:9547 gitk:9605
1052 msgid "No changes committed"
1053 msgstr "Keine Änderungen eingetragen"
1054
1009 -#: gitk:9028
1055 +#: gitk:9574
1056 +#, fuzzy, tcl-format
1057 +msgid "Commit %s is not included in branch %s -- really revert it?"
1058 +msgstr ""
1059 +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
1060 +"eintragen?"
1061 +
1062 +#: gitk:9579
1063 +#, fuzzy
1064 +msgid "Reverting"
1065 +msgstr "Zurücksetzen"
1066 +
1067 +#: gitk:9587
1068 +#, fuzzy, tcl-format
1069 +msgid ""
1070 +"Revert failed because of local changes to the following files:%s Please "
1071 +"commit, reset or stash your changes and try again."
1072 +msgstr ""
1073 +"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n"
1074 +"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
1075 +"zwischenspeichern (»git stash«) und dann erneut versuchen."
1076 +
1077 +#: gitk:9591
1078 +#, fuzzy
1079 +msgid ""
1080 +"Revert failed because of merge conflict.\n"
1081 +" Do you wish to run git citool to resolve it?"
1082 +msgstr ""
1083 +"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n"
1084 +"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
1085 +"werden, um diesen Konflikt aufzulösen?"
1086 +
1087 +#: gitk:9634
1088 msgid "Confirm reset"
1089 msgstr "Zurücksetzen bestätigen"
1090
1013 -#: gitk:9030
1091 +#: gitk:9636
1092 #, tcl-format
1093 msgid "Reset branch %s to %s?"
1094 msgstr "Zweig »%s« auf »%s« zurücksetzen?"
1095
1018 -#: gitk:9032
1096 +#: gitk:9638
1097 msgid "Reset type:"
1098 msgstr "Art des Zurücksetzens:"
1099
1022 -#: gitk:9035
1100 +#: gitk:9641
1101 msgid "Soft: Leave working tree and index untouched"
1102 msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
1103
1026 -#: gitk:9038
1104 +#: gitk:9644
1105 msgid "Mixed: Leave working tree untouched, reset index"
1106 msgstr ""
1107 "Gemischt: Arbeitskopie unverändert,\n"
1108 "Bereitstellung zurückgesetzt"
1109
1032 -#: gitk:9041
1110 +#: gitk:9647
1111 msgid ""
1112 "Hard: Reset working tree and index\n"
1113 "(discard ALL local changes)"
@@ -1037,21 +1115,21 @@ msgstr ""
1115 "Hart: Arbeitskopie und Bereitstellung\n"
1116 "(Alle lokalen Änderungen werden gelöscht)"
1117
1040 -#: gitk:9058
1118 +#: gitk:9664
1119 msgid "Resetting"
1120 msgstr "Zurücksetzen"
1121
1044 -#: gitk:9118
1122 +#: gitk:9724
1123 msgid "Checking out"
1124 msgstr "Umstellen"
1125
1048 -#: gitk:9171
1126 +#: gitk:9777
1127 msgid "Cannot delete the currently checked-out branch"
1128 msgstr ""
1129 "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
1130 "gelöscht werden."
1131
1054 -#: gitk:9177
1132 +#: gitk:9783
1133 #, tcl-format
1134 msgid ""
1135 "The commits on branch %s aren't on any other branch.\n"
@@ -1060,16 +1138,16 @@ msgstr ""
1138 "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
1139 "Zweig »%s« trotzdem löschen?"
1140
1063 -#: gitk:9208
1141 +#: gitk:9814
1142 #, tcl-format
1143 msgid "Tags and heads: %s"
1144 msgstr "Markierungen und Zweige: %s"
1145
1068 -#: gitk:9223
1146 +#: gitk:9829
1147 msgid "Filter"
1148 msgstr "Filtern"
1149
1072 -#: gitk:9518
1150 +#: gitk:10125
1151 msgid ""
1152 "Error reading commit topology information; branch and preceding/following "
1153 "tag information will be incomplete."
@@ -1077,202 +1155,228 @@ msgstr ""
1155 "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
1156 "Vorgänger/Nachfolger werden unvollständig sein."
1157
1080 -#: gitk:10504
1158 +#: gitk:11102
1159 msgid "Tag"
1160 msgstr "Markierung"
1161
1084 -#: gitk:10504
1162 +#: gitk:11106
1163 msgid "Id"
1164 msgstr "Id"
1165
1088 -#: gitk:10554
1166 +#: gitk:11189
1167 msgid "Gitk font chooser"
1168 msgstr "Gitk-Schriften wählen"
1169
1092 -#: gitk:10571
1170 +#: gitk:11206
1171 msgid "B"
1172 msgstr "F"
1173
1096 -#: gitk:10574
1174 +#: gitk:11209
1175 msgid "I"
1176 msgstr "K"
1177
1100 -#: gitk:10692
1101 -msgid "Gitk preferences"
1102 -msgstr "Gitk-Einstellungen"
1103 -
1104 -#: gitk:10694
1178 +#: gitk:11327
1179 msgid "Commit list display options"
1180 msgstr "Anzeige der Versionsliste"
1181
1108 -#: gitk:10697
1182 +#: gitk:11330
1183 msgid "Maximum graph width (lines)"
1184 msgstr "Maximale Graphenbreite (Zeilen)"
1185
1112 -#: gitk:10700
1113 -#, tcl-format
1186 +#: gitk:11334
1187 +#, no-tcl-format
1188 msgid "Maximum graph width (% of pane)"
1189 msgstr "Maximale Graphenbreite (% des Fensters)"
1190
1117 -#: gitk:10703
1191 +#: gitk:11337
1192 msgid "Show local changes"
1193 msgstr "Lokale Änderungen anzeigen"
1194
1121 -#: gitk:10706
1122 -msgid "Auto-select SHA1"
1195 +#: gitk:11340
1196 +#, fuzzy
1197 +msgid "Auto-select SHA1 (length)"
1198 msgstr "SHA1-Hashwert automatisch auswählen"
1199
1125 -#: gitk:10709
1200 +#: gitk:11344
1201 msgid "Hide remote refs"
1202 msgstr "Entfernte Zweige/Markierungen ausblenden"
1203
1129 -#: gitk:10713
1204 +#: gitk:11348
1205 msgid "Diff display options"
1206 msgstr "Anzeige des Vergleichs"
1207
1133 -#: gitk:10715
1208 +#: gitk:11350
1209 msgid "Tab spacing"
1210 msgstr "Tabulatorbreite"
1211
1137 -#: gitk:10718
1138 -msgid "Display nearby tags"
1212 +#: gitk:11353
1213 +#, fuzzy
1214 +msgid "Display nearby tags/heads"
1215 msgstr "Naheliegende Markierungen anzeigen"
1216
1141 -#: gitk:10721
1217 +#: gitk:11356
1218 +msgid "Maximum # tags/heads to show"
1219 +msgstr ""
1220 +
1221 +#: gitk:11359
1222 msgid "Limit diffs to listed paths"
1223 msgstr "Vergleich nur für angezeigte Pfade"
1224
1145 -#: gitk:10724
1225 +#: gitk:11362
1226 msgid "Support per-file encodings"
1227 msgstr "Zeichenkodierung pro Datei ermitteln"
1228
1149 -#: gitk:10730 gitk:10819
1229 +#: gitk:11368 gitk:11515
1230 msgid "External diff tool"
1231 msgstr "Externes Diff-Programm"
1232
1153 -#: gitk:10731
1233 +#: gitk:11369
1234 msgid "Choose..."
1235 msgstr "Wählen ..."
1236
1157 -#: gitk:10736
1237 +#: gitk:11374
1238 msgid "General options"
1239 msgstr "Allgemeine Optionen"
1240
1161 -#: gitk:10739
1241 +#: gitk:11377
1242 msgid "Use themed widgets"
1243 msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen"
1244
1165 -#: gitk:10741
1245 +#: gitk:11379
1246 msgid "(change requires restart)"
1247 msgstr "(Änderungen werden erst nach Neustart wirksam)"
1248
1169 -#: gitk:10743
1249 +#: gitk:11381
1250 msgid "(currently unavailable)"
1251 msgstr "(Momentan nicht verfügbar)"
1252
1173 -#: gitk:10747
1253 +#: gitk:11392
1254 msgid "Colors: press to choose"
1255 msgstr "Farben: Klicken zum Wählen"
1256
1177 -#: gitk:10750
1257 +#: gitk:11395
1258 msgid "Interface"
1259 msgstr "Benutzeroberfläche"
1260
1181 -#: gitk:10751
1261 +#: gitk:11396
1262 msgid "interface"
1263 msgstr "Benutzeroberfläche"
1264
1185 -#: gitk:10754
1265 +#: gitk:11399
1266 msgid "Background"
1267 msgstr "Hintergrund"
1268
1189 -#: gitk:10755 gitk:10785
1269 +#: gitk:11400 gitk:11430
1270 msgid "background"
1271 msgstr "Hintergrund"
1272
1193 -#: gitk:10758
1273 +#: gitk:11403
1274 msgid "Foreground"
1275 msgstr "Vordergrund"
1276
1197 -#: gitk:10759
1277 +#: gitk:11404
1278 msgid "foreground"
1279 msgstr "Vordergrund"
1280
1201 -#: gitk:10762
1281 +#: gitk:11407
1282 msgid "Diff: old lines"
1283 msgstr "Vergleich: Alte Zeilen"
1284
1205 -#: gitk:10763
1285 +#: gitk:11408
1286 msgid "diff old lines"
1287 msgstr "Vergleich - Alte Zeilen"
1288
1209 -#: gitk:10767
1289 +#: gitk:11412
1290 msgid "Diff: new lines"
1291 msgstr "Vergleich: Neue Zeilen"
1292
1213 -#: gitk:10768
1293 +#: gitk:11413
1294 msgid "diff new lines"
1295 msgstr "Vergleich - Neue Zeilen"
1296
1217 -#: gitk:10772
1297 +#: gitk:11417
1298 msgid "Diff: hunk header"
1299 msgstr "Vergleich: Änderungstitel"
1300
1221 -#: gitk:10774
1301 +#: gitk:11419
1302 msgid "diff hunk header"
1303 msgstr "Vergleich - Änderungstitel"
1304
1225 -#: gitk:10778
1305 +#: gitk:11423
1306 msgid "Marked line bg"
1307 msgstr "Hintergrund für markierte Zeile"
1308
1229 -#: gitk:10780
1309 +#: gitk:11425
1310 msgid "marked line background"
1311 msgstr "Hintergrund für markierte Zeile"
1312
1233 -#: gitk:10784
1313 +#: gitk:11429
1314 msgid "Select bg"
1315 msgstr "Hintergrundfarbe auswählen"
1316
1237 -#: gitk:10788
1317 +#: gitk:11438
1318 msgid "Fonts: press to choose"
1319 msgstr "Schriftart: Klicken zum Wählen"
1320
1241 -#: gitk:10790
1321 +#: gitk:11440
1322 msgid "Main font"
1323 msgstr "Programmschriftart"
1324
1245 -#: gitk:10791
1325 +#: gitk:11441
1326 msgid "Diff display font"
1327 msgstr "Schriftart für Vergleich"
1328
1249 -#: gitk:10792
1329 +#: gitk:11442
1330 msgid "User interface font"
1331 msgstr "Beschriftungen"
1332
1253 -#: gitk:10829
1333 +#: gitk:11464
1334 +msgid "Gitk preferences"
1335 +msgstr "Gitk-Einstellungen"
1336 +
1337 +#: gitk:11473
1338 +#, fuzzy
1339 +msgid "General"
1340 +msgstr "Erzeugen"
1341 +
1342 +#: gitk:11474
1343 +msgid "Colors"
1344 +msgstr ""
1345 +
1346 +#: gitk:11475
1347 +msgid "Fonts"
1348 +msgstr ""
1349 +
1350 +#: gitk:11525
1351 #, tcl-format
1352 msgid "Gitk: choose color for %s"
1353 msgstr "Gitk: Farbe wählen für %s"
1354
1258 -#: gitk:11433
1355 +#: gitk:12242
1356 msgid "Cannot find a git repository here."
1357 msgstr "Kein Git-Projektarchiv gefunden."
1358
1262 -#: gitk:11437
1263 -#, tcl-format
1264 -msgid "Cannot find the git directory \"%s\"."
1265 -msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
1266 -
1267 -#: gitk:11484
1359 +#: gitk:12289
1360 #, tcl-format
1361 msgid "Ambiguous argument '%s': both revision and filename"
1362 msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
1363
1272 -#: gitk:11496
1364 +#: gitk:12301
1365 msgid "Bad arguments to gitk:"
1366 msgstr "Falsche Kommandozeilen-Parameter für gitk:"
1367
1276 -#: gitk:11587
1368 +#: gitk:12405
1369 msgid "Command line"
1370 msgstr "Kommandozeile"
1371 +
1372 +#~ msgid "next"
1373 +#~ msgstr "nächste"
1374 +
1375 +#~ msgid "prev"
1376 +#~ msgstr "vorige"
1377 +
1378 +#~ msgid "CDate"
1379 +#~ msgstr "Eintragedatum"
1380 +
1381 +#~ msgid "Cannot find the git directory \"%s\"."
1382 +#~ msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
po/es.po
+745 -261
@@ -8,25 +8,43 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2008-10-18 22:03+1100\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
15 +"Language: \n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
19 -#: gitk:113
20 +#: gitk:140
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
23
23 -#: gitk:340
24 +#: gitk:212 gitk:2381
25 +msgid "Color words"
26 +msgstr ""
27 +
28 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +msgid "Markup words"
30 +msgstr ""
31 +
32 +#: gitk:324
33 +#, fuzzy
34 +msgid "Error parsing revisions:"
35 +msgstr "Error al leer las diferencias de fusión:"
36 +
37 +#: gitk:380
38 +msgid "Error executing --argscmd command:"
39 +msgstr ""
40 +
41 +#: gitk:393
42 msgid "No files selected: --merge specified but no files are unmerged."
43 msgstr ""
44 "No hay archivos seleccionados: se seleccionó la opción --merge pero no hay "
45 "archivos pendientes de fusión."
46
29 -#: gitk:343
47 +#: gitk:396
48 msgid ""
49 "No files selected: --merge specified but no unmerged files are within file "
50 "limit."
@@ -34,254 +52,317 @@ msgstr ""
52 "No hay archivos seleccionados: se seleccionó la opción --merge pero los "
53 "archivos especificados no necesitan fusión."
54
37 -#: gitk:378
55 +#: gitk:418 gitk:566
56 +#, fuzzy
57 +msgid "Error executing git log:"
58 +msgstr "Error al crear la etiqueta:"
59 +
60 +#: gitk:436 gitk:582
61 msgid "Reading"
62 msgstr "Leyendo"
63
41 -#: gitk:438 gitk:3462
64 +#: gitk:496 gitk:4508
65 msgid "Reading commits..."
66 msgstr "Leyendo revisiones..."
67
45 -#: gitk:441 gitk:1528 gitk:3465
68 +#: gitk:499 gitk:1637 gitk:4511
69 msgid "No commits selected"
70 msgstr "No se seleccionaron revisiones"
71
49 -#: gitk:1399
72 +#: gitk:1511
73 msgid "Can't parse git log output:"
74 msgstr "Error analizando la salida de git log:"
75
53 -#: gitk:1605
76 +#: gitk:1740
77 msgid "No commit information available"
78 msgstr "Falta información sobre las revisiones"
79
57 -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466
80 +#: gitk:1897
81 +msgid "mc"
82 +msgstr ""
83 +
84 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
85 msgid "OK"
86 msgstr "Aceptar"
87
61 -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766
62 -#: gitk:9294 gitk:9467
88 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
89 +#: gitk:11221 gitk:11501
90 msgid "Cancel"
91 msgstr "Cancelar"
92
66 -#: gitk:1811
93 +#: gitk:2069
94 msgid "Update"
95 msgstr "Actualizar"
96
70 -#: gitk:1813
97 +#: gitk:2070
98 +msgid "Reload"
99 +msgstr ""
100 +
101 +#: gitk:2071
102 msgid "Reread references"
103 msgstr "Releer referencias"
104
74 -#: gitk:1814
105 +#: gitk:2072
106 msgid "List references"
107 msgstr "Lista de referencias"
108
78 -#: gitk:1815
109 +#: gitk:2074
110 +msgid "Start git gui"
111 +msgstr ""
112 +
113 +#: gitk:2076
114 msgid "Quit"
115 msgstr "Salir"
116
82 -#: gitk:1810
117 +#: gitk:2068
118 msgid "File"
119 msgstr "Archivo"
120
86 -#: gitk:1818
121 +#: gitk:2080
122 msgid "Preferences"
123 msgstr "Preferencias"
124
90 -#: gitk:1817
125 +#: gitk:2079
126 msgid "Edit"
127 msgstr "Editar"
128
94 -#: gitk:1821
129 +#: gitk:2084
130 msgid "New view..."
131 msgstr "Nueva vista..."
132
98 -#: gitk:1822
133 +#: gitk:2085
134 msgid "Edit view..."
135 msgstr "Modificar vista..."
136
102 -#: gitk:1823
137 +#: gitk:2086
138 msgid "Delete view"
139 msgstr "Eliminar vista"
140
106 -#: gitk:1825
141 +#: gitk:2088
142 msgid "All files"
143 msgstr "Todos los archivos"
144
110 -#: gitk:1820 gitk:3196
145 +#: gitk:2083 gitk:4050
146 msgid "View"
147 msgstr "Vista"
148
114 -#: gitk:1828 gitk:2487
149 +#: gitk:2093 gitk:2103 gitk:3009
150 msgid "About gitk"
151 msgstr "Acerca de gitk"
152
118 -#: gitk:1829
153 +#: gitk:2094 gitk:2108
154 msgid "Key bindings"
155 msgstr "Combinaciones de teclas"
156
122 -#: gitk:1827
157 +#: gitk:2092 gitk:2107
158 msgid "Help"
159 msgstr "Ayuda"
160
126 -#: gitk:1887
127 -msgid "SHA1 ID: "
128 -msgstr "SHA1 ID: "
161 +#: gitk:2185 gitk:8633
162 +msgid "SHA1 ID:"
163 +msgstr "SHA1 ID:"
164
130 -#: gitk:1918
165 +#: gitk:2229
166 msgid "Row"
167 msgstr ""
168
134 -#: gitk:1949
169 +#: gitk:2267
170 msgid "Find"
171 msgstr "Buscar"
172
138 -#: gitk:1950
139 -msgid "next"
140 -msgstr "<<"
141 -
142 -#: gitk:1951
143 -msgid "prev"
144 -msgstr ">>"
145 -
146 -#: gitk:1952
173 +#: gitk:2295
174 msgid "commit"
175 msgstr "revisión"
176
150 -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621
177 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
178 +#: gitk:6893
179 msgid "containing:"
180 msgstr "que contiene:"
181
154 -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692
182 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
183 msgid "touching paths:"
184 msgstr "que modifica la ruta:"
185
158 -#: gitk:1959 gitk:3697
186 +#: gitk:2303 gitk:4759
187 msgid "adding/removing string:"
188 msgstr "que añade/elimina cadena:"
189
162 -#: gitk:1968 gitk:1970
190 +#: gitk:2304 gitk:4761
191 +msgid "changing lines matching:"
192 +msgstr ""
193 +
194 +#: gitk:2313 gitk:2315 gitk:4748
195 msgid "Exact"
196 msgstr "Exacto"
197
166 -#: gitk:1970 gitk:3773 gitk:5518
198 +#: gitk:2315 gitk:4836 gitk:6704
199 msgid "IgnCase"
200 msgstr "NoMayús"
201
170 -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514
202 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
203 msgid "Regexp"
204 msgstr "Regex"
205
174 -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708
206 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
207 msgid "All fields"
208 msgstr "Todos los campos"
209
178 -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580
210 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
211 msgid "Headline"
212 msgstr "Título"
213
182 -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109
214 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
215 msgid "Comments"
216 msgstr "Comentarios"
217
186 -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285
187 -#: gitk:7300
218 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
219 +#: gitk:8826
220 msgid "Author"
221 msgstr "Autor"
222
191 -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047
223 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
224 msgid "Committer"
225 msgstr ""
226
195 -#: gitk:2003
227 +#: gitk:2350
228 msgid "Search"
229 msgstr "Buscar"
230
199 -#: gitk:2010
231 +#: gitk:2358
232 msgid "Diff"
233 msgstr "Diferencia"
234
203 -#: gitk:2012
235 +#: gitk:2360
236 msgid "Old version"
237 msgstr "Versión antigua"
238
207 -#: gitk:2014
239 +#: gitk:2362
240 msgid "New version"
241 msgstr "Versión nueva"
242
211 -#: gitk:2016
243 +#: gitk:2364
244 msgid "Lines of context"
245 msgstr "Líneas de contexto"
246
215 -#: gitk:2026
247 +#: gitk:2374
248 msgid "Ignore space change"
249 msgstr "Ignora cambios de espaciado"
250
219 -#: gitk:2084
251 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
252 +msgid "Line diff"
253 +msgstr ""
254 +
255 +#: gitk:2445
256 msgid "Patch"
257 msgstr "Parche"
258
223 -#: gitk:2086
259 +#: gitk:2447
260 msgid "Tree"
261 msgstr "Árbol"
262
227 -#: gitk:2213 gitk:2226
263 +#: gitk:2616 gitk:2636
264 msgid "Diff this -> selected"
265 msgstr "Diferencia de esta -> seleccionada"
266
231 -#: gitk:2214 gitk:2227
267 +#: gitk:2617 gitk:2637
268 msgid "Diff selected -> this"
269 msgstr "Diferencia de seleccionada -> esta"
270
235 -#: gitk:2215 gitk:2228
271 +#: gitk:2618 gitk:2638
272 msgid "Make patch"
273 msgstr "Crear patch"
274
239 -#: gitk:2216 gitk:7494
275 +#: gitk:2619 gitk:9235
276 msgid "Create tag"
277 msgstr "Crear etiqueta"
278
243 -#: gitk:2217 gitk:7593
279 +#: gitk:2620 gitk:9352
280 msgid "Write commit to file"
281 msgstr "Escribir revisiones a archivo"
282
247 -#: gitk:2218 gitk:7647
283 +#: gitk:2621 gitk:9409
284 msgid "Create new branch"
285 msgstr "Crear nueva rama"
286
251 -#: gitk:2219
287 +#: gitk:2622
288 msgid "Cherry-pick this commit"
289 msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
290
255 -#: gitk:2220
291 +#: gitk:2623
292 msgid "Reset HEAD branch to here"
293 msgstr "Traer la rama HEAD aquí"
294
259 -#: gitk:2234
295 +#: gitk:2624
296 +#, fuzzy
297 +msgid "Mark this commit"
298 +msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
299 +
300 +#: gitk:2625
301 +msgid "Return to mark"
302 +msgstr ""
303 +
304 +#: gitk:2626
305 +msgid "Find descendant of this and mark"
306 +msgstr ""
307 +
308 +#: gitk:2627
309 +msgid "Compare with marked commit"
310 +msgstr ""
311 +
312 +#: gitk:2628 gitk:2639
313 +#, fuzzy
314 +msgid "Diff this -> marked commit"
315 +msgstr "Diferencia de esta -> seleccionada"
316 +
317 +#: gitk:2629 gitk:2640
318 +#, fuzzy
319 +msgid "Diff marked commit -> this"
320 +msgstr "Diferencia de seleccionada -> esta"
321 +
322 +#: gitk:2630
323 +#, fuzzy
324 +msgid "Revert this commit"
325 +msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
326 +
327 +#: gitk:2646
328 msgid "Check out this branch"
329 msgstr "Cambiar a esta rama"
330
263 -#: gitk:2235
331 +#: gitk:2647
332 msgid "Remove this branch"
333 msgstr "Eliminar esta rama"
334
267 -#: gitk:2242
335 +#: gitk:2654
336 msgid "Highlight this too"
337 msgstr "Seleccionar también"
338
271 -#: gitk:2243
339 +#: gitk:2655
340 msgid "Highlight this only"
341 msgstr "Seleccionar sólo"
342
275 -#: gitk:2245
343 +#: gitk:2656
344 +msgid "External diff"
345 +msgstr ""
346 +
347 +#: gitk:2657
348 msgid "Blame parent commit"
349 msgstr ""
350
279 -#: gitk:2488
351 +#: gitk:2664
352 +msgid "Show origin of this line"
353 +msgstr ""
354 +
355 +#: gitk:2665
356 +msgid "Run git gui blame on this line"
357 +msgstr ""
358 +
359 +#: gitk:3011
360 +#, fuzzy
361 msgid ""
362 "\n"
363 "Gitk - a commit viewer for git\n"
364 "\n"
284 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
365 +"Copyright © 2005-2014 Paul Mackerras\n"
366 "\n"
367 "Use and redistribute under the terms of the GNU General Public License"
368 msgstr ""
@@ -293,425 +374,728 @@ msgstr ""
374 "Uso y redistribución permitidos según los términos de la Licencia Pública "
375 "General de GNU (GNU GPL)"
376
296 -#: gitk:2496 gitk:2557 gitk:7943
377 +#: gitk:3019 gitk:3085 gitk:9836
378 msgid "Close"
379 msgstr "Cerrar"
380
300 -#: gitk:2515
381 +#: gitk:3040
382 msgid "Gitk key bindings"
383 msgstr "Combinaciones de tecla de Gitk"
384
304 -#: gitk:2517
385 +#: gitk:3043
386 msgid "Gitk key bindings:"
387 msgstr "Combinaciones de tecla de Gitk:"
388
308 -#: gitk:2519
389 +#: gitk:3045
390 #, tcl-format
391 msgid "<%s-Q>\t\tQuit"
392 msgstr "<%s-Q>\t\tSalir"
393
313 -#: gitk:2520
394 +#: gitk:3046
395 +#, fuzzy, tcl-format
396 +msgid "<%s-W>\t\tClose window"
397 +msgstr "<%s-F>\t\tBuscar"
398 +
399 +#: gitk:3047
400 msgid "<Home>\t\tMove to first commit"
401 msgstr "<Home>\t\tIr a la primera revisión"
402
317 -#: gitk:2521
403 +#: gitk:3048
404 msgid "<End>\t\tMove to last commit"
405 msgstr "<End>\t\tIr a la última revisión"
406
321 -#: gitk:2522
322 -msgid "<Up>, p, i\tMove up one commit"
407 +#: gitk:3049
408 +#, fuzzy
409 +msgid "<Up>, p, k\tMove up one commit"
410 msgstr "<Up>, p, i\tSubir una revisión"
411
325 -#: gitk:2523
326 -msgid "<Down>, n, k\tMove down one commit"
412 +#: gitk:3050
413 +#, fuzzy
414 +msgid "<Down>, n, j\tMove down one commit"
415 msgstr "<Down>, n, k\tBajar una revisión"
416
329 -#: gitk:2524
330 -msgid "<Left>, z, j\tGo back in history list"
417 +#: gitk:3051
418 +#, fuzzy
419 +msgid "<Left>, z, h\tGo back in history list"
420 msgstr "<Left>, z, j\tRetroceder en la historia"
421
333 -#: gitk:2525
422 +#: gitk:3052
423 msgid "<Right>, x, l\tGo forward in history list"
424 msgstr "<Right>, x, l\tAvanzar en la historia"
425
337 -#: gitk:2526
426 +#: gitk:3053
427 +#, tcl-format
428 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
429 +msgstr ""
430 +
431 +#: gitk:3054
432 msgid "<PageUp>\tMove up one page in commit list"
433 msgstr "<PageUp>\tSubir una página en la lista de revisiones"
434
341 -#: gitk:2527
435 +#: gitk:3055
436 msgid "<PageDown>\tMove down one page in commit list"
437 msgstr "<PageDown>\tBajar una página en la lista de revisiones"
438
345 -#: gitk:2528
439 +#: gitk:3056
440 #, tcl-format
441 msgid "<%s-Home>\tScroll to top of commit list"
442 msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones"
443
350 -#: gitk:2529
444 +#: gitk:3057
445 #, tcl-format
446 msgid "<%s-End>\tScroll to bottom of commit list"
447 msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones"
448
355 -#: gitk:2530
449 +#: gitk:3058
450 #, tcl-format
451 msgid "<%s-Up>\tScroll commit list up one line"
452 msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones"
453
360 -#: gitk:2531
454 +#: gitk:3059
455 #, tcl-format
456 msgid "<%s-Down>\tScroll commit list down one line"
457 msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones"
458
365 -#: gitk:2532
459 +#: gitk:3060
460 #, tcl-format
461 msgid "<%s-PageUp>\tScroll commit list up one page"
462 msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones"
463
370 -#: gitk:2533
464 +#: gitk:3061
465 #, tcl-format
466 msgid "<%s-PageDown>\tScroll commit list down one page"
467 msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones"
468
375 -#: gitk:2534
469 +#: gitk:3062
470 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
471 msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)"
472
379 -#: gitk:2535
473 +#: gitk:3063
474 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
475 msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)"
476
383 -#: gitk:2536
477 +#: gitk:3064
478 msgid "<Delete>, b\tScroll diff view up one page"
479 msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias"
480
387 -#: gitk:2537
481 +#: gitk:3065
482 msgid "<Backspace>\tScroll diff view up one page"
483 msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias"
484
391 -#: gitk:2538
485 +#: gitk:3066
486 msgid "<Space>\t\tScroll diff view down one page"
487 msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias"
488
395 -#: gitk:2539
489 +#: gitk:3067
490 msgid "u\t\tScroll diff view up 18 lines"
491 msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias"
492
399 -#: gitk:2540
493 +#: gitk:3068
494 msgid "d\t\tScroll diff view down 18 lines"
495 msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias"
496
403 -#: gitk:2541
497 +#: gitk:3069
498 #, tcl-format
499 msgid "<%s-F>\t\tFind"
500 msgstr "<%s-F>\t\tBuscar"
501
408 -#: gitk:2542
502 +#: gitk:3070
503 #, tcl-format
504 msgid "<%s-G>\t\tMove to next find hit"
505 msgstr "<%s-G>\t\tBuscar el siguiente"
506
413 -#: gitk:2543
507 +#: gitk:3071
508 msgid "<Return>\tMove to next find hit"
509 msgstr "<Return>\tBuscar el siguiente"
510
417 -#: gitk:2544
418 -msgid "/\t\tMove to next find hit, or redo find"
419 -msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda"
511 +#: gitk:3072
512 +msgid "/\t\tFocus the search box"
513 +msgstr ""
514
421 -#: gitk:2545
515 +#: gitk:3073
516 msgid "?\t\tMove to previous find hit"
517 msgstr "?\t\tBuscar el anterior"
518
425 -#: gitk:2546
519 +#: gitk:3074
520 msgid "f\t\tScroll diff view to next file"
521 msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
522
429 -#: gitk:2547
523 +#: gitk:3075
524 #, tcl-format
525 msgid "<%s-S>\t\tSearch for next hit in diff view"
526 msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias"
527
434 -#: gitk:2548
528 +#: gitk:3076
529 #, tcl-format
530 msgid "<%s-R>\t\tSearch for previous hit in diff view"
531 msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias"
532
439 -#: gitk:2549
533 +#: gitk:3077
534 #, tcl-format
535 msgid "<%s-KP+>\tIncrease font size"
536 msgstr "<%s-KP+>\tAumentar tamaño del texto"
537
444 -#: gitk:2550
538 +#: gitk:3078
539 #, tcl-format
540 msgid "<%s-plus>\tIncrease font size"
541 msgstr "<%s-plus>\tAumentar tamaño del texto"
542
449 -#: gitk:2551
543 +#: gitk:3079
544 #, tcl-format
545 msgid "<%s-KP->\tDecrease font size"
546 msgstr "<%s-KP->\tDisminuir tamaño del texto"
547
454 -#: gitk:2552
548 +#: gitk:3080
549 #, tcl-format
550 msgid "<%s-minus>\tDecrease font size"
551 msgstr "<%s-minus>\tDisminuir tamaño del texto"
552
459 -#: gitk:2553
553 +#: gitk:3081
554 msgid "<F5>\t\tUpdate"
555 msgstr "<F5>\t\tActualizar"
556
463 -#: gitk:3200
557 +#: gitk:3546 gitk:3555
558 +#, fuzzy, tcl-format
559 +msgid "Error creating temporary directory %s:"
560 +msgstr "Error en la creación del parche:"
561 +
562 +#: gitk:3568
563 +#, fuzzy, tcl-format
564 +msgid "Error getting \"%s\" from %s:"
565 +msgstr "Error al leer las diferencias de fusión:"
566 +
567 +#: gitk:3631
568 +#, fuzzy
569 +msgid "command failed:"
570 +msgstr "Línea de comandos"
571 +
572 +#: gitk:3780
573 +#, fuzzy
574 +msgid "No such commit"
575 +msgstr "No se han guardado cambios"
576 +
577 +#: gitk:3794
578 +msgid "git gui blame: command failed:"
579 +msgstr ""
580 +
581 +#: gitk:3825
582 +#, tcl-format
583 +msgid "Couldn't read merge head: %s"
584 +msgstr ""
585 +
586 +#: gitk:3833
587 +#, fuzzy, tcl-format
588 +msgid "Error reading index: %s"
589 +msgstr "Error al crear la etiqueta:"
590 +
591 +#: gitk:3858
592 +#, tcl-format
593 +msgid "Couldn't start git blame: %s"
594 +msgstr ""
595 +
596 +#: gitk:3861 gitk:6735
597 +msgid "Searching"
598 +msgstr "Buscando"
599 +
600 +#: gitk:3893
601 +#, fuzzy, tcl-format
602 +msgid "Error running git blame: %s"
603 +msgstr "Error al crear la etiqueta:"
604 +
605 +#: gitk:3921
606 +#, tcl-format
607 +msgid "That line comes from commit %s, which is not in this view"
608 +msgstr ""
609 +
610 +#: gitk:3935
611 +#, fuzzy
612 +msgid "External diff viewer failed:"
613 +msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
614 +
615 +#: gitk:4053
616 msgid "Gitk view definition"
617 msgstr "Definición de vistas de Gitk"
618
467 -#: gitk:3225
468 -msgid "Name"
469 -msgstr "Nombre"
470 -
471 -#: gitk:3228
619 +#: gitk:4057
620 msgid "Remember this view"
621 msgstr "Recordar esta vista"
622
475 -#: gitk:3232
476 -msgid "Commits to include (arguments to git log):"
623 +#: gitk:4058
624 +msgid "References (space separated list):"
625 +msgstr ""
626 +
627 +#: gitk:4059
628 +msgid "Branches & tags:"
629 +msgstr ""
630 +
631 +#: gitk:4060
632 +#, fuzzy
633 +msgid "All refs"
634 +msgstr "Todos los archivos"
635 +
636 +#: gitk:4061
637 +msgid "All (local) branches"
638 +msgstr ""
639 +
640 +#: gitk:4062
641 +msgid "All tags"
642 +msgstr ""
643 +
644 +#: gitk:4063
645 +msgid "All remote-tracking branches"
646 +msgstr ""
647 +
648 +#: gitk:4064
649 +msgid "Commit Info (regular expressions):"
650 +msgstr ""
651 +
652 +#: gitk:4065
653 +#, fuzzy
654 +msgid "Author:"
655 +msgstr "Autor"
656 +
657 +#: gitk:4066
658 +#, fuzzy
659 +msgid "Committer:"
660 +msgstr "revisión"
661 +
662 +#: gitk:4067
663 +msgid "Commit Message:"
664 +msgstr ""
665 +
666 +#: gitk:4068
667 +msgid "Matches all Commit Info criteria"
668 +msgstr ""
669 +
670 +#: gitk:4069
671 +msgid "Matches none Commit Info criteria"
672 +msgstr ""
673 +
674 +#: gitk:4070
675 +msgid "Changes to Files:"
676 +msgstr ""
677 +
678 +#: gitk:4071
679 +msgid "Fixed String"
680 +msgstr ""
681 +
682 +#: gitk:4072
683 +msgid "Regular Expression"
684 +msgstr ""
685 +
686 +#: gitk:4073
687 +#, fuzzy
688 +msgid "Search string:"
689 +msgstr "Buscando"
690 +
691 +#: gitk:4074
692 +msgid ""
693 +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
694 +"15:27:38\"):"
695 +msgstr ""
696 +
697 +#: gitk:4075
698 +msgid "Since:"
699 +msgstr ""
700 +
701 +#: gitk:4076
702 +msgid "Until:"
703 +msgstr ""
704 +
705 +#: gitk:4077
706 +msgid "Limit and/or skip a number of revisions (positive integer):"
707 +msgstr ""
708 +
709 +#: gitk:4078
710 +msgid "Number to show:"
711 +msgstr ""
712 +
713 +#: gitk:4079
714 +msgid "Number to skip:"
715 +msgstr ""
716 +
717 +#: gitk:4080
718 +msgid "Miscellaneous options:"
719 +msgstr ""
720 +
721 +#: gitk:4081
722 +msgid "Strictly sort by date"
723 +msgstr ""
724 +
725 +#: gitk:4082
726 +msgid "Mark branch sides"
727 +msgstr ""
728 +
729 +#: gitk:4083
730 +#, fuzzy
731 +msgid "Limit to first parent"
732 +msgstr "Limitar las diferencias a las rutas seleccionadas"
733 +
734 +#: gitk:4084
735 +msgid "Simple history"
736 +msgstr ""
737 +
738 +#: gitk:4085
739 +#, fuzzy
740 +msgid "Additional arguments to git log:"
741 msgstr "Revisiones a incluir (argumentos a git log):"
742
479 -#: gitk:3239
743 +#: gitk:4086
744 +msgid "Enter files and directories to include, one per line:"
745 +msgstr "Introducir archivos y directorios a incluir, uno por línea:"
746 +
747 +#: gitk:4087
748 msgid "Command to generate more commits to include:"
749 msgstr "Comando que genera más revisiones a incluir:"
750
483 -#: gitk:3246
484 -msgid "Enter files and directories to include, one per line:"
485 -msgstr "Introducir archivos y directorios a incluir, uno por línea:"
751 +#: gitk:4211
752 +msgid "Gitk: edit view"
753 +msgstr ""
754 +
755 +#: gitk:4219
756 +msgid "-- criteria for selecting revisions"
757 +msgstr ""
758 +
759 +#: gitk:4224
760 +#, fuzzy
761 +msgid "View Name"
762 +msgstr "Vista"
763 +
764 +#: gitk:4299
765 +msgid "Apply (F5)"
766 +msgstr ""
767
487 -#: gitk:3293
768 +#: gitk:4337
769 msgid "Error in commit selection arguments:"
770 msgstr "Error en los argumentos de selección de las revisiones:"
771
491 -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142
772 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
773 msgid "None"
774 msgstr "Ninguno"
775
495 -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302
496 -msgid "Date"
497 -msgstr "Fecha"
498 -
499 -#: gitk:3790 gitk:5580
500 -msgid "CDate"
501 -msgstr "Fecha de creación"
502 -
503 -#: gitk:3939 gitk:3944
776 +#: gitk:5003 gitk:5008
777 msgid "Descendant"
778 msgstr "Descendiente"
779
507 -#: gitk:3940
780 +#: gitk:5004
781 msgid "Not descendant"
782 msgstr "No descendiente"
783
511 -#: gitk:3947 gitk:3952
784 +#: gitk:5011 gitk:5016
785 msgid "Ancestor"
786 msgstr "Antepasado"
787
515 -#: gitk:3948
788 +#: gitk:5012
789 msgid "Not ancestor"
790 msgstr "No antepasado"
791
519 -#: gitk:4187
792 +#: gitk:5306
793 msgid "Local changes checked in to index but not committed"
794 msgstr "Cambios locales añadidos al índice pero sin completar revisión"
795
523 -#: gitk:4220
796 +#: gitk:5342
797 msgid "Local uncommitted changes, not checked in to index"
798 msgstr "Cambios locales sin añadir al índice"
799
527 -#: gitk:5549
528 -msgid "Searching"
529 -msgstr "Buscando"
800 +#: gitk:7115
801 +msgid "and many more"
802 +msgstr ""
803 +
804 +#: gitk:7118
805 +msgid "many"
806 +msgstr ""
807
531 -#: gitk:6049
808 +#: gitk:7309
809 msgid "Tags:"
810 msgstr "Etiquetas:"
811
535 -#: gitk:6066 gitk:6072 gitk:7280
812 +#: gitk:7326 gitk:7332 gitk:8806
813 msgid "Parent"
814 msgstr "Padre"
815
539 -#: gitk:6077
816 +#: gitk:7337
817 msgid "Child"
818 msgstr "Hija"
819
543 -#: gitk:6086
820 +#: gitk:7346
821 msgid "Branch"
822 msgstr "Rama"
823
547 -#: gitk:6089
824 +#: gitk:7349
825 msgid "Follows"
826 msgstr "Sigue-a"
827
551 -#: gitk:6092
828 +#: gitk:7352
829 msgid "Precedes"
830 msgstr "Precede-a"
831
555 -#: gitk:6378
556 -msgid "Error getting merge diffs:"
832 +#: gitk:7947
833 +#, fuzzy, tcl-format
834 +msgid "Error getting diffs: %s"
835 msgstr "Error al leer las diferencias de fusión:"
836
559 -#: gitk:7113
837 +#: gitk:8631
838 msgid "Goto:"
839 msgstr "Ir a:"
840
563 -#: gitk:7115
564 -msgid "SHA1 ID:"
565 -msgstr "SHA1 ID:"
566 -
567 -#: gitk:7134
841 +#: gitk:8652
842 #, tcl-format
843 msgid "Short SHA1 id %s is ambiguous"
844 msgstr "La id SHA1 abreviada %s es ambigua"
845
572 -#: gitk:7146
846 +#: gitk:8659
847 +#, fuzzy, tcl-format
848 +msgid "Revision %s is not known"
849 +msgstr "La id SHA1 %s es desconocida"
850 +
851 +#: gitk:8669
852 #, tcl-format
853 msgid "SHA1 id %s is not known"
854 msgstr "La id SHA1 %s es desconocida"
855
577 -#: gitk:7148
856 +#: gitk:8671
857 #, tcl-format
579 -msgid "Tag/Head %s is not known"
580 -msgstr "La etiqueta/rama %s es deconocida"
858 +msgid "Revision %s is not in the current view"
859 +msgstr ""
860
582 -#: gitk:7290
861 +#: gitk:8813 gitk:8828
862 +msgid "Date"
863 +msgstr "Fecha"
864 +
865 +#: gitk:8816
866 msgid "Children"
867 msgstr "Hijas"
868
586 -#: gitk:7347
869 +#: gitk:8879
870 #, tcl-format
871 msgid "Reset %s branch to here"
872 msgstr "Poner la rama %s en esta revisión"
873
591 -#: gitk:7349
874 +#: gitk:8881
875 msgid "Detached head: can't reset"
876 msgstr ""
877
595 -#: gitk:7381
878 +#: gitk:8986 gitk:8992
879 +msgid "Skipping merge commit "
880 +msgstr ""
881 +
882 +#: gitk:9001 gitk:9006
883 +#, fuzzy
884 +msgid "Error getting patch ID for "
885 +msgstr "Error en la creación del parche:"
886 +
887 +#: gitk:9002 gitk:9007
888 +msgid " - stopping\n"
889 +msgstr ""
890 +
891 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
892 +#, fuzzy
893 +msgid "Commit "
894 +msgstr "revisión"
895 +
896 +#: gitk:9016
897 +msgid ""
898 +" is the same patch as\n"
899 +" "
900 +msgstr ""
901 +
902 +#: gitk:9024
903 +msgid ""
904 +" differs from\n"
905 +" "
906 +msgstr ""
907 +
908 +#: gitk:9026
909 +msgid ""
910 +"Diff of commits:\n"
911 +"\n"
912 +msgstr ""
913 +
914 +#: gitk:9038 gitk:9047
915 +#, tcl-format
916 +msgid " has %s children - stopping\n"
917 +msgstr ""
918 +
919 +#: gitk:9066
920 +#, fuzzy, tcl-format
921 +msgid "Error writing commit to file: %s"
922 +msgstr "Error al escribir revisión:"
923 +
924 +#: gitk:9072
925 +#, fuzzy, tcl-format
926 +msgid "Error diffing commits: %s"
927 +msgstr "Error al escribir revisión:"
928 +
929 +#: gitk:9118
930 msgid "Top"
931 msgstr "Origen"
932
599 -#: gitk:7382
933 +#: gitk:9119
934 msgid "From"
935 msgstr "De"
936
603 -#: gitk:7387
937 +#: gitk:9124
938 msgid "To"
939 msgstr "A"
940
607 -#: gitk:7410
941 +#: gitk:9148
942 msgid "Generate patch"
943 msgstr "Generar parche"
944
611 -#: gitk:7412
945 +#: gitk:9150
946 msgid "From:"
947 msgstr "De:"
948
615 -#: gitk:7421
949 +#: gitk:9159
950 msgid "To:"
951 msgstr "Para:"
952
619 -#: gitk:7430
953 +#: gitk:9168
954 msgid "Reverse"
955 msgstr "Invertir"
956
623 -#: gitk:7432 gitk:7607
957 +#: gitk:9170 gitk:9366
958 msgid "Output file:"
959 msgstr "Escribir a archivo:"
960
627 -#: gitk:7438
961 +#: gitk:9176
962 msgid "Generate"
963 msgstr "Generar"
964
631 -#: gitk:7474
965 +#: gitk:9214
966 msgid "Error creating patch:"
967 msgstr "Error en la creación del parche:"
968
635 -#: gitk:7496 gitk:7595 gitk:7649
969 +#: gitk:9237 gitk:9354 gitk:9411
970 msgid "ID:"
971 msgstr "ID:"
972
639 -#: gitk:7505
973 +#: gitk:9246
974 msgid "Tag name:"
975 msgstr "Nombre de etiqueta:"
976
643 -#: gitk:7509 gitk:7659
977 +#: gitk:9249
978 +msgid "Tag message is optional"
979 +msgstr ""
980 +
981 +#: gitk:9251
982 +#, fuzzy
983 +msgid "Tag message:"
984 +msgstr "Nombre de etiqueta:"
985 +
986 +#: gitk:9255 gitk:9420
987 msgid "Create"
988 msgstr "Crear"
989
647 -#: gitk:7524
990 +#: gitk:9273
991 msgid "No tag name specified"
992 msgstr "No se ha especificado etiqueta"
993
651 -#: gitk:7528
994 +#: gitk:9277
995 #, tcl-format
996 msgid "Tag \"%s\" already exists"
997 msgstr "La etiqueta \"%s\" ya existe"
998
656 -#: gitk:7534
999 +#: gitk:9287
1000 msgid "Error creating tag:"
1001 msgstr "Error al crear la etiqueta:"
1002
660 -#: gitk:7604
1003 +#: gitk:9363
1004 msgid "Command:"
1005 msgstr "Comando:"
1006
664 -#: gitk:7612
1007 +#: gitk:9371
1008 msgid "Write"
1009 msgstr "Escribir"
1010
668 -#: gitk:7628
1011 +#: gitk:9389
1012 msgid "Error writing commit:"
1013 msgstr "Error al escribir revisión:"
1014
672 -#: gitk:7654
1015 +#: gitk:9416
1016 msgid "Name:"
1017 msgstr "Nombre:"
1018
676 -#: gitk:7674
1019 +#: gitk:9439
1020 msgid "Please specify a name for the new branch"
1021 msgstr "Especifique un nombre para la nueva rama"
1022
680 -#: gitk:7703
1023 +#: gitk:9444
1024 +#, fuzzy, tcl-format
1025 +msgid "Branch '%s' already exists. Overwrite?"
1026 +msgstr "La etiqueta \"%s\" ya existe"
1027 +
1028 +#: gitk:9511
1029 #, tcl-format
1030 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1031 msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
1032
685 -#: gitk:7708
1033 +#: gitk:9516
1034 msgid "Cherry-picking"
1035 msgstr "Eligiendo revisiones (cherry-picking)"
1036
689 -#: gitk:7720
1037 +#: gitk:9525
1038 +#, tcl-format
1039 +msgid ""
1040 +"Cherry-pick failed because of local changes to file '%s'.\n"
1041 +"Please commit, reset or stash your changes and try again."
1042 +msgstr ""
1043 +
1044 +#: gitk:9531
1045 +msgid ""
1046 +"Cherry-pick failed because of merge conflict.\n"
1047 +"Do you wish to run git citool to resolve it?"
1048 +msgstr ""
1049 +
1050 +#: gitk:9547 gitk:9605
1051 msgid "No changes committed"
1052 msgstr "No se han guardado cambios"
1053
693 -#: gitk:7745
1054 +#: gitk:9574
1055 +#, fuzzy, tcl-format
1056 +msgid "Commit %s is not included in branch %s -- really revert it?"
1057 +msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
1058 +
1059 +#: gitk:9579
1060 +#, fuzzy
1061 +msgid "Reverting"
1062 +msgstr "Reponiendo"
1063 +
1064 +#: gitk:9587
1065 +#, tcl-format
1066 +msgid ""
1067 +"Revert failed because of local changes to the following files:%s Please "
1068 +"commit, reset or stash your changes and try again."
1069 +msgstr ""
1070 +
1071 +#: gitk:9591
1072 +msgid ""
1073 +"Revert failed because of merge conflict.\n"
1074 +" Do you wish to run git citool to resolve it?"
1075 +msgstr ""
1076 +
1077 +#: gitk:9634
1078 msgid "Confirm reset"
1079 msgstr "Confirmar git reset"
1080
697 -#: gitk:7747
1081 +#: gitk:9636
1082 #, tcl-format
1083 msgid "Reset branch %s to %s?"
1084 msgstr "¿Reponer la rama %s a %s?"
1085
702 -#: gitk:7751
1086 +#: gitk:9638
1087 msgid "Reset type:"
1088 msgstr "Tipo de reposición:"
1089
706 -#: gitk:7755
1090 +#: gitk:9641
1091 msgid "Soft: Leave working tree and index untouched"
1092 msgstr "Suave: No altera la copia de trabajo ni el índice"
1093
710 -#: gitk:7758
1094 +#: gitk:9644
1095 msgid "Mixed: Leave working tree untouched, reset index"
1096 msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo"
1097
714 -#: gitk:7761
1098 +#: gitk:9647
1099 msgid ""
1100 "Hard: Reset working tree and index\n"
1101 "(discard ALL local changes)"
@@ -719,19 +1103,19 @@ msgstr ""
1103 "Dura: Actualiza el índice y la copia de trabajo\n"
1104 "(abandona TODAS las modificaciones locales)"
1105
722 -#: gitk:7777
1106 +#: gitk:9664
1107 msgid "Resetting"
1108 msgstr "Reponiendo"
1109
726 -#: gitk:7834
1110 +#: gitk:9724
1111 msgid "Checking out"
1112 msgstr "Creando copia de trabajo"
1113
730 -#: gitk:7885
1114 +#: gitk:9777
1115 msgid "Cannot delete the currently checked-out branch"
1116 msgstr "No se puede borrar la rama actual"
1117
734 -#: gitk:7891
1118 +#: gitk:9783
1119 #, tcl-format
1120 msgid ""
1121 "The commits on branch %s aren't on any other branch.\n"
@@ -740,16 +1124,16 @@ msgstr ""
1124 "Las revisiones de la rama %s no están presentes en otras ramas.\n"
1125 "¿Borrar la rama %s?"
1126
743 -#: gitk:7922
1127 +#: gitk:9814
1128 #, tcl-format
1129 msgid "Tags and heads: %s"
1130 msgstr "Etiquetas y ramas: %s"
1131
748 -#: gitk:7936
1132 +#: gitk:9829
1133 msgid "Filter"
1134 msgstr "Filtro"
1135
752 -#: gitk:8230
1136 +#: gitk:10125
1137 msgid ""
1138 "Error reading commit topology information; branch and preceding/following "
1139 "tag information will be incomplete."
@@ -757,155 +1141,255 @@ msgstr ""
1141 "Error al leer la topología de revisiones: la información sobre las ramas y "
1142 "etiquetas precedentes y siguientes será incompleta."
1143
760 -#: gitk:9216
1144 +#: gitk:11102
1145 msgid "Tag"
1146 msgstr "Etiqueta"
1147
764 -#: gitk:9216
1148 +#: gitk:11106
1149 msgid "Id"
1150 msgstr "Id"
1151
768 -#: gitk:9262
1152 +#: gitk:11189
1153 msgid "Gitk font chooser"
1154 msgstr "Selector de tipografías gitk"
1155
772 -#: gitk:9279
1156 +#: gitk:11206
1157 msgid "B"
1158 msgstr "B"
1159
776 -#: gitk:9282
1160 +#: gitk:11209
1161 msgid "I"
1162 msgstr "I"
1163
780 -#: gitk:9375
781 -msgid "Gitk preferences"
782 -msgstr "Preferencias de gitk"
783 -
784 -#: gitk:9376
1164 +#: gitk:11327
1165 msgid "Commit list display options"
1166 msgstr "Opciones de visualización de la lista de revisiones"
1167
788 -#: gitk:9379
1168 +#: gitk:11330
1169 msgid "Maximum graph width (lines)"
1170 msgstr "Ancho máximo del gráfico (en líneas)"
1171
792 -#: gitk:9383
793 -#, tcl-format
1172 +#: gitk:11334
1173 +#, no-tcl-format
1174 msgid "Maximum graph width (% of pane)"
1175 msgstr "Ancho máximo del gráfico (en % del panel)"
1176
797 -#: gitk:9388
1177 +#: gitk:11337
1178 msgid "Show local changes"
1179 msgstr "Mostrar cambios locales"
1180
801 -#: gitk:9393
802 -msgid "Auto-select SHA1"
1181 +#: gitk:11340
1182 +#, fuzzy
1183 +msgid "Auto-select SHA1 (length)"
1184 msgstr "Seleccionar automáticamente SHA1 hash"
1185
805 -#: gitk:9398
1186 +#: gitk:11344
1187 +msgid "Hide remote refs"
1188 +msgstr ""
1189 +
1190 +#: gitk:11348
1191 msgid "Diff display options"
1192 msgstr "Opciones de visualización de diferencias"
1193
809 -#: gitk:9400
1194 +#: gitk:11350
1195 msgid "Tab spacing"
1196 msgstr "Espaciado de tabulador"
1197
813 -#: gitk:9404
814 -msgid "Display nearby tags"
1198 +#: gitk:11353
1199 +#, fuzzy
1200 +msgid "Display nearby tags/heads"
1201 msgstr "Mostrar etiquetas cercanas"
1202
817 -#: gitk:9409
1203 +#: gitk:11356
1204 +msgid "Maximum # tags/heads to show"
1205 +msgstr ""
1206 +
1207 +#: gitk:11359
1208 msgid "Limit diffs to listed paths"
1209 msgstr "Limitar las diferencias a las rutas seleccionadas"
1210
821 -#: gitk:9414
1211 +#: gitk:11362
1212 msgid "Support per-file encodings"
1213 msgstr ""
1214
825 -#: gitk:9421
1215 +#: gitk:11368 gitk:11515
1216 msgid "External diff tool"
1217 msgstr ""
1218
829 -#: gitk:9423
1219 +#: gitk:11369
1220 msgid "Choose..."
1221 msgstr ""
1222
833 -#: gitk:9428
1223 +#: gitk:11374
1224 +#, fuzzy
1225 +msgid "General options"
1226 +msgstr "Generar parche"
1227 +
1228 +#: gitk:11377
1229 +msgid "Use themed widgets"
1230 +msgstr ""
1231 +
1232 +#: gitk:11379
1233 +msgid "(change requires restart)"
1234 +msgstr ""
1235 +
1236 +#: gitk:11381
1237 +msgid "(currently unavailable)"
1238 +msgstr ""
1239 +
1240 +#: gitk:11392
1241 msgid "Colors: press to choose"
1242 msgstr "Colores: pulse para seleccionar"
1243
837 -#: gitk:9431
1244 +#: gitk:11395
1245 +msgid "Interface"
1246 +msgstr ""
1247 +
1248 +#: gitk:11396
1249 +#, fuzzy
1250 +msgid "interface"
1251 +msgstr "Tipografía para interfaz de usuario"
1252 +
1253 +#: gitk:11399
1254 msgid "Background"
1255 msgstr "Fondo"
1256
841 -#: gitk:9435
1257 +#: gitk:11400 gitk:11430
1258 +#, fuzzy
1259 +msgid "background"
1260 +msgstr "Fondo"
1261 +
1262 +#: gitk:11403
1263 msgid "Foreground"
1264 msgstr "Primer plano"
1265
845 -#: gitk:9439
1266 +#: gitk:11404
1267 +#, fuzzy
1268 +msgid "foreground"
1269 +msgstr "Primer plano"
1270 +
1271 +#: gitk:11407
1272 msgid "Diff: old lines"
1273 msgstr "Diff: líneas viejas"
1274
849 -#: gitk:9444
1275 +#: gitk:11408
1276 +#, fuzzy
1277 +msgid "diff old lines"
1278 +msgstr "Diff: líneas viejas"
1279 +
1280 +#: gitk:11412
1281 msgid "Diff: new lines"
1282 msgstr "Diff: líneas nuevas"
1283
853 -#: gitk:9449
1284 +#: gitk:11413
1285 +#, fuzzy
1286 +msgid "diff new lines"
1287 +msgstr "Diff: líneas nuevas"
1288 +
1289 +#: gitk:11417
1290 msgid "Diff: hunk header"
1291 msgstr "Diff: cabecera de fragmento"
1292
857 -#: gitk:9455
1293 +#: gitk:11419
1294 +#, fuzzy
1295 +msgid "diff hunk header"
1296 +msgstr "Diff: cabecera de fragmento"
1297 +
1298 +#: gitk:11423
1299 +msgid "Marked line bg"
1300 +msgstr ""
1301 +
1302 +#: gitk:11425
1303 +msgid "marked line background"
1304 +msgstr ""
1305 +
1306 +#: gitk:11429
1307 msgid "Select bg"
1308 msgstr "Color de fondo de la selección"
1309
861 -#: gitk:9459
1310 +#: gitk:11438
1311 msgid "Fonts: press to choose"
1312 msgstr "Tipografías: pulse para elegir"
1313
865 -#: gitk:9461
1314 +#: gitk:11440
1315 msgid "Main font"
1316 msgstr "Tipografía principal"
1317
869 -#: gitk:9462
1318 +#: gitk:11441
1319 msgid "Diff display font"
1320 msgstr "Tipografía para diferencias"
1321
873 -#: gitk:9463
1322 +#: gitk:11442
1323 msgid "User interface font"
1324 msgstr "Tipografía para interfaz de usuario"
1325
877 -#: gitk:9488
1326 +#: gitk:11464
1327 +msgid "Gitk preferences"
1328 +msgstr "Preferencias de gitk"
1329 +
1330 +#: gitk:11473
1331 +#, fuzzy
1332 +msgid "General"
1333 +msgstr "Generar"
1334 +
1335 +#: gitk:11474
1336 +msgid "Colors"
1337 +msgstr ""
1338 +
1339 +#: gitk:11475
1340 +msgid "Fonts"
1341 +msgstr ""
1342 +
1343 +#: gitk:11525
1344 #, tcl-format
1345 msgid "Gitk: choose color for %s"
1346 msgstr "Gitk: elegir color para %s"
1347
882 -#: gitk:9934
883 -msgid ""
884 -"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
885 -" Gitk requires at least Tcl/Tk 8.4."
886 -msgstr ""
887 -"Esta versión de Tcl/Tk es demasiado antigua.\n"
888 -" Gitk requiere Tcl/Tk versión 8.4 o superior."
889 -
890 -#: gitk:10047
1348 +#: gitk:12242
1349 msgid "Cannot find a git repository here."
1350 msgstr "No hay un repositorio git aquí."
1351
894 -#: gitk:10051
895 -#, tcl-format
896 -msgid "Cannot find the git directory \"%s\"."
897 -msgstr "No hay directorio git \"%s\"."
898 -
899 -#: gitk:10098
1352 +#: gitk:12289
1353 #, tcl-format
1354 msgid "Ambiguous argument '%s': both revision and filename"
1355 msgstr ""
1356 "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
1357
905 -#: gitk:10110
1358 +#: gitk:12301
1359 msgid "Bad arguments to gitk:"
1360 msgstr "Argumentos incorrectos a Gitk:"
1361
909 -#: gitk:10170
1362 +#: gitk:12405
1363 msgid "Command line"
1364 msgstr "Línea de comandos"
1365 +
1366 +#~ msgid "SHA1 ID: "
1367 +#~ msgstr "SHA1 ID: "
1368 +
1369 +#~ msgid "next"
1370 +#~ msgstr "<<"
1371 +
1372 +#~ msgid "prev"
1373 +#~ msgstr ">>"
1374 +
1375 +#~ msgid "/\t\tMove to next find hit, or redo find"
1376 +#~ msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda"
1377 +
1378 +#~ msgid "Name"
1379 +#~ msgstr "Nombre"
1380 +
1381 +#~ msgid "CDate"
1382 +#~ msgstr "Fecha de creación"
1383 +
1384 +#~ msgid "Tag/Head %s is not known"
1385 +#~ msgstr "La etiqueta/rama %s es deconocida"
1386 +
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 +
1394 +#~ msgid "Cannot find the git directory \"%s\"."
1395 +#~ msgstr "No hay directorio git \"%s\"."
po/fr.po
+486 -331
@@ -8,36 +8,45 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2009-10-05 15:16+0200\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
15 +"Language: \n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "X-Poedit-Language: French\n"
20 "X-Poedit-Country: FRANCE\n"
21
21 -#: gitk:113
22 +#: gitk:140
23 msgid "Couldn't get list of unmerged files:"
24 msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
25
25 -#: gitk:269
26 +#: gitk:212 gitk:2381
27 +msgid "Color words"
28 +msgstr ""
29 +
30 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
31 +msgid "Markup words"
32 +msgstr ""
33 +
34 +#: gitk:324
35 msgid "Error parsing revisions:"
36 msgstr "Erreur lors du parcours des révisions :"
37
29 -#: gitk:324
38 +#: gitk:380
39 msgid "Error executing --argscmd command:"
40 msgstr "Erreur à l'exécution de la commande --argscmd :"
41
33 -#: gitk:337
42 +#: gitk:393
43 msgid "No files selected: --merge specified but no files are unmerged."
44 msgstr ""
45 "Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont "
46 "fusionnés."
47
48 # FIXME : améliorer la traduction de 'file limite'
40 -#: gitk:340
49 +#: gitk:396
50 #, fuzzy
51 msgid ""
52 "No files selected: --merge specified but no unmerged files are within file "
@@ -46,295 +55,315 @@ msgstr ""
55 "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné "
56 "n'est dans la limite des fichiers."
57
49 -#: gitk:362 gitk:509
58 +#: gitk:418 gitk:566
59 msgid "Error executing git log:"
60 msgstr "Erreur à l'exécution de git log :"
61
53 -#: gitk:380 gitk:525
62 +#: gitk:436 gitk:582
63 msgid "Reading"
64 msgstr "Lecture en cours"
65
57 -#: gitk:440 gitk:4123
66 +#: gitk:496 gitk:4508
67 msgid "Reading commits..."
68 msgstr "Lecture des commits..."
69
61 -#: gitk:443 gitk:1561 gitk:4126
70 +#: gitk:499 gitk:1637 gitk:4511
71 msgid "No commits selected"
72 msgstr "Aucun commit sélectionné"
73
65 -#: gitk:1437
74 +#: gitk:1511
75 msgid "Can't parse git log output:"
76 msgstr "Impossible de lire la sortie de git log :"
77
69 -#: gitk:1657
78 +#: gitk:1740
79 msgid "No commit information available"
80 msgstr "Aucune information disponible sur le commit"
81
73 -#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498
82 +#: gitk:1897
83 +msgid "mc"
84 +msgstr ""
85 +
86 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
87 msgid "OK"
88 msgstr "OK"
89
77 -#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788
78 -#: gitk:10323 gitk:10499
90 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
91 +#: gitk:11221 gitk:11501
92 msgid "Cancel"
93 msgstr "Annuler"
94
82 -#: gitk:1919
95 +#: gitk:2069
96 msgid "Update"
97 msgstr "Mise à jour"
98
86 -#: gitk:1920
99 +#: gitk:2070
100 msgid "Reload"
101 msgstr "Recharger"
102
90 -#: gitk:1921
103 +#: gitk:2071
104 msgid "Reread references"
105 msgstr "Relire les références"
106
94 -#: gitk:1922
107 +#: gitk:2072
108 msgid "List references"
109 msgstr "Lister les références"
110
98 -#: gitk:1924
111 +#: gitk:2074
112 msgid "Start git gui"
113 msgstr "Démarrer git gui"
114
102 -#: gitk:1926
115 +#: gitk:2076
116 msgid "Quit"
117 msgstr "Quitter"
118
106 -#: gitk:1918
119 +#: gitk:2068
120 msgid "File"
121 msgstr "Fichier"
122
110 -#: gitk:1930
123 +#: gitk:2080
124 msgid "Preferences"
125 msgstr "Préférences"
126
114 -#: gitk:1929
127 +#: gitk:2079
128 msgid "Edit"
129 msgstr "Éditer"
130
118 -#: gitk:1934
131 +#: gitk:2084
132 msgid "New view..."
133 msgstr "Nouvelle vue..."
134
122 -#: gitk:1935
135 +#: gitk:2085
136 msgid "Edit view..."
137 msgstr "Éditer la vue..."
138
126 -#: gitk:1936
139 +#: gitk:2086
140 msgid "Delete view"
141 msgstr "Supprimer la vue"
142
130 -#: gitk:1938
143 +#: gitk:2088
144 msgid "All files"
145 msgstr "Tous les fichiers"
146
134 -#: gitk:1933 gitk:3670
147 +#: gitk:2083 gitk:4050
148 msgid "View"
149 msgstr "Vue"
150
138 -#: gitk:1943 gitk:1953 gitk:2654
151 +#: gitk:2093 gitk:2103 gitk:3009
152 msgid "About gitk"
153 msgstr "À propos de gitk"
154
142 -#: gitk:1944 gitk:1958
155 +#: gitk:2094 gitk:2108
156 msgid "Key bindings"
157 msgstr "Raccourcis clavier"
158
146 -#: gitk:1942 gitk:1957
159 +#: gitk:2092 gitk:2107
160 msgid "Help"
161 msgstr "Aide"
162
150 -#: gitk:2018
151 -msgid "SHA1 ID: "
152 -msgstr "ID SHA1 :"
163 +#: gitk:2185 gitk:8633
164 +msgid "SHA1 ID:"
165 +msgstr "Id SHA1 :"
166
154 -#: gitk:2049
167 +#: gitk:2229
168 msgid "Row"
169 msgstr "Colonne"
170
158 -#: gitk:2080
171 +#: gitk:2267
172 msgid "Find"
173 msgstr "Recherche"
174
162 -#: gitk:2081
163 -msgid "next"
164 -msgstr "suivant"
165 -
166 -#: gitk:2082
167 -msgid "prev"
168 -msgstr "précédent"
169 -
170 -#: gitk:2083
175 +#: gitk:2295
176 msgid "commit"
177 msgstr "commit"
178
174 -#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344
175 -#: gitk:6428
179 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
180 +#: gitk:6893
181 msgid "containing:"
182 msgstr "contient :"
183
179 -#: gitk:2089 gitk:3162 gitk:3167 gitk:4359
184 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
185 msgid "touching paths:"
186 msgstr "chemins modifiés :"
187
183 -#: gitk:2090 gitk:4364
188 +#: gitk:2303 gitk:4759
189 msgid "adding/removing string:"
190 msgstr "ajoute/supprime la chaîne :"
191
187 -#: gitk:2099 gitk:2101
192 +#: gitk:2304 gitk:4761
193 +msgid "changing lines matching:"
194 +msgstr ""
195 +
196 +#: gitk:2313 gitk:2315 gitk:4748
197 msgid "Exact"
198 msgstr "Exact"
199
191 -#: gitk:2101 gitk:4439 gitk:6240
200 +#: gitk:2315 gitk:4836 gitk:6704
201 msgid "IgnCase"
202 msgstr "Ignorer la casse"
203
195 -#: gitk:2101 gitk:4333 gitk:4437 gitk:6236
204 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
205 msgid "Regexp"
206 msgstr "Expression régulière"
207
199 -#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432
208 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
209 msgid "All fields"
210 msgstr "Tous les champs"
211
203 -#: gitk:2104 gitk:4456 gitk:4488 gitk:6303
212 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
213 msgid "Headline"
214 msgstr "Surligner"
215
207 -#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866
216 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
217 msgid "Comments"
218 msgstr "Commentaires"
219
211 -#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063
212 -#: gitk:8078
220 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
221 +#: gitk:8826
222 msgid "Author"
223 msgstr "Auteur"
224
216 -#: gitk:2105 gitk:4456 gitk:6303 gitk:6803
225 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
226 msgid "Committer"
227 msgstr "Auteur du commit"
228
220 -#: gitk:2134
229 +#: gitk:2350
230 msgid "Search"
231 msgstr "Rechercher"
232
224 -#: gitk:2141
233 +#: gitk:2358
234 msgid "Diff"
235 msgstr "Diff"
236
228 -#: gitk:2143
237 +#: gitk:2360
238 msgid "Old version"
239 msgstr "Ancienne version"
240
232 -#: gitk:2145
241 +#: gitk:2362
242 msgid "New version"
243 msgstr "Nouvelle version"
244
236 -#: gitk:2147
245 +#: gitk:2364
246 msgid "Lines of context"
247 msgstr "Lignes de contexte"
248
240 -#: gitk:2157
249 +#: gitk:2374
250 msgid "Ignore space change"
251 msgstr "Ignorer les modifications d'espace"
252
244 -#: gitk:2215
253 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
254 +msgid "Line diff"
255 +msgstr ""
256 +
257 +#: gitk:2445
258 msgid "Patch"
259 msgstr "Patch"
260
248 -#: gitk:2217
261 +#: gitk:2447
262 msgid "Tree"
263 msgstr "Arbre"
264
252 -#: gitk:2361 gitk:2378
265 +#: gitk:2616 gitk:2636
266 msgid "Diff this -> selected"
267 msgstr "Diff entre ceci et la sélection"
268
256 -#: gitk:2362 gitk:2379
269 +#: gitk:2617 gitk:2637
270 msgid "Diff selected -> this"
271 msgstr "Diff entre sélection et ceci"
272
260 -#: gitk:2363 gitk:2380
273 +#: gitk:2618 gitk:2638
274 msgid "Make patch"
275 msgstr "Créer patch"
276
264 -#: gitk:2364 gitk:8441
277 +#: gitk:2619 gitk:9235
278 msgid "Create tag"
279 msgstr "Créer tag"
280
268 -#: gitk:2365 gitk:8547
281 +#: gitk:2620 gitk:9352
282 msgid "Write commit to file"
283 msgstr "Écrire le commit dans un fichier"
284
272 -#: gitk:2366 gitk:8604
285 +#: gitk:2621 gitk:9409
286 msgid "Create new branch"
287 msgstr "Créer une nouvelle branche"
288
276 -#: gitk:2367
289 +#: gitk:2622
290 msgid "Cherry-pick this commit"
291 msgstr "Cueillir (cherry-pick) ce commit"
292
280 -#: gitk:2368
293 +#: gitk:2623
294 msgid "Reset HEAD branch to here"
295 msgstr "Réinitialiser la branche HEAD vers cet état"
296
284 -#: gitk:2369
297 +#: gitk:2624
298 msgid "Mark this commit"
299 msgstr "Marquer ce commit"
300
288 -#: gitk:2370
301 +#: gitk:2625
302 msgid "Return to mark"
303 msgstr "Retourner à la marque"
304
292 -#: gitk:2371
305 +#: gitk:2626
306 msgid "Find descendant of this and mark"
307 msgstr "Chercher le descendant de ceci et le marquer"
308
296 -#: gitk:2372
309 +#: gitk:2627
310 msgid "Compare with marked commit"
311 msgstr "Comparer avec le commit marqué"
312
300 -#: gitk:2386
313 +#: gitk:2628 gitk:2639
314 +#, fuzzy
315 +msgid "Diff this -> marked commit"
316 +msgstr "Diff entre ceci et la sélection"
317 +
318 +#: gitk:2629 gitk:2640
319 +#, fuzzy
320 +msgid "Diff marked commit -> this"
321 +msgstr "Diff entre sélection et ceci"
322 +
323 +#: gitk:2630
324 +#, fuzzy
325 +msgid "Revert this commit"
326 +msgstr "Marquer ce commit"
327 +
328 +#: gitk:2646
329 msgid "Check out this branch"
330 msgstr "Récupérer cette branche"
331
304 -#: gitk:2387
332 +#: gitk:2647
333 msgid "Remove this branch"
334 msgstr "Supprimer cette branche"
335
308 -#: gitk:2394
336 +#: gitk:2654
337 msgid "Highlight this too"
338 msgstr "Surligner également ceci"
339
312 -#: gitk:2395
340 +#: gitk:2655
341 msgid "Highlight this only"
342 msgstr "Surligner seulement ceci"
343
316 -#: gitk:2396
344 +#: gitk:2656
345 msgid "External diff"
346 msgstr "Diff externe"
347
320 -#: gitk:2397
348 +#: gitk:2657
349 msgid "Blame parent commit"
350 msgstr "Blâmer le commit parent"
351
324 -#: gitk:2404
352 +#: gitk:2664
353 msgid "Show origin of this line"
354 msgstr "Montrer l'origine de cette ligne"
355
328 -#: gitk:2405
356 +#: gitk:2665
357 msgid "Run git gui blame on this line"
358 msgstr "Exécuter git gui blame sur cette ligne"
359
332 -#: gitk:2656
360 +#: gitk:3011
361 +#, fuzzy
362 msgid ""
363 "\n"
364 "Gitk - a commit viewer for git\n"
365 "\n"
337 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
366 +"Copyright © 2005-2014 Paul Mackerras\n"
367 "\n"
368 "Use and redistribute under the terms of the GNU General Public License"
369 msgstr ""
@@ -346,299 +375,317 @@ msgstr ""
375 "Utilisation et redistribution soumises aux termes de la GNU General Public "
376 "License"
377
349 -#: gitk:2664 gitk:2726 gitk:8969
378 +#: gitk:3019 gitk:3085 gitk:9836
379 msgid "Close"
380 msgstr "Fermer"
381
353 -#: gitk:2683
382 +#: gitk:3040
383 msgid "Gitk key bindings"
384 msgstr "Raccourcis clavier de Gitk"
385
357 -#: gitk:2686
386 +#: gitk:3043
387 msgid "Gitk key bindings:"
388 msgstr "Raccourcis clavier de Gitk :"
389
361 -#: gitk:2688
390 +#: gitk:3045
391 #, tcl-format
392 msgid "<%s-Q>\t\tQuit"
393 msgstr "<%s-Q>\t\tQuitter"
394
366 -#: gitk:2689
395 +#: gitk:3046
396 +#, fuzzy, tcl-format
397 +msgid "<%s-W>\t\tClose window"
398 +msgstr "<%s-F>\t\tRechercher"
399 +
400 +#: gitk:3047
401 msgid "<Home>\t\tMove to first commit"
402 msgstr "<Début>\t\tAller au premier commit"
403
370 -#: gitk:2690
404 +#: gitk:3048
405 msgid "<End>\t\tMove to last commit"
406 msgstr "<Fin>\t\tAller au dernier commit"
407
374 -#: gitk:2691
375 -msgid "<Up>, p, i\tMove up one commit"
408 +#: gitk:3049
409 +#, fuzzy
410 +msgid "<Up>, p, k\tMove up one commit"
411 msgstr "<Haut>, p, i\t Aller au commit suivant"
412
378 -#: gitk:2692
379 -msgid "<Down>, n, k\tMove down one commit"
413 +#: gitk:3050
414 +#, fuzzy
415 +msgid "<Down>, n, j\tMove down one commit"
416 msgstr "<Bas>, n, k\t Aller au commit précédent"
417
382 -#: gitk:2693
383 -msgid "<Left>, z, j\tGo back in history list"
418 +#: gitk:3051
419 +#, fuzzy
420 +msgid "<Left>, z, h\tGo back in history list"
421 msgstr "<Gauche>, z, j\tReculer dans l'historique"
422
386 -#: gitk:2694
423 +#: gitk:3052
424 msgid "<Right>, x, l\tGo forward in history list"
425 msgstr "<Droite>, x, l\tAvancer dans l'historique"
426
390 -#: gitk:2695
427 +#: gitk:3053
428 +#, tcl-format
429 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
430 +msgstr ""
431 +
432 +#: gitk:3054
433 msgid "<PageUp>\tMove up one page in commit list"
434 msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
435
394 -#: gitk:2696
436 +#: gitk:3055
437 msgid "<PageDown>\tMove down one page in commit list"
438 msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
439
398 -#: gitk:2697
440 +#: gitk:3056
441 #, tcl-format
442 msgid "<%s-Home>\tScroll to top of commit list"
443 msgstr "<%s-Début>\tAller en haut de la liste des commits"
444
403 -#: gitk:2698
445 +#: gitk:3057
446 #, tcl-format
447 msgid "<%s-End>\tScroll to bottom of commit list"
448 msgstr "<%s-End>\tAller en bas de la liste des commits"
449
408 -#: gitk:2699
450 +#: gitk:3058
451 #, tcl-format
452 msgid "<%s-Up>\tScroll commit list up one line"
453 msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
454
413 -#: gitk:2700
455 +#: gitk:3059
456 #, tcl-format
457 msgid "<%s-Down>\tScroll commit list down one line"
458 msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
459
418 -#: gitk:2701
460 +#: gitk:3060
461 #, tcl-format
462 msgid "<%s-PageUp>\tScroll commit list up one page"
463 msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
464
423 -#: gitk:2702
465 +#: gitk:3061
466 #, tcl-format
467 msgid "<%s-PageDown>\tScroll commit list down one page"
468 msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
469
428 -#: gitk:2703
470 +#: gitk:3062
471 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
472 msgstr ""
473 "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
474
433 -#: gitk:2704
475 +#: gitk:3063
476 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
477 msgstr ""
478 "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
479
438 -#: gitk:2705
480 +#: gitk:3064
481 msgid "<Delete>, b\tScroll diff view up one page"
482 msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
483
442 -#: gitk:2706
484 +#: gitk:3065
485 msgid "<Backspace>\tScroll diff view up one page"
486 msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
487
446 -#: gitk:2707
488 +#: gitk:3066
489 msgid "<Space>\t\tScroll diff view down one page"
490 msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
491
450 -#: gitk:2708
492 +#: gitk:3067
493 msgid "u\t\tScroll diff view up 18 lines"
494 msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
495
454 -#: gitk:2709
496 +#: gitk:3068
497 msgid "d\t\tScroll diff view down 18 lines"
498 msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
499
458 -#: gitk:2710
500 +#: gitk:3069
501 #, tcl-format
502 msgid "<%s-F>\t\tFind"
503 msgstr "<%s-F>\t\tRechercher"
504
463 -#: gitk:2711
505 +#: gitk:3070
506 #, tcl-format
507 msgid "<%s-G>\t\tMove to next find hit"
508 msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
509
468 -#: gitk:2712
510 +#: gitk:3071
511 msgid "<Return>\tMove to next find hit"
512 msgstr "<Return>\t\tAller au résultat de recherche suivant"
513
472 -#: gitk:2713
514 +#: gitk:3072
515 msgid "/\t\tFocus the search box"
516 msgstr "/\t\tFocus sur la zone de recherche"
517
476 -#: gitk:2714
518 +#: gitk:3073
519 msgid "?\t\tMove to previous find hit"
520 msgstr "?\t\tAller au résultat de recherche précédent"
521
480 -#: gitk:2715
522 +#: gitk:3074
523 msgid "f\t\tScroll diff view to next file"
524 msgstr "f\t\tAller au prochain fichier dans la vue des diff"
525
484 -#: gitk:2716
526 +#: gitk:3075
527 #, tcl-format
528 msgid "<%s-S>\t\tSearch for next hit in diff view"
529 msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff"
530
489 -#: gitk:2717
531 +#: gitk:3076
532 #, tcl-format
533 msgid "<%s-R>\t\tSearch for previous hit in diff view"
534 msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff"
535
494 -#: gitk:2718
536 +#: gitk:3077
537 #, tcl-format
538 msgid "<%s-KP+>\tIncrease font size"
539 msgstr "<%s-KP+>\tAugmenter la taille de la police"
540
499 -#: gitk:2719
541 +#: gitk:3078
542 #, tcl-format
543 msgid "<%s-plus>\tIncrease font size"
544 msgstr "<%s-plus>\tAugmenter la taille de la police"
545
504 -#: gitk:2720
546 +#: gitk:3079
547 #, tcl-format
548 msgid "<%s-KP->\tDecrease font size"
549 msgstr "<%s-KP->\tDiminuer la taille de la police"
550
509 -#: gitk:2721
551 +#: gitk:3080
552 #, tcl-format
553 msgid "<%s-minus>\tDecrease font size"
554 msgstr "<%s-minus>\tDiminuer la taille de la police"
555
514 -#: gitk:2722
556 +#: gitk:3081
557 msgid "<F5>\t\tUpdate"
558 msgstr "<F5>\t\tMise à jour"
559
518 -#: gitk:3177
519 -#, tcl-format
520 -msgid "Error getting \"%s\" from %s:"
521 -msgstr "Erreur en obtenant \"%s\" de %s:"
522 -
523 -#: gitk:3234 gitk:3243
560 +#: gitk:3546 gitk:3555
561 #, tcl-format
562 msgid "Error creating temporary directory %s:"
563 msgstr "Erreur lors de la création du répertoire temporaire %s :"
564
528 -#: gitk:3255
565 +#: gitk:3568
566 +#, tcl-format
567 +msgid "Error getting \"%s\" from %s:"
568 +msgstr "Erreur en obtenant \"%s\" de %s:"
569 +
570 +#: gitk:3631
571 msgid "command failed:"
572 msgstr "échec de la commande :"
573
532 -#: gitk:3401
574 +#: gitk:3780
575 msgid "No such commit"
576 msgstr "Commit inexistant"
577
536 -#: gitk:3415
578 +#: gitk:3794
579 msgid "git gui blame: command failed:"
580 msgstr "git gui blame : échec de la commande :"
581
540 -#: gitk:3446
582 +#: gitk:3825
583 #, tcl-format
584 msgid "Couldn't read merge head: %s"
585 msgstr "Impossible de lire le head de la fusion : %s"
586
545 -#: gitk:3454
587 +#: gitk:3833
588 #, tcl-format
589 msgid "Error reading index: %s"
590 msgstr "Erreur à la lecture de l'index : %s"
591
550 -#: gitk:3479
592 +#: gitk:3858
593 #, tcl-format
594 msgid "Couldn't start git blame: %s"
595 msgstr "Impossible de démarrer git blame : %s"
596
555 -#: gitk:3482 gitk:6271
597 +#: gitk:3861 gitk:6735
598 msgid "Searching"
599 msgstr "Recherche en cours"
600
559 -#: gitk:3514
601 +#: gitk:3893
602 #, tcl-format
603 msgid "Error running git blame: %s"
604 msgstr "Erreur à l'exécution de git blame : %s"
605
564 -#: gitk:3542
606 +#: gitk:3921
607 #, tcl-format
608 msgid "That line comes from commit %s, which is not in this view"
609 msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
610
569 -#: gitk:3556
611 +#: gitk:3935
612 msgid "External diff viewer failed:"
613 msgstr "Échec de l'outil externe de visualisation des diff"
614
573 -#: gitk:3674
615 +#: gitk:4053
616 msgid "Gitk view definition"
617 msgstr "Définition des vues de Gitk"
618
577 -#: gitk:3678
619 +#: gitk:4057
620 msgid "Remember this view"
621 msgstr "Se souvenir de cette vue"
622
581 -#: gitk:3679
623 +#: gitk:4058
624 msgid "References (space separated list):"
625 msgstr "Références (liste d'éléments séparés par des espaces) :"
626
585 -#: gitk:3680
627 +#: gitk:4059
628 msgid "Branches & tags:"
629 msgstr "Branches & tags :"
630
589 -#: gitk:3681
631 +#: gitk:4060
632 msgid "All refs"
633 msgstr "Toutes les références"
634
593 -#: gitk:3682
635 +#: gitk:4061
636 msgid "All (local) branches"
637 msgstr "Toutes les branches (locales)"
638
597 -#: gitk:3683
639 +#: gitk:4062
640 msgid "All tags"
641 msgstr "Tous les tags"
642
601 -#: gitk:3684
643 +#: gitk:4063
644 msgid "All remote-tracking branches"
645 msgstr "Toutes les branches de suivi à distance"
646
605 -#: gitk:3685
647 +#: gitk:4064
648 msgid "Commit Info (regular expressions):"
649 msgstr "Info sur les commits (expressions régulières) :"
650
609 -#: gitk:3686
651 +#: gitk:4065
652 msgid "Author:"
653 msgstr "Auteur :"
654
613 -#: gitk:3687
655 +#: gitk:4066
656 msgid "Committer:"
657 msgstr "Commiteur :"
658
617 -#: gitk:3688
659 +#: gitk:4067
660 msgid "Commit Message:"
661 msgstr "Message de commit :"
662
621 -#: gitk:3689
663 +#: gitk:4068
664 msgid "Matches all Commit Info criteria"
665 msgstr "Correspond à tous les critères d'Info sur les commits"
666
625 -#: gitk:3690
667 +#: gitk:4069
668 +#, fuzzy
669 +msgid "Matches none Commit Info criteria"
670 +msgstr "Correspond à tous les critères d'Info sur les commits"
671 +
672 +#: gitk:4070
673 msgid "Changes to Files:"
674 msgstr "Changements des fichiers :"
675
629 -#: gitk:3691
676 +#: gitk:4071
677 msgid "Fixed String"
678 msgstr "Chaîne Figée"
679
633 -#: gitk:3692
680 +#: gitk:4072
681 msgid "Regular Expression"
682 msgstr "Expression Régulière"
683
637 -#: gitk:3693
684 +#: gitk:4073
685 msgid "Search string:"
686 msgstr "Recherche de la chaîne :"
687
641 -#: gitk:3694
688 +#: gitk:4074
689 msgid ""
690 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
691 "15:27:38\"):"
@@ -646,207 +693,204 @@ msgstr ""
693 "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
694 "2009 15:27:38\") :"
695
649 -#: gitk:3695
696 +#: gitk:4075
697 msgid "Since:"
698 msgstr "De :"
699
653 -#: gitk:3696
700 +#: gitk:4076
701 msgid "Until:"
702 msgstr "Jusqu'au :"
703
657 -#: gitk:3697
704 +#: gitk:4077
705 msgid "Limit and/or skip a number of revisions (positive integer):"
706 msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :"
707
661 -#: gitk:3698
708 +#: gitk:4078
709 msgid "Number to show:"
710 msgstr "Nombre à afficher :"
711
665 -#: gitk:3699
712 +#: gitk:4079
713 msgid "Number to skip:"
714 msgstr "Nombre à sauter :"
715
669 -#: gitk:3700
716 +#: gitk:4080
717 msgid "Miscellaneous options:"
718 msgstr "Options diverses :"
719
673 -#: gitk:3701
720 +#: gitk:4081
721 msgid "Strictly sort by date"
722 msgstr "Trier par date"
723
724 # FIXME : traduction de "branch sides"
678 -#: gitk:3702
725 +#: gitk:4082
726 #, fuzzy
727 msgid "Mark branch sides"
728 msgstr "Marquer les extrémités des branches"
729
683 -#: gitk:3703
730 +#: gitk:4083
731 msgid "Limit to first parent"
732 msgstr "Limiter au premier ancêtre"
733
687 -#: gitk:3704
734 +#: gitk:4084
735 msgid "Simple history"
736 msgstr "Historique simple"
737
691 -#: gitk:3705
738 +#: gitk:4085
739 msgid "Additional arguments to git log:"
740 msgstr "Arguments supplémentaires de git log :"
741
695 -#: gitk:3706
742 +#: gitk:4086
743 msgid "Enter files and directories to include, one per line:"
744 msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
745
699 -#: gitk:3707
746 +#: gitk:4087
747 msgid "Command to generate more commits to include:"
748 msgstr "Commande pour générer plus de commits à inclure :"
749
703 -#: gitk:3829
750 +#: gitk:4211
751 msgid "Gitk: edit view"
752 msgstr "Gitk : éditer la vue"
753
707 -#: gitk:3837
754 +#: gitk:4219
755 msgid "-- criteria for selecting revisions"
756 msgstr "-- critère pour la sélection des révisions"
757
711 -#: gitk:3842
712 -msgid "View Name:"
758 +#: gitk:4224
759 +#, fuzzy
760 +msgid "View Name"
761 msgstr "Nom de la vue :"
762
715 -#: gitk:3917
763 +#: gitk:4299
764 msgid "Apply (F5)"
765 msgstr "Appliquer (F5)"
766
719 -#: gitk:3955
767 +#: gitk:4337
768 msgid "Error in commit selection arguments:"
769 msgstr "Erreur dans les arguments de sélection des commits :"
770
723 -#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197
771 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
772 msgid "None"
773 msgstr "Aucun"
774
727 -#: gitk:4456 gitk:6303 gitk:8065 gitk:8080
728 -msgid "Date"
729 -msgstr "Date"
730 -
731 -#: gitk:4456 gitk:6303
732 -msgid "CDate"
733 -msgstr "CDate"
734 -
735 -#: gitk:4605 gitk:4610
775 +#: gitk:5003 gitk:5008
776 msgid "Descendant"
777 msgstr "Descendant"
778
739 -#: gitk:4606
779 +#: gitk:5004
780 msgid "Not descendant"
781 msgstr "Pas un descendant"
782
743 -#: gitk:4613 gitk:4618
783 +#: gitk:5011 gitk:5016
784 msgid "Ancestor"
785 msgstr "Ancêtre"
786
747 -#: gitk:4614
787 +#: gitk:5012
788 msgid "Not ancestor"
789 msgstr "Pas un ancêtre"
790
751 -#: gitk:4904
791 +#: gitk:5306
792 msgid "Local changes checked in to index but not committed"
793 msgstr "Modifications locales enregistrées dans l'index mais non commitées"
794
755 -#: gitk:4940
795 +#: gitk:5342
796 msgid "Local uncommitted changes, not checked in to index"
797 msgstr "Modifications locales non enregistrées dans l'index et non commitées"
798
759 -#: gitk:6621
799 +#: gitk:7115
800 +msgid "and many more"
801 +msgstr ""
802 +
803 +#: gitk:7118
804 msgid "many"
805 msgstr "nombreux"
806
763 -#: gitk:6805
807 +#: gitk:7309
808 msgid "Tags:"
809 msgstr "Tags :"
810
767 -#: gitk:6822 gitk:6828 gitk:8058
811 +#: gitk:7326 gitk:7332 gitk:8806
812 msgid "Parent"
813 msgstr "Parent"
814
771 -#: gitk:6833
815 +#: gitk:7337
816 msgid "Child"
817 msgstr "Enfant"
818
775 -#: gitk:6842
819 +#: gitk:7346
820 msgid "Branch"
821 msgstr "Branche"
822
779 -#: gitk:6845
823 +#: gitk:7349
824 msgid "Follows"
825 msgstr "Suit"
826
783 -#: gitk:6848
827 +#: gitk:7352
828 msgid "Precedes"
829 msgstr "Précède"
830
787 -#: gitk:7346
831 +#: gitk:7947
832 #, tcl-format
833 msgid "Error getting diffs: %s"
834 msgstr "Erreur lors de la récupération des diff : %s"
835
792 -#: gitk:7886
836 +#: gitk:8631
837 msgid "Goto:"
838 msgstr "Aller à :"
839
796 -#: gitk:7888
797 -msgid "SHA1 ID:"
798 -msgstr "Id SHA1 :"
799 -
800 -#: gitk:7907
840 +#: gitk:8652
841 #, tcl-format
842 msgid "Short SHA1 id %s is ambiguous"
843 msgstr "Id SHA1 court %s est ambigu"
844
805 -#: gitk:7914
845 +#: gitk:8659
846 #, tcl-format
847 msgid "Revision %s is not known"
848 msgstr "Id SHA1 %s est inconnu"
849
810 -#: gitk:7924
850 +#: gitk:8669
851 #, tcl-format
852 msgid "SHA1 id %s is not known"
853 msgstr "Id SHA1 %s est inconnu"
854
815 -#: gitk:7926
855 +#: gitk:8671
856 #, tcl-format
857 msgid "Revision %s is not in the current view"
858 msgstr "La révision %s n'est pas dans la vue courante"
859
820 -#: gitk:8068
860 +#: gitk:8813 gitk:8828
861 +msgid "Date"
862 +msgstr "Date"
863 +
864 +#: gitk:8816
865 msgid "Children"
866 msgstr "Enfants"
867
824 -#: gitk:8125
868 +#: gitk:8879
869 #, tcl-format
870 msgid "Reset %s branch to here"
871 msgstr "Réinitialiser la branche %s vers cet état"
872
829 -#: gitk:8127
873 +#: gitk:8881
874 msgid "Detached head: can't reset"
875 msgstr "Head détaché : impossible de réinitialiser"
876
833 -#: gitk:8236 gitk:8242
877 +#: gitk:8986 gitk:8992
878 msgid "Skipping merge commit "
879 msgstr "Éviter le commit de la fusion "
880
837 -#: gitk:8251 gitk:8256
881 +#: gitk:9001 gitk:9006
882 msgid "Error getting patch ID for "
883 msgstr "Erreur à l'obtention de l'ID du patch pour "
884
841 -#: gitk:8252 gitk:8257
885 +#: gitk:9002 gitk:9007
886 msgid " - stopping\n"
887 msgstr " - arrêt en cours\n"
888
845 -#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292
889 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
890 msgid "Commit "
891 msgstr "Commit "
892
849 -#: gitk:8266
893 +#: gitk:9016
894 msgid ""
895 " is the same patch as\n"
896 " "
@@ -854,7 +898,7 @@ msgstr ""
898 "est le même patch que \n"
899 " "
900
857 -#: gitk:8274
901 +#: gitk:9024
902 msgid ""
903 " differs from\n"
904 " "
@@ -862,117 +906,138 @@ msgstr ""
906 " diffère de\n"
907 " "
908
865 -#: gitk:8276
866 -msgid "- stopping\n"
867 -msgstr "- arrêt en cours\n"
909 +#: gitk:9026
910 +msgid ""
911 +"Diff of commits:\n"
912 +"\n"
913 +msgstr ""
914
869 -#: gitk:8284 gitk:8293
915 +#: gitk:9038 gitk:9047
916 #, tcl-format
917 msgid " has %s children - stopping\n"
918 msgstr "a %s enfants - arrêt en cours\n"
919
874 -#: gitk:8324
920 +#: gitk:9066
921 +#, fuzzy, tcl-format
922 +msgid "Error writing commit to file: %s"
923 +msgstr "Erreur à l'ecriture du commit :"
924 +
925 +#: gitk:9072
926 +#, fuzzy, tcl-format
927 +msgid "Error diffing commits: %s"
928 +msgstr "Erreur à l'ecriture du commit :"
929 +
930 +#: gitk:9118
931 msgid "Top"
932 msgstr "Haut"
933
878 -#: gitk:8325
934 +#: gitk:9119
935 msgid "From"
936 msgstr "De"
937
882 -#: gitk:8330
938 +#: gitk:9124
939 msgid "To"
940 msgstr "À"
941
886 -#: gitk:8354
942 +#: gitk:9148
943 msgid "Generate patch"
944 msgstr "Générer le patch"
945
890 -#: gitk:8356
946 +#: gitk:9150
947 msgid "From:"
948 msgstr "De :"
949
894 -#: gitk:8365
950 +#: gitk:9159
951 msgid "To:"
952 msgstr "À :"
953
898 -#: gitk:8374
954 +#: gitk:9168
955 msgid "Reverse"
956 msgstr "Inverser"
957
902 -#: gitk:8376 gitk:8561
958 +#: gitk:9170 gitk:9366
959 msgid "Output file:"
960 msgstr "Fichier de sortie :"
961
906 -#: gitk:8382
962 +#: gitk:9176
963 msgid "Generate"
964 msgstr "Générer"
965
910 -#: gitk:8420
966 +#: gitk:9214
967 msgid "Error creating patch:"
968 msgstr "Erreur à la création du patch :"
969
914 -#: gitk:8443 gitk:8549 gitk:8606
970 +#: gitk:9237 gitk:9354 gitk:9411
971 msgid "ID:"
972 msgstr "ID :"
973
918 -#: gitk:8452
974 +#: gitk:9246
975 msgid "Tag name:"
976 msgstr "Nom du Tag :"
977
922 -#: gitk:8456 gitk:8615
978 +#: gitk:9249
979 +msgid "Tag message is optional"
980 +msgstr ""
981 +
982 +#: gitk:9251
983 +#, fuzzy
984 +msgid "Tag message:"
985 +msgstr "Nom du Tag :"
986 +
987 +#: gitk:9255 gitk:9420
988 msgid "Create"
989 msgstr "Créer"
990
926 -#: gitk:8473
991 +#: gitk:9273
992 msgid "No tag name specified"
993 msgstr "Aucun nom de tag spécifié"
994
930 -#: gitk:8477
995 +#: gitk:9277
996 #, tcl-format
997 msgid "Tag \"%s\" already exists"
998 msgstr "Le tag \"%s\" existe déjà"
999
935 -#: gitk:8483
1000 +#: gitk:9287
1001 msgid "Error creating tag:"
1002 msgstr "Erreur à la création du tag :"
1003
939 -#: gitk:8558
1004 +#: gitk:9363
1005 msgid "Command:"
1006 msgstr "Commande :"
1007
943 -#: gitk:8566
1008 +#: gitk:9371
1009 msgid "Write"
1010 msgstr "Écrire"
1011
947 -#: gitk:8584
1012 +#: gitk:9389
1013 msgid "Error writing commit:"
1014 msgstr "Erreur à l'ecriture du commit :"
1015
951 -#: gitk:8611
1016 +#: gitk:9416
1017 msgid "Name:"
1018 msgstr "Nom :"
1019
955 -#: gitk:8634
1020 +#: gitk:9439
1021 msgid "Please specify a name for the new branch"
1022 msgstr "Veuillez spécifier un nom pour la nouvelle branche"
1023
959 -#: gitk:8639
1024 +#: gitk:9444
1025 #, tcl-format
1026 msgid "Branch '%s' already exists. Overwrite?"
1027 msgstr "La branche '%s' existe déjà. Écraser?"
1028
964 -#: gitk:8705
1029 +#: gitk:9511
1030 #, tcl-format
1031 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1032 msgstr ""
1033 "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
1034 "tout?"
1035
971 -#: gitk:8710
1036 +#: gitk:9516
1037 msgid "Cherry-picking"
1038 msgstr "Cueillir (Cherry-picking)"
1039
975 -#: gitk:8719
1040 +#: gitk:9525
1041 #, tcl-format
1042 msgid ""
1043 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -983,7 +1048,7 @@ msgstr ""
1048 "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
1049 "nouveau."
1050
986 -#: gitk:8725
1051 +#: gitk:9531
1052 msgid ""
1053 "Cherry-pick failed because of merge conflict.\n"
1054 "Do you wish to run git citool to resolve it?"
@@ -992,34 +1057,67 @@ msgstr ""
1057 "fusion.\n"
1058 "Souhaitez-vous exécuter git citool pour le résoudre ?"
1059
995 -#: gitk:8741
1060 +#: gitk:9547 gitk:9605
1061 msgid "No changes committed"
1062 msgstr "Aucun changement commité"
1063
999 -#: gitk:8767
1064 +#: gitk:9574
1065 +#, fuzzy, tcl-format
1066 +msgid "Commit %s is not included in branch %s -- really revert it?"
1067 +msgstr ""
1068 +"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
1069 +"tout?"
1070 +
1071 +#: gitk:9579
1072 +#, fuzzy
1073 +msgid "Reverting"
1074 +msgstr "Réinitialisation"
1075 +
1076 +#: gitk:9587
1077 +#, fuzzy, tcl-format
1078 +msgid ""
1079 +"Revert failed because of local changes to the following files:%s Please "
1080 +"commit, reset or stash your changes and try again."
1081 +msgstr ""
1082 +"La cueillette (cherry-pick) a échouée à cause de modifications locales du "
1083 +"fichier '%s'.\n"
1084 +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
1085 +"nouveau."
1086 +
1087 +#: gitk:9591
1088 +#, fuzzy
1089 +msgid ""
1090 +"Revert failed because of merge conflict.\n"
1091 +" Do you wish to run git citool to resolve it?"
1092 +msgstr ""
1093 +"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une "
1094 +"fusion.\n"
1095 +"Souhaitez-vous exécuter git citool pour le résoudre ?"
1096 +
1097 +#: gitk:9634
1098 msgid "Confirm reset"
1099 msgstr "Confirmer la réinitialisation"
1100
1003 -#: gitk:8769
1101 +#: gitk:9636
1102 #, tcl-format
1103 msgid "Reset branch %s to %s?"
1104 msgstr "Réinitialiser la branche %s à %s?"
1105
1008 -#: gitk:8773
1106 +#: gitk:9638
1107 msgid "Reset type:"
1108 msgstr "Type de réinitialisation :"
1109
1012 -#: gitk:8777
1110 +#: gitk:9641
1111 msgid "Soft: Leave working tree and index untouched"
1112 msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
1113
1016 -#: gitk:8780
1114 +#: gitk:9644
1115 msgid "Mixed: Leave working tree untouched, reset index"
1116 msgstr ""
1117 "Hybride : Laisse le répertoire de travail dans son état courant, "
1118 "réinitialise l'index"
1119
1022 -#: gitk:8783
1120 +#: gitk:9647
1121 msgid ""
1122 "Hard: Reset working tree and index\n"
1123 "(discard ALL local changes)"
@@ -1027,21 +1125,21 @@ msgstr ""
1125 "Dure : Réinitialise le répertoire de travail et l'index\n"
1126 "(abandonne TOUS les changements locaux)"
1127
1030 -#: gitk:8800
1128 +#: gitk:9664
1129 msgid "Resetting"
1130 msgstr "Réinitialisation"
1131
1132 # Fixme: Récupération est-il vraiment une mauvaise traduction?
1035 -#: gitk:8857
1133 +#: gitk:9724
1134 #, fuzzy
1135 msgid "Checking out"
1136 msgstr "Récupération"
1137
1040 -#: gitk:8910
1138 +#: gitk:9777
1139 msgid "Cannot delete the currently checked-out branch"
1140 msgstr "Impossible de supprimer la branche en cours"
1141
1044 -#: gitk:8916
1142 +#: gitk:9783
1143 #, tcl-format
1144 msgid ""
1145 "The commits on branch %s aren't on any other branch.\n"
@@ -1050,16 +1148,16 @@ msgstr ""
1148 "Les commits de la branche %s ne sont dans aucune autre branche.\n"
1149 "Voulez-vous vraiment supprimer cette branche %s ?"
1150
1053 -#: gitk:8947
1151 +#: gitk:9814
1152 #, tcl-format
1153 msgid "Tags and heads: %s"
1154 msgstr "Tags et heads : %s"
1155
1058 -#: gitk:8962
1156 +#: gitk:9829
1157 msgid "Filter"
1158 msgstr "Filtrer"
1159
1062 -#: gitk:9257
1160 +#: gitk:10125
1161 msgid ""
1162 "Error reading commit topology information; branch and preceding/following "
1163 "tag information will be incomplete."
@@ -1068,187 +1166,244 @@ msgstr ""
1166 "informations sur les branches et les tags précédents/suivants seront "
1167 "incomplètes."
1168
1071 -#: gitk:10243
1169 +#: gitk:11102
1170 msgid "Tag"
1171 msgstr "Tag"
1172
1075 -#: gitk:10243
1173 +#: gitk:11106
1174 msgid "Id"
1175 msgstr "Id"
1176
1079 -#: gitk:10291
1177 +#: gitk:11189
1178 msgid "Gitk font chooser"
1179 msgstr "Sélecteur de police de Gitk"
1180
1083 -#: gitk:10308
1181 +#: gitk:11206
1182 msgid "B"
1183 msgstr "B"
1184
1087 -#: gitk:10311
1185 +#: gitk:11209
1186 msgid "I"
1187 msgstr "I"
1188
1091 -#: gitk:10407
1092 -msgid "Gitk preferences"
1093 -msgstr "Préférences de Gitk"
1094 -
1095 -#: gitk:10409
1189 +#: gitk:11327
1190 msgid "Commit list display options"
1191 msgstr "Options d'affichage de la liste des commits"
1192
1099 -#: gitk:10412
1193 +#: gitk:11330
1194 msgid "Maximum graph width (lines)"
1195 msgstr "Longueur maximum du graphe (lignes)"
1196
1197 # FIXME : Traduction standard de "pane"?
1104 -#: gitk:10416
1105 -#, fuzzy, tcl-format
1198 +#: gitk:11334
1199 +#, fuzzy, no-tcl-format
1200 msgid "Maximum graph width (% of pane)"
1201 msgstr "Longueur maximum du graphe (% du panneau)"
1202
1109 -#: gitk:10420
1203 +#: gitk:11337
1204 msgid "Show local changes"
1205 msgstr "Montrer les changements locaux"
1206
1113 -#: gitk:10423
1114 -msgid "Auto-select SHA1"
1207 +#: gitk:11340
1208 +#, fuzzy
1209 +msgid "Auto-select SHA1 (length)"
1210 msgstr "Sélection auto. du SHA1"
1211
1117 -#: gitk:10427
1212 +#: gitk:11344
1213 +msgid "Hide remote refs"
1214 +msgstr "Cacher les refs distantes"
1215 +
1216 +#: gitk:11348
1217 msgid "Diff display options"
1218 msgstr "Options d'affichage des diff"
1219
1121 -#: gitk:10429
1220 +#: gitk:11350
1221 msgid "Tab spacing"
1222 msgstr "Taille des tabulations"
1223
1125 -#: gitk:10432
1126 -msgid "Display nearby tags"
1224 +#: gitk:11353
1225 +#, fuzzy
1226 +msgid "Display nearby tags/heads"
1227 msgstr "Afficher les tags les plus proches"
1228
1129 -#: gitk:10435
1130 -msgid "Hide remote refs"
1131 -msgstr "Cacher les refs distantes"
1229 +#: gitk:11356
1230 +msgid "Maximum # tags/heads to show"
1231 +msgstr ""
1232
1133 -#: gitk:10438
1233 +#: gitk:11359
1234 msgid "Limit diffs to listed paths"
1235 msgstr "Limiter les différences aux chemins listés"
1236
1137 -#: gitk:10441
1237 +#: gitk:11362
1238 msgid "Support per-file encodings"
1239 msgstr "Support pour un encodage des caractères par fichier"
1240
1141 -#: gitk:10447 gitk:10512
1241 +#: gitk:11368 gitk:11515
1242 msgid "External diff tool"
1243 msgstr "Outil diff externe"
1244
1145 -#: gitk:10449
1245 +#: gitk:11369
1246 msgid "Choose..."
1247 msgstr "Choisir..."
1248
1149 -#: gitk:10454
1249 +#: gitk:11374
1250 +#, fuzzy
1251 +msgid "General options"
1252 +msgstr "Générer le patch"
1253 +
1254 +#: gitk:11377
1255 +msgid "Use themed widgets"
1256 +msgstr ""
1257 +
1258 +#: gitk:11379
1259 +msgid "(change requires restart)"
1260 +msgstr ""
1261 +
1262 +#: gitk:11381
1263 +msgid "(currently unavailable)"
1264 +msgstr ""
1265 +
1266 +#: gitk:11392
1267 msgid "Colors: press to choose"
1268 msgstr "Couleurs : cliquer pour choisir"
1269
1153 -#: gitk:10457
1270 +#: gitk:11395
1271 +msgid "Interface"
1272 +msgstr ""
1273 +
1274 +#: gitk:11396
1275 +#, fuzzy
1276 +msgid "interface"
1277 +msgstr "Police de l'interface utilisateur"
1278 +
1279 +#: gitk:11399
1280 msgid "Background"
1281 msgstr "Arrière-plan"
1282
1157 -#: gitk:10458 gitk:10488
1283 +#: gitk:11400 gitk:11430
1284 msgid "background"
1285 msgstr "arrière-plan"
1286
1161 -#: gitk:10461
1287 +#: gitk:11403
1288 msgid "Foreground"
1289 msgstr "Premier plan"
1290
1165 -#: gitk:10462
1291 +#: gitk:11404
1292 msgid "foreground"
1293 msgstr "premier plan"
1294
1169 -#: gitk:10465
1295 +#: gitk:11407
1296 msgid "Diff: old lines"
1297 msgstr "Diff : anciennes lignes"
1298
1173 -#: gitk:10466
1299 +#: gitk:11408
1300 msgid "diff old lines"
1301 msgstr "diff anciennes lignes"
1302
1177 -#: gitk:10470
1303 +#: gitk:11412
1304 msgid "Diff: new lines"
1305 msgstr "Diff : nouvelles lignes"
1306
1181 -#: gitk:10471
1307 +#: gitk:11413
1308 msgid "diff new lines"
1309 msgstr "diff nouvelles lignes"
1310
1185 -#: gitk:10475
1311 +#: gitk:11417
1312 msgid "Diff: hunk header"
1313 msgstr "Diff : entête du hunk"
1314
1189 -#: gitk:10477
1315 +#: gitk:11419
1316 msgid "diff hunk header"
1317 msgstr "diff : entête du hunk"
1318
1193 -#: gitk:10481
1319 +#: gitk:11423
1320 msgid "Marked line bg"
1321 msgstr "Arrière-plan de la ligne marquée"
1322
1197 -#: gitk:10483
1323 +#: gitk:11425
1324 msgid "marked line background"
1325 msgstr "Arrière-plan de la ligne marquée"
1326
1201 -#: gitk:10487
1327 +#: gitk:11429
1328 msgid "Select bg"
1329 msgstr "Sélectionner l'arrière-plan"
1330
1205 -#: gitk:10491
1331 +#: gitk:11438
1332 msgid "Fonts: press to choose"
1333 msgstr "Polices : cliquer pour choisir"
1334
1209 -#: gitk:10493
1335 +#: gitk:11440
1336 msgid "Main font"
1337 msgstr "Police principale"
1338
1213 -#: gitk:10494
1339 +#: gitk:11441
1340 msgid "Diff display font"
1341 msgstr "Police d'affichage des diff"
1342
1217 -#: gitk:10495
1343 +#: gitk:11442
1344 msgid "User interface font"
1345 msgstr "Police de l'interface utilisateur"
1346
1221 -#: gitk:10522
1347 +#: gitk:11464
1348 +msgid "Gitk preferences"
1349 +msgstr "Préférences de Gitk"
1350 +
1351 +#: gitk:11473
1352 +#, fuzzy
1353 +msgid "General"
1354 +msgstr "Générer"
1355 +
1356 +#: gitk:11474
1357 +msgid "Colors"
1358 +msgstr ""
1359 +
1360 +#: gitk:11475
1361 +msgid "Fonts"
1362 +msgstr ""
1363 +
1364 +#: gitk:11525
1365 #, tcl-format
1366 msgid "Gitk: choose color for %s"
1367 msgstr "Gitk : choisir la couleur de %s"
1368
1226 -#: gitk:10973
1227 -msgid ""
1228 -"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1229 -" Gitk requires at least Tcl/Tk 8.4."
1230 -msgstr ""
1231 -"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
1232 -" Gitk requiert Tcl/Tk version 8.4 ou supérieur."
1233 -
1234 -#: gitk:11101
1369 +#: gitk:12242
1370 msgid "Cannot find a git repository here."
1371 msgstr "Impossible de trouver un dépôt git ici."
1372
1238 -#: gitk:11105
1239 -#, tcl-format
1240 -msgid "Cannot find the git directory \"%s\"."
1241 -msgstr "Impossible de trouver le répertoire git \"%s\"."
1242 -
1243 -#: gitk:11152
1373 +#: gitk:12289
1374 #, tcl-format
1375 msgid "Ambiguous argument '%s': both revision and filename"
1376 msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier"
1377
1248 -#: gitk:11164
1378 +#: gitk:12301
1379 msgid "Bad arguments to gitk:"
1380 msgstr "Arguments invalides pour gitk :"
1381
1252 -#: gitk:11249
1382 +#: gitk:12405
1383 msgid "Command line"
1384 msgstr "Ligne de commande"
1385 +
1386 +#~ msgid "SHA1 ID: "
1387 +#~ msgstr "ID SHA1 :"
1388 +
1389 +#~ msgid "next"
1390 +#~ msgstr "suivant"
1391 +
1392 +#~ msgid "prev"
1393 +#~ msgstr "précédent"
1394 +
1395 +#~ msgid "CDate"
1396 +#~ msgstr "CDate"
1397 +
1398 +#~ msgid "- stopping\n"
1399 +#~ msgstr "- arrêt en cours\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 +#~ "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 +
1408 +#~ msgid "Cannot find the git directory \"%s\"."
1409 +#~ msgstr "Impossible de trouver le répertoire git \"%s\"."
po/hu.po
+434 -323
@@ -8,32 +8,41 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: git-gui\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2009-12-14 13:33+0100\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
15 +"Language: \n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
19 -#: gitk:115
20 +#: gitk:140
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Nem sikerült letölteni az unmerged fájl listát:"
23
23 -#: gitk:271
24 +#: gitk:212 gitk:2381
25 +msgid "Color words"
26 +msgstr ""
27 +
28 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +msgid "Markup words"
30 +msgstr ""
31 +
32 +#: gitk:324
33 msgid "Error parsing revisions:"
34 msgstr "Hiba történt értelmezés közben:"
35
27 -#: gitk:326
36 +#: gitk:380
37 msgid "Error executing --argscmd command:"
38 msgstr "Hiba történt a végrehajtáskor --argscmd parancs:"
39
31 -#: gitk:339
40 +#: gitk:393
41 msgid "No files selected: --merge specified but no files are unmerged."
42 msgstr ""
43 "Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged."
44
36 -#: gitk:342
45 +#: gitk:396
46 msgid ""
47 "No files selected: --merge specified but no unmerged files are within file "
48 "limit."
@@ -41,299 +50,315 @@ msgstr ""
50 "Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a "
51 "fájlon belül limit."
52
44 -#: gitk:364 gitk:511
53 +#: gitk:418 gitk:566
54 msgid "Error executing git log:"
55 msgstr "Hiba történt a git log végrehajtása közben:"
56
48 -#: gitk:382 gitk:527
57 +#: gitk:436 gitk:582
58 msgid "Reading"
59 msgstr "Olvasás"
60
52 -#: gitk:442 gitk:4258
61 +#: gitk:496 gitk:4508
62 msgid "Reading commits..."
63 msgstr "Commitok olvasása ..."
64
56 -#: gitk:445 gitk:1575 gitk:4261
65 +#: gitk:499 gitk:1637 gitk:4511
66 msgid "No commits selected"
67 msgstr "Nincsen commit kiválasztva"
68
60 -#: gitk:1451
69 +#: gitk:1511
70 msgid "Can't parse git log output:"
71 msgstr "Nem lehet értelmezni a git log kimenetét:"
72
64 -#: gitk:1671
73 +#: gitk:1740
74 msgid "No commit information available"
75 msgstr "Nincsen elérhető commit információ"
76
68 -#: gitk:1813
77 +#: gitk:1897
78 msgid "mc"
79 msgstr "mc"
80
72 -#: gitk:1848 gitk:4051 gitk:9029 gitk:10570 gitk:10789
81 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
82 msgid "OK"
83 msgstr "OK"
84
76 -#: gitk:1850 gitk:4053 gitk:8629 gitk:8703 gitk:8813 gitk:8862 gitk:9031
77 -#: gitk:10571 gitk:10790
85 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
86 +#: gitk:11221 gitk:11501
87 msgid "Cancel"
88 msgstr "Visszavonás"
89
81 -#: gitk:1972
90 +#: gitk:2069
91 msgid "Update"
92 msgstr "Frissités"
93
85 -#: gitk:1973
94 +#: gitk:2070
95 msgid "Reload"
96 msgstr "Újratöltés"
97
89 -#: gitk:1974
98 +#: gitk:2071
99 msgid "Reread references"
100 msgstr "Referenciák újraolvasása"
101
93 -#: gitk:1975
102 +#: gitk:2072
103 msgid "List references"
104 msgstr "Referenciák listázása"
105
97 -#: gitk:1977
106 +#: gitk:2074
107 msgid "Start git gui"
108 msgstr "Git gui indítása"
109
101 -#: gitk:1979
110 +#: gitk:2076
111 msgid "Quit"
112 msgstr "Kilépés"
113
105 -#: gitk:1971
114 +#: gitk:2068
115 msgid "File"
116 msgstr "Fájl"
117
109 -#: gitk:1983
118 +#: gitk:2080
119 msgid "Preferences"
120 msgstr "Beállítások"
121
113 -#: gitk:1982
122 +#: gitk:2079
123 msgid "Edit"
124 msgstr "Szerkesztés"
125
117 -#: gitk:1987
126 +#: gitk:2084
127 msgid "New view..."
128 msgstr "Új nézet ..."
129
121 -#: gitk:1988
130 +#: gitk:2085
131 msgid "Edit view..."
132 msgstr "Nézet szerkesztése ..."
133
125 -#: gitk:1989
134 +#: gitk:2086
135 msgid "Delete view"
136 msgstr "Nézet törlése"
137
129 -#: gitk:1991
138 +#: gitk:2088
139 msgid "All files"
140 msgstr "Minden fájl"
141
133 -#: gitk:1986 gitk:3805
142 +#: gitk:2083 gitk:4050
143 msgid "View"
144 msgstr "Nézet"
145
137 -#: gitk:1996 gitk:2006 gitk:2777
146 +#: gitk:2093 gitk:2103 gitk:3009
147 msgid "About gitk"
148 msgstr "Gitk névjegy"
149
141 -#: gitk:1997 gitk:2011
150 +#: gitk:2094 gitk:2108
151 msgid "Key bindings"
152 msgstr "Billentyűkombináció"
153
145 -#: gitk:1995 gitk:2010
154 +#: gitk:2092 gitk:2107
155 msgid "Help"
156 msgstr "Segítség"
157
149 -#: gitk:2088
150 -msgid "SHA1 ID: "
151 -msgstr "SHA1 ID: "
158 +#: gitk:2185 gitk:8633
159 +msgid "SHA1 ID:"
160 +msgstr "SHA1 ID:"
161
153 -#: gitk:2119
162 +#: gitk:2229
163 msgid "Row"
164 msgstr "Sor"
165
157 -#: gitk:2157
166 +#: gitk:2267
167 msgid "Find"
168 msgstr "Keresés"
169
161 -#: gitk:2158
162 -msgid "next"
163 -msgstr "következő"
164 -
165 -#: gitk:2159
166 -msgid "prev"
167 -msgstr "előző"
168 -
169 -#: gitk:2160
170 +#: gitk:2295
171 msgid "commit"
172 msgstr "commit"
173
173 -#: gitk:2163 gitk:2165 gitk:4419 gitk:4442 gitk:4466 gitk:6407 gitk:6479
174 -#: gitk:6563
174 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
175 +#: gitk:6893
176 msgid "containing:"
177 msgstr "tartalmazás:"
178
178 -#: gitk:2166 gitk:3287 gitk:3292 gitk:4494
179 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
180 msgid "touching paths:"
181 msgstr "érintendő útvonalak:"
182
182 -#: gitk:2167 gitk:4499
183 +#: gitk:2303 gitk:4759
184 msgid "adding/removing string:"
185 msgstr "string hozzáadása/törlése:"
186
186 -#: gitk:2176 gitk:2178
187 +#: gitk:2304 gitk:4761
188 +msgid "changing lines matching:"
189 +msgstr ""
190 +
191 +#: gitk:2313 gitk:2315 gitk:4748
192 msgid "Exact"
193 msgstr "Pontos"
194
190 -#: gitk:2178 gitk:4574 gitk:6375
195 +#: gitk:2315 gitk:4836 gitk:6704
196 msgid "IgnCase"
197 msgstr "Kis/nagy betű nem számít"
198
194 -#: gitk:2178 gitk:4468 gitk:4572 gitk:6371
199 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
200 msgid "Regexp"
201 msgstr "Regexp"
202
198 -#: gitk:2180 gitk:2181 gitk:4593 gitk:4623 gitk:4630 gitk:6499 gitk:6567
203 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
204 msgid "All fields"
205 msgstr "Minden mező"
206
202 -#: gitk:2181 gitk:4591 gitk:4623 gitk:6438
207 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
208 msgid "Headline"
209 msgstr "Főcím"
210
206 -#: gitk:2182 gitk:4591 gitk:6438 gitk:6567 gitk:7000
211 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
212 msgid "Comments"
213 msgstr "Megjegyzések"
214
210 -#: gitk:2182 gitk:4591 gitk:4595 gitk:4630 gitk:6438 gitk:6935 gitk:8280
211 -#: gitk:8295
215 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
216 +#: gitk:8826
217 msgid "Author"
218 msgstr "Szerző"
219
215 -#: gitk:2182 gitk:4591 gitk:6438 gitk:6937
220 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
221 msgid "Committer"
222 msgstr "Commitoló"
223
219 -#: gitk:2213
224 +#: gitk:2350
225 msgid "Search"
226 msgstr "Keresés"
227
223 -#: gitk:2221
228 +#: gitk:2358
229 msgid "Diff"
230 msgstr "Diff"
231
227 -#: gitk:2223
232 +#: gitk:2360
233 msgid "Old version"
234 msgstr "Régi verzió"
235
231 -#: gitk:2225
236 +#: gitk:2362
237 msgid "New version"
238 msgstr "Új verzió"
239
235 -#: gitk:2227
240 +#: gitk:2364
241 msgid "Lines of context"
242 msgstr "Tartalmi sorok"
243
239 -#: gitk:2237
244 +#: gitk:2374
245 msgid "Ignore space change"
246 msgstr "Space váltás mellőzése"
247
243 -#: gitk:2296
248 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
249 +msgid "Line diff"
250 +msgstr ""
251 +
252 +#: gitk:2445
253 msgid "Patch"
254 msgstr "Patch"
255
247 -#: gitk:2298
256 +#: gitk:2447
257 msgid "Tree"
258 msgstr "Tree"
259
251 -#: gitk:2453 gitk:2470
260 +#: gitk:2616 gitk:2636
261 msgid "Diff this -> selected"
262 msgstr "Diff ezeket -> kiválasztott"
263
255 -#: gitk:2454 gitk:2471
264 +#: gitk:2617 gitk:2637
265 msgid "Diff selected -> this"
266 msgstr "Diff kiválasztottakat -> ezt"
267
259 -#: gitk:2455 gitk:2472
268 +#: gitk:2618 gitk:2638
269 msgid "Make patch"
270 msgstr "Patch készítése"
271
263 -#: gitk:2456 gitk:8687
272 +#: gitk:2619 gitk:9235
273 msgid "Create tag"
274 msgstr "Tag készítése"
275
267 -#: gitk:2457 gitk:8793
276 +#: gitk:2620 gitk:9352
277 msgid "Write commit to file"
278 msgstr "Commit fáljba írása"
279
271 -#: gitk:2458 gitk:8850
280 +#: gitk:2621 gitk:9409
281 msgid "Create new branch"
282 msgstr "Új branch készítése"
283
275 -#: gitk:2459
284 +#: gitk:2622
285 msgid "Cherry-pick this commit"
286 msgstr "Cherry-pick erre a commitra"
287
279 -#: gitk:2460
288 +#: gitk:2623
289 msgid "Reset HEAD branch to here"
290 msgstr "HEAD branch újraindítása ide"
291
283 -#: gitk:2461
292 +#: gitk:2624
293 msgid "Mark this commit"
294 msgstr "Ezen commit megjelölése"
295
287 -#: gitk:2462
296 +#: gitk:2625
297 msgid "Return to mark"
298 msgstr "Visszatérés a megjelöléshez"
299
291 -#: gitk:2463
300 +#: gitk:2626
301 msgid "Find descendant of this and mark"
302 msgstr "Találd meg ezen utódokat és jelöld meg"
303
295 -#: gitk:2464
304 +#: gitk:2627
305 msgid "Compare with marked commit"
306 msgstr "Összehasonlítás a megjelölt commit-tal"
307
299 -#: gitk:2478
308 +#: gitk:2628 gitk:2639
309 +#, fuzzy
310 +msgid "Diff this -> marked commit"
311 +msgstr "Diff ezeket -> kiválasztott"
312 +
313 +#: gitk:2629 gitk:2640
314 +#, fuzzy
315 +msgid "Diff marked commit -> this"
316 +msgstr "Diff kiválasztottakat -> ezt"
317 +
318 +#: gitk:2630
319 +#, fuzzy
320 +msgid "Revert this commit"
321 +msgstr "Ezen commit megjelölése"
322 +
323 +#: gitk:2646
324 msgid "Check out this branch"
325 msgstr "Check out ezt a branchot"
326
303 -#: gitk:2479
327 +#: gitk:2647
328 msgid "Remove this branch"
329 msgstr "Töröld ezt a branch-ot"
330
307 -#: gitk:2486
331 +#: gitk:2654
332 msgid "Highlight this too"
333 msgstr "Emeld ki ezt is"
334
311 -#: gitk:2487
335 +#: gitk:2655
336 msgid "Highlight this only"
337 msgstr "Csak ezt emeld ki"
338
315 -#: gitk:2488
339 +#: gitk:2656
340 msgid "External diff"
341 msgstr "Külső diff"
342
319 -#: gitk:2489
343 +#: gitk:2657
344 msgid "Blame parent commit"
345 msgstr "Blame szülő kommitra"
346
323 -#: gitk:2496
347 +#: gitk:2664
348 msgid "Show origin of this line"
349 msgstr "Mutasd meg ennek a sornak az eredetét"
350
327 -#: gitk:2497
351 +#: gitk:2665
352 msgid "Run git gui blame on this line"
353 msgstr "Futtasd a git gui blame-t ezen a soron"
354
331 -#: gitk:2779
355 +#: gitk:3011
356 +#, fuzzy
357 msgid ""
358 "\n"
359 "Gitk - a commit viewer for git\n"
360 "\n"
336 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
361 +"Copyright © 2005-2014 Paul Mackerras\n"
362 "\n"
363 "Use and redistribute under the terms of the GNU General Public License"
364 msgstr ""
@@ -344,298 +369,316 @@ msgstr ""
369 "\n"
370 "Használd és terjeszd a GNU General Public License feltételei mellett"
371
347 -#: gitk:2787 gitk:2851 gitk:9215
372 +#: gitk:3019 gitk:3085 gitk:9836
373 msgid "Close"
374 msgstr "Bezárás"
375
351 -#: gitk:2808
376 +#: gitk:3040
377 msgid "Gitk key bindings"
378 msgstr "Gitk-billentyű hozzárendelés"
379
355 -#: gitk:2811
380 +#: gitk:3043
381 msgid "Gitk key bindings:"
382 msgstr "Gitk-billentyű hozzaárendelés:"
383
359 -#: gitk:2813
384 +#: gitk:3045
385 #, tcl-format
386 msgid "<%s-Q>\t\tQuit"
387 msgstr "<%s-Q>\t\tKilépés"
388
364 -#: gitk:2814
389 +#: gitk:3046
390 +#, fuzzy, tcl-format
391 +msgid "<%s-W>\t\tClose window"
392 +msgstr "<%s-F>\t\tKeresés"
393 +
394 +#: gitk:3047
395 msgid "<Home>\t\tMove to first commit"
396 msgstr "<Pos1>\t\tElső commithoz"
397
368 -#: gitk:2815
398 +#: gitk:3048
399 msgid "<End>\t\tMove to last commit"
400 msgstr "<Ende>\t\tUtolsó commithoz"
401
372 -#: gitk:2816
373 -msgid "<Up>, p, i\tMove up one commit"
402 +#: gitk:3049
403 +#, fuzzy
404 +msgid "<Up>, p, k\tMove up one commit"
405 msgstr "<Hoch>, p, i\tEgy committal feljebb"
406
376 -#: gitk:2817
377 -msgid "<Down>, n, k\tMove down one commit"
407 +#: gitk:3050
408 +#, fuzzy
409 +msgid "<Down>, n, j\tMove down one commit"
410 msgstr "<Runter>, n, k\tEgy committal lejjebb"
411
380 -#: gitk:2818
381 -msgid "<Left>, z, j\tGo back in history list"
412 +#: gitk:3051
413 +#, fuzzy
414 +msgid "<Left>, z, h\tGo back in history list"
415 msgstr "<Links>, z, j\tVissza a history listába"
416
384 -#: gitk:2819
417 +#: gitk:3052
418 msgid "<Right>, x, l\tGo forward in history list"
419 msgstr "<Rechts>, x, l\tElőre a history listába"
420
388 -#: gitk:2820
421 +#: gitk:3053
422 +#, tcl-format
423 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
424 +msgstr ""
425 +
426 +#: gitk:3054
427 msgid "<PageUp>\tMove up one page in commit list"
428 msgstr "<BildHoch>\tEgy lappal feljebb a commit listába"
429
392 -#: gitk:2821
430 +#: gitk:3055
431 msgid "<PageDown>\tMove down one page in commit list"
432 msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába"
433
396 -#: gitk:2822
434 +#: gitk:3056
435 #, tcl-format
436 msgid "<%s-Home>\tScroll to top of commit list"
437 msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez"
438
401 -#: gitk:2823
439 +#: gitk:3057
440 #, tcl-format
441 msgid "<%s-End>\tScroll to bottom of commit list"
442 msgstr "<%s-Ende>\tGörgetés a commit lista aljához"
443
406 -#: gitk:2824
444 +#: gitk:3058
445 #, tcl-format
446 msgid "<%s-Up>\tScroll commit list up one line"
447 msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában"
448
411 -#: gitk:2825
449 +#: gitk:3059
450 #, tcl-format
451 msgid "<%s-Down>\tScroll commit list down one line"
452 msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában"
453
416 -#: gitk:2826
454 +#: gitk:3060
455 #, tcl-format
456 msgid "<%s-PageUp>\tScroll commit list up one page"
457 msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában"
458
421 -#: gitk:2827
459 +#: gitk:3061
460 #, tcl-format
461 msgid "<%s-PageDown>\tScroll commit list down one page"
462 msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában"
463
426 -#: gitk:2828
464 +#: gitk:3062
465 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
466 msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)"
467
430 -#: gitk:2829
468 +#: gitk:3063
469 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
470 msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)"
471
434 -#: gitk:2830
472 +#: gitk:3064
473 msgid "<Delete>, b\tScroll diff view up one page"
474 msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben"
475
438 -#: gitk:2831
476 +#: gitk:3065
477 msgid "<Backspace>\tScroll diff view up one page"
478 msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben"
479
442 -#: gitk:2832
480 +#: gitk:3066
481 msgid "<Space>\t\tScroll diff view down one page"
482 msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben"
483
446 -#: gitk:2833
484 +#: gitk:3067
485 msgid "u\t\tScroll diff view up 18 lines"
486 msgstr "u\t\t18 sorral felfelé görgetés diff nézetben"
487
450 -#: gitk:2834
488 +#: gitk:3068
489 msgid "d\t\tScroll diff view down 18 lines"
490 msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben"
491
454 -#: gitk:2835
492 +#: gitk:3069
493 #, tcl-format
494 msgid "<%s-F>\t\tFind"
495 msgstr "<%s-F>\t\tKeresés"
496
459 -#: gitk:2836
497 +#: gitk:3070
498 #, tcl-format
499 msgid "<%s-G>\t\tMove to next find hit"
500 msgstr "<%s-G>\t\tKövetkező találathoz"
501
464 -#: gitk:2837
502 +#: gitk:3071
503 msgid "<Return>\tMove to next find hit"
504 msgstr "<Eingabetaste>\tKövetkező találathoz"
505
468 -#: gitk:2838
506 +#: gitk:3072
507 msgid "/\t\tFocus the search box"
508 msgstr "/\t\tLépj a keresési mezőre"
509
472 -#: gitk:2839
510 +#: gitk:3073
511 msgid "?\t\tMove to previous find hit"
512 msgstr "?\t\tElőző találathoz"
513
476 -#: gitk:2840
514 +#: gitk:3074
515 msgid "f\t\tScroll diff view to next file"
516 msgstr "f\t\tKövetkező fájlra görgetés diff nézetben"
517
480 -#: gitk:2841
518 +#: gitk:3075
519 #, tcl-format
520 msgid "<%s-S>\t\tSearch for next hit in diff view"
521 msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben"
522
485 -#: gitk:2842
523 +#: gitk:3076
524 #, tcl-format
525 msgid "<%s-R>\t\tSearch for previous hit in diff view"
526 msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben"
527
490 -#: gitk:2843
528 +#: gitk:3077
529 #, tcl-format
530 msgid "<%s-KP+>\tIncrease font size"
531 msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése"
532
495 -#: gitk:2844
533 +#: gitk:3078
534 #, tcl-format
535 msgid "<%s-plus>\tIncrease font size"
536 msgstr "<%s-Plus>\tBetűméret növelése"
537
500 -#: gitk:2845
538 +#: gitk:3079
539 #, tcl-format
540 msgid "<%s-KP->\tDecrease font size"
541 msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése"
542
505 -#: gitk:2846
543 +#: gitk:3080
544 #, tcl-format
545 msgid "<%s-minus>\tDecrease font size"
546 msgstr "<%s-Minus>\tBetűméret csökkentése"
547
510 -#: gitk:2847
548 +#: gitk:3081
549 msgid "<F5>\t\tUpdate"
550 msgstr "<F5>\t\tFrissítés"
551
514 -#: gitk:3302 gitk:3311
552 +#: gitk:3546 gitk:3555
553 #, tcl-format
554 msgid "Error creating temporary directory %s:"
555 msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:"
556
519 -#: gitk:3324
557 +#: gitk:3568
558 #, tcl-format
559 msgid "Error getting \"%s\" from %s:"
560 msgstr "Hiba történt \"%s\" letöltése közben %s-ről:"
561
524 -#: gitk:3387
562 +#: gitk:3631
563 msgid "command failed:"
564 msgstr "parancs hiba:"
565
528 -#: gitk:3536
566 +#: gitk:3780
567 msgid "No such commit"
568 msgstr "Nincs ilyen commit"
569
532 -#: gitk:3550
570 +#: gitk:3794
571 msgid "git gui blame: command failed:"
572 msgstr "git gui blame: parancs hiba:"
573
536 -#: gitk:3581
574 +#: gitk:3825
575 #, tcl-format
576 msgid "Couldn't read merge head: %s"
577 msgstr "Nem sikerült a Merge head olvasása: %s"
578
541 -#: gitk:3589
579 +#: gitk:3833
580 #, tcl-format
581 msgid "Error reading index: %s"
582 msgstr "Hiba történt az index olvasása közben: %s"
583
546 -#: gitk:3614
584 +#: gitk:3858
585 #, tcl-format
586 msgid "Couldn't start git blame: %s"
587 msgstr "Nem sikerült a git blame indítása: %s"
588
551 -#: gitk:3617 gitk:6406
589 +#: gitk:3861 gitk:6735
590 msgid "Searching"
591 msgstr "Keresés"
592
555 -#: gitk:3649
593 +#: gitk:3893
594 #, tcl-format
595 msgid "Error running git blame: %s"
596 msgstr "Hiba történt a git blame futtatása közben: %s"
597
560 -#: gitk:3677
598 +#: gitk:3921
599 #, tcl-format
600 msgid "That line comes from commit %s, which is not in this view"
601 msgstr ""
602 "A %s commitból származik az a sor, amelyik nem található ebben a nézetben"
603
566 -#: gitk:3691
604 +#: gitk:3935
605 msgid "External diff viewer failed:"
606 msgstr "Külső diff nézegető hiba:"
607
570 -#: gitk:3809
608 +#: gitk:4053
609 msgid "Gitk view definition"
610 msgstr "Gitk nézet meghatározása"
611
574 -#: gitk:3813
612 +#: gitk:4057
613 msgid "Remember this view"
614 msgstr "Maradj ennél a nézetnél"
615
578 -#: gitk:3814
616 +#: gitk:4058
617 msgid "References (space separated list):"
618 msgstr "Referenciák (szóközzel tagolt lista"
619
582 -#: gitk:3815
620 +#: gitk:4059
621 msgid "Branches & tags:"
622 msgstr "Branch-ek & tagek:"
623
586 -#: gitk:3816
624 +#: gitk:4060
625 msgid "All refs"
626 msgstr "Minden ref"
627
590 -#: gitk:3817
628 +#: gitk:4061
629 msgid "All (local) branches"
630 msgstr "Minden (helyi) branch"
631
594 -#: gitk:3818
632 +#: gitk:4062
633 msgid "All tags"
634 msgstr "Minden tag"
635
598 -#: gitk:3819
636 +#: gitk:4063
637 msgid "All remote-tracking branches"
638 msgstr "Minden távoli követő branch"
639
602 -#: gitk:3820
640 +#: gitk:4064
641 msgid "Commit Info (regular expressions):"
642 msgstr "Commit Infó (reguláris kifejezés):"
643
606 -#: gitk:3821
644 +#: gitk:4065
645 msgid "Author:"
646 msgstr "Szerző:"
647
610 -#: gitk:3822
648 +#: gitk:4066
649 msgid "Committer:"
650 msgstr "Commitoló:"
651
614 -#: gitk:3823
652 +#: gitk:4067
653 msgid "Commit Message:"
654 msgstr "Commit üzenet:"
655
618 -#: gitk:3824
656 +#: gitk:4068
657 msgid "Matches all Commit Info criteria"
658 msgstr "Egyezik minen Commit Infó feltétellel"
659
622 -#: gitk:3825
660 +#: gitk:4069
661 +#, fuzzy
662 +msgid "Matches none Commit Info criteria"
663 +msgstr "Egyezik minen Commit Infó feltétellel"
664 +
665 +#: gitk:4070
666 msgid "Changes to Files:"
667 msgstr "Fájl változások:"
668
626 -#: gitk:3826
669 +#: gitk:4071
670 msgid "Fixed String"
671 msgstr "Fix String"
672
630 -#: gitk:3827
673 +#: gitk:4072
674 msgid "Regular Expression"
675 msgstr "Reguláris kifejezés"
676
634 -#: gitk:3828
677 +#: gitk:4073
678 msgid "Search string:"
679 msgstr "Keresés szöveg:"
680
638 -#: gitk:3829
681 +#: gitk:4074
682 msgid ""
683 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
684 "15:27:38\"):"
@@ -643,206 +686,203 @@ msgstr ""
686 "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
687 "15:27:38\"):"
688
646 -#: gitk:3830
689 +#: gitk:4075
690 msgid "Since:"
691 msgstr "Ettől:"
692
650 -#: gitk:3831
693 +#: gitk:4076
694 msgid "Until:"
695 msgstr "Eddig:"
696
654 -#: gitk:3832
697 +#: gitk:4077
698 msgid "Limit and/or skip a number of revisions (positive integer):"
699 msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):"
700
658 -#: gitk:3833
701 +#: gitk:4078
702 msgid "Number to show:"
703 msgstr "Mutatandó szám:"
704
662 -#: gitk:3834
705 +#: gitk:4079
706 msgid "Number to skip:"
707 msgstr "Kihagyandó szám:"
708
666 -#: gitk:3835
709 +#: gitk:4080
710 msgid "Miscellaneous options:"
711 msgstr "Különféle opciók:"
712
670 -#: gitk:3836
713 +#: gitk:4081
714 msgid "Strictly sort by date"
715 msgstr "Szigorú rendezás dátum alapján"
716
674 -#: gitk:3837
717 +#: gitk:4082
718 msgid "Mark branch sides"
719 msgstr "Jelölje meg az ágakat"
720
678 -#: gitk:3838
721 +#: gitk:4083
722 msgid "Limit to first parent"
723 msgstr "Korlátozás az első szülőre"
724
682 -#: gitk:3839
725 +#: gitk:4084
726 msgid "Simple history"
727 msgstr "Egyszerű history"
728
686 -#: gitk:3840
729 +#: gitk:4085
730 msgid "Additional arguments to git log:"
731 msgstr "További argumentok a git log-hoz:"
732
690 -#: gitk:3841
733 +#: gitk:4086
734 msgid "Enter files and directories to include, one per line:"
735 msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:"
736
694 -#: gitk:3842
737 +#: gitk:4087
738 msgid "Command to generate more commits to include:"
739 msgstr "Parancs több tartalmazó commit generálására:"
740
698 -#: gitk:3964
741 +#: gitk:4211
742 msgid "Gitk: edit view"
743 msgstr "Gitk: szerkesztés nézet"
744
702 -#: gitk:3972
745 +#: gitk:4219
746 msgid "-- criteria for selecting revisions"
747 msgstr "-- kritériumok a revíziók kiválasztásához"
748
706 -#: gitk:3977
749 +#: gitk:4224
750 msgid "View Name"
751 msgstr "Nézet neve"
752
710 -#: gitk:4052
753 +#: gitk:4299
754 msgid "Apply (F5)"
755 msgstr "Alkalmaz (F5)"
756
714 -#: gitk:4090
757 +#: gitk:4337
758 msgid "Error in commit selection arguments:"
759 msgstr "Hiba történt a commit argumentumok kiválasztása közben:"
760
718 -#: gitk:4143 gitk:4195 gitk:4643 gitk:4657 gitk:5918 gitk:11519 gitk:11520
761 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
762 msgid "None"
763 msgstr "Keine"
764
722 -#: gitk:4591 gitk:6438 gitk:8282 gitk:8297
723 -msgid "Date"
724 -msgstr "Dátum"
725 -
726 -#: gitk:4591 gitk:6438
727 -msgid "CDate"
728 -msgstr "Dátum"
729 -
730 -#: gitk:4740 gitk:4745
765 +#: gitk:5003 gitk:5008
766 msgid "Descendant"
767 msgstr "Leszármazott"
768
734 -#: gitk:4741
769 +#: gitk:5004
770 msgid "Not descendant"
771 msgstr "Nem leszármazott"
772
738 -#: gitk:4748 gitk:4753
773 +#: gitk:5011 gitk:5016
774 msgid "Ancestor"
775 msgstr "Előd"
776
742 -#: gitk:4749
777 +#: gitk:5012
778 msgid "Not ancestor"
779 msgstr "Nem előd"
780
746 -#: gitk:5039
781 +#: gitk:5306
782 msgid "Local changes checked in to index but not committed"
783 msgstr ""
784 "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek "
785 "commitolva"
786
752 -#: gitk:5075
787 +#: gitk:5342
788 msgid "Local uncommitted changes, not checked in to index"
789 msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe"
790
756 -#: gitk:6756
791 +#: gitk:7115
792 +msgid "and many more"
793 +msgstr ""
794 +
795 +#: gitk:7118
796 msgid "many"
797 msgstr "sok"
798
760 -#: gitk:6939
799 +#: gitk:7309
800 msgid "Tags:"
801 msgstr "Tagek:"
802
764 -#: gitk:6956 gitk:6962 gitk:8275
803 +#: gitk:7326 gitk:7332 gitk:8806
804 msgid "Parent"
805 msgstr "Eltern"
806
768 -#: gitk:6967
807 +#: gitk:7337
808 msgid "Child"
809 msgstr "Gyerek"
810
772 -#: gitk:6976
811 +#: gitk:7346
812 msgid "Branch"
813 msgstr "Ág"
814
776 -#: gitk:6979
815 +#: gitk:7349
816 msgid "Follows"
817 msgstr "Következők"
818
780 -#: gitk:6982
819 +#: gitk:7352
820 msgid "Precedes"
821 msgstr "Megelőzők"
822
784 -#: gitk:7519
823 +#: gitk:7947
824 #, tcl-format
825 msgid "Error getting diffs: %s"
826 msgstr "Hiba történt a diff-ek letöltése közben: %s"
827
789 -#: gitk:8103
828 +#: gitk:8631
829 msgid "Goto:"
830 msgstr "Menj:"
831
793 -#: gitk:8105
794 -msgid "SHA1 ID:"
795 -msgstr "SHA1 ID:"
796 -
797 -#: gitk:8124
832 +#: gitk:8652
833 #, tcl-format
834 msgid "Short SHA1 id %s is ambiguous"
835 msgstr "Rövid SHA1 id %s félreérthető"
836
802 -#: gitk:8131
837 +#: gitk:8659
838 +#, tcl-format
839 msgid "Revision %s is not known"
840 msgstr "A(z) %s revízió nem ismert"
841
806 -#: gitk:8141
842 +#: gitk:8669
843 #, tcl-format
844 msgid "SHA1 id %s is not known"
845 msgstr "SHA1 id %s nem ismert"
846
811 -#: gitk:8143
847 +#: gitk:8671
848 #, tcl-format
849 msgid "Revision %s is not in the current view"
850 msgstr "A(z) %s revízió nincs a jelenlegi nézetben"
851
816 -#: gitk:8285
852 +#: gitk:8813 gitk:8828
853 +msgid "Date"
854 +msgstr "Dátum"
855 +
856 +#: gitk:8816
857 msgid "Children"
858 msgstr "Gyerekek"
859
820 -#: gitk:8343
860 +#: gitk:8879
861 #, tcl-format
862 msgid "Reset %s branch to here"
863 msgstr "Állítsd vissza a %s branch-ot ide"
864
825 -#: gitk:8345
865 +#: gitk:8881
866 msgid "Detached head: can't reset"
867 msgstr "Elkülönített head: nem lehet visszaállítani"
868
829 -#: gitk:8454 gitk:8460
869 +#: gitk:8986 gitk:8992
870 msgid "Skipping merge commit "
871 msgstr "Merge commit kihagyása "
872
833 -#: gitk:8469 gitk:8474
873 +#: gitk:9001 gitk:9006
874 msgid "Error getting patch ID for "
875 msgstr "Hiba történt a patch ID megszerzése közben a következőnél "
876
837 -#: gitk:8470 gitk:8475
877 +#: gitk:9002 gitk:9007
878 msgid " - stopping\n"
879 msgstr " - abbahagyás\n"
880
841 -#: gitk:8480 gitk:8483 gitk:8491 gitk:8505 gitk:8514
881 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
882 msgid "Commit "
883 msgstr "Commit "
884
845 -#: gitk:8484
885 +#: gitk:9016
886 msgid ""
887 " is the same patch as\n"
888 " "
@@ -850,7 +890,7 @@ msgstr ""
890 " Ugyanaz a patch mint\n"
891 " "
892
853 -#: gitk:8492
893 +#: gitk:9024
894 msgid ""
895 " differs from\n"
896 " "
@@ -858,7 +898,7 @@ msgstr ""
898 " különbözik innentől\n"
899 " "
900
861 -#: gitk:8494
901 +#: gitk:9026
902 msgid ""
903 "Diff of commits:\n"
904 "\n"
@@ -866,121 +906,132 @@ msgstr ""
906 "A commitok diffje:\n"
907 "\n"
908
869 -#: gitk:8506 gitk:8515
909 +#: gitk:9038 gitk:9047
910 #, tcl-format
911 msgid " has %s children - stopping\n"
912 msgstr " %s gyereke van. abbahagyás\n"
913
874 -#: gitk:8534
914 +#: gitk:9066
915 +#, tcl-format
916 msgid "Error writing commit to file: %s"
917 msgstr "Hiba történt a commit fájlba írása közben: %s"
918
878 -#: gitk:8540
919 +#: gitk:9072
920 +#, tcl-format
921 msgid "Error diffing commits: %s"
922 msgstr "Hiba történt a commitok diffelése közben: %s"
923
882 -#: gitk:8570
924 +#: gitk:9118
925 msgid "Top"
926 msgstr "Teteje"
927
886 -#: gitk:8571
928 +#: gitk:9119
929 msgid "From"
930 msgstr "Innen"
931
890 -#: gitk:8576
932 +#: gitk:9124
933 msgid "To"
934 msgstr "Ide"
935
894 -#: gitk:8600
936 +#: gitk:9148
937 msgid "Generate patch"
938 msgstr "Patch generálása"
939
898 -#: gitk:8602
940 +#: gitk:9150
941 msgid "From:"
942 msgstr "Innen:"
943
902 -#: gitk:8611
944 +#: gitk:9159
945 msgid "To:"
946 msgstr "Ide:"
947
906 -#: gitk:8620
948 +#: gitk:9168
949 msgid "Reverse"
950 msgstr "Visszafele"
951
910 -#: gitk:8622 gitk:8807
952 +#: gitk:9170 gitk:9366
953 msgid "Output file:"
954 msgstr "Kimeneti fájl:"
955
914 -#: gitk:8628
956 +#: gitk:9176
957 msgid "Generate"
958 msgstr "Generálás"
959
918 -#: gitk:8666
960 +#: gitk:9214
961 msgid "Error creating patch:"
962 msgstr "Hiba törtét a patch készítése közben:"
963
922 -#: gitk:8689 gitk:8795 gitk:8852
964 +#: gitk:9237 gitk:9354 gitk:9411
965 msgid "ID:"
966 msgstr "ID:"
967
926 -#: gitk:8698
968 +#: gitk:9246
969 msgid "Tag name:"
970 msgstr "Tag név:"
971
930 -#: gitk:8702 gitk:8861
972 +#: gitk:9249
973 +msgid "Tag message is optional"
974 +msgstr ""
975 +
976 +#: gitk:9251
977 +#, fuzzy
978 +msgid "Tag message:"
979 +msgstr "Tag név:"
980 +
981 +#: gitk:9255 gitk:9420
982 msgid "Create"
983 msgstr "Létrehozás"
984
934 -#: gitk:8719
985 +#: gitk:9273
986 msgid "No tag name specified"
987 msgstr "A tag neve nincsen megadva"
988
938 -#: gitk:8723
989 +#: gitk:9277
990 #, tcl-format
991 msgid "Tag \"%s\" already exists"
992 msgstr "%s Tag már létezik"
993
943 -#: gitk:8729
994 +#: gitk:9287
995 msgid "Error creating tag:"
996 msgstr "Hiba történt a tag létrehozása közben:"
997
947 -#: gitk:8804
998 +#: gitk:9363
999 msgid "Command:"
1000 msgstr "Parancs:"
1001
951 -#: gitk:8812
1002 +#: gitk:9371
1003 msgid "Write"
1004 msgstr "Írás"
1005
955 -#: gitk:8830
1006 +#: gitk:9389
1007 msgid "Error writing commit:"
1008 msgstr "Hiba történt a commit írása közben:"
1009
959 -#: gitk:8857
1010 +#: gitk:9416
1011 msgid "Name:"
1012 msgstr "Név:"
1013
963 -#: gitk:8880
1014 +#: gitk:9439
1015 msgid "Please specify a name for the new branch"
1016 msgstr "Kérem adja meg a nevét az új branchhoz"
1017
967 -#: gitk:8885
1018 +#: gitk:9444
1019 #, tcl-format
1020 msgid "Branch '%s' already exists. Overwrite?"
1021 msgstr "%s branch már létezik. Felülírja?"
1022
972 -#: gitk:8951
1023 +#: gitk:9511
1024 #, tcl-format
1025 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1026 msgstr ""
1027 "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?"
1028 "eintragen?"
1029
979 -#: gitk:8956
1030 +#: gitk:9516
1031 msgid "Cherry-picking"
1032 msgstr "Cherry-picking"
1033
983 -#: gitk:8965
1034 +#: gitk:9525
1035 #, tcl-format
1036 msgid ""
1037 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -990,7 +1041,7 @@ msgstr ""
1041 "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja "
1042 "újra."
1043
993 -#: gitk:8971
1044 +#: gitk:9531
1045 msgid ""
1046 "Cherry-pick failed because of merge conflict.\n"
1047 "Do you wish to run git citool to resolve it?"
@@ -998,32 +1049,63 @@ msgstr ""
1049 "Cherry-pick hiba történt merge konfliktus miatt.\n"
1050 "Kívánja futtatni a git citool-t a probléma megoldásához?"
1051
1001 -#: gitk:8987
1052 +#: gitk:9547 gitk:9605
1053 msgid "No changes committed"
1054 msgstr "Nincsen változás commitolva"
1055
1005 -#: gitk:9013
1056 +#: gitk:9574
1057 +#, fuzzy, tcl-format
1058 +msgid "Commit %s is not included in branch %s -- really revert it?"
1059 +msgstr ""
1060 +"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?"
1061 +"eintragen?"
1062 +
1063 +#: gitk:9579
1064 +#, fuzzy
1065 +msgid "Reverting"
1066 +msgstr "Újraindítás"
1067 +
1068 +#: gitk:9587
1069 +#, fuzzy, tcl-format
1070 +msgid ""
1071 +"Revert failed because of local changes to the following files:%s Please "
1072 +"commit, reset or stash your changes and try again."
1073 +msgstr ""
1074 +"Cherry-pick hiba történt lokális váltotások miatt a '%s' fájlban.\n"
1075 +"Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja "
1076 +"újra."
1077 +
1078 +#: gitk:9591
1079 +#, fuzzy
1080 +msgid ""
1081 +"Revert failed because of merge conflict.\n"
1082 +" Do you wish to run git citool to resolve it?"
1083 +msgstr ""
1084 +"Cherry-pick hiba történt merge konfliktus miatt.\n"
1085 +"Kívánja futtatni a git citool-t a probléma megoldásához?"
1086 +
1087 +#: gitk:9634
1088 msgid "Confirm reset"
1089 msgstr "Újraindítás megerősítése"
1090
1009 -#: gitk:9015
1091 +#: gitk:9636
1092 #, tcl-format
1093 msgid "Reset branch %s to %s?"
1094 msgstr "Újraindítja a %s branchot %s-ig?"
1095
1014 -#: gitk:9017
1096 +#: gitk:9638
1097 msgid "Reset type:"
1098 msgstr "Újraindítás típusa:"
1099
1018 -#: gitk:9020
1100 +#: gitk:9641
1101 msgid "Soft: Leave working tree and index untouched"
1102 msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül"
1103
1022 -#: gitk:9023
1104 +#: gitk:9644
1105 msgid "Mixed: Leave working tree untouched, reset index"
1106 msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet"
1107
1026 -#: gitk:9026
1108 +#: gitk:9647
1109 msgid ""
1110 "Hard: Reset working tree and index\n"
1111 "(discard ALL local changes)"
@@ -1031,19 +1113,19 @@ msgstr ""
1113 "Hard: Indítsd újra a working tree-t és az indexet\n"
1114 "(MINDEN lokális változás eldobása)"
1115
1034 -#: gitk:9043
1116 +#: gitk:9664
1117 msgid "Resetting"
1118 msgstr "Újraindítás"
1119
1038 -#: gitk:9103
1120 +#: gitk:9724
1121 msgid "Checking out"
1122 msgstr "Kivesz"
1123
1042 -#: gitk:9156
1124 +#: gitk:9777
1125 msgid "Cannot delete the currently checked-out branch"
1126 msgstr "Nem lehet a jelenleg kivett branch-ot törölni"
1127
1046 -#: gitk:9162
1128 +#: gitk:9783
1129 #, tcl-format
1130 msgid ""
1131 "The commits on branch %s aren't on any other branch.\n"
@@ -1052,16 +1134,16 @@ msgstr ""
1134 "A %s branchon található commit nem található meg semelyik másik branchon.\n"
1135 "Tényleg törli a %s branchot?"
1136
1055 -#: gitk:9193
1137 +#: gitk:9814
1138 #, tcl-format
1139 msgid "Tags and heads: %s"
1140 msgstr "Tagek és headek: %s"
1141
1060 -#: gitk:9208
1142 +#: gitk:9829
1143 msgid "Filter"
1144 msgstr "Szűrő"
1145
1064 -#: gitk:9503
1146 +#: gitk:10125
1147 msgid ""
1148 "Error reading commit topology information; branch and preceding/following "
1149 "tag information will be incomplete."
@@ -1069,206 +1151,235 @@ msgstr ""
1151 "Hiba történt a commit topológiai információ olvasása közben; branch ésa "
1152 "megelőző/következő információ nem lesz teljes."
1153
1072 -#: gitk:10489
1154 +#: gitk:11102
1155 msgid "Tag"
1156 msgstr "Tag"
1157
1076 -#: gitk:10489
1158 +#: gitk:11106
1159 msgid "Id"
1160 msgstr "Id"
1161
1080 -#: gitk:10539
1162 +#: gitk:11189
1163 msgid "Gitk font chooser"
1164 msgstr "Gitk-betű kiválasztó"
1165
1084 -#: gitk:10556
1166 +#: gitk:11206
1167 msgid "B"
1168 msgstr "F"
1169
1088 -#: gitk:10559
1170 +#: gitk:11209
1171 msgid "I"
1172 msgstr "K"
1173
1092 -#: gitk:10677
1093 -msgid "Gitk preferences"
1094 -msgstr "Gitk beállítások"
1095 -
1096 -#: gitk:10679
1174 +#: gitk:11327
1175 msgid "Commit list display options"
1176 msgstr "Commit lista kijelzési opciók"
1177
1100 -#: gitk:10682
1178 +#: gitk:11330
1179 msgid "Maximum graph width (lines)"
1180 msgstr "Maximális grafikon szélesség (sorok)"
1181
1104 -#: gitk:10685
1105 -#, tcl-format
1182 +#: gitk:11334
1183 +#, no-tcl-format
1184 msgid "Maximum graph width (% of pane)"
1185 msgstr "Maximális grafikon szélesség (táble %-je)"
1186
1109 -#: gitk:10688
1187 +#: gitk:11337
1188 msgid "Show local changes"
1189 msgstr "Mutasd a lokális változtatásokat"
1190
1113 -#: gitk:10691
1114 -msgid "Auto-select SHA1"
1191 +#: gitk:11340
1192 +#, fuzzy
1193 +msgid "Auto-select SHA1 (length)"
1194 msgstr "SHA1 Automatikus kiválasztása"
1195
1117 -#: gitk:10694
1196 +#: gitk:11344
1197 msgid "Hide remote refs"
1198 msgstr "A távoli refek elrejtése"
1199
1121 -#: gitk:10698
1200 +#: gitk:11348
1201 msgid "Diff display options"
1202 msgstr "Diff kijelző opciók"
1203
1125 -#: gitk:10700
1204 +#: gitk:11350
1205 msgid "Tab spacing"
1206 msgstr "Tab sorköz"
1207
1129 -#: gitk:10703
1130 -msgid "Display nearby tags"
1208 +#: gitk:11353
1209 +#, fuzzy
1210 +msgid "Display nearby tags/heads"
1211 msgstr "Szomszédos tagek kijelzése"
1212
1133 -#: gitk:10706
1213 +#: gitk:11356
1214 +msgid "Maximum # tags/heads to show"
1215 +msgstr ""
1216 +
1217 +#: gitk:11359
1218 msgid "Limit diffs to listed paths"
1219 msgstr "Korlátozott diffek a kilistázott útvonalakhoz"
1220
1137 -#: gitk:10709
1221 +#: gitk:11362
1222 msgid "Support per-file encodings"
1223 msgstr "Fájlonkénti kódolás támgatása"
1224
1141 -#: gitk:10715 gitk:10804
1225 +#: gitk:11368 gitk:11515
1226 msgid "External diff tool"
1227 msgstr "Külső diff alkalmazás"
1228
1145 -#: gitk:10716
1229 +#: gitk:11369
1230 msgid "Choose..."
1231 msgstr "Válaszd ..."
1232
1149 -#: gitk:10721
1233 +#: gitk:11374
1234 msgid "General options"
1235 msgstr "Általános opciók"
1236
1153 -#: gitk:10724
1237 +#: gitk:11377
1238 msgid "Use themed widgets"
1239 msgstr "Témázott vezérlők használata"
1240
1157 -#: gitk:10726
1241 +#: gitk:11379
1242 msgid "(change requires restart)"
1243 msgstr "(a változás újraindítást igényel)"
1244
1161 -#: gitk:10728
1245 +#: gitk:11381
1246 msgid "(currently unavailable)"
1247 msgstr "(jelenleg nem elérhető)"
1248
1165 -#: gitk:10732
1249 +#: gitk:11392
1250 msgid "Colors: press to choose"
1251 msgstr "Színek: nyomja meg a kiválasztáshoz"
1252
1169 -#: gitk:10735
1253 +#: gitk:11395
1254 msgid "Interface"
1255 msgstr "Interfész"
1256
1173 -#: gitk:10736
1257 +#: gitk:11396
1258 msgid "interface"
1259 msgstr "interfész"
1260
1177 -#: gitk:10739
1261 +#: gitk:11399
1262 msgid "Background"
1263 msgstr "Háttér"
1264
1181 -#: gitk:10740 gitk:10770
1265 +#: gitk:11400 gitk:11430
1266 msgid "background"
1267 msgstr "háttér"
1268
1185 -#: gitk:10743
1269 +#: gitk:11403
1270 msgid "Foreground"
1271 msgstr "Előtér"
1272
1189 -#: gitk:10744
1273 +#: gitk:11404
1274 msgid "foreground"
1275 msgstr "előtér"
1276
1193 -#: gitk:10747
1277 +#: gitk:11407
1278 msgid "Diff: old lines"
1279 msgstr "Diff: régi sorok"
1280
1197 -#: gitk:10748
1281 +#: gitk:11408
1282 msgid "diff old lines"
1283 msgstr "diff régi sorok"
1284
1201 -#: gitk:10752
1285 +#: gitk:11412
1286 msgid "Diff: new lines"
1287 msgstr "Diff: új sorok"
1288
1205 -#: gitk:10753
1289 +#: gitk:11413
1290 msgid "diff new lines"
1291 msgstr "diff - új sorok"
1292
1209 -#: gitk:10757
1293 +#: gitk:11417
1294 msgid "Diff: hunk header"
1295 msgstr "Diff: nagy headerök"
1296
1213 -#: gitk:10759
1297 +#: gitk:11419
1298 msgid "diff hunk header"
1299 msgstr "diff - nagy headerök"
1300
1217 -#: gitk:10763
1301 +#: gitk:11423
1302 msgid "Marked line bg"
1303 msgstr "Megjelölt sor háttér"
1304
1221 -#: gitk:10765
1305 +#: gitk:11425
1306 msgid "marked line background"
1307 msgstr "megjelölt sor háttér"
1308
1225 -#: gitk:10769
1309 +#: gitk:11429
1310 msgid "Select bg"
1311 msgstr "Válasszon hátteret"
1312
1229 -#: gitk:10773
1313 +#: gitk:11438
1314 msgid "Fonts: press to choose"
1315 msgstr "Betű: nyomja meg a kiválasztáshoz"
1316
1233 -#: gitk:10775
1317 +#: gitk:11440
1318 msgid "Main font"
1319 msgstr "Fő betű"
1320
1237 -#: gitk:10776
1321 +#: gitk:11441
1322 msgid "Diff display font"
1323 msgstr "Diff kijelző betű"
1324
1241 -#: gitk:10777
1325 +#: gitk:11442
1326 msgid "User interface font"
1327 msgstr "Felhasználói interfész betű"
1328
1245 -#: gitk:10814
1329 +#: gitk:11464
1330 +msgid "Gitk preferences"
1331 +msgstr "Gitk beállítások"
1332 +
1333 +#: gitk:11473
1334 +#, fuzzy
1335 +msgid "General"
1336 +msgstr "Generálás"
1337 +
1338 +#: gitk:11474
1339 +msgid "Colors"
1340 +msgstr ""
1341 +
1342 +#: gitk:11475
1343 +msgid "Fonts"
1344 +msgstr ""
1345 +
1346 +#: gitk:11525
1347 #, tcl-format
1348 msgid "Gitk: choose color for %s"
1349 msgstr "Gitk: válasszon színt a %s-ra"
1350
1250 -#: gitk:11418
1351 +#: gitk:12242
1352 msgid "Cannot find a git repository here."
1353 msgstr "Nem találhatü git repository itt."
1354
1254 -#: gitk:11422
1255 -#, tcl-format
1256 -msgid "Cannot find the git directory \"%s\"."
1257 -msgstr "Nem található a \"%s\" könyvtár."
1258 -
1259 -#: gitk:11469
1355 +#: gitk:12289
1356 #, tcl-format
1357 msgid "Ambiguous argument '%s': both revision and filename"
1358 msgstr "Félreérthető argumentum '%s': revízió és fájlnév is"
1359
1264 -#: gitk:11481
1360 +#: gitk:12301
1361 msgid "Bad arguments to gitk:"
1362 msgstr "Rossz gitk argumentumok:"
1363
1268 -#: gitk:11572
1364 +#: gitk:12405
1365 msgid "Command line"
1366 msgstr "Parancs sor"
1367
1368 +#~ msgid "SHA1 ID: "
1369 +#~ msgstr "SHA1 ID: "
1370 +
1371 +#~ msgid "next"
1372 +#~ msgstr "következő"
1373 +
1374 +#~ msgid "prev"
1375 +#~ msgstr "előző"
1376 +
1377 +#~ msgid "CDate"
1378 +#~ msgstr "Dátum"
1379 +
1380 +#~ msgid "Cannot find the git directory \"%s\"."
1381 +#~ msgstr "Nem található a \"%s\" könyvtár."
1382 +
1383 #~ msgid "Use all refs"
1384 #~ msgstr "Használd az összes referenciát"
1385
po/it.po
+415 -319
@@ -8,33 +8,42 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2010-01-28 18:40+0100\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
15 +"Language: \n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19
19 -#: gitk:115
20 +#: gitk:140
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:"
23
23 -#: gitk:274
24 +#: gitk:212 gitk:2381
25 +msgid "Color words"
26 +msgstr ""
27 +
28 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 +msgid "Markup words"
30 +msgstr ""
31 +
32 +#: gitk:324
33 msgid "Error parsing revisions:"
34 msgstr "Errore nella lettura delle revisioni:"
35
27 -#: gitk:329
36 +#: gitk:380
37 msgid "Error executing --argscmd command:"
38 msgstr "Errore nell'esecuzione del comando specificato con --argscmd:"
39
31 -#: gitk:342
40 +#: gitk:393
41 msgid "No files selected: --merge specified but no files are unmerged."
42 msgstr ""
43 "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci "
44 "sono file in attesa di fusione."
45
37 -#: gitk:345
46 +#: gitk:396
47 msgid ""
48 "No files selected: --merge specified but no unmerged files are within file "
49 "limit."
@@ -42,299 +51,315 @@ msgstr ""
51 "Nessun file selezionato: è stata specificata l'opzione --merge ma i file "
52 "specificati non sono in attesa di fusione."
53
45 -#: gitk:367 gitk:514
54 +#: gitk:418 gitk:566
55 msgid "Error executing git log:"
56 msgstr "Errore nell'esecuzione di git log:"
57
49 -#: gitk:385 gitk:530
58 +#: gitk:436 gitk:582
59 msgid "Reading"
60 msgstr "Lettura in corso"
61
53 -#: gitk:445 gitk:4261
62 +#: gitk:496 gitk:4508
63 msgid "Reading commits..."
64 msgstr "Lettura delle revisioni in corso..."
65
57 -#: gitk:448 gitk:1578 gitk:4264
66 +#: gitk:499 gitk:1637 gitk:4511
67 msgid "No commits selected"
68 msgstr "Nessuna revisione selezionata"
69
61 -#: gitk:1454
70 +#: gitk:1511
71 msgid "Can't parse git log output:"
72 msgstr "Impossibile elaborare i dati di git log:"
73
65 -#: gitk:1674
74 +#: gitk:1740
75 msgid "No commit information available"
76 msgstr "Nessuna informazione disponibile sulle revisioni"
77
69 -#: gitk:1816
78 +#: gitk:1897
79 msgid "mc"
80 msgstr ""
81
73 -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804
82 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
83 msgid "OK"
84 msgstr "OK"
85
77 -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046
78 -#: gitk:10586 gitk:10805
86 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
87 +#: gitk:11221 gitk:11501
88 msgid "Cancel"
89 msgstr "Annulla"
90
82 -#: gitk:1975
91 +#: gitk:2069
92 msgid "Update"
93 msgstr "Aggiorna"
94
86 -#: gitk:1976
95 +#: gitk:2070
96 msgid "Reload"
97 msgstr "Ricarica"
98
90 -#: gitk:1977
99 +#: gitk:2071
100 msgid "Reread references"
101 msgstr "Rileggi riferimenti"
102
94 -#: gitk:1978
103 +#: gitk:2072
104 msgid "List references"
105 msgstr "Elenca riferimenti"
106
98 -#: gitk:1980
107 +#: gitk:2074
108 msgid "Start git gui"
109 msgstr "Avvia git gui"
110
102 -#: gitk:1982
111 +#: gitk:2076
112 msgid "Quit"
113 msgstr "Esci"
114
106 -#: gitk:1974
115 +#: gitk:2068
116 msgid "File"
117 msgstr "File"
118
110 -#: gitk:1986
119 +#: gitk:2080
120 msgid "Preferences"
121 msgstr "Preferenze"
122
114 -#: gitk:1985
123 +#: gitk:2079
124 msgid "Edit"
125 msgstr "Modifica"
126
118 -#: gitk:1990
127 +#: gitk:2084
128 msgid "New view..."
129 msgstr "Nuova vista..."
130
122 -#: gitk:1991
131 +#: gitk:2085
132 msgid "Edit view..."
133 msgstr "Modifica vista..."
134
126 -#: gitk:1992
135 +#: gitk:2086
136 msgid "Delete view"
137 msgstr "Elimina vista"
138
130 -#: gitk:1994
139 +#: gitk:2088
140 msgid "All files"
141 msgstr "Tutti i file"
142
134 -#: gitk:1989 gitk:3808
143 +#: gitk:2083 gitk:4050
144 msgid "View"
145 msgstr "Vista"
146
138 -#: gitk:1999 gitk:2009 gitk:2780
147 +#: gitk:2093 gitk:2103 gitk:3009
148 msgid "About gitk"
149 msgstr "Informazioni su gitk"
150
142 -#: gitk:2000 gitk:2014
151 +#: gitk:2094 gitk:2108
152 msgid "Key bindings"
153 msgstr "Scorciatoie da tastiera"
154
146 -#: gitk:1998 gitk:2013
155 +#: gitk:2092 gitk:2107
156 msgid "Help"
157 msgstr "Aiuto"
158
150 -#: gitk:2091 gitk:8110
159 +#: gitk:2185 gitk:8633
160 msgid "SHA1 ID:"
161 msgstr "SHA1 ID:"
162
154 -#: gitk:2122
163 +#: gitk:2229
164 msgid "Row"
165 msgstr "Riga"
166
158 -#: gitk:2160
167 +#: gitk:2267
168 msgid "Find"
169 msgstr "Trova"
170
162 -#: gitk:2161
163 -msgid "next"
164 -msgstr "succ"
165 -
166 -#: gitk:2162
167 -msgid "prev"
168 -msgstr "prec"
169 -
170 -#: gitk:2163
171 +#: gitk:2295
172 msgid "commit"
173 msgstr "revisione"
174
174 -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482
175 -#: gitk:6566
175 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
176 +#: gitk:6893
177 msgid "containing:"
178 msgstr "contenente:"
179
179 -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497
180 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
181 msgid "touching paths:"
182 msgstr "che riguarda i percorsi:"
183
183 -#: gitk:2170 gitk:4502
184 +#: gitk:2303 gitk:4759
185 msgid "adding/removing string:"
186 msgstr "che aggiunge/rimuove la stringa:"
187
187 -#: gitk:2179 gitk:2181
188 +#: gitk:2304 gitk:4761
189 +msgid "changing lines matching:"
190 +msgstr ""
191 +
192 +#: gitk:2313 gitk:2315 gitk:4748
193 msgid "Exact"
194 msgstr "Esatto"
195
191 -#: gitk:2181 gitk:4577 gitk:6378
196 +#: gitk:2315 gitk:4836 gitk:6704
197 msgid "IgnCase"
198 msgstr ""
199
195 -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374
200 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
201 msgid "Regexp"
202 msgstr ""
203
199 -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570
204 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
205 msgid "All fields"
206 msgstr "Tutti i campi"
207
203 -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441
208 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
209 msgid "Headline"
210 msgstr "Titolo"
211
207 -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003
212 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
213 msgid "Comments"
214 msgstr "Commenti"
215
211 -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285
212 -#: gitk:8300
216 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
217 +#: gitk:8826
218 msgid "Author"
219 msgstr "Autore"
220
216 -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940
221 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
222 msgid "Committer"
223 msgstr "Revisione creata da"
224
220 -#: gitk:2216
225 +#: gitk:2350
226 msgid "Search"
227 msgstr "Cerca"
228
224 -#: gitk:2224
229 +#: gitk:2358
230 msgid "Diff"
231 msgstr ""
232
228 -#: gitk:2226
233 +#: gitk:2360
234 msgid "Old version"
235 msgstr "Vecchia versione"
236
232 -#: gitk:2228
237 +#: gitk:2362
238 msgid "New version"
239 msgstr "Nuova versione"
240
236 -#: gitk:2230
241 +#: gitk:2364
242 msgid "Lines of context"
243 msgstr "Linee di contesto"
244
240 -#: gitk:2240
245 +#: gitk:2374
246 msgid "Ignore space change"
247 msgstr "Ignora modifiche agli spazi"
248
244 -#: gitk:2299
249 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
250 +msgid "Line diff"
251 +msgstr ""
252 +
253 +#: gitk:2445
254 msgid "Patch"
255 msgstr "Modifiche"
256
248 -#: gitk:2301
257 +#: gitk:2447
258 msgid "Tree"
259 msgstr "Directory"
260
252 -#: gitk:2456 gitk:2473
261 +#: gitk:2616 gitk:2636
262 msgid "Diff this -> selected"
263 msgstr "Diff questo -> selezionato"
264
256 -#: gitk:2457 gitk:2474
265 +#: gitk:2617 gitk:2637
266 msgid "Diff selected -> this"
267 msgstr "Diff selezionato -> questo"
268
260 -#: gitk:2458 gitk:2475
269 +#: gitk:2618 gitk:2638
270 msgid "Make patch"
271 msgstr "Crea patch"
272
264 -#: gitk:2459 gitk:8692
273 +#: gitk:2619 gitk:9235
274 msgid "Create tag"
275 msgstr "Crea etichetta"
276
268 -#: gitk:2460 gitk:8808
277 +#: gitk:2620 gitk:9352
278 msgid "Write commit to file"
279 msgstr "Scrivi revisione in un file"
280
272 -#: gitk:2461 gitk:8865
281 +#: gitk:2621 gitk:9409
282 msgid "Create new branch"
283 msgstr "Crea un nuovo ramo"
284
276 -#: gitk:2462
285 +#: gitk:2622
286 msgid "Cherry-pick this commit"
287 msgstr "Porta questa revisione in cima al ramo attuale"
288
280 -#: gitk:2463
289 +#: gitk:2623
290 msgid "Reset HEAD branch to here"
291 msgstr "Aggiorna il ramo HEAD a questa revisione"
292
284 -#: gitk:2464
293 +#: gitk:2624
294 msgid "Mark this commit"
295 msgstr "Segna questa revisione"
296
288 -#: gitk:2465
297 +#: gitk:2625
298 msgid "Return to mark"
299 msgstr "Torna alla revisione segnata"
300
292 -#: gitk:2466
301 +#: gitk:2626
302 msgid "Find descendant of this and mark"
303 msgstr "Trova il discendente di questa revisione e di quella segnata"
304
296 -#: gitk:2467
305 +#: gitk:2627
306 msgid "Compare with marked commit"
307 msgstr "Confronta con la revisione segnata"
308
300 -#: gitk:2481
309 +#: gitk:2628 gitk:2639
310 +#, fuzzy
311 +msgid "Diff this -> marked commit"
312 +msgstr "Diff questo -> selezionato"
313 +
314 +#: gitk:2629 gitk:2640
315 +#, fuzzy
316 +msgid "Diff marked commit -> this"
317 +msgstr "Diff selezionato -> questo"
318 +
319 +#: gitk:2630
320 +#, fuzzy
321 +msgid "Revert this commit"
322 +msgstr "Segna questa revisione"
323 +
324 +#: gitk:2646
325 msgid "Check out this branch"
326 msgstr "Attiva questo ramo"
327
304 -#: gitk:2482
328 +#: gitk:2647
329 msgid "Remove this branch"
330 msgstr "Elimina questo ramo"
331
308 -#: gitk:2489
332 +#: gitk:2654
333 msgid "Highlight this too"
334 msgstr "Evidenzia anche questo"
335
312 -#: gitk:2490
336 +#: gitk:2655
337 msgid "Highlight this only"
338 msgstr "Evidenzia solo questo"
339
316 -#: gitk:2491
340 +#: gitk:2656
341 msgid "External diff"
342 msgstr "Visualizza differenze in un altro programma"
343
320 -#: gitk:2492
344 +#: gitk:2657
345 msgid "Blame parent commit"
346 msgstr "Annota la revisione precedente"
347
324 -#: gitk:2499
348 +#: gitk:2664
349 msgid "Show origin of this line"
350 msgstr "Mostra la provenienza di questa riga"
351
328 -#: gitk:2500
352 +#: gitk:2665
353 msgid "Run git gui blame on this line"
354 msgstr "Esegui git gui blame su questa riga"
355
332 -#: gitk:2782
356 +#: gitk:3011
357 +#, fuzzy
358 msgid ""
359 "\n"
360 "Gitk - a commit viewer for git\n"
361 "\n"
337 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
362 +"Copyright © 2005-2014 Paul Mackerras\n"
363 "\n"
364 "Use and redistribute under the terms of the GNU General Public License"
365 msgstr ""
@@ -346,298 +371,316 @@ msgstr ""
371 "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
372 "License"
373
349 -#: gitk:2790 gitk:2854 gitk:9230
374 +#: gitk:3019 gitk:3085 gitk:9836
375 msgid "Close"
376 msgstr "Chiudi"
377
353 -#: gitk:2811
378 +#: gitk:3040
379 msgid "Gitk key bindings"
380 msgstr "Scorciatoie da tastiera di Gitk"
381
357 -#: gitk:2814
382 +#: gitk:3043
383 msgid "Gitk key bindings:"
384 msgstr "Scorciatoie da tastiera di Gitk:"
385
361 -#: gitk:2816
386 +#: gitk:3045
387 #, tcl-format
388 msgid "<%s-Q>\t\tQuit"
389 msgstr "<%s-Q>\t\tEsci"
390
366 -#: gitk:2817
391 +#: gitk:3046
392 +#, fuzzy, tcl-format
393 +msgid "<%s-W>\t\tClose window"
394 +msgstr "<%s-F>\t\tTrova"
395 +
396 +#: gitk:3047
397 msgid "<Home>\t\tMove to first commit"
398 msgstr "<Home>\t\tVai alla prima revisione"
399
370 -#: gitk:2818
400 +#: gitk:3048
401 msgid "<End>\t\tMove to last commit"
402 msgstr "<End>\t\tVai all'ultima revisione"
403
374 -#: gitk:2819
375 -msgid "<Up>, p, i\tMove up one commit"
404 +#: gitk:3049
405 +#, fuzzy
406 +msgid "<Up>, p, k\tMove up one commit"
407 msgstr "<Su>, p, i\tVai più in alto di una revisione"
408
378 -#: gitk:2820
379 -msgid "<Down>, n, k\tMove down one commit"
409 +#: gitk:3050
410 +#, fuzzy
411 +msgid "<Down>, n, j\tMove down one commit"
412 msgstr "<Giù>, n, k\tVai più in basso di una revisione"
413
382 -#: gitk:2821
383 -msgid "<Left>, z, j\tGo back in history list"
414 +#: gitk:3051
415 +#, fuzzy
416 +msgid "<Left>, z, h\tGo back in history list"
417 msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia"
418
386 -#: gitk:2822
419 +#: gitk:3052
420 msgid "<Right>, x, l\tGo forward in history list"
421 msgstr "<Destra>, x, l\tVai avanti nella cronologia"
422
390 -#: gitk:2823
423 +#: gitk:3053
424 +#, tcl-format
425 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
426 +msgstr ""
427 +
428 +#: gitk:3054
429 msgid "<PageUp>\tMove up one page in commit list"
430 msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni"
431
394 -#: gitk:2824
432 +#: gitk:3055
433 msgid "<PageDown>\tMove down one page in commit list"
434 msgstr ""
435 "<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni"
436
399 -#: gitk:2825
437 +#: gitk:3056
438 #, tcl-format
439 msgid "<%s-Home>\tScroll to top of commit list"
440 msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni"
441
404 -#: gitk:2826
442 +#: gitk:3057
443 #, tcl-format
444 msgid "<%s-End>\tScroll to bottom of commit list"
445 msgstr "<%s-End>\tScorri alla fine della lista delle revisioni"
446
409 -#: gitk:2827
447 +#: gitk:3058
448 #, tcl-format
449 msgid "<%s-Up>\tScroll commit list up one line"
450 msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga"
451
414 -#: gitk:2828
452 +#: gitk:3059
453 #, tcl-format
454 msgid "<%s-Down>\tScroll commit list down one line"
455 msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga"
456
419 -#: gitk:2829
457 +#: gitk:3060
458 #, tcl-format
459 msgid "<%s-PageUp>\tScroll commit list up one page"
460 msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina"
461
424 -#: gitk:2830
462 +#: gitk:3061
463 #, tcl-format
464 msgid "<%s-PageDown>\tScroll commit list down one page"
465 msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina"
466
429 -#: gitk:2831
467 +#: gitk:3062
468 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
469 msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)"
470
433 -#: gitk:2832
471 +#: gitk:3063
472 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
473 msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)"
474
437 -#: gitk:2833
475 +#: gitk:3064
476 msgid "<Delete>, b\tScroll diff view up one page"
477 msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina"
478
441 -#: gitk:2834
479 +#: gitk:3065
480 msgid "<Backspace>\tScroll diff view up one page"
481 msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina"
482
445 -#: gitk:2835
483 +#: gitk:3066
484 msgid "<Space>\t\tScroll diff view down one page"
485 msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina"
486
449 -#: gitk:2836
487 +#: gitk:3067
488 msgid "u\t\tScroll diff view up 18 lines"
489 msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee"
490
453 -#: gitk:2837
491 +#: gitk:3068
492 msgid "d\t\tScroll diff view down 18 lines"
493 msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee"
494
457 -#: gitk:2838
495 +#: gitk:3069
496 #, tcl-format
497 msgid "<%s-F>\t\tFind"
498 msgstr "<%s-F>\t\tTrova"
499
462 -#: gitk:2839
500 +#: gitk:3070
501 #, tcl-format
502 msgid "<%s-G>\t\tMove to next find hit"
503 msgstr "<%s-G>\t\tTrova in avanti"
504
467 -#: gitk:2840
505 +#: gitk:3071
506 msgid "<Return>\tMove to next find hit"
507 msgstr "<Invio>\tTrova in avanti"
508
471 -#: gitk:2841
509 +#: gitk:3072
510 msgid "/\t\tFocus the search box"
511 msgstr "/\t\tCursore nel box di ricerca"
512
475 -#: gitk:2842
513 +#: gitk:3073
514 msgid "?\t\tMove to previous find hit"
515 msgstr "?\t\tTrova all'indietro"
516
479 -#: gitk:2843
517 +#: gitk:3074
518 msgid "f\t\tScroll diff view to next file"
519 msgstr "f\t\tScorri la vista delle differenze al file successivo"
520
483 -#: gitk:2844
521 +#: gitk:3075
522 #, tcl-format
523 msgid "<%s-S>\t\tSearch for next hit in diff view"
524 msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze"
525
488 -#: gitk:2845
526 +#: gitk:3076
527 #, tcl-format
528 msgid "<%s-R>\t\tSearch for previous hit in diff view"
529 msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze"
530
493 -#: gitk:2846
531 +#: gitk:3077
532 #, tcl-format
533 msgid "<%s-KP+>\tIncrease font size"
534 msgstr "<%s-KP+>\tAumenta dimensione carattere"
535
498 -#: gitk:2847
536 +#: gitk:3078
537 #, tcl-format
538 msgid "<%s-plus>\tIncrease font size"
539 msgstr "<%s-più>\tAumenta dimensione carattere"
540
503 -#: gitk:2848
541 +#: gitk:3079
542 #, tcl-format
543 msgid "<%s-KP->\tDecrease font size"
544 msgstr "<%s-KP->\tDiminuisci dimensione carattere"
545
508 -#: gitk:2849
546 +#: gitk:3080
547 #, tcl-format
548 msgid "<%s-minus>\tDecrease font size"
549 msgstr "<%s-meno>\tDiminuisci dimensione carattere"
550
513 -#: gitk:2850
551 +#: gitk:3081
552 msgid "<F5>\t\tUpdate"
553 msgstr "<F5>\t\tAggiorna"
554
517 -#: gitk:3305 gitk:3314
555 +#: gitk:3546 gitk:3555
556 #, tcl-format
557 msgid "Error creating temporary directory %s:"
558 msgstr "Errore durante la creazione della directory temporanea %s:"
559
522 -#: gitk:3327
560 +#: gitk:3568
561 #, tcl-format
562 msgid "Error getting \"%s\" from %s:"
563 msgstr "Errore nella lettura di \"%s\" da %s:"
564
527 -#: gitk:3390
565 +#: gitk:3631
566 msgid "command failed:"
567 msgstr "impossibile eseguire il comando:"
568
531 -#: gitk:3539
569 +#: gitk:3780
570 msgid "No such commit"
571 msgstr "Revisione inesistente"
572
535 -#: gitk:3553
573 +#: gitk:3794
574 msgid "git gui blame: command failed:"
575 msgstr "git gui blame: impossibile eseguire il comando:"
576
539 -#: gitk:3584
577 +#: gitk:3825
578 #, tcl-format
579 msgid "Couldn't read merge head: %s"
580 msgstr "Impossibile leggere merge head: %s"
581
544 -#: gitk:3592
582 +#: gitk:3833
583 #, tcl-format
584 msgid "Error reading index: %s"
585 msgstr "Errore nella lettura dell'indice: %s"
586
549 -#: gitk:3617
587 +#: gitk:3858
588 #, tcl-format
589 msgid "Couldn't start git blame: %s"
590 msgstr "Impossibile eseguire git blame: %s"
591
554 -#: gitk:3620 gitk:6409
592 +#: gitk:3861 gitk:6735
593 msgid "Searching"
594 msgstr "Ricerca in corso"
595
558 -#: gitk:3652
596 +#: gitk:3893
597 #, tcl-format
598 msgid "Error running git blame: %s"
599 msgstr "Errore nell'esecuzione di git blame: %s"
600
563 -#: gitk:3680
601 +#: gitk:3921
602 #, tcl-format
603 msgid "That line comes from commit %s, which is not in this view"
604 msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista"
605
568 -#: gitk:3694
606 +#: gitk:3935
607 msgid "External diff viewer failed:"
608 msgstr "Impossibile eseguire il visualizzatore di differenze:"
609
572 -#: gitk:3812
610 +#: gitk:4053
611 msgid "Gitk view definition"
612 msgstr "Scelta vista Gitk"
613
576 -#: gitk:3816
614 +#: gitk:4057
615 msgid "Remember this view"
616 msgstr "Ricorda questa vista"
617
580 -#: gitk:3817
618 +#: gitk:4058
619 msgid "References (space separated list):"
620 msgstr "Riferimenti (lista di elementi separati da spazi)"
621
584 -#: gitk:3818
622 +#: gitk:4059
623 msgid "Branches & tags:"
624 msgstr "Rami ed etichette"
625
588 -#: gitk:3819
626 +#: gitk:4060
627 msgid "All refs"
628 msgstr "Tutti i riferimenti"
629
592 -#: gitk:3820
630 +#: gitk:4061
631 msgid "All (local) branches"
632 msgstr "Tutti i rami (locali)"
633
596 -#: gitk:3821
634 +#: gitk:4062
635 msgid "All tags"
636 msgstr "Tutte le etichette"
637
600 -#: gitk:3822
638 +#: gitk:4063
639 msgid "All remote-tracking branches"
640 msgstr "Tutti i rami remoti"
641
604 -#: gitk:3823
642 +#: gitk:4064
643 msgid "Commit Info (regular expressions):"
644 msgstr "Informazioni sulla revisione (espressioni regolari):"
645
608 -#: gitk:3824
646 +#: gitk:4065
647 msgid "Author:"
648 msgstr "Autore:"
649
612 -#: gitk:3825
650 +#: gitk:4066
651 msgid "Committer:"
652 msgstr "Revisione creata da:"
653
616 -#: gitk:3826
654 +#: gitk:4067
655 msgid "Commit Message:"
656 msgstr "Messaggio di revisione:"
657
620 -#: gitk:3827
658 +#: gitk:4068
659 msgid "Matches all Commit Info criteria"
660 msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
661
624 -#: gitk:3828
662 +#: gitk:4069
663 +#, fuzzy
664 +msgid "Matches none Commit Info criteria"
665 +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
666 +
667 +#: gitk:4070
668 msgid "Changes to Files:"
669 msgstr "Modifiche ai file:"
670
628 -#: gitk:3829
671 +#: gitk:4071
672 msgid "Fixed String"
673 msgstr "Stringa fissa"
674
632 -#: gitk:3830
675 +#: gitk:4072
676 msgid "Regular Expression"
677 msgstr "Espressione regolare"
678
636 -#: gitk:3831
679 +#: gitk:4073
680 msgid "Search string:"
681 msgstr "Cerca stringa:"
682
640 -#: gitk:3832
683 +#: gitk:4074
684 msgid ""
685 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
686 "15:27:38\"):"
@@ -645,201 +688,201 @@ msgstr ""
688 "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
689 "2009 15:27:38\"):"
690
648 -#: gitk:3833
691 +#: gitk:4075
692 msgid "Since:"
693 msgstr "Da:"
694
652 -#: gitk:3834
695 +#: gitk:4076
696 msgid "Until:"
697 msgstr "A:"
698
656 -#: gitk:3835
699 +#: gitk:4077
700 msgid "Limit and/or skip a number of revisions (positive integer):"
701 msgstr "Limita e/o salta N revisioni (intero positivo):"
702
660 -#: gitk:3836
703 +#: gitk:4078
704 msgid "Number to show:"
705 msgstr "Numero di revisioni da mostrare:"
706
664 -#: gitk:3837
707 +#: gitk:4079
708 msgid "Number to skip:"
709 msgstr "Numero di revisioni da saltare:"
710
668 -#: gitk:3838
711 +#: gitk:4080
712 msgid "Miscellaneous options:"
713 msgstr "Altre opzioni:"
714
672 -#: gitk:3839
715 +#: gitk:4081
716 msgid "Strictly sort by date"
717 msgstr "Ordina solo per data"
718
676 -#: gitk:3840
719 +#: gitk:4082
720 msgid "Mark branch sides"
721 msgstr "Segna i lati del ramo"
722
680 -#: gitk:3841
723 +#: gitk:4083
724 msgid "Limit to first parent"
725 msgstr "Limita al primo genitore"
726
684 -#: gitk:3842
727 +#: gitk:4084
728 msgid "Simple history"
729 msgstr "Cronologia semplificata"
730
688 -#: gitk:3843
731 +#: gitk:4085
732 msgid "Additional arguments to git log:"
733 msgstr "Ulteriori argomenti da passare a git log:"
734
692 -#: gitk:3844
735 +#: gitk:4086
736 msgid "Enter files and directories to include, one per line:"
737 msgstr "Inserire file e directory da includere, uno per riga:"
738
696 -#: gitk:3845
739 +#: gitk:4087
740 msgid "Command to generate more commits to include:"
741 msgstr "Comando che genera altre revisioni da visualizzare:"
742
700 -#: gitk:3967
743 +#: gitk:4211
744 msgid "Gitk: edit view"
745 msgstr "Gitk: modifica vista"
746
704 -#: gitk:3975
747 +#: gitk:4219
748 msgid "-- criteria for selecting revisions"
749 msgstr "-- criteri per la scelta delle revisioni"
750
708 -#: gitk:3980
751 +#: gitk:4224
752 msgid "View Name"
753 msgstr "Nome vista"
754
712 -#: gitk:4055
755 +#: gitk:4299
756 msgid "Apply (F5)"
757 msgstr "Applica (F5)"
758
716 -#: gitk:4093
759 +#: gitk:4337
760 msgid "Error in commit selection arguments:"
761 msgstr "Errore negli argomenti di selezione delle revisioni:"
762
720 -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535
763 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
764 msgid "None"
765 msgstr "Nessuno"
766
724 -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302
725 -msgid "Date"
726 -msgstr "Data"
727 -
728 -#: gitk:4594 gitk:6441
729 -msgid "CDate"
730 -msgstr ""
731 -
732 -#: gitk:4743 gitk:4748
767 +#: gitk:5003 gitk:5008
768 msgid "Descendant"
769 msgstr "Discendente"
770
736 -#: gitk:4744
771 +#: gitk:5004
772 msgid "Not descendant"
773 msgstr "Non discendente"
774
740 -#: gitk:4751 gitk:4756
775 +#: gitk:5011 gitk:5016
776 msgid "Ancestor"
777 msgstr "Ascendente"
778
744 -#: gitk:4752
779 +#: gitk:5012
780 msgid "Not ancestor"
781 msgstr "Non ascendente"
782
748 -#: gitk:5042
783 +#: gitk:5306
784 msgid "Local changes checked in to index but not committed"
785 msgstr "Modifiche locali presenti nell'indice ma non nell'archivio"
786
752 -#: gitk:5078
787 +#: gitk:5342
788 msgid "Local uncommitted changes, not checked in to index"
789 msgstr "Modifiche locali non presenti né nell'archivio né nell'indice"
790
756 -#: gitk:6759
791 +#: gitk:7115
792 +msgid "and many more"
793 +msgstr ""
794 +
795 +#: gitk:7118
796 msgid "many"
797 msgstr "molti"
798
760 -#: gitk:6942
799 +#: gitk:7309
800 msgid "Tags:"
801 msgstr "Etichette:"
802
764 -#: gitk:6959 gitk:6965 gitk:8280
803 +#: gitk:7326 gitk:7332 gitk:8806
804 msgid "Parent"
805 msgstr "Genitore"
806
768 -#: gitk:6970
807 +#: gitk:7337
808 msgid "Child"
809 msgstr "Figlio"
810
772 -#: gitk:6979
811 +#: gitk:7346
812 msgid "Branch"
813 msgstr "Ramo"
814
776 -#: gitk:6982
815 +#: gitk:7349
816 msgid "Follows"
817 msgstr "Segue"
818
780 -#: gitk:6985
819 +#: gitk:7352
820 msgid "Precedes"
821 msgstr "Precede"
822
784 -#: gitk:7522
823 +#: gitk:7947
824 #, tcl-format
825 msgid "Error getting diffs: %s"
826 msgstr "Errore nella lettura delle differenze:"
827
789 -#: gitk:8108
828 +#: gitk:8631
829 msgid "Goto:"
830 msgstr "Vai a:"
831
793 -#: gitk:8129
832 +#: gitk:8652
833 #, tcl-format
834 msgid "Short SHA1 id %s is ambiguous"
835 msgstr "La SHA1 id abbreviata %s è ambigua"
836
798 -#: gitk:8136
837 +#: gitk:8659
838 #, tcl-format
839 msgid "Revision %s is not known"
840 msgstr "La revisione %s è sconosciuta"
841
803 -#: gitk:8146
842 +#: gitk:8669
843 #, tcl-format
844 msgid "SHA1 id %s is not known"
845 msgstr "La SHA1 id %s è sconosciuta"
846
808 -#: gitk:8148
847 +#: gitk:8671
848 #, tcl-format
849 msgid "Revision %s is not in the current view"
850 msgstr "La revisione %s non è presente nella vista attuale"
851
813 -#: gitk:8290
852 +#: gitk:8813 gitk:8828
853 +msgid "Date"
854 +msgstr "Data"
855 +
856 +#: gitk:8816
857 msgid "Children"
858 msgstr "Figli"
859
817 -#: gitk:8348
860 +#: gitk:8879
861 #, tcl-format
862 msgid "Reset %s branch to here"
863 msgstr "Aggiorna il ramo %s a questa revisione"
864
822 -#: gitk:8350
865 +#: gitk:8881
866 msgid "Detached head: can't reset"
867 msgstr "Nessun ramo attivo: reset impossibile"
868
826 -#: gitk:8459 gitk:8465
869 +#: gitk:8986 gitk:8992
870 msgid "Skipping merge commit "
871 msgstr "Salto la revisione di fusione "
872
830 -#: gitk:8474 gitk:8479
873 +#: gitk:9001 gitk:9006
874 msgid "Error getting patch ID for "
875 msgstr "Errore nella identificazione della patch per "
876
834 -#: gitk:8475 gitk:8480
877 +#: gitk:9002 gitk:9007
878 msgid " - stopping\n"
879 msgstr " - fine\n"
880
838 -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519
881 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
882 msgid "Commit "
883 msgstr "La revisione "
884
842 -#: gitk:8489
885 +#: gitk:9016
886 msgid ""
887 " is the same patch as\n"
888 " "
@@ -847,7 +890,7 @@ msgstr ""
890 " ha le stesse differenze di\n"
891 " "
892
850 -#: gitk:8497
893 +#: gitk:9024
894 msgid ""
895 " differs from\n"
896 " "
@@ -855,7 +898,7 @@ msgstr ""
898 " è diversa da\n"
899 " "
900
858 -#: gitk:8499
901 +#: gitk:9026
902 msgid ""
903 "Diff of commits:\n"
904 "\n"
@@ -863,129 +906,129 @@ msgstr ""
906 "Differenze tra le revisioni:\n"
907 "\n"
908
866 -#: gitk:8511 gitk:8520
909 +#: gitk:9038 gitk:9047
910 #, tcl-format
911 msgid " has %s children - stopping\n"
912 msgstr " ha %s figli - fine\n"
913
871 -#: gitk:8539
914 +#: gitk:9066
915 #, tcl-format
916 msgid "Error writing commit to file: %s"
917 msgstr "Errore nella scrittura della revisione nel file: %s"
918
876 -#: gitk:8545
919 +#: gitk:9072
920 #, tcl-format
921 msgid "Error diffing commits: %s"
922 msgstr "Errore nelle differenze tra le revisioni: %s"
923
881 -#: gitk:8575
924 +#: gitk:9118
925 msgid "Top"
926 msgstr "Inizio"
927
885 -#: gitk:8576
928 +#: gitk:9119
929 msgid "From"
930 msgstr "Da"
931
889 -#: gitk:8581
932 +#: gitk:9124
933 msgid "To"
934 msgstr "A"
935
893 -#: gitk:8605
936 +#: gitk:9148
937 msgid "Generate patch"
938 msgstr "Genera patch"
939
897 -#: gitk:8607
940 +#: gitk:9150
941 msgid "From:"
942 msgstr "Da:"
943
901 -#: gitk:8616
944 +#: gitk:9159
945 msgid "To:"
946 msgstr "A:"
947
905 -#: gitk:8625
948 +#: gitk:9168
949 msgid "Reverse"
950 msgstr "Inverti"
951
909 -#: gitk:8627 gitk:8822
952 +#: gitk:9170 gitk:9366
953 msgid "Output file:"
954 msgstr "Scrivi sul file:"
955
913 -#: gitk:8633
956 +#: gitk:9176
957 msgid "Generate"
958 msgstr "Genera"
959
917 -#: gitk:8671
960 +#: gitk:9214
961 msgid "Error creating patch:"
962 msgstr "Errore nella creazione della patch:"
963
921 -#: gitk:8694 gitk:8810 gitk:8867
964 +#: gitk:9237 gitk:9354 gitk:9411
965 msgid "ID:"
966 msgstr "ID:"
967
925 -#: gitk:8703
968 +#: gitk:9246
969 msgid "Tag name:"
970 msgstr "Nome etichetta:"
971
929 -#: gitk:8706
972 +#: gitk:9249
973 msgid "Tag message is optional"
974 msgstr "Il messaggio dell'etichetta è opzionale"
975
933 -#: gitk:8708
976 +#: gitk:9251
977 msgid "Tag message:"
978 msgstr "Messaggio dell'etichetta:"
979
937 -#: gitk:8712 gitk:8876
980 +#: gitk:9255 gitk:9420
981 msgid "Create"
982 msgstr "Crea"
983
941 -#: gitk:8730
984 +#: gitk:9273
985 msgid "No tag name specified"
986 msgstr "Nessuna etichetta specificata"
987
945 -#: gitk:8734
988 +#: gitk:9277
989 #, tcl-format
990 msgid "Tag \"%s\" already exists"
991 msgstr "L'etichetta \"%s\" esiste già"
992
950 -#: gitk:8744
993 +#: gitk:9287
994 msgid "Error creating tag:"
995 msgstr "Errore nella creazione dell'etichetta:"
996
954 -#: gitk:8819
997 +#: gitk:9363
998 msgid "Command:"
999 msgstr "Comando:"
1000
958 -#: gitk:8827
1001 +#: gitk:9371
1002 msgid "Write"
1003 msgstr "Scrivi"
1004
962 -#: gitk:8845
1005 +#: gitk:9389
1006 msgid "Error writing commit:"
1007 msgstr "Errore nella scrittura della revisione:"
1008
966 -#: gitk:8872
1009 +#: gitk:9416
1010 msgid "Name:"
1011 msgstr "Nome:"
1012
970 -#: gitk:8895
1013 +#: gitk:9439
1014 msgid "Please specify a name for the new branch"
1015 msgstr "Specificare un nome per il nuovo ramo"
1016
974 -#: gitk:8900
1017 +#: gitk:9444
1018 #, tcl-format
1019 msgid "Branch '%s' already exists. Overwrite?"
1020 msgstr "Il ramo '%s' esiste già. Sovrascrivere?"
1021
979 -#: gitk:8966
1022 +#: gitk:9511
1023 #, tcl-format
1024 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1025 msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
1026
984 -#: gitk:8971
1027 +#: gitk:9516
1028 msgid "Cherry-picking"
1029 msgstr ""
1030
988 -#: gitk:8980
1031 +#: gitk:9525
1032 #, tcl-format
1033 msgid ""
1034 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -996,7 +1039,7 @@ msgstr ""
1039 "Prima di riprovare, bisogna creare una nuova revisione, annullare le "
1040 "modifiche o usare 'git stash'."
1041
999 -#: gitk:8986
1042 +#: gitk:9531
1043 msgid ""
1044 "Cherry-pick failed because of merge conflict.\n"
1045 "Do you wish to run git citool to resolve it?"
@@ -1004,32 +1047,62 @@ msgstr ""
1047 "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
1048 "Vuoi avviare git citool per risolverlo?"
1049
1007 -#: gitk:9002
1050 +#: gitk:9547 gitk:9605
1051 msgid "No changes committed"
1052 msgstr "Nessuna modifica archiviata"
1053
1011 -#: gitk:9028
1054 +#: gitk:9574
1055 +#, fuzzy, tcl-format
1056 +msgid "Commit %s is not included in branch %s -- really revert it?"
1057 +msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
1058 +
1059 +#: gitk:9579
1060 +#, fuzzy
1061 +msgid "Reverting"
1062 +msgstr "git reset in corso"
1063 +
1064 +#: gitk:9587
1065 +#, fuzzy, tcl-format
1066 +msgid ""
1067 +"Revert failed because of local changes to the following files:%s Please "
1068 +"commit, reset or stash your changes and try again."
1069 +msgstr ""
1070 +"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato "
1071 +"nella directory di lavoro.\n"
1072 +"Prima di riprovare, bisogna creare una nuova revisione, annullare le "
1073 +"modifiche o usare 'git stash'."
1074 +
1075 +#: gitk:9591
1076 +#, fuzzy
1077 +msgid ""
1078 +"Revert failed because of merge conflict.\n"
1079 +" Do you wish to run git citool to resolve it?"
1080 +msgstr ""
1081 +"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
1082 +"Vuoi avviare git citool per risolverlo?"
1083 +
1084 +#: gitk:9634
1085 msgid "Confirm reset"
1086 msgstr "Conferma git reset"
1087
1015 -#: gitk:9030
1088 +#: gitk:9636
1089 #, tcl-format
1090 msgid "Reset branch %s to %s?"
1091 msgstr "Aggiornare il ramo %s a %s?"
1092
1020 -#: gitk:9032
1093 +#: gitk:9638
1094 msgid "Reset type:"
1095 msgstr "Tipo di aggiornamento:"
1096
1024 -#: gitk:9035
1097 +#: gitk:9641
1098 msgid "Soft: Leave working tree and index untouched"
1099 msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono"
1100
1028 -#: gitk:9038
1101 +#: gitk:9644
1102 msgid "Mixed: Leave working tree untouched, reset index"
1103 msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice"
1104
1032 -#: gitk:9041
1105 +#: gitk:9647
1106 msgid ""
1107 "Hard: Reset working tree and index\n"
1108 "(discard ALL local changes)"
@@ -1037,19 +1110,19 @@ msgstr ""
1110 "Hard: Aggiorna la directory di lavoro e l'indice\n"
1111 "(abbandona TUTTE le modifiche locali)"
1112
1040 -#: gitk:9058
1113 +#: gitk:9664
1114 msgid "Resetting"
1115 msgstr "git reset in corso"
1116
1044 -#: gitk:9118
1117 +#: gitk:9724
1118 msgid "Checking out"
1119 msgstr "Attivazione in corso"
1120
1048 -#: gitk:9171
1121 +#: gitk:9777
1122 msgid "Cannot delete the currently checked-out branch"
1123 msgstr "Impossibile cancellare il ramo attualmente attivo"
1124
1052 -#: gitk:9177
1125 +#: gitk:9783
1126 #, tcl-format
1127 msgid ""
1128 "The commits on branch %s aren't on any other branch.\n"
@@ -1058,16 +1131,16 @@ msgstr ""
1131 "Le revisioni nel ramo %s non sono presenti su altri rami.\n"
1132 "Cancellare il ramo %s?"
1133
1061 -#: gitk:9208
1134 +#: gitk:9814
1135 #, tcl-format
1136 msgid "Tags and heads: %s"
1137 msgstr "Etichette e rami: %s"
1138
1066 -#: gitk:9223
1139 +#: gitk:9829
1140 msgid "Filter"
1141 msgstr "Filtro"
1142
1070 -#: gitk:9518
1143 +#: gitk:10125
1144 msgid ""
1145 "Error reading commit topology information; branch and preceding/following "
1146 "tag information will be incomplete."
@@ -1075,202 +1148,225 @@ msgstr ""
1148 "Errore nella lettura della topologia delle revisioni: le informazioni sul "
1149 "ramo e le etichette precedenti e seguenti saranno incomplete."
1150
1078 -#: gitk:10504
1151 +#: gitk:11102
1152 msgid "Tag"
1153 msgstr "Etichetta"
1154
1082 -#: gitk:10504
1155 +#: gitk:11106
1156 msgid "Id"
1157 msgstr "Id"
1158
1086 -#: gitk:10554
1159 +#: gitk:11189
1160 msgid "Gitk font chooser"
1161 msgstr "Scelta caratteri gitk"
1162
1090 -#: gitk:10571
1163 +#: gitk:11206
1164 msgid "B"
1165 msgstr "B"
1166
1094 -#: gitk:10574
1167 +#: gitk:11209
1168 msgid "I"
1169 msgstr "I"
1170
1098 -#: gitk:10692
1099 -msgid "Gitk preferences"
1100 -msgstr "Preferenze gitk"
1101 -
1102 -#: gitk:10694
1171 +#: gitk:11327
1172 msgid "Commit list display options"
1173 msgstr "Opzioni visualizzazione dell'elenco revisioni"
1174
1106 -#: gitk:10697
1175 +#: gitk:11330
1176 msgid "Maximum graph width (lines)"
1177 msgstr "Larghezza massima del grafico (in linee)"
1178
1110 -#: gitk:10700
1111 -#, tcl-format
1179 +#: gitk:11334
1180 +#, no-tcl-format
1181 msgid "Maximum graph width (% of pane)"
1182 msgstr "Larghezza massima del grafico (% del pannello)"
1183
1115 -#: gitk:10703
1184 +#: gitk:11337
1185 msgid "Show local changes"
1186 msgstr "Mostra modifiche locali"
1187
1119 -#: gitk:10706
1120 -msgid "Auto-select SHA1"
1188 +#: gitk:11340
1189 +#, fuzzy
1190 +msgid "Auto-select SHA1 (length)"
1191 msgstr "Seleziona automaticamente SHA1 hash"
1192
1123 -#: gitk:10709
1193 +#: gitk:11344
1194 msgid "Hide remote refs"
1195 msgstr "Nascondi i riferimenti remoti"
1196
1127 -#: gitk:10713
1197 +#: gitk:11348
1198 msgid "Diff display options"
1199 msgstr "Opzioni di visualizzazione delle differenze"
1200
1131 -#: gitk:10715
1201 +#: gitk:11350
1202 msgid "Tab spacing"
1203 msgstr "Spaziatura tabulazioni"
1204
1135 -#: gitk:10718
1136 -msgid "Display nearby tags"
1205 +#: gitk:11353
1206 +#, fuzzy
1207 +msgid "Display nearby tags/heads"
1208 msgstr "Mostra etichette vicine"
1209
1139 -#: gitk:10721
1210 +#: gitk:11356
1211 +msgid "Maximum # tags/heads to show"
1212 +msgstr ""
1213 +
1214 +#: gitk:11359
1215 msgid "Limit diffs to listed paths"
1216 msgstr "Limita le differenze ai percorsi elencati"
1217
1143 -#: gitk:10724
1218 +#: gitk:11362
1219 msgid "Support per-file encodings"
1220 msgstr "Attiva codifica file per file"
1221
1147 -#: gitk:10730 gitk:10819
1222 +#: gitk:11368 gitk:11515
1223 msgid "External diff tool"
1224 msgstr "Visualizzatore di differenze"
1225
1151 -#: gitk:10731
1226 +#: gitk:11369
1227 msgid "Choose..."
1228 msgstr "Scegli..."
1229
1155 -#: gitk:10736
1230 +#: gitk:11374
1231 msgid "General options"
1232 msgstr "Opzioni generali"
1233
1159 -#: gitk:10739
1234 +#: gitk:11377
1235 msgid "Use themed widgets"
1236 msgstr "Utilizza interfaccia a tema"
1237
1163 -#: gitk:10741
1238 +#: gitk:11379
1239 msgid "(change requires restart)"
1240 msgstr "(una modifica richiede il riavvio)"
1241
1167 -#: gitk:10743
1242 +#: gitk:11381
1243 msgid "(currently unavailable)"
1244 msgstr "(momentaneamente non disponibile)"
1245
1171 -#: gitk:10747
1246 +#: gitk:11392
1247 msgid "Colors: press to choose"
1248 msgstr "Colori: premere per scegliere"
1249
1175 -#: gitk:10750
1250 +#: gitk:11395
1251 msgid "Interface"
1252 msgstr "Interfaccia"
1253
1179 -#: gitk:10751
1254 +#: gitk:11396
1255 msgid "interface"
1256 msgstr "interfaccia"
1257
1183 -#: gitk:10754
1258 +#: gitk:11399
1259 msgid "Background"
1260 msgstr "Sfondo"
1261
1187 -#: gitk:10755 gitk:10785
1262 +#: gitk:11400 gitk:11430
1263 msgid "background"
1264 msgstr "sfondo"
1265
1191 -#: gitk:10758
1266 +#: gitk:11403
1267 msgid "Foreground"
1268 msgstr "Primo piano"
1269
1195 -#: gitk:10759
1270 +#: gitk:11404
1271 msgid "foreground"
1272 msgstr "primo piano"
1273
1199 -#: gitk:10762
1274 +#: gitk:11407
1275 msgid "Diff: old lines"
1276 msgstr "Diff: vecchie linee"
1277
1203 -#: gitk:10763
1278 +#: gitk:11408
1279 msgid "diff old lines"
1280 msgstr "vecchie linee"
1281
1207 -#: gitk:10767
1282 +#: gitk:11412
1283 msgid "Diff: new lines"
1284 msgstr "Diff: nuove linee"
1285
1211 -#: gitk:10768
1286 +#: gitk:11413
1287 msgid "diff new lines"
1288 msgstr "nuove linee"
1289
1215 -#: gitk:10772
1290 +#: gitk:11417
1291 msgid "Diff: hunk header"
1292 msgstr "Diff: intestazione della sezione"
1293
1219 -#: gitk:10774
1294 +#: gitk:11419
1295 msgid "diff hunk header"
1296 msgstr "intestazione della sezione"
1297
1223 -#: gitk:10778
1298 +#: gitk:11423
1299 msgid "Marked line bg"
1300 msgstr "Sfondo riga selezionata"
1301
1227 -#: gitk:10780
1302 +#: gitk:11425
1303 msgid "marked line background"
1304 msgstr "sfondo riga selezionata"
1305
1231 -#: gitk:10784
1306 +#: gitk:11429
1307 msgid "Select bg"
1308 msgstr "Sfondo"
1309
1235 -#: gitk:10788
1310 +#: gitk:11438
1311 msgid "Fonts: press to choose"
1312 msgstr "Carattere: premere per scegliere"
1313
1239 -#: gitk:10790
1314 +#: gitk:11440
1315 msgid "Main font"
1316 msgstr "Carattere principale"
1317
1243 -#: gitk:10791
1318 +#: gitk:11441
1319 msgid "Diff display font"
1320 msgstr "Carattere per differenze"
1321
1247 -#: gitk:10792
1322 +#: gitk:11442
1323 msgid "User interface font"
1324 msgstr "Carattere per interfaccia utente"
1325
1251 -#: gitk:10829
1326 +#: gitk:11464
1327 +msgid "Gitk preferences"
1328 +msgstr "Preferenze gitk"
1329 +
1330 +#: gitk:11473
1331 +#, fuzzy
1332 +msgid "General"
1333 +msgstr "Genera"
1334 +
1335 +#: gitk:11474
1336 +msgid "Colors"
1337 +msgstr ""
1338 +
1339 +#: gitk:11475
1340 +msgid "Fonts"
1341 +msgstr ""
1342 +
1343 +#: gitk:11525
1344 #, tcl-format
1345 msgid "Gitk: choose color for %s"
1346 msgstr "Gitk: scegliere un colore per %s"
1347
1256 -#: gitk:11433
1348 +#: gitk:12242
1349 msgid "Cannot find a git repository here."
1350 msgstr "Archivio git non trovato."
1351
1260 -#: gitk:11437
1261 -#, tcl-format
1262 -msgid "Cannot find the git directory \"%s\"."
1263 -msgstr "Directory git \"%s\" non trovata."
1264 -
1265 -#: gitk:11484
1352 +#: gitk:12289
1353 #, tcl-format
1354 msgid "Ambiguous argument '%s': both revision and filename"
1355 msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file"
1356
1270 -#: gitk:11496
1357 +#: gitk:12301
1358 msgid "Bad arguments to gitk:"
1359 msgstr "Gitk: argomenti errati:"
1360
1274 -#: gitk:11587
1361 +#: gitk:12405
1362 msgid "Command line"
1363 msgstr "Linea di comando"
1364 +
1365 +#~ msgid "next"
1366 +#~ msgstr "succ"
1367 +
1368 +#~ msgid "prev"
1369 +#~ msgstr "prec"
1370 +
1371 +#~ msgid "Cannot find the git directory \"%s\"."
1372 +#~ msgstr "Directory git \"%s\" non trovata."
po/ja.po
+447 -322
@@ -8,34 +8,43 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: gitk\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2009-11-04 00:08+0900\n"
11 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
15 +"Language: \n"
16 "MIME-Version: 1.0\n"
17 "Content-Type: text/plain; charset=UTF-8\n"
18 "Content-Transfer-Encoding: 8bit\n"
19 "Plural-Forms: nplurals=1; plural=0;\n"
20
20 -#: gitk:113
21 +#: gitk:140
22 msgid "Couldn't get list of unmerged files:"
23 msgstr "マージされていないファイルのリストを取得できません:"
24
24 -#: gitk:269
25 +#: gitk:212 gitk:2381
26 +msgid "Color words"
27 +msgstr ""
28 +
29 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
30 +msgid "Markup words"
31 +msgstr ""
32 +
33 +#: gitk:324
34 msgid "Error parsing revisions:"
35 msgstr "リビジョン解析エラー:"
36
28 -#: gitk:324
37 +#: gitk:380
38 msgid "Error executing --argscmd command:"
39 msgstr "--argscmd コマンド実行エラー:"
40
32 -#: gitk:337
41 +#: gitk:393
42 msgid "No files selected: --merge specified but no files are unmerged."
43 msgstr ""
44 "ファイル未選択: --merge が指定されましたが、マージされていないファイルはあり"
45 "ません。"
46
38 -#: gitk:340
47 +#: gitk:396
48 msgid ""
49 "No files selected: --merge specified but no unmerged files are within file "
50 "limit."
@@ -43,299 +52,315 @@ msgstr ""
52 "ファイル未選択: --merge が指定されましたが、ファイル制限内にマージされていな"
53 "いファイルはありません。"
54
46 -#: gitk:362 gitk:509
55 +#: gitk:418 gitk:566
56 msgid "Error executing git log:"
57 msgstr "git log 実行エラー:"
58
50 -#: gitk:380 gitk:525
59 +#: gitk:436 gitk:582
60 msgid "Reading"
61 msgstr "読み込み中"
62
54 -#: gitk:440 gitk:4132
63 +#: gitk:496 gitk:4508
64 msgid "Reading commits..."
65 msgstr "コミット読み込み中..."
66
58 -#: gitk:443 gitk:1561 gitk:4135
67 +#: gitk:499 gitk:1637 gitk:4511
68 msgid "No commits selected"
69 msgstr "コミットが選択されていません"
70
62 -#: gitk:1437
71 +#: gitk:1511
72 msgid "Can't parse git log output:"
73 msgstr "git log の出力を解析できません:"
74
66 -#: gitk:1657
75 +#: gitk:1740
76 msgid "No commit information available"
77 msgstr "有効なコミットの情報がありません"
78
70 -#: gitk:1790
79 +#: gitk:1897
80 msgid "mc"
81 msgstr "mc"
82
74 -#: gitk:1817 gitk:3925 gitk:8842 gitk:10378 gitk:10558
83 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
84 msgid "OK"
85 msgstr "OK"
86
78 -#: gitk:1819 gitk:3927 gitk:8439 gitk:8513 gitk:8623 gitk:8672 gitk:8844
79 -#: gitk:10379 gitk:10559
87 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
88 +#: gitk:11221 gitk:11501
89 msgid "Cancel"
90 msgstr "キャンセル"
91
83 -#: gitk:1919
92 +#: gitk:2069
93 msgid "Update"
94 msgstr "更新"
95
87 -#: gitk:1920
96 +#: gitk:2070
97 msgid "Reload"
98 msgstr "リロード"
99
91 -#: gitk:1921
100 +#: gitk:2071
101 msgid "Reread references"
102 msgstr "リファレンスを再読み込み"
103
95 -#: gitk:1922
104 +#: gitk:2072
105 msgid "List references"
106 msgstr "リファレンスリストを表示"
107
99 -#: gitk:1924
108 +#: gitk:2074
109 msgid "Start git gui"
110 msgstr "git gui の開始"
111
103 -#: gitk:1926
112 +#: gitk:2076
113 msgid "Quit"
114 msgstr "終了"
115
107 -#: gitk:1918
116 +#: gitk:2068
117 msgid "File"
118 msgstr "ファイル"
119
111 -#: gitk:1930
120 +#: gitk:2080
121 msgid "Preferences"
122 msgstr "設定"
123
115 -#: gitk:1929
124 +#: gitk:2079
125 msgid "Edit"
126 msgstr "編集"
127
119 -#: gitk:1934
128 +#: gitk:2084
129 msgid "New view..."
130 msgstr "新規ビュー..."
131
123 -#: gitk:1935
132 +#: gitk:2085
133 msgid "Edit view..."
134 msgstr "ビュー編集..."
135
127 -#: gitk:1936
136 +#: gitk:2086
137 msgid "Delete view"
138 msgstr "ビュー削除"
139
131 -#: gitk:1938
140 +#: gitk:2088
141 msgid "All files"
142 msgstr "全てのファイル"
143
135 -#: gitk:1933 gitk:3679
144 +#: gitk:2083 gitk:4050
145 msgid "View"
146 msgstr "ビュー"
147
139 -#: gitk:1943 gitk:1953 gitk:2656
148 +#: gitk:2093 gitk:2103 gitk:3009
149 msgid "About gitk"
150 msgstr "gitk について"
151
143 -#: gitk:1944 gitk:1958
152 +#: gitk:2094 gitk:2108
153 msgid "Key bindings"
154 msgstr "キーバインディング"
155
147 -#: gitk:1942 gitk:1957
156 +#: gitk:2092 gitk:2107
157 msgid "Help"
158 msgstr "ヘルプ"
159
151 -#: gitk:2018
152 -msgid "SHA1 ID: "
153 -msgstr "SHA1 ID: "
160 +#: gitk:2185 gitk:8633
161 +msgid "SHA1 ID:"
162 +msgstr "SHA1 ID:"
163
155 -#: gitk:2049
164 +#: gitk:2229
165 msgid "Row"
166 msgstr "行"
167
159 -#: gitk:2080
168 +#: gitk:2267
169 msgid "Find"
170 msgstr "検索"
171
163 -#: gitk:2081
164 -msgid "next"
165 -msgstr "次"
166 -
167 -#: gitk:2082
168 -msgid "prev"
169 -msgstr "前"
170 -
171 -#: gitk:2083
172 +#: gitk:2295
173 msgid "commit"
174 msgstr "コミット"
175
175 -#: gitk:2086 gitk:2088 gitk:4293 gitk:4316 gitk:4340 gitk:6281 gitk:6353
176 -#: gitk:6437
176 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
177 +#: gitk:6893
178 msgid "containing:"
179 msgstr "含む:"
180
180 -#: gitk:2089 gitk:3164 gitk:3169 gitk:4368
181 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
182 msgid "touching paths:"
183 msgstr "パスの一部:"
184
184 -#: gitk:2090 gitk:4373
185 +#: gitk:2303 gitk:4759
186 msgid "adding/removing string:"
187 msgstr "追加/除去する文字列:"
188
188 -#: gitk:2099 gitk:2101
189 +#: gitk:2304 gitk:4761
190 +msgid "changing lines matching:"
191 +msgstr ""
192 +
193 +#: gitk:2313 gitk:2315 gitk:4748
194 msgid "Exact"
195 msgstr "英字の大小を区別する"
196
192 -#: gitk:2101 gitk:4448 gitk:6249
197 +#: gitk:2315 gitk:4836 gitk:6704
198 msgid "IgnCase"
199 msgstr "英字の大小を区別しない"
200
196 -#: gitk:2101 gitk:4342 gitk:4446 gitk:6245
201 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
202 msgid "Regexp"
203 msgstr "正規表現"
204
200 -#: gitk:2103 gitk:2104 gitk:4467 gitk:4497 gitk:4504 gitk:6373 gitk:6441
205 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
206 msgid "All fields"
207 msgstr "全ての項目"
208
204 -#: gitk:2104 gitk:4465 gitk:4497 gitk:6312
209 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
210 msgid "Headline"
211 msgstr "ヘッドライン"
212
208 -#: gitk:2105 gitk:4465 gitk:6312 gitk:6441 gitk:6875
213 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
214 msgid "Comments"
215 msgstr "コメント"
216
212 -#: gitk:2105 gitk:4465 gitk:4469 gitk:4504 gitk:6312 gitk:6810 gitk:8091
213 -#: gitk:8106
217 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
218 +#: gitk:8826
219 msgid "Author"
220 msgstr "作者"
221
217 -#: gitk:2105 gitk:4465 gitk:6312 gitk:6812
222 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
223 msgid "Committer"
224 msgstr "コミット者"
225
221 -#: gitk:2134
226 +#: gitk:2350
227 msgid "Search"
228 msgstr "検索"
229
225 -#: gitk:2141
230 +#: gitk:2358
231 msgid "Diff"
232 msgstr "Diff"
233
229 -#: gitk:2143
234 +#: gitk:2360
235 msgid "Old version"
236 msgstr "旧バージョン"
237
233 -#: gitk:2145
238 +#: gitk:2362
239 msgid "New version"
240 msgstr "新バージョン"
241
237 -#: gitk:2147
242 +#: gitk:2364
243 msgid "Lines of context"
244 msgstr "文脈行数"
245
241 -#: gitk:2157
246 +#: gitk:2374
247 msgid "Ignore space change"
248 msgstr "空白の違いを無視"
249
245 -#: gitk:2215
250 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
251 +msgid "Line diff"
252 +msgstr ""
253 +
254 +#: gitk:2445
255 msgid "Patch"
256 msgstr "パッチ"
257
249 -#: gitk:2217
258 +#: gitk:2447
259 msgid "Tree"
260 msgstr "ツリー"
261
253 -#: gitk:2361 gitk:2378
262 +#: gitk:2616 gitk:2636
263 msgid "Diff this -> selected"
264 msgstr "これと選択したコミットのdiffを見る"
265
257 -#: gitk:2362 gitk:2379
266 +#: gitk:2617 gitk:2637
267 msgid "Diff selected -> this"
268 msgstr "選択したコミットとこれのdiffを見る"
269
261 -#: gitk:2363 gitk:2380
270 +#: gitk:2618 gitk:2638
271 msgid "Make patch"
272 msgstr "パッチ作成"
273
265 -#: gitk:2364 gitk:8497
274 +#: gitk:2619 gitk:9235
275 msgid "Create tag"
276 msgstr "タグ生成"
277
269 -#: gitk:2365 gitk:8603
278 +#: gitk:2620 gitk:9352
279 msgid "Write commit to file"
280 msgstr "コミットをファイルに書き出す"
281
273 -#: gitk:2366 gitk:8660
282 +#: gitk:2621 gitk:9409
283 msgid "Create new branch"
284 msgstr "新規ブランチ生成"
285
277 -#: gitk:2367
286 +#: gitk:2622
287 msgid "Cherry-pick this commit"
288 msgstr "このコミットをチェリーピックする"
289
281 -#: gitk:2368
290 +#: gitk:2623
291 msgid "Reset HEAD branch to here"
292 msgstr "ブランチのHEADをここにリセットする"
293
285 -#: gitk:2369
294 +#: gitk:2624
295 msgid "Mark this commit"
296 msgstr "このコミットにマークをつける"
297
289 -#: gitk:2370
298 +#: gitk:2625
299 msgid "Return to mark"
300 msgstr "マークを付けた所に戻る"
301
293 -#: gitk:2371
302 +#: gitk:2626
303 msgid "Find descendant of this and mark"
304 msgstr "これとマークをつけた所との子孫を見つける"
305
297 -#: gitk:2372
306 +#: gitk:2627
307 msgid "Compare with marked commit"
308 msgstr "マークを付けたコミットと比較する"
309
301 -#: gitk:2386
310 +#: gitk:2628 gitk:2639
311 +#, fuzzy
312 +msgid "Diff this -> marked commit"
313 +msgstr "これと選択したコミットのdiffを見る"
314 +
315 +#: gitk:2629 gitk:2640
316 +#, fuzzy
317 +msgid "Diff marked commit -> this"
318 +msgstr "選択したコミットとこれのdiffを見る"
319 +
320 +#: gitk:2630
321 +#, fuzzy
322 +msgid "Revert this commit"
323 +msgstr "このコミットにマークをつける"
324 +
325 +#: gitk:2646
326 msgid "Check out this branch"
327 msgstr "このブランチをチェックアウトする"
328
305 -#: gitk:2387
329 +#: gitk:2647
330 msgid "Remove this branch"
331 msgstr "このブランチを除去する"
332
309 -#: gitk:2394
333 +#: gitk:2654
334 msgid "Highlight this too"
335 msgstr "これもハイライトさせる"
336
313 -#: gitk:2395
337 +#: gitk:2655
338 msgid "Highlight this only"
339 msgstr "これだけをハイライトさせる"
340
317 -#: gitk:2396
341 +#: gitk:2656
342 msgid "External diff"
343 msgstr "外部diffツール"
344
321 -#: gitk:2397
345 +#: gitk:2657
346 msgid "Blame parent commit"
347 msgstr "親コミットから blame をかける"
348
325 -#: gitk:2404
349 +#: gitk:2664
350 msgid "Show origin of this line"
351 msgstr "この行の出自を表示する"
352
329 -#: gitk:2405
353 +#: gitk:2665
354 msgid "Run git gui blame on this line"
355 msgstr "この行に git gui で blame をかける"
356
333 -#: gitk:2658
357 +#: gitk:3011
358 +#, fuzzy
359 msgid ""
360 "\n"
361 "Gitk - a commit viewer for git\n"
362 "\n"
338 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
363 +"Copyright © 2005-2014 Paul Mackerras\n"
364 "\n"
365 "Use and redistribute under the terms of the GNU General Public License"
366 msgstr ""
@@ -346,297 +371,315 @@ msgstr ""
371 "\n"
372 "使用および再配布は GNU General Public License に従ってください"
373
349 -#: gitk:2666 gitk:2728 gitk:9025
374 +#: gitk:3019 gitk:3085 gitk:9836
375 msgid "Close"
376 msgstr "閉じる"
377
353 -#: gitk:2685
378 +#: gitk:3040
379 msgid "Gitk key bindings"
380 msgstr "Gitk キーバインディング"
381
357 -#: gitk:2688
382 +#: gitk:3043
383 msgid "Gitk key bindings:"
384 msgstr "Gitk キーバインディング:"
385
361 -#: gitk:2690
386 +#: gitk:3045
387 #, tcl-format
388 msgid "<%s-Q>\t\tQuit"
389 msgstr "<%s-Q>\t\t終了"
390
366 -#: gitk:2691
391 +#: gitk:3046
392 +#, fuzzy, tcl-format
393 +msgid "<%s-W>\t\tClose window"
394 +msgstr "<%s-F>\t\t検索"
395 +
396 +#: gitk:3047
397 msgid "<Home>\t\tMove to first commit"
398 msgstr "<Home>\t\t最初のコミットに移動"
399
370 -#: gitk:2692
400 +#: gitk:3048
401 msgid "<End>\t\tMove to last commit"
402 msgstr "<End>\t\t最後のコミットに移動"
403
374 -#: gitk:2693
375 -msgid "<Up>, p, i\tMove up one commit"
404 +#: gitk:3049
405 +#, fuzzy
406 +msgid "<Up>, p, k\tMove up one commit"
407 msgstr "<Up>, p, i\t一つ上のコミットに移動"
408
378 -#: gitk:2694
379 -msgid "<Down>, n, k\tMove down one commit"
409 +#: gitk:3050
410 +#, fuzzy
411 +msgid "<Down>, n, j\tMove down one commit"
412 msgstr "<Down>, n, k\t一つ下のコミットに移動"
413
382 -#: gitk:2695
383 -msgid "<Left>, z, j\tGo back in history list"
414 +#: gitk:3051
415 +#, fuzzy
416 +msgid "<Left>, z, h\tGo back in history list"
417 msgstr "<Left>, z, j\t履歴の前に戻る"
418
386 -#: gitk:2696
419 +#: gitk:3052
420 msgid "<Right>, x, l\tGo forward in history list"
421 msgstr "<Right>, x, l\t履歴の次へ進む"
422
390 -#: gitk:2697
423 +#: gitk:3053
424 +#, tcl-format
425 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
426 +msgstr ""
427 +
428 +#: gitk:3054
429 msgid "<PageUp>\tMove up one page in commit list"
430 msgstr "<PageUp>\tコミットリストの一つ上のページに移動"
431
394 -#: gitk:2698
432 +#: gitk:3055
433 msgid "<PageDown>\tMove down one page in commit list"
434 msgstr "<PageDown>\tコミットリストの一つ下のページに移動"
435
398 -#: gitk:2699
436 +#: gitk:3056
437 #, tcl-format
438 msgid "<%s-Home>\tScroll to top of commit list"
439 msgstr "<%s-Home>\tコミットリストの一番上にスクロールする"
440
403 -#: gitk:2700
441 +#: gitk:3057
442 #, tcl-format
443 msgid "<%s-End>\tScroll to bottom of commit list"
444 msgstr "<%s-End>\tコミットリストの一番下にスクロールする"
445
408 -#: gitk:2701
446 +#: gitk:3058
447 #, tcl-format
448 msgid "<%s-Up>\tScroll commit list up one line"
449 msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする"
450
413 -#: gitk:2702
451 +#: gitk:3059
452 #, tcl-format
453 msgid "<%s-Down>\tScroll commit list down one line"
454 msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする"
455
418 -#: gitk:2703
456 +#: gitk:3060
457 #, tcl-format
458 msgid "<%s-PageUp>\tScroll commit list up one page"
459 msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする"
460
423 -#: gitk:2704
461 +#: gitk:3061
462 #, tcl-format
463 msgid "<%s-PageDown>\tScroll commit list down one page"
464 msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする"
465
428 -#: gitk:2705
466 +#: gitk:3062
467 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
468 msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)"
469
432 -#: gitk:2706
470 +#: gitk:3063
471 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
472 msgstr "<Shift-Down>\t前方を検索（下方の・古いコミット）"
473
436 -#: gitk:2707
474 +#: gitk:3064
475 msgid "<Delete>, b\tScroll diff view up one page"
476 msgstr "<Delete>, b\tdiff画面を上のページにスクロールする"
477
440 -#: gitk:2708
478 +#: gitk:3065
479 msgid "<Backspace>\tScroll diff view up one page"
480 msgstr "<Backspace>\tdiff画面を上のページにスクロールする"
481
444 -#: gitk:2709
482 +#: gitk:3066
483 msgid "<Space>\t\tScroll diff view down one page"
484 msgstr "<Space>\t\tdiff画面を下のページにスクロールする"
485
448 -#: gitk:2710
486 +#: gitk:3067
487 msgid "u\t\tScroll diff view up 18 lines"
488 msgstr "u\t\tdiff画面を上に18行スクロールする"
489
452 -#: gitk:2711
490 +#: gitk:3068
491 msgid "d\t\tScroll diff view down 18 lines"
492 msgstr "d\t\tdiff画面を下に18行スクロールする"
493
456 -#: gitk:2712
494 +#: gitk:3069
495 #, tcl-format
496 msgid "<%s-F>\t\tFind"
497 msgstr "<%s-F>\t\t検索"
498
461 -#: gitk:2713
499 +#: gitk:3070
500 #, tcl-format
501 msgid "<%s-G>\t\tMove to next find hit"
502 msgstr "<%s-G>\t\t次を検索して移動"
503
466 -#: gitk:2714
504 +#: gitk:3071
505 msgid "<Return>\tMove to next find hit"
506 msgstr "<Return>\t次を検索して移動"
507
470 -#: gitk:2715
508 +#: gitk:3072
509 msgid "/\t\tFocus the search box"
510 msgstr "/\t\t検索ボックスにフォーカス"
511
474 -#: gitk:2716
512 +#: gitk:3073
513 msgid "?\t\tMove to previous find hit"
514 msgstr "?\t\t前を検索して移動"
515
478 -#: gitk:2717
516 +#: gitk:3074
517 msgid "f\t\tScroll diff view to next file"
518 msgstr "f\t\t次のファイルにdiff画面をスクロールする"
519
482 -#: gitk:2718
520 +#: gitk:3075
521 #, tcl-format
522 msgid "<%s-S>\t\tSearch for next hit in diff view"
523 msgstr "<%s-S>\t\tdiff画面の次を検索"
524
487 -#: gitk:2719
525 +#: gitk:3076
526 #, tcl-format
527 msgid "<%s-R>\t\tSearch for previous hit in diff view"
528 msgstr "<%s-R>\t\tdiff画面の前を検索"
529
492 -#: gitk:2720
530 +#: gitk:3077
531 #, tcl-format
532 msgid "<%s-KP+>\tIncrease font size"
533 msgstr "<%s-KP+>\t文字サイズを拡大"
534
497 -#: gitk:2721
535 +#: gitk:3078
536 #, tcl-format
537 msgid "<%s-plus>\tIncrease font size"
538 msgstr "<%s-plus>\t文字サイズを拡大"
539
502 -#: gitk:2722
540 +#: gitk:3079
541 #, tcl-format
542 msgid "<%s-KP->\tDecrease font size"
543 msgstr "<%s-KP->\t文字サイズを縮小"
544
507 -#: gitk:2723
545 +#: gitk:3080
546 #, tcl-format
547 msgid "<%s-minus>\tDecrease font size"
548 msgstr "<%s-minus>\t文字サイズを縮小"
549
512 -#: gitk:2724
550 +#: gitk:3081
551 msgid "<F5>\t\tUpdate"
552 msgstr "<F5>\t\t更新"
553
516 -#: gitk:3179 gitk:3188
554 +#: gitk:3546 gitk:3555
555 #, tcl-format
556 msgid "Error creating temporary directory %s:"
557 msgstr "一時ディレクトリ %s 生成時エラー:"
558
521 -#: gitk:3201
559 +#: gitk:3568
560 #, tcl-format
561 msgid "Error getting \"%s\" from %s:"
562 msgstr "\"%s\" のエラーが %s に発生:"
563
526 -#: gitk:3264
564 +#: gitk:3631
565 msgid "command failed:"
566 msgstr "コマンド失敗:"
567
530 -#: gitk:3410
568 +#: gitk:3780
569 msgid "No such commit"
570 msgstr "そのようなコミットはありません"
571
534 -#: gitk:3424
572 +#: gitk:3794
573 msgid "git gui blame: command failed:"
574 msgstr "git gui blame: コマンド失敗:"
575
538 -#: gitk:3455
576 +#: gitk:3825
577 #, tcl-format
578 msgid "Couldn't read merge head: %s"
579 msgstr "マージする HEAD を読み込めません: %s"
580
543 -#: gitk:3463
581 +#: gitk:3833
582 #, tcl-format
583 msgid "Error reading index: %s"
584 msgstr "インデックス読み込みエラー: %s"
585
548 -#: gitk:3488
586 +#: gitk:3858
587 #, tcl-format
588 msgid "Couldn't start git blame: %s"
589 msgstr "git blame を始められません: %s"
590
553 -#: gitk:3491 gitk:6280
591 +#: gitk:3861 gitk:6735
592 msgid "Searching"
593 msgstr "検索中"
594
557 -#: gitk:3523
595 +#: gitk:3893
596 #, tcl-format
597 msgid "Error running git blame: %s"
598 msgstr "git blame 実行エラー: %s"
599
562 -#: gitk:3551
600 +#: gitk:3921
601 #, tcl-format
602 msgid "That line comes from commit %s, which is not in this view"
603 msgstr "コミット %s に由来するその行は、このビューに表示されていません"
604
567 -#: gitk:3565
605 +#: gitk:3935
606 msgid "External diff viewer failed:"
607 msgstr "外部diffビューアが失敗:"
608
571 -#: gitk:3683
609 +#: gitk:4053
610 msgid "Gitk view definition"
611 msgstr "Gitk ビュー定義"
612
575 -#: gitk:3687
613 +#: gitk:4057
614 msgid "Remember this view"
615 msgstr "このビューを記憶する"
616
579 -#: gitk:3688
617 +#: gitk:4058
618 msgid "References (space separated list):"
619 msgstr "リファレンス（スペース区切りのリスト）:"
620
583 -#: gitk:3689
621 +#: gitk:4059
622 msgid "Branches & tags:"
623 msgstr "ブランチ＆タグ:"
624
587 -#: gitk:3690
625 +#: gitk:4060
626 msgid "All refs"
627 msgstr "全てのリファレンス"
628
591 -#: gitk:3691
629 +#: gitk:4061
630 msgid "All (local) branches"
631 msgstr "全ての（ローカルな）ブランチ"
632
595 -#: gitk:3692
633 +#: gitk:4062
634 msgid "All tags"
635 msgstr "全てのタグ"
636
599 -#: gitk:3693
637 +#: gitk:4063
638 msgid "All remote-tracking branches"
639 msgstr "全てのリモート追跡ブランチ"
640
603 -#: gitk:3694
641 +#: gitk:4064
642 msgid "Commit Info (regular expressions):"
643 msgstr "コミット情報（正規表現）:"
644
607 -#: gitk:3695
645 +#: gitk:4065
646 msgid "Author:"
647 msgstr "作者:"
648
611 -#: gitk:3696
649 +#: gitk:4066
650 msgid "Committer:"
651 msgstr "コミット者:"
652
615 -#: gitk:3697
653 +#: gitk:4067
654 msgid "Commit Message:"
655 msgstr "コミットメッセージ:"
656
619 -#: gitk:3698
657 +#: gitk:4068
658 msgid "Matches all Commit Info criteria"
659 msgstr "コミット情報の全ての条件に一致"
660
623 -#: gitk:3699
661 +#: gitk:4069
662 +#, fuzzy
663 +msgid "Matches none Commit Info criteria"
664 +msgstr "コミット情報の全ての条件に一致"
665 +
666 +#: gitk:4070
667 msgid "Changes to Files:"
668 msgstr "変更したファイル:"
669
627 -#: gitk:3700
670 +#: gitk:4071
671 msgid "Fixed String"
672 msgstr "固定文字列"
673
631 -#: gitk:3701
674 +#: gitk:4072
675 msgid "Regular Expression"
676 msgstr "正規表現"
677
635 -#: gitk:3702
678 +#: gitk:4073
679 msgid "Search string:"
680 msgstr "検索文字列:"
681
639 -#: gitk:3703
682 +#: gitk:4074
683 msgid ""
684 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
685 "15:27:38\"):"
@@ -644,205 +687,202 @@ msgstr ""
687 "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
688 "15:27:38\"):"
689
647 -#: gitk:3704
690 +#: gitk:4075
691 msgid "Since:"
692 msgstr "期間の始め:"
693
651 -#: gitk:3705
694 +#: gitk:4076
695 msgid "Until:"
696 msgstr "期間の終わり:"
697
655 -#: gitk:3706
698 +#: gitk:4077
699 msgid "Limit and/or skip a number of revisions (positive integer):"
700 msgstr "制限・省略するリビジョンの数（正の整数）:"
701
659 -#: gitk:3707
702 +#: gitk:4078
703 msgid "Number to show:"
704 msgstr "表示する数:"
705
663 -#: gitk:3708
706 +#: gitk:4079
707 msgid "Number to skip:"
708 msgstr "省略する数:"
709
667 -#: gitk:3709
710 +#: gitk:4080
711 msgid "Miscellaneous options:"
712 msgstr "その他のオプション:"
713
671 -#: gitk:3710
714 +#: gitk:4081
715 msgid "Strictly sort by date"
716 msgstr "厳密に日付順で並び替え"
717
675 -#: gitk:3711
718 +#: gitk:4082
719 msgid "Mark branch sides"
720 msgstr "側枝マーク"
721
679 -#: gitk:3712
722 +#: gitk:4083
723 msgid "Limit to first parent"
724 msgstr "最初の親に制限"
725
683 -#: gitk:3713
726 +#: gitk:4084
727 msgid "Simple history"
728 msgstr "簡易な履歴"
729
687 -#: gitk:3714
730 +#: gitk:4085
731 msgid "Additional arguments to git log:"
732 msgstr "git log への追加の引数:"
733
691 -#: gitk:3715
734 +#: gitk:4086
735 msgid "Enter files and directories to include, one per line:"
736 msgstr "含まれるファイル・ディレクトリを一行ごとに入力:"
737
695 -#: gitk:3716
738 +#: gitk:4087
739 msgid "Command to generate more commits to include:"
740 msgstr "コミット追加コマンド:"
741
699 -#: gitk:3838
742 +#: gitk:4211
743 msgid "Gitk: edit view"
744 msgstr "Gitk: ビュー編集"
745
703 -#: gitk:3846
746 +#: gitk:4219
747 msgid "-- criteria for selecting revisions"
748 msgstr "― リビジョンの選択条件"
749
707 -#: gitk:3851
708 -msgid "View Name:"
750 +#: gitk:4224
751 +#, fuzzy
752 +msgid "View Name"
753 msgstr "ビュー名:"
754
711 -#: gitk:3926
755 +#: gitk:4299
756 msgid "Apply (F5)"
757 msgstr "適用 (F5)"
758
715 -#: gitk:3964
759 +#: gitk:4337
760 msgid "Error in commit selection arguments:"
761 msgstr "コミット選択引数のエラー:"
762
719 -#: gitk:4017 gitk:4069 gitk:4517 gitk:4531 gitk:5792 gitk:11263 gitk:11264
763 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
764 msgid "None"
765 msgstr "無し"
766
723 -#: gitk:4465 gitk:6312 gitk:8093 gitk:8108
724 -msgid "Date"
725 -msgstr "日付"
726 -
727 -#: gitk:4465 gitk:6312
728 -msgid "CDate"
729 -msgstr "作成日"
730 -
731 -#: gitk:4614 gitk:4619
767 +#: gitk:5003 gitk:5008
768 msgid "Descendant"
769 msgstr "子孫"
770
735 -#: gitk:4615
771 +#: gitk:5004
772 msgid "Not descendant"
773 msgstr "非子孫"
774
739 -#: gitk:4622 gitk:4627
775 +#: gitk:5011 gitk:5016
776 msgid "Ancestor"
777 msgstr "祖先"
778
743 -#: gitk:4623
779 +#: gitk:5012
780 msgid "Not ancestor"
781 msgstr "非祖先"
782
747 -#: gitk:4913
783 +#: gitk:5306
784 msgid "Local changes checked in to index but not committed"
785 msgstr "ステージされた、コミット前のローカルな変更"
786
751 -#: gitk:4949
787 +#: gitk:5342
788 msgid "Local uncommitted changes, not checked in to index"
789 msgstr "ステージされていない、コミット前のローカルな変更"
790
755 -#: gitk:6630
791 +#: gitk:7115
792 +msgid "and many more"
793 +msgstr ""
794 +
795 +#: gitk:7118
796 msgid "many"
797 msgstr "多数"
798
759 -#: gitk:6814
799 +#: gitk:7309
800 msgid "Tags:"
801 msgstr "タグ:"
802
763 -#: gitk:6831 gitk:6837 gitk:8086
803 +#: gitk:7326 gitk:7332 gitk:8806
804 msgid "Parent"
805 msgstr "親"
806
767 -#: gitk:6842
807 +#: gitk:7337
808 msgid "Child"
809 msgstr "子"
810
771 -#: gitk:6851
811 +#: gitk:7346
812 msgid "Branch"
813 msgstr "ブランチ"
814
775 -#: gitk:6854
815 +#: gitk:7349
816 msgid "Follows"
817 msgstr "下位"
818
779 -#: gitk:6857
819 +#: gitk:7352
820 msgid "Precedes"
821 msgstr "上位"
822
783 -#: gitk:7359
823 +#: gitk:7947
824 #, tcl-format
825 msgid "Error getting diffs: %s"
826 msgstr "diff取得エラー: %s"
827
788 -#: gitk:7914
828 +#: gitk:8631
829 msgid "Goto:"
830 msgstr "Goto:"
831
792 -#: gitk:7916
793 -msgid "SHA1 ID:"
794 -msgstr "SHA1 ID:"
795 -
796 -#: gitk:7935
832 +#: gitk:8652
833 #, tcl-format
834 msgid "Short SHA1 id %s is ambiguous"
835 msgstr "%s を含む SHA1 ID は複数存在します"
836
801 -#: gitk:7942
837 +#: gitk:8659
838 #, tcl-format
839 msgid "Revision %s is not known"
840 msgstr "リビジョン %s は不明です"
841
806 -#: gitk:7952
842 +#: gitk:8669
843 #, tcl-format
844 msgid "SHA1 id %s is not known"
845 msgstr "SHA1 id %s は不明です"
846
811 -#: gitk:7954
847 +#: gitk:8671
848 #, tcl-format
849 msgid "Revision %s is not in the current view"
850 msgstr "リビジョン %s は現在のビューにはありません"
851
816 -#: gitk:8096
852 +#: gitk:8813 gitk:8828
853 +msgid "Date"
854 +msgstr "日付"
855 +
856 +#: gitk:8816
857 msgid "Children"
858 msgstr "子"
859
820 -#: gitk:8153
860 +#: gitk:8879
861 #, tcl-format
862 msgid "Reset %s branch to here"
863 msgstr "%s ブランチをここにリセットする"
864
825 -#: gitk:8155
865 +#: gitk:8881
866 msgid "Detached head: can't reset"
867 msgstr "切り離されたHEAD: リセットできません"
868
829 -#: gitk:8264 gitk:8270
869 +#: gitk:8986 gitk:8992
870 msgid "Skipping merge commit "
871 msgstr "コミットマージをスキップ: "
872
833 -#: gitk:8279 gitk:8284
873 +#: gitk:9001 gitk:9006
874 msgid "Error getting patch ID for "
875 msgstr "パッチ取得エラー: ID "
876
837 -#: gitk:8280 gitk:8285
877 +#: gitk:9002 gitk:9007
878 msgid " - stopping\n"
879 msgstr " - 停止\n"
880
841 -#: gitk:8290 gitk:8293 gitk:8301 gitk:8314 gitk:8323
881 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
882 msgid "Commit "
883 msgstr "コミット "
884
845 -#: gitk:8294
885 +#: gitk:9016
886 msgid ""
887 " is the same patch as\n"
888 " "
@@ -850,7 +890,7 @@ msgstr ""
890 " は下記のパッチと同等\n"
891 " "
892
853 -#: gitk:8302
893 +#: gitk:9024
894 msgid ""
895 " differs from\n"
896 " "
@@ -858,7 +898,7 @@ msgstr ""
898 " 下記からのdiff\n"
899 " "
900
861 -#: gitk:8304
901 +#: gitk:9026
902 msgid ""
903 "Diff of commits:\n"
904 "\n"
@@ -866,122 +906,131 @@ msgstr ""
906 "コミットのdiff:\n"
907 "\n"
908
869 -#: gitk:8315 gitk:8324
909 +#: gitk:9038 gitk:9047
910 #, tcl-format
911 msgid " has %s children - stopping\n"
912 msgstr " には %s の子があります - 停止\n"
913
874 -#: gitk:8344
914 +#: gitk:9066
915 #, tcl-format
916 msgid "Error writing commit to file: %s"
917 msgstr "ファイルへのコミット書き出しエラー: %s"
918
879 -#: gitk:8350
919 +#: gitk:9072
920 #, tcl-format
921 msgid "Error diffing commits: %s"
922 msgstr "コミットのdiff実行エラー: %s"
923
884 -#: gitk:8380
924 +#: gitk:9118
925 msgid "Top"
926 msgstr "Top"
927
888 -#: gitk:8381
928 +#: gitk:9119
929 msgid "From"
930 msgstr "From"
931
892 -#: gitk:8386
932 +#: gitk:9124
933 msgid "To"
934 msgstr "To"
935
896 -#: gitk:8410
936 +#: gitk:9148
937 msgid "Generate patch"
938 msgstr "パッチ生成"
939
900 -#: gitk:8412
940 +#: gitk:9150
941 msgid "From:"
942 msgstr "From:"
943
904 -#: gitk:8421
944 +#: gitk:9159
945 msgid "To:"
946 msgstr "To:"
947
908 -#: gitk:8430
948 +#: gitk:9168
949 msgid "Reverse"
950 msgstr "逆"
951
912 -#: gitk:8432 gitk:8617
952 +#: gitk:9170 gitk:9366
953 msgid "Output file:"
954 msgstr "出力ファイル:"
955
916 -#: gitk:8438
956 +#: gitk:9176
957 msgid "Generate"
958 msgstr "生成"
959
920 -#: gitk:8476
960 +#: gitk:9214
961 msgid "Error creating patch:"
962 msgstr "パッチ生成エラー:"
963
924 -#: gitk:8499 gitk:8605 gitk:8662
964 +#: gitk:9237 gitk:9354 gitk:9411
965 msgid "ID:"
966 msgstr "ID:"
967
928 -#: gitk:8508
968 +#: gitk:9246
969 msgid "Tag name:"
970 msgstr "タグ名:"
971
932 -#: gitk:8512 gitk:8671
972 +#: gitk:9249
973 +msgid "Tag message is optional"
974 +msgstr ""
975 +
976 +#: gitk:9251
977 +#, fuzzy
978 +msgid "Tag message:"
979 +msgstr "タグ名:"
980 +
981 +#: gitk:9255 gitk:9420
982 msgid "Create"
983 msgstr "生成"
984
936 -#: gitk:8529
985 +#: gitk:9273
986 msgid "No tag name specified"
987 msgstr "タグの名称が指定されていません"
988
940 -#: gitk:8533
989 +#: gitk:9277
990 #, tcl-format
991 msgid "Tag \"%s\" already exists"
992 msgstr "タグ \"%s\" は既に存在します"
993
945 -#: gitk:8539
994 +#: gitk:9287
995 msgid "Error creating tag:"
996 msgstr "タグ生成エラー:"
997
949 -#: gitk:8614
998 +#: gitk:9363
999 msgid "Command:"
1000 msgstr "コマンド:"
1001
953 -#: gitk:8622
1002 +#: gitk:9371
1003 msgid "Write"
1004 msgstr "書き出し"
1005
957 -#: gitk:8640
1006 +#: gitk:9389
1007 msgid "Error writing commit:"
1008 msgstr "コミット書き出しエラー:"
1009
961 -#: gitk:8667
1010 +#: gitk:9416
1011 msgid "Name:"
1012 msgstr "名前:"
1013
965 -#: gitk:8690
1014 +#: gitk:9439
1015 msgid "Please specify a name for the new branch"
1016 msgstr "新しいブランチの名前を指定してください"
1017
969 -#: gitk:8695
1018 +#: gitk:9444
1019 #, tcl-format
1020 msgid "Branch '%s' already exists. Overwrite?"
1021 msgstr "ブランチ '%s' は既に存在します。上書きしますか？"
1022
974 -#: gitk:8761
1023 +#: gitk:9511
1024 #, tcl-format
1025 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1026 msgstr ""
1027 "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？"
1028
980 -#: gitk:8766
1029 +#: gitk:9516
1030 msgid "Cherry-picking"
1031 msgstr "チェリーピック中"
1032
984 -#: gitk:8775
1033 +#: gitk:9525
1034 #, tcl-format
1035 msgid ""
1036 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -991,7 +1040,7 @@ msgstr ""
1040 "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ"
1041 "い。"
1042
994 -#: gitk:8781
1043 +#: gitk:9531
1044 msgid ""
1045 "Cherry-pick failed because of merge conflict.\n"
1046 "Do you wish to run git citool to resolve it?"
@@ -999,32 +1048,62 @@ msgstr ""
1048 "マージの衝突によってチェリーピックは失敗しました。\n"
1049 "この解決のために git citool を実行したいですか？"
1050
1002 -#: gitk:8797
1051 +#: gitk:9547 gitk:9605
1052 msgid "No changes committed"
1053 msgstr "何の変更もコミットされていません"
1054
1006 -#: gitk:8823
1055 +#: gitk:9574
1056 +#, fuzzy, tcl-format
1057 +msgid "Commit %s is not included in branch %s -- really revert it?"
1058 +msgstr ""
1059 +"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？"
1060 +
1061 +#: gitk:9579
1062 +#, fuzzy
1063 +msgid "Reverting"
1064 +msgstr "リセット中"
1065 +
1066 +#: gitk:9587
1067 +#, fuzzy, tcl-format
1068 +msgid ""
1069 +"Revert failed because of local changes to the following files:%s Please "
1070 +"commit, reset or stash your changes and try again."
1071 +msgstr ""
1072 +"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\n"
1073 +"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ"
1074 +"い。"
1075 +
1076 +#: gitk:9591
1077 +#, fuzzy
1078 +msgid ""
1079 +"Revert failed because of merge conflict.\n"
1080 +" Do you wish to run git citool to resolve it?"
1081 +msgstr ""
1082 +"マージの衝突によってチェリーピックは失敗しました。\n"
1083 +"この解決のために git citool を実行したいですか？"
1084 +
1085 +#: gitk:9634
1086 msgid "Confirm reset"
1087 msgstr "確認を取り消す"
1088
1010 -#: gitk:8825
1089 +#: gitk:9636
1090 #, tcl-format
1091 msgid "Reset branch %s to %s?"
1092 msgstr "ブランチ %s を %s にリセットしますか？"
1093
1015 -#: gitk:8829
1094 +#: gitk:9638
1095 msgid "Reset type:"
1096 msgstr "Reset タイプ:"
1097
1019 -#: gitk:8833
1098 +#: gitk:9641
1099 msgid "Soft: Leave working tree and index untouched"
1100 msgstr "Soft: 作業ツリーもインデックスもそのままにする"
1101
1023 -#: gitk:8836
1102 +#: gitk:9644
1103 msgid "Mixed: Leave working tree untouched, reset index"
1104 msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット"
1105
1027 -#: gitk:8839
1106 +#: gitk:9647
1107 msgid ""
1108 "Hard: Reset working tree and index\n"
1109 "(discard ALL local changes)"
@@ -1032,19 +1111,19 @@ msgstr ""
1111 "Hard: 作業ツリーやインデックスをリセット\n"
1112 "（「全ての」ローカルな変更を破棄）"
1113
1035 -#: gitk:8856
1114 +#: gitk:9664
1115 msgid "Resetting"
1116 msgstr "リセット中"
1117
1039 -#: gitk:8913
1118 +#: gitk:9724
1119 msgid "Checking out"
1120 msgstr "チェックアウト"
1121
1043 -#: gitk:8966
1122 +#: gitk:9777
1123 msgid "Cannot delete the currently checked-out branch"
1124 msgstr "現在チェックアウトされているブランチを削除することはできません"
1125
1047 -#: gitk:8972
1126 +#: gitk:9783
1127 #, tcl-format
1128 msgid ""
1129 "The commits on branch %s aren't on any other branch.\n"
@@ -1053,16 +1132,16 @@ msgstr ""
1132 "ブランチ %s には他のブランチに存在しないコミットがあります。\n"
1133 "本当にブランチ %s を削除しますか？"
1134
1056 -#: gitk:9003
1135 +#: gitk:9814
1136 #, tcl-format
1137 msgid "Tags and heads: %s"
1138 msgstr "タグとHEAD: %s"
1139
1061 -#: gitk:9018
1140 +#: gitk:9829
1141 msgid "Filter"
1142 msgstr "フィルター"
1143
1065 -#: gitk:9313
1144 +#: gitk:10125
1145 msgid ""
1146 "Error reading commit topology information; branch and preceding/following "
1147 "tag information will be incomplete."
@@ -1070,186 +1149,232 @@ msgstr ""
1149 "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である"
1150 "ようです。"
1151
1073 -#: gitk:10299
1152 +#: gitk:11102
1153 msgid "Tag"
1154 msgstr "タグ"
1155
1077 -#: gitk:10299
1156 +#: gitk:11106
1157 msgid "Id"
1158 msgstr "ID"
1159
1081 -#: gitk:10347
1160 +#: gitk:11189
1161 msgid "Gitk font chooser"
1162 msgstr "Gitk フォント選択"
1163
1085 -#: gitk:10364
1164 +#: gitk:11206
1165 msgid "B"
1166 msgstr "B"
1167
1089 -#: gitk:10367
1168 +#: gitk:11209
1169 msgid "I"
1170 msgstr "I"
1171
1093 -#: gitk:10463
1094 -msgid "Gitk preferences"
1095 -msgstr "Gitk 設定"
1096 -
1097 -#: gitk:10465
1172 +#: gitk:11327
1173 msgid "Commit list display options"
1174 msgstr "コミットリスト表示オプション"
1175
1101 -#: gitk:10468
1176 +#: gitk:11330
1177 msgid "Maximum graph width (lines)"
1178 msgstr "最大グラフ幅（線の本数）"
1179
1105 -#: gitk:10472
1106 -#, tcl-format
1180 +#: gitk:11334
1181 +#, no-tcl-format
1182 msgid "Maximum graph width (% of pane)"
1183 msgstr "最大グラフ幅（ペインに対する％）"
1184
1110 -#: gitk:10476
1185 +#: gitk:11337
1186 msgid "Show local changes"
1187 msgstr "ローカルな変更を表示"
1188
1114 -#: gitk:10479
1115 -msgid "Auto-select SHA1"
1189 +#: gitk:11340
1190 +#, fuzzy
1191 +msgid "Auto-select SHA1 (length)"
1192 msgstr "SHA1 の自動選択"
1193
1118 -#: gitk:10483
1194 +#: gitk:11344
1195 +msgid "Hide remote refs"
1196 +msgstr "リモートリファレンスを隠す"
1197 +
1198 +#: gitk:11348
1199 msgid "Diff display options"
1200 msgstr "diff表示オプション"
1201
1122 -#: gitk:10485
1202 +#: gitk:11350
1203 msgid "Tab spacing"
1204 msgstr "タブ空白幅"
1205
1126 -#: gitk:10488
1127 -msgid "Display nearby tags"
1206 +#: gitk:11353
1207 +#, fuzzy
1208 +msgid "Display nearby tags/heads"
1209 msgstr "近くのタグを表示する"
1210
1130 -#: gitk:10491
1131 -msgid "Hide remote refs"
1132 -msgstr "リモートリファレンスを隠す"
1211 +#: gitk:11356
1212 +msgid "Maximum # tags/heads to show"
1213 +msgstr ""
1214
1134 -#: gitk:10494
1215 +#: gitk:11359
1216 msgid "Limit diffs to listed paths"
1217 msgstr "diff をリストのパスに制限"
1218
1138 -#: gitk:10497
1219 +#: gitk:11362
1220 msgid "Support per-file encodings"
1221 msgstr "ファイルごとのエンコーディングのサポート"
1222
1142 -#: gitk:10503 gitk:10572
1223 +#: gitk:11368 gitk:11515
1224 msgid "External diff tool"
1225 msgstr "外部diffツール"
1226
1146 -#: gitk:10505
1227 +#: gitk:11369
1228 msgid "Choose..."
1229 msgstr "選択..."
1230
1150 -#: gitk:10510
1231 +#: gitk:11374
1232 +#, fuzzy
1233 +msgid "General options"
1234 +msgstr "パッチ生成"
1235 +
1236 +#: gitk:11377
1237 +msgid "Use themed widgets"
1238 +msgstr ""
1239 +
1240 +#: gitk:11379
1241 +msgid "(change requires restart)"
1242 +msgstr ""
1243 +
1244 +#: gitk:11381
1245 +msgid "(currently unavailable)"
1246 +msgstr ""
1247 +
1248 +#: gitk:11392
1249 msgid "Colors: press to choose"
1250 msgstr "色: ボタンを押して選択"
1251
1154 -#: gitk:10513
1252 +#: gitk:11395
1253 msgid "Interface"
1254 msgstr "インターフェイス"
1255
1158 -#: gitk:10514
1256 +#: gitk:11396
1257 msgid "interface"
1258 msgstr "インターフェイス"
1259
1162 -#: gitk:10517
1260 +#: gitk:11399
1261 msgid "Background"
1262 msgstr "背景"
1263
1166 -#: gitk:10518 gitk:10548
1264 +#: gitk:11400 gitk:11430
1265 msgid "background"
1266 msgstr "背景"
1267
1170 -#: gitk:10521
1268 +#: gitk:11403
1269 msgid "Foreground"
1270 msgstr "前景"
1271
1174 -#: gitk:10522
1272 +#: gitk:11404
1273 msgid "foreground"
1274 msgstr "前景"
1275
1178 -#: gitk:10525
1276 +#: gitk:11407
1277 msgid "Diff: old lines"
1278 msgstr "Diff: 旧バージョン"
1279
1182 -#: gitk:10526
1280 +#: gitk:11408
1281 msgid "diff old lines"
1282 msgstr "diff 旧バージョン"
1283
1186 -#: gitk:10530
1284 +#: gitk:11412
1285 msgid "Diff: new lines"
1286 msgstr "Diff: 新バージョン"
1287
1190 -#: gitk:10531
1288 +#: gitk:11413
1289 msgid "diff new lines"
1290 msgstr "diff 新バージョン"
1291
1194 -#: gitk:10535
1292 +#: gitk:11417
1293 msgid "Diff: hunk header"
1294 msgstr "Diff: hunkヘッダ"
1295
1198 -#: gitk:10537
1296 +#: gitk:11419
1297 msgid "diff hunk header"
1298 msgstr "diff hunkヘッダ"
1299
1202 -#: gitk:10541
1300 +#: gitk:11423
1301 msgid "Marked line bg"
1302 msgstr "マーク行の背景"
1303
1206 -#: gitk:10543
1304 +#: gitk:11425
1305 msgid "marked line background"
1306 msgstr "マーク行の背景"
1307
1210 -#: gitk:10547
1308 +#: gitk:11429
1309 msgid "Select bg"
1310 msgstr "選択の背景"
1311
1214 -#: gitk:10551
1312 +#: gitk:11438
1313 msgid "Fonts: press to choose"
1314 msgstr "フォント: ボタンを押して選択"
1315
1218 -#: gitk:10553
1316 +#: gitk:11440
1317 msgid "Main font"
1318 msgstr "主フォント"
1319
1222 -#: gitk:10554
1320 +#: gitk:11441
1321 msgid "Diff display font"
1322 msgstr "Diff表示用フォント"
1323
1226 -#: gitk:10555
1324 +#: gitk:11442
1325 msgid "User interface font"
1326 msgstr "UI用フォント"
1327
1230 -#: gitk:10582
1328 +#: gitk:11464
1329 +msgid "Gitk preferences"
1330 +msgstr "Gitk 設定"
1331 +
1332 +#: gitk:11473
1333 +#, fuzzy
1334 +msgid "General"
1335 +msgstr "生成"
1336 +
1337 +#: gitk:11474
1338 +msgid "Colors"
1339 +msgstr ""
1340 +
1341 +#: gitk:11475
1342 +msgid "Fonts"
1343 +msgstr ""
1344 +
1345 +#: gitk:11525
1346 #, tcl-format
1347 msgid "Gitk: choose color for %s"
1348 msgstr "Gitk: 「%s」 の色を選択"
1349
1235 -#: gitk:11168
1350 +#: gitk:12242
1351 msgid "Cannot find a git repository here."
1352 msgstr "ここにはgitリポジトリがありません。"
1353
1239 -#: gitk:11172
1240 -#, tcl-format
1241 -msgid "Cannot find the git directory \"%s\"."
1242 -msgstr "gitディレクトリ \"%s\" を見つけられません。"
1243 -
1244 -#: gitk:11219
1354 +#: gitk:12289
1355 #, tcl-format
1356 msgid "Ambiguous argument '%s': both revision and filename"
1357 msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます"
1358
1249 -#: gitk:11231
1359 +#: gitk:12301
1360 msgid "Bad arguments to gitk:"
1361 msgstr "gitkへの不正な引数:"
1362
1253 -#: gitk:11316
1363 +#: gitk:12405
1364 msgid "Command line"
1365 msgstr "コマンド行"
1366 +
1367 +#~ msgid "SHA1 ID: "
1368 +#~ msgstr "SHA1 ID: "
1369 +
1370 +#~ msgid "next"
1371 +#~ msgstr "次"
1372 +
1373 +#~ msgid "prev"
1374 +#~ msgstr "前"
1375 +
1376 +#~ msgid "CDate"
1377 +#~ msgstr "作成日"
1378 +
1379 +#~ msgid "Cannot find the git directory \"%s\"."
1380 +#~ msgstr "gitディレクトリ \"%s\" を見つけられません。"
po/pt_br.po
+417 -322
@@ -9,33 +9,42 @@ msgid ""
9 msgstr ""
10 "Project-Id-Version: gitk\n"
11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2010-01-26 15:47-0800\n"
12 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
16 +"Language: pt_BR\n"
17 "MIME-Version: 1.0\n"
18 "Content-Type: text/plain; charset=UTF-8\n"
19 "Content-Transfer-Encoding: 8bit\n"
20
20 -#: gitk:115
21 +#: gitk:140
22 msgid "Couldn't get list of unmerged files:"
23 msgstr "Não foi possível obter a lista dos arquivos não mesclados:"
24
24 -#: gitk:274
25 +#: gitk:212 gitk:2381
26 +msgid "Color words"
27 +msgstr ""
28 +
29 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
30 +msgid "Markup words"
31 +msgstr ""
32 +
33 +#: gitk:324
34 msgid "Error parsing revisions:"
35 msgstr "Erro ao interpretar revisões:"
36
28 -#: gitk:330
37 +#: gitk:380
38 msgid "Error executing --argscmd command:"
39 msgstr "Erro ao executar o comando--argscmd:"
40
32 -#: gitk:343
41 +#: gitk:393
42 msgid "No files selected: --merge specified but no files are unmerged."
43 msgstr ""
44 "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-"
45 "mesclados."
46
38 -#: gitk:346
47 +#: gitk:396
48 msgid ""
49 "No files selected: --merge specified but no unmerged files are within file "
50 "limit."
@@ -43,603 +52,634 @@ msgstr ""
52 "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-"
53 "mesclados dentro dos limites."
54
46 -#: gitk:368 gitk:516
55 +#: gitk:418 gitk:566
56 msgid "Error executing git log:"
57 msgstr "Erro ao executar git log:"
58
50 -#: gitk:386 gitk:532
59 +#: gitk:436 gitk:582
60 msgid "Reading"
61 msgstr "Lendo"
62
54 -#: gitk:446 gitk:4271
63 +#: gitk:496 gitk:4508
64 msgid "Reading commits..."
65 msgstr "Lendo revisões..."
66
58 -#: gitk:449 gitk:1580 gitk:4274
67 +#: gitk:499 gitk:1637 gitk:4511
68 msgid "No commits selected"
69 msgstr "Nenhuma revisão foi selecionada"
70
62 -#: gitk:1456
71 +#: gitk:1511
72 msgid "Can't parse git log output:"
73 msgstr "Não foi possível interpretar a saída do \"git log\":"
74
66 -#: gitk:1676
75 +#: gitk:1740
76 msgid "No commit information available"
77 msgstr "Não há informações disponíveis sobre a revisão"
78
70 -#: gitk:1818
79 +#: gitk:1897
80 msgid "mc"
81 msgstr "mc"
82
74 -#: gitk:1853 gitk:4064 gitk:9067 gitk:10607 gitk:10817
83 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
84 msgid "OK"
85 msgstr "Ok"
86
78 -#: gitk:1855 gitk:4066 gitk:8657 gitk:8736 gitk:8851 gitk:8900 gitk:9069
79 -#: gitk:10608 gitk:10818
87 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
88 +#: gitk:11221 gitk:11501
89 msgid "Cancel"
90 msgstr "Cancelar"
91
83 -#: gitk:1980
92 +#: gitk:2069
93 msgid "Update"
94 msgstr "Atualizar"
95
87 -#: gitk:1981
96 +#: gitk:2070
97 msgid "Reload"
98 msgstr "Recarregar"
99
91 -#: gitk:1982
100 +#: gitk:2071
101 msgid "Reread references"
102 msgstr "Ler as referências novamente"
103
95 -#: gitk:1983
104 +#: gitk:2072
105 msgid "List references"
106 msgstr "Listar referências"
107
99 -#: gitk:1985
108 +#: gitk:2074
109 msgid "Start git gui"
110 msgstr "Iniciar Git GUI"
111
103 -#: gitk:1987
112 +#: gitk:2076
113 msgid "Quit"
114 msgstr "Sair"
115
107 -#: gitk:1979
116 +#: gitk:2068
117 msgid "File"
118 msgstr "Arquivo"
119
111 -#: gitk:1991
120 +#: gitk:2080
121 msgid "Preferences"
122 msgstr "Preferências"
123
115 -#: gitk:1990
124 +#: gitk:2079
125 msgid "Edit"
126 msgstr "Editar"
127
119 -#: gitk:1995
128 +#: gitk:2084
129 msgid "New view..."
130 msgstr "Nova vista..."
131
123 -#: gitk:1996
132 +#: gitk:2085
133 msgid "Edit view..."
134 msgstr "Editar vista..."
135
127 -#: gitk:1997
136 +#: gitk:2086
137 msgid "Delete view"
138 msgstr "Apagar vista"
139
131 -#: gitk:1999
140 +#: gitk:2088
141 msgid "All files"
142 msgstr "Todos os arquivos"
143
135 -#: gitk:1994 gitk:3817
144 +#: gitk:2083 gitk:4050
145 msgid "View"
146 msgstr "Exibir"
147
139 -#: gitk:2004 gitk:2014 gitk:2787
148 +#: gitk:2093 gitk:2103 gitk:3009
149 msgid "About gitk"
150 msgstr "Sobre o gitk"
151
143 -#: gitk:2005 gitk:2019
152 +#: gitk:2094 gitk:2108
153 msgid "Key bindings"
154 msgstr "Atalhos de teclado"
155
147 -#: gitk:2003 gitk:2018
156 +#: gitk:2092 gitk:2107
157 msgid "Help"
158 msgstr "Ajuda"
159
151 -#: gitk:2096 gitk:8132
160 +#: gitk:2185 gitk:8633
161 msgid "SHA1 ID:"
162 msgstr "SHA1 ID:"
163
155 -#: gitk:2127
164 +#: gitk:2229
165 msgid "Row"
166 msgstr "Linha"
167
159 -#: gitk:2165
168 +#: gitk:2267
169 msgid "Find"
170 msgstr "Encontrar"
171
163 -#: gitk:2166
164 -msgid "next"
165 -msgstr "Próximo"
166 -
167 -#: gitk:2167
168 -msgid "prev"
169 -msgstr "Anterior"
170 -
171 -#: gitk:2168
172 +#: gitk:2295
173 msgid "commit"
174 msgstr "Revisão"
175
175 -#: gitk:2171 gitk:2173 gitk:4432 gitk:4455 gitk:4479 gitk:6420 gitk:6492
176 -#: gitk:6576
176 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
177 +#: gitk:6893
178 msgid "containing:"
179 msgstr "contendo:"
180
180 -#: gitk:2174 gitk:3298 gitk:3303 gitk:4507
181 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
182 msgid "touching paths:"
183 msgstr "envolvendo os caminhos:"
184
184 -#: gitk:2175 gitk:4512
185 +#: gitk:2303 gitk:4759
186 msgid "adding/removing string:"
187 msgstr "Adicionando/removendo texto:"
188
188 -#: gitk:2184 gitk:2186
189 +#: gitk:2304 gitk:4761
190 +msgid "changing lines matching:"
191 +msgstr ""
192 +
193 +#: gitk:2313 gitk:2315 gitk:4748
194 msgid "Exact"
195 msgstr "Exatamente"
196
192 -#: gitk:2186 gitk:4587 gitk:6388
197 +#: gitk:2315 gitk:4836 gitk:6704
198 msgid "IgnCase"
199 msgstr "Ignorar maiúsculas/minúsculas"
200
196 -#: gitk:2186 gitk:4481 gitk:4585 gitk:6384
201 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
202 msgid "Regexp"
203 msgstr "Expressão regular"
204
200 -#: gitk:2188 gitk:2189 gitk:4606 gitk:4636 gitk:4643 gitk:6512 gitk:6580
205 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
206 msgid "All fields"
207 msgstr "Todos os campos"
208
204 -#: gitk:2189 gitk:4604 gitk:4636 gitk:6451
209 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
210 msgid "Headline"
211 msgstr "Assunto"
212
208 -#: gitk:2190 gitk:4604 gitk:6451 gitk:6580 gitk:7013
213 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
214 msgid "Comments"
215 msgstr "Descrição da revisão"
216
212 -#: gitk:2190 gitk:4604 gitk:4608 gitk:4643 gitk:6451 gitk:6948 gitk:8307
213 -#: gitk:8322
217 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
218 +#: gitk:8826
219 msgid "Author"
220 msgstr "Autor"
221
217 -#: gitk:2190 gitk:4604 gitk:6451 gitk:6950
222 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
223 msgid "Committer"
224 msgstr "Revisor"
225
221 -#: gitk:2221
226 +#: gitk:2350
227 msgid "Search"
228 msgstr "Buscar"
229
225 -#: gitk:2229
230 +#: gitk:2358
231 msgid "Diff"
232 msgstr "Diferenças"
233
229 -#: gitk:2231
234 +#: gitk:2360
235 msgid "Old version"
236 msgstr "Versão antiga"
237
233 -#: gitk:2233
238 +#: gitk:2362
239 msgid "New version"
240 msgstr "Versão nova"
241
237 -#: gitk:2235
242 +#: gitk:2364
243 msgid "Lines of context"
244 msgstr "Número de linhas de contexto"
245
241 -#: gitk:2245
246 +#: gitk:2374
247 msgid "Ignore space change"
248 msgstr "Ignorar mudanças de caixa"
249
245 -#: gitk:2304
250 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
251 +msgid "Line diff"
252 +msgstr ""
253 +
254 +#: gitk:2445
255 msgid "Patch"
256 msgstr "Diferenças"
257
249 -#: gitk:2306
258 +#: gitk:2447
259 msgid "Tree"
260 msgstr "Árvore"
261
253 -#: gitk:2463 gitk:2480
262 +#: gitk:2616 gitk:2636
263 msgid "Diff this -> selected"
264 msgstr "Comparar esta revisão com a selecionada"
265
257 -#: gitk:2464 gitk:2481
266 +#: gitk:2617 gitk:2637
267 msgid "Diff selected -> this"
268 msgstr "Comparar a revisão selecionada com esta"
269
261 -#: gitk:2465 gitk:2482
270 +#: gitk:2618 gitk:2638
271 msgid "Make patch"
272 msgstr "Criar patch"
273
265 -#: gitk:2466 gitk:8715
274 +#: gitk:2619 gitk:9235
275 msgid "Create tag"
276 msgstr "Criar etiqueta"
277
269 -#: gitk:2467 gitk:8831
278 +#: gitk:2620 gitk:9352
279 msgid "Write commit to file"
280 msgstr "Salvar revisão para um arquivo"
281
273 -#: gitk:2468 gitk:8888
282 +#: gitk:2621 gitk:9409
283 msgid "Create new branch"
284 msgstr "Criar novo ramo"
285
277 -#: gitk:2469
286 +#: gitk:2622
287 msgid "Cherry-pick this commit"
288 msgstr "Fazer cherry-pick desta revisão"
289
281 -#: gitk:2470
290 +#: gitk:2623
291 msgid "Reset HEAD branch to here"
292 msgstr "Redefinir HEAD para cá"
293
285 -#: gitk:2471
294 +#: gitk:2624
295 msgid "Mark this commit"
296 msgstr "Marcar esta revisão"
297
289 -#: gitk:2472
298 +#: gitk:2625
299 msgid "Return to mark"
300 msgstr "Voltar à marca"
301
293 -#: gitk:2473
302 +#: gitk:2626
303 msgid "Find descendant of this and mark"
304 msgstr "Encontrar descendente e marcar"
305
297 -#: gitk:2474
306 +#: gitk:2627
307 msgid "Compare with marked commit"
308 msgstr "Comparar com a revisão marcada"
309
301 -#: gitk:2488
310 +#: gitk:2628 gitk:2639
311 +#, fuzzy
312 +msgid "Diff this -> marked commit"
313 +msgstr "Comparar esta revisão com a selecionada"
314 +
315 +#: gitk:2629 gitk:2640
316 +#, fuzzy
317 +msgid "Diff marked commit -> this"
318 +msgstr "Comparar a revisão selecionada com esta"
319 +
320 +#: gitk:2630
321 +#, fuzzy
322 +msgid "Revert this commit"
323 +msgstr "Marcar esta revisão"
324 +
325 +#: gitk:2646
326 msgid "Check out this branch"
327 msgstr "Efetuar checkout deste ramo"
328
305 -#: gitk:2489
329 +#: gitk:2647
330 msgid "Remove this branch"
331 msgstr "Excluir este ramo"
332
309 -#: gitk:2496
333 +#: gitk:2654
334 msgid "Highlight this too"
335 msgstr "Marcar este também"
336
313 -#: gitk:2497
337 +#: gitk:2655
338 msgid "Highlight this only"
339 msgstr "Marcar apenas este"
340
317 -#: gitk:2498
341 +#: gitk:2656
342 msgid "External diff"
343 msgstr "Diff externo"
344
321 -#: gitk:2499
345 +#: gitk:2657
346 msgid "Blame parent commit"
347 msgstr "Anotar revisão anterior"
348
325 -#: gitk:2506
349 +#: gitk:2664
350 msgid "Show origin of this line"
351 msgstr "Exibir origem desta linha"
352
329 -#: gitk:2507
353 +#: gitk:2665
354 msgid "Run git gui blame on this line"
355 msgstr "Executar 'git blame' nesta linha"
356
333 -#: gitk:2789
334 -msgid "\n"
357 +#: gitk:3011
358 +#, fuzzy
359 +msgid ""
360 +"\n"
361 "Gitk - a commit viewer for git\n"
362 "\n"
337 -"Copyright ©9 2005-2010 Paul Mackerras\n"
363 +"Copyright © 2005-2014 Paul Mackerras\n"
364 "\n"
365 "Use and redistribute under the terms of the GNU General Public License"
340 -msgstr "\n"
366 +msgstr ""
367 +"\n"
368 "Gitk - um visualizador de revisões para o git \n"
369 "\n"
370 "Copyright ©9 2005-2010 Paul Mackerras\n"
371 "\n"
372 "Uso e distribuição segundo os termos da Licença Pública Geral GNU"
373
347 -#: gitk:2797 gitk:2862 gitk:9253
374 +#: gitk:3019 gitk:3085 gitk:9836
375 msgid "Close"
376 msgstr "Fechar"
377
351 -#: gitk:2818
378 +#: gitk:3040
379 msgid "Gitk key bindings"
380 msgstr "Atalhos de teclado"
381
355 -#: gitk:2821
382 +#: gitk:3043
383 msgid "Gitk key bindings:"
384 msgstr "Atalhos de teclado:"
385
359 -#: gitk:2823
386 +#: gitk:3045
387 #, tcl-format
388 msgid "<%s-Q>\t\tQuit"
389 msgstr "<%s-Q>\t\tSair"
390
364 -#: gitk:2824
391 +#: gitk:3046
392 #, tcl-format
393 msgid "<%s-W>\t\tClose window"
394 msgstr "<%s-W>\t\tFechar janela"
395
369 -#: gitk:2825
396 +#: gitk:3047
397 msgid "<Home>\t\tMove to first commit"
398 msgstr "<Home>\t\tIr para a primeira revisão"
399
373 -#: gitk:2826
400 +#: gitk:3048
401 msgid "<End>\t\tMove to last commit"
402 msgstr "<End>\t\tIr para a última revisão"
403
377 -#: gitk:2827
378 -msgid "<Up>, p, i\tMove up one commit"
404 +#: gitk:3049
405 +#, fuzzy
406 +msgid "<Up>, p, k\tMove up one commit"
407 msgstr "<Up>, p, i\tIr para uma revisão acima"
408
381 -#: gitk:2828
382 -msgid "<Down>, n, k\tMove down one commit"
409 +#: gitk:3050
410 +#, fuzzy
411 +msgid "<Down>, n, j\tMove down one commit"
412 msgstr "<Down>, n, k\tIr para uma revisão abaixo"
413
385 -#: gitk:2829
386 -msgid "<Left>, z, j\tGo back in history list"
414 +#: gitk:3051
415 +#, fuzzy
416 +msgid "<Left>, z, h\tGo back in history list"
417 msgstr "<Left>, z, j\tVoltar no histórico"
418
389 -#: gitk:2830
419 +#: gitk:3052
420 msgid "<Right>, x, l\tGo forward in history list"
421 msgstr "<Right>, x, l\tAvançar no histórico"
422
393 -#: gitk:2831
423 +#: gitk:3053
424 +#, tcl-format
425 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
426 +msgstr ""
427 +
428 +#: gitk:3054
429 msgid "<PageUp>\tMove up one page in commit list"
430 msgstr "<PageUp>\tSubir uma página na lista de revisões"
431
397 -#: gitk:2832
432 +#: gitk:3055
433 msgid "<PageDown>\tMove down one page in commit list"
434 msgstr "<PageDown>\tDescer uma página na lista de revisões"
435
401 -#: gitk:2833
436 +#: gitk:3056
437 #, tcl-format
438 msgid "<%s-Home>\tScroll to top of commit list"
439 msgstr "<%s-Home>\tRolar para o início da lista de revisões"
440
406 -#: gitk:2834
441 +#: gitk:3057
442 #, tcl-format
443 msgid "<%s-End>\tScroll to bottom of commit list"
444 msgstr "<%s-End>\tRolar para o final da lista de revisões"
445
411 -#: gitk:2835
446 +#: gitk:3058
447 #, tcl-format
448 msgid "<%s-Up>\tScroll commit list up one line"
449 msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões"
450
416 -#: gitk:2836
451 +#: gitk:3059
452 #, tcl-format
453 msgid "<%s-Down>\tScroll commit list down one line"
454 msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões"
455
421 -#: gitk:2837
456 +#: gitk:3060
457 #, tcl-format
458 msgid "<%s-PageUp>\tScroll commit list up one page"
459 msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões"
460
426 -#: gitk:2838
461 +#: gitk:3061
462 #, tcl-format
463 msgid "<%s-PageDown>\tScroll commit list down one page"
464 msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões"
465
431 -#: gitk:2839
466 +#: gitk:3062
467 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
468 msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)"
469
435 -#: gitk:2840
470 +#: gitk:3063
471 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
472 msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)"
473
439 -#: gitk:2841
474 +#: gitk:3064
475 msgid "<Delete>, b\tScroll diff view up one page"
476 msgstr "<Delete>, b\tRola alterações uma página acima"
477
443 -#: gitk:2842
478 +#: gitk:3065
479 msgid "<Backspace>\tScroll diff view up one page"
480 msgstr "<Backspace>\tRolar alterações uma página abaixo"
481
447 -#: gitk:2843
482 +#: gitk:3066
483 msgid "<Space>\t\tScroll diff view down one page"
484 msgstr "<Space>\t\tRolar alterações uma página abaixo"
485
451 -#: gitk:2844
486 +#: gitk:3067
487 msgid "u\t\tScroll diff view up 18 lines"
488 msgstr "u\t\tRolar alterações 18 linhas acima"
489
455 -#: gitk:2845
490 +#: gitk:3068
491 msgid "d\t\tScroll diff view down 18 lines"
492 msgstr "d\t\tRolar alterações 18 linhas abaixo"
493
459 -#: gitk:2846
494 +#: gitk:3069
495 #, tcl-format
496 msgid "<%s-F>\t\tFind"
497 msgstr "<%s-F>\t\tProcurar"
498
464 -#: gitk:2847
499 +#: gitk:3070
500 #, tcl-format
501 msgid "<%s-G>\t\tMove to next find hit"
502 msgstr "<%s-G>\t\tIr para a próxima ocorrência"
503
469 -#: gitk:2848
504 +#: gitk:3071
505 msgid "<Return>\tMove to next find hit"
506 msgstr "<Return>\tIr para a próxima ocorrência"
507
473 -#: gitk:2849
508 +#: gitk:3072
509 msgid "/\t\tFocus the search box"
510 msgstr "/\t\tPor foco na caixa de busca"
511
477 -#: gitk:2850
512 +#: gitk:3073
513 msgid "?\t\tMove to previous find hit"
514 msgstr "?\t\tIr para a ocorrência anterior"
515
481 -#: gitk:2851
516 +#: gitk:3074
517 msgid "f\t\tScroll diff view to next file"
518 msgstr "f\t\tRolar alterações para o próximo arquivo"
519
485 -#: gitk:2852
520 +#: gitk:3075
521 #, tcl-format
522 msgid "<%s-S>\t\tSearch for next hit in diff view"
523 msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações"
524
490 -#: gitk:2853
525 +#: gitk:3076
526 #, tcl-format
527 msgid "<%s-R>\t\tSearch for previous hit in diff view"
528 msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações"
529
495 -#: gitk:2854
530 +#: gitk:3077
531 #, tcl-format
532 msgid "<%s-KP+>\tIncrease font size"
533 msgstr "<%s-KP+>\tAumentar tamanho da fonte"
534
500 -#: gitk:2855
535 +#: gitk:3078
536 #, tcl-format
537 msgid "<%s-plus>\tIncrease font size"
538 msgstr "<%s-plus>\tAumentar tamanho da fonte"
539
505 -#: gitk:2856
540 +#: gitk:3079
541 #, tcl-format
542 msgid "<%s-KP->\tDecrease font size"
543 msgstr "<%s-KP->\tReduzir tamanho da fonte"
544
510 -#: gitk:2857
545 +#: gitk:3080
546 #, tcl-format
547 msgid "<%s-minus>\tDecrease font size"
548 msgstr "<%s-minus>\tReduzir tamanho da fonte"
549
515 -#: gitk:2858
550 +#: gitk:3081
551 msgid "<F5>\t\tUpdate"
552 msgstr "<F5>\t\tAtualizar"
553
519 -#: gitk:3313 gitk:3322
554 +#: gitk:3546 gitk:3555
555 #, tcl-format
556 msgid "Error creating temporary directory %s:"
557 msgstr "Erro ao criar o diretório temporário %s:"
558
524 -#: gitk:3335
559 +#: gitk:3568
560 #, tcl-format
561 msgid "Error getting \"%s\" from %s:"
562 msgstr "Erro ao ler \"%s\" de %s:"
563
529 -#: gitk:3398
564 +#: gitk:3631
565 msgid "command failed:"
566 msgstr "O comando falhou:"
567
533 -#: gitk:3547
568 +#: gitk:3780
569 msgid "No such commit"
570 msgstr "Revisão não encontrada"
571
537 -#: gitk:3561
572 +#: gitk:3794
573 msgid "git gui blame: command failed:"
574 msgstr "Comando 'git gui blame' falhou:"
575
541 -#: gitk:3592
576 +#: gitk:3825
577 #, tcl-format
578 msgid "Couldn't read merge head: %s"
579 msgstr "Impossível ler merge head: %s"
580
546 -#: gitk:3600
581 +#: gitk:3833
582 #, tcl-format
583 msgid "Error reading index: %s"
584 msgstr "Erro ao ler o índice: %s"
585
551 -#: gitk:3625
586 +#: gitk:3858
587 #, tcl-format
588 msgid "Couldn't start git blame: %s"
589 msgstr "Não foi possível inciar o 'git blame': %s"
590
556 -#: gitk:3628 gitk:6419
591 +#: gitk:3861 gitk:6735
592 msgid "Searching"
593 msgstr "Procurando"
594
560 -#: gitk:3660
595 +#: gitk:3893
596 #, tcl-format
597 msgid "Error running git blame: %s"
598 msgstr "Erro ao executar 'git blame': %s"
599
565 -#: gitk:3688
600 +#: gitk:3921
601 #, tcl-format
602 msgid "That line comes from commit %s, which is not in this view"
603 msgstr "Esta linha vem da revisão %s, que não está nesta vista"
604
570 -#: gitk:3702
605 +#: gitk:3935
606 msgid "External diff viewer failed:"
607 msgstr "Erro do visualizador de alterações externo:"
608
574 -#: gitk:3820
609 +#: gitk:4053
610 msgid "Gitk view definition"
611 msgstr "Definir vista"
612
578 -#: gitk:3824
613 +#: gitk:4057
614 msgid "Remember this view"
615 msgstr "Lembrar esta vista"
616
582 -#: gitk:3825
617 +#: gitk:4058
618 msgid "References (space separated list):"
619 msgstr "Referências (separar a lista com um espaço):"
620
586 -#: gitk:3826
621 +#: gitk:4059
622 msgid "Branches & tags:"
623 msgstr "Ramos & etiquetas:"
624
590 -#: gitk:3827
625 +#: gitk:4060
626 msgid "All refs"
627 msgstr "Todas as referências"
628
594 -#: gitk:3828
629 +#: gitk:4061
630 msgid "All (local) branches"
631 msgstr "Todos os ramos locais"
632
598 -#: gitk:3829
633 +#: gitk:4062
634 msgid "All tags"
635 msgstr "Todas as etiquetas"
636
602 -#: gitk:3830
637 +#: gitk:4063
638 msgid "All remote-tracking branches"
639 msgstr "Todos os ramos de rastreio"
640
606 -#: gitk:3831
641 +#: gitk:4064
642 msgid "Commit Info (regular expressions):"
643 msgstr "Informações da revisão (expressões regulares):"
644
610 -#: gitk:3832
645 +#: gitk:4065
646 msgid "Author:"
647 msgstr "Autor:"
648
614 -#: gitk:3833
649 +#: gitk:4066
650 msgid "Committer:"
651 msgstr "Revisor:"
652
618 -#: gitk:3834
653 +#: gitk:4067
654 msgid "Commit Message:"
655 msgstr "Descrição da revisão:"
656
622 -#: gitk:3835
657 +#: gitk:4068
658 msgid "Matches all Commit Info criteria"
659 msgstr "Coincidir todos os critérios de informações da revisão"
660
626 -#: gitk:3836
661 +#: gitk:4069
662 +#, fuzzy
663 +msgid "Matches none Commit Info criteria"
664 +msgstr "Coincidir todos os critérios de informações da revisão"
665 +
666 +#: gitk:4070
667 msgid "Changes to Files:"
668 msgstr "Mudanças para os arquivos:"
669
630 -#: gitk:3837
670 +#: gitk:4071
671 msgid "Fixed String"
672 msgstr "Texto fixo"
673
634 -#: gitk:3838
674 +#: gitk:4072
675 msgid "Regular Expression"
676 msgstr "Expressão regular"
677
638 -#: gitk:3839
678 +#: gitk:4073
679 msgid "Search string:"
680 msgstr "Texto de busca"
681
642 -#: gitk:3840
682 +#: gitk:4074
683 msgid ""
684 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
685 "15:27:38\"):"
@@ -647,201 +687,201 @@ msgstr ""
687 "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
688 "15:27:38\"):"
689
650 -#: gitk:3841
690 +#: gitk:4075
691 msgid "Since:"
692 msgstr "Desde:"
693
654 -#: gitk:3842
694 +#: gitk:4076
695 msgid "Until:"
696 msgstr "Até:"
697
658 -#: gitk:3843
698 +#: gitk:4077
699 msgid "Limit and/or skip a number of revisions (positive integer):"
700 msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):"
701
662 -#: gitk:3844
702 +#: gitk:4078
703 msgid "Number to show:"
704 msgstr "Número para mostrar:"
705
666 -#: gitk:3845
706 +#: gitk:4079
707 msgid "Number to skip:"
708 msgstr "Número para ignorar:"
709
670 -#: gitk:3846
710 +#: gitk:4080
711 msgid "Miscellaneous options:"
712 msgstr "Opções diversas:"
713
674 -#: gitk:3847
714 +#: gitk:4081
715 msgid "Strictly sort by date"
716 msgstr "Ordenar estritamente pela data"
717
678 -#: gitk:3848
718 +#: gitk:4082
719 msgid "Mark branch sides"
720 msgstr "Marcar os dois lados do ramo"
721
682 -#: gitk:3849
722 +#: gitk:4083
723 msgid "Limit to first parent"
724 msgstr "Limitar ao primeiro antecessor"
725
686 -#: gitk:3850
726 +#: gitk:4084
727 msgid "Simple history"
728 msgstr "Histórico simplificado"
729
690 -#: gitk:3851
730 +#: gitk:4085
731 msgid "Additional arguments to git log:"
732 msgstr "Argumentos adicionais para o 'git log':"
733
694 -#: gitk:3852
734 +#: gitk:4086
735 msgid "Enter files and directories to include, one per line:"
736 msgstr "Arquivos e diretórios para incluir, um por linha"
737
698 -#: gitk:3853
738 +#: gitk:4087
739 msgid "Command to generate more commits to include:"
740 msgstr "Comando para gerar mais revisões para incluir:"
741
702 -#: gitk:3977
742 +#: gitk:4211
743 msgid "Gitk: edit view"
744 msgstr "Gitk: editar vista"
745
706 -#: gitk:3985
746 +#: gitk:4219
747 msgid "-- criteria for selecting revisions"
748 msgstr "-- critérios para selecionar revisões"
749
710 -#: gitk:3990
750 +#: gitk:4224
751 msgid "View Name"
752 msgstr "Nome da vista"
753
714 -#: gitk:4065
754 +#: gitk:4299
755 msgid "Apply (F5)"
756 msgstr "Aplicar (F5)"
757
718 -#: gitk:4103
758 +#: gitk:4337
759 msgid "Error in commit selection arguments:"
760 msgstr "Erro nos argumentos de seleção de revisões:"
761
722 -#: gitk:4156 gitk:4208 gitk:4656 gitk:4670 gitk:5931 gitk:11551 gitk:11552
762 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
763 msgid "None"
764 msgstr "Nenhum"
765
726 -#: gitk:4604 gitk:6451 gitk:8309 gitk:8324
727 -msgid "Date"
728 -msgstr "Data"
729 -
730 -#: gitk:4604 gitk:6451
731 -msgid "CDate"
732 -msgstr "DataR"
733 -
734 -#: gitk:4753 gitk:4758
766 +#: gitk:5003 gitk:5008
767 msgid "Descendant"
768 msgstr "Descendente de"
769
738 -#: gitk:4754
770 +#: gitk:5004
771 msgid "Not descendant"
772 msgstr "Não descendente de"
773
742 -#: gitk:4761 gitk:4766
774 +#: gitk:5011 gitk:5016
775 msgid "Ancestor"
776 msgstr "Antecessor de"
777
746 -#: gitk:4762
778 +#: gitk:5012
779 msgid "Not ancestor"
780 msgstr "Não antecessor de"
781
750 -#: gitk:5052
782 +#: gitk:5306
783 msgid "Local changes checked in to index but not committed"
784 msgstr "Mudanças locais marcadas, porém não salvas"
785
754 -#: gitk:5088
786 +#: gitk:5342
787 msgid "Local uncommitted changes, not checked in to index"
788 msgstr "Mudanças locais não marcadas"
789
758 -#: gitk:6769
790 +#: gitk:7115
791 +msgid "and many more"
792 +msgstr ""
793 +
794 +#: gitk:7118
795 msgid "many"
796 msgstr "muitas"
797
762 -#: gitk:6952
798 +#: gitk:7309
799 msgid "Tags:"
800 msgstr "Etiquetas:"
801
766 -#: gitk:6969 gitk:6975 gitk:8302
802 +#: gitk:7326 gitk:7332 gitk:8806
803 msgid "Parent"
804 msgstr "Antecessor"
805
770 -#: gitk:6980
806 +#: gitk:7337
807 msgid "Child"
808 msgstr "Descendente"
809
774 -#: gitk:6989
810 +#: gitk:7346
811 msgid "Branch"
812 msgstr "Ramo"
813
778 -#: gitk:6992
814 +#: gitk:7349
815 msgid "Follows"
816 msgstr "Segue"
817
782 -#: gitk:6995
818 +#: gitk:7352
819 msgid "Precedes"
820 msgstr "Precede"
821
786 -#: gitk:7532
822 +#: gitk:7947
823 #, tcl-format
824 msgid "Error getting diffs: %s"
825 msgstr "Erro ao obter diferenças: %s"
826
791 -#: gitk:8130
827 +#: gitk:8631
828 msgid "Goto:"
829 msgstr "Ir para:"
830
795 -#: gitk:8151
831 +#: gitk:8652
832 #, tcl-format
833 msgid "Short SHA1 id %s is ambiguous"
834 msgstr "O id SHA1 %s é ambíguo"
835
800 -#: gitk:8158
836 +#: gitk:8659
837 #, tcl-format
838 msgid "Revision %s is not known"
839 msgstr "Revisão %s desconhecida"
840
805 -#: gitk:8168
841 +#: gitk:8669
842 #, tcl-format
843 msgid "SHA1 id %s is not known"
844 msgstr "Id SHA1 %s desconhecido"
845
810 -#: gitk:8170
846 +#: gitk:8671
847 #, tcl-format
848 msgid "Revision %s is not in the current view"
849 msgstr "A revisão %s não está na vista atual"
850
815 -#: gitk:8312
851 +#: gitk:8813 gitk:8828
852 +msgid "Date"
853 +msgstr "Data"
854 +
855 +#: gitk:8816
856 msgid "Children"
857 msgstr "Descendentes"
858
819 -#: gitk:8370
859 +#: gitk:8879
860 #, tcl-format
861 msgid "Reset %s branch to here"
862 msgstr "Redefinir ramo %s para este ponto"
863
824 -#: gitk:8372
864 +#: gitk:8881
865 msgid "Detached head: can't reset"
866 msgstr "Detached head: impossível redefinir"
867
828 -#: gitk:8481 gitk:8487
868 +#: gitk:8986 gitk:8992
869 msgid "Skipping merge commit "
870 msgstr "Saltando revisão de mesclagem"
871
832 -#: gitk:8496 gitk:8501
872 +#: gitk:9001 gitk:9006
873 msgid "Error getting patch ID for "
874 msgstr "Erro ao obter patch ID para"
875
836 -#: gitk:8497 gitk:8502
876 +#: gitk:9002 gitk:9007
877 msgid " - stopping\n"
878 msgstr "- parando\n"
879
840 -#: gitk:8507 gitk:8510 gitk:8518 gitk:8532 gitk:8541
880 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
881 msgid "Commit "
882 msgstr "Revisão"
883
844 -#: gitk:8511
884 +#: gitk:9016
885 msgid ""
886 " is the same patch as\n"
887 " "
@@ -849,13 +889,13 @@ msgstr ""
889 "é o mesmo patch que\n"
890 " "
891
852 -#: gitk:8519
892 +#: gitk:9024
893 msgid ""
894 " differs from\n"
895 " "
896 msgstr "difere de"
897
858 -#: gitk:8521
898 +#: gitk:9026
899 msgid ""
900 "Diff of commits:\n"
901 "\n"
@@ -863,129 +903,129 @@ msgstr ""
903 "Diferença de revisões:\n"
904 "\n"
905
866 -#: gitk:8533 gitk:8542
906 +#: gitk:9038 gitk:9047
907 #, tcl-format
908 msgid " has %s children - stopping\n"
909 msgstr "possui %s descendentes - parando\n"
910
871 -#: gitk:8561
911 +#: gitk:9066
912 #, tcl-format
913 msgid "Error writing commit to file: %s"
914 msgstr "Erro ao salvar revisão para o arquivo: %s"
915
876 -#: gitk:8567
916 +#: gitk:9072
917 #, tcl-format
918 msgid "Error diffing commits: %s"
919 msgstr "Erro ao comparar revisões: %s"
920
881 -#: gitk:8598
921 +#: gitk:9118
922 msgid "Top"
923 msgstr "Início"
924
885 -#: gitk:8599
925 +#: gitk:9119
926 msgid "From"
927 msgstr "De"
928
889 -#: gitk:8604
929 +#: gitk:9124
930 msgid "To"
931 msgstr "Para"
932
893 -#: gitk:8628
933 +#: gitk:9148
934 msgid "Generate patch"
935 msgstr "Gerar patch"
936
897 -#: gitk:8630
937 +#: gitk:9150
938 msgid "From:"
939 msgstr "De:"
940
901 -#: gitk:8639
941 +#: gitk:9159
942 msgid "To:"
943 msgstr "Para:"
944
905 -#: gitk:8648
945 +#: gitk:9168
946 msgid "Reverse"
947 msgstr "Inverter"
948
909 -#: gitk:8650 gitk:8845
949 +#: gitk:9170 gitk:9366
950 msgid "Output file:"
951 msgstr "Arquivo de saída:"
952
913 -#: gitk:8656
953 +#: gitk:9176
954 msgid "Generate"
955 msgstr "Gerar"
956
917 -#: gitk:8694
957 +#: gitk:9214
958 msgid "Error creating patch:"
959 msgstr "Erro ao criar patch:"
960
921 -#: gitk:8717 gitk:8833 gitk:8890
961 +#: gitk:9237 gitk:9354 gitk:9411
962 msgid "ID:"
963 msgstr "ID:"
964
925 -#: gitk:8726
965 +#: gitk:9246
966 msgid "Tag name:"
967 msgstr "Nome da etiqueta:"
968
929 -#: gitk:8729
969 +#: gitk:9249
970 msgid "Tag message is optional"
971 msgstr "A descrição da etiqueta é opcional"
972
933 -#: gitk:8731
973 +#: gitk:9251
974 msgid "Tag message:"
975 msgstr "Descrição da etiqueta"
976
937 -#: gitk:8735 gitk:8899
977 +#: gitk:9255 gitk:9420
978 msgid "Create"
979 msgstr "Criar"
980
941 -#: gitk:8753
981 +#: gitk:9273
982 msgid "No tag name specified"
983 msgstr "Nome da etiqueta não indicado"
984
945 -#: gitk:8757
985 +#: gitk:9277
986 #, tcl-format
987 msgid "Tag \"%s\" already exists"
988 msgstr "Etiqueta \"%s\" já existe"
989
950 -#: gitk:8767
990 +#: gitk:9287
991 msgid "Error creating tag:"
992 msgstr "Erro ao criar etiqueta:"
993
954 -#: gitk:8842
994 +#: gitk:9363
995 msgid "Command:"
996 msgstr "Comando:"
997
958 -#: gitk:8850
998 +#: gitk:9371
999 msgid "Write"
1000 msgstr "Exportar"
1001
962 -#: gitk:8868
1002 +#: gitk:9389
1003 msgid "Error writing commit:"
1004 msgstr "Erro ao exportar revisão"
1005
966 -#: gitk:8895
1006 +#: gitk:9416
1007 msgid "Name:"
1008 msgstr "Nome:"
1009
970 -#: gitk:8918
1010 +#: gitk:9439
1011 msgid "Please specify a name for the new branch"
1012 msgstr "Indique um nome para o novo ramo"
1013
974 -#: gitk:8923
1014 +#: gitk:9444
1015 #, tcl-format
1016 msgid "Branch '%s' already exists. Overwrite?"
1017 msgstr "O ramo \"%s\" já existe. Sobrescrever?"
1018
979 -#: gitk:8989
1019 +#: gitk:9511
1020 #, tcl-format
1021 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1022 msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?"
1023
984 -#: gitk:8994
1024 +#: gitk:9516
1025 msgid "Cherry-picking"
1026 msgstr "Cherry-picking"
1027
988 -#: gitk:9003
1028 +#: gitk:9525
1029 #, tcl-format
1030 msgid ""
1031 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -995,7 +1035,7 @@ msgstr ""
1035 "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente "
1036 "novamente."
1037
998 -#: gitk:9009
1038 +#: gitk:9531
1039 msgid ""
1040 "Cherry-pick failed because of merge conflict.\n"
1041 "Do you wish to run git citool to resolve it?"
@@ -1003,32 +1043,61 @@ msgstr ""
1043 "O cherry-pick falhou porque houve um conflito na mesclagem.\n"
1044 "Executar o 'git citool' para resolvê-lo?"
1045
1006 -#: gitk:9025
1046 +#: gitk:9547 gitk:9605
1047 msgid "No changes committed"
1048 msgstr "Nenhuma revisão foi salva"
1049
1010 -#: gitk:9051
1050 +#: gitk:9574
1051 +#, fuzzy, tcl-format
1052 +msgid "Commit %s is not included in branch %s -- really revert it?"
1053 +msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?"
1054 +
1055 +#: gitk:9579
1056 +#, fuzzy
1057 +msgid "Reverting"
1058 +msgstr "Redefinindo"
1059 +
1060 +#: gitk:9587
1061 +#, fuzzy, tcl-format
1062 +msgid ""
1063 +"Revert failed because of local changes to the following files:%s Please "
1064 +"commit, reset or stash your changes and try again."
1065 +msgstr ""
1066 +"O cherry-pick falhou porque o arquivo \"%s\" possui mudanças locais.\n"
1067 +"Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente "
1068 +"novamente."
1069 +
1070 +#: gitk:9591
1071 +#, fuzzy
1072 +msgid ""
1073 +"Revert failed because of merge conflict.\n"
1074 +" Do you wish to run git citool to resolve it?"
1075 +msgstr ""
1076 +"O cherry-pick falhou porque houve um conflito na mesclagem.\n"
1077 +"Executar o 'git citool' para resolvê-lo?"
1078 +
1079 +#: gitk:9634
1080 msgid "Confirm reset"
1081 msgstr "Confirmar redefinição"
1082
1014 -#: gitk:9053
1083 +#: gitk:9636
1084 #, tcl-format
1085 msgid "Reset branch %s to %s?"
1086 msgstr "Você realmente deseja redefinir o ramo %s para %s?"
1087
1019 -#: gitk:9055
1088 +#: gitk:9638
1089 msgid "Reset type:"
1090 msgstr "Tipo de redefinição"
1091
1023 -#: gitk:9058
1092 +#: gitk:9641
1093 msgid "Soft: Leave working tree and index untouched"
1094 msgstr "Soft: deixa a árvore de trabalho e o índice intocados"
1095
1027 -#: gitk:9061
1096 +#: gitk:9644
1097 msgid "Mixed: Leave working tree untouched, reset index"
1098 msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice"
1099
1031 -#: gitk:9064
1100 +#: gitk:9647
1101 msgid ""
1102 "Hard: Reset working tree and index\n"
1103 "(discard ALL local changes)"
@@ -1036,19 +1105,19 @@ msgstr ""
1105 "Hard: Redefine a árvore de trabalho e o índice\n"
1106 "(descarta TODAS as mudanças locais)"
1107
1039 -#: gitk:9081
1108 +#: gitk:9664
1109 msgid "Resetting"
1110 msgstr "Redefinindo"
1111
1043 -#: gitk:9141
1112 +#: gitk:9724
1113 msgid "Checking out"
1114 msgstr "Abrindo"
1115
1047 -#: gitk:9194
1116 +#: gitk:9777
1117 msgid "Cannot delete the currently checked-out branch"
1118 msgstr "Impossível excluir o ramo atualmente aberto"
1119
1051 -#: gitk:9200
1120 +#: gitk:9783
1121 #, tcl-format
1122 msgid ""
1123 "The commits on branch %s aren't on any other branch.\n"
@@ -1057,16 +1126,16 @@ msgstr ""
1126 "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n"
1127 "Você realmente deseja excluir ramo \"%s\"?"
1128
1060 -#: gitk:9231
1129 +#: gitk:9814
1130 #, tcl-format
1131 msgid "Tags and heads: %s"
1132 msgstr "Referências: %s"
1133
1065 -#: gitk:9246
1134 +#: gitk:9829
1135 msgid "Filter"
1136 msgstr "Filtro"
1137
1069 -#: gitk:9541
1138 +#: gitk:10125
1139 msgid ""
1140 "Error reading commit topology information; branch and preceding/following "
1141 "tag information will be incomplete."
@@ -1074,204 +1143,230 @@ msgstr ""
1143 "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas "
1144 "antecessoras/sucessoras estarão incompletas"
1145
1077 -#: gitk:10527
1146 +#: gitk:11102
1147 msgid "Tag"
1148 msgstr "Etiqueta"
1149
1081 -#: gitk:10527
1150 +#: gitk:11106
1151 msgid "Id"
1152 msgstr "Id"
1153
1085 -#: gitk:10576
1154 +#: gitk:11189
1155 msgid "Gitk font chooser"
1156 msgstr "Selecionar fontes do Gitk"
1157
1089 -#: gitk:10593
1158 +#: gitk:11206
1159 msgid "B"
1160 msgstr "B"
1161
1093 -#: gitk:10596
1162 +#: gitk:11209
1163 msgid "I"
1164 msgstr "I"
1165
1097 -#: gitk:10714
1098 -msgid "Gitk preferences"
1099 -msgstr "Preferências do Gitk"
1100 -
1101 -#: gitk:10716
1166 +#: gitk:11327
1167 msgid "Commit list display options"
1168 msgstr "Opções da lista de revisões"
1169
1105 -#: gitk:10719
1170 +#: gitk:11330
1171 msgid "Maximum graph width (lines)"
1172 msgstr "Largura máxima do grafo (linhas)"
1173
1109 -#: gitk:10722
1110 -#, tcl-format
1174 +#: gitk:11334
1175 +#, no-tcl-format
1176 msgid "Maximum graph width (% of pane)"
1177 msgstr "Largura máxima do grafo (% do painel)"
1178
1114 -#: gitk:10725
1179 +#: gitk:11337
1180 msgid "Show local changes"
1181 msgstr "Exibir mudanças locais"
1182
1118 -#: gitk:10728
1119 -msgid "Auto-select SHA1"
1183 +#: gitk:11340
1184 +#, fuzzy
1185 +msgid "Auto-select SHA1 (length)"
1186 msgstr "Selecionar o SHA1 automaticamente"
1187
1122 -#: gitk:10731
1188 +#: gitk:11344
1189 msgid "Hide remote refs"
1190 msgstr "Ocultar referências remotas"
1191
1126 -#: gitk:10735
1192 +#: gitk:11348
1193 msgid "Diff display options"
1194 msgstr "Opções de exibição das alterações"
1195
1130 -#: gitk:10737
1196 +#: gitk:11350
1197 msgid "Tab spacing"
1198 msgstr "Espaços por tabulação"
1199
1134 -#: gitk:10740
1135 -msgid "Display nearby tags"
1200 +#: gitk:11353
1201 +#, fuzzy
1202 +msgid "Display nearby tags/heads"
1203 msgstr "Exibir etiquetas próximas"
1204
1138 -#: gitk:10743
1205 +#: gitk:11356
1206 +msgid "Maximum # tags/heads to show"
1207 +msgstr ""
1208 +
1209 +#: gitk:11359
1210 msgid "Limit diffs to listed paths"
1211 msgstr "Limitar diferenças aos caminhos listados"
1212
1142 -#: gitk:10746
1213 +#: gitk:11362
1214 msgid "Support per-file encodings"
1215 msgstr "Usar codificações distintas por arquivo"
1216
1146 -#: gitk:10752 gitk:10832
1217 +#: gitk:11368 gitk:11515
1218 msgid "External diff tool"
1219 msgstr "Ferramenta 'diff' externa"
1220
1150 -#: gitk:10753
1221 +#: gitk:11369
1222 msgid "Choose..."
1223 msgstr "Selecionar..."
1224
1154 -#: gitk:10758
1225 +#: gitk:11374
1226 msgid "General options"
1227 msgstr "Opções gerais"
1228
1158 -#: gitk:10761
1229 +#: gitk:11377
1230 msgid "Use themed widgets"
1231 msgstr "Usar temas para as janelas"
1232
1162 -#: gitk:10763
1233 +#: gitk:11379
1234 msgid "(change requires restart)"
1235 msgstr "(exige reinicialização)"
1236
1166 -#: gitk:10765
1237 +#: gitk:11381
1238 msgid "(currently unavailable)"
1239 msgstr "(atualmente indisponível)"
1240
1170 -#: gitk:10769
1241 +#: gitk:11392
1242 msgid "Colors: press to choose"
1243 msgstr "Cores: clique para escolher"
1244
1174 -#: gitk:10772
1245 +#: gitk:11395
1246 msgid "Interface"
1247 msgstr "Interface"
1248
1178 -#: gitk:10773
1249 +#: gitk:11396
1250 msgid "interface"
1251 msgstr "interface"
1252
1182 -#: gitk:10776
1253 +#: gitk:11399
1254 msgid "Background"
1255 msgstr "Segundo plano"
1256
1186 -#: gitk:10777 gitk:10807
1257 +#: gitk:11400 gitk:11430
1258 msgid "background"
1259 msgstr "segundo plano"
1260
1190 -#: gitk:10780
1261 +#: gitk:11403
1262 msgid "Foreground"
1263 msgstr "Primeiro plano"
1264
1194 -#: gitk:10781
1265 +#: gitk:11404
1266 msgid "foreground"
1267 msgstr "primeiro plano"
1268
1198 -#: gitk:10784
1269 +#: gitk:11407
1270 msgid "Diff: old lines"
1271 msgstr "Diff: linhas excluídas"
1272
1202 -#: gitk:10785
1273 +#: gitk:11408
1274 msgid "diff old lines"
1275 msgstr "linhas excluídas"
1276
1206 -#: gitk:10789
1277 +#: gitk:11412
1278 msgid "Diff: new lines"
1279 msgstr "Diff: linhas adicionadas"
1280
1210 -#: gitk:10790
1281 +#: gitk:11413
1282 msgid "diff new lines"
1283 msgstr "linhas adicionadas"
1284
1214 -#: gitk:10794
1285 +#: gitk:11417
1286 msgid "Diff: hunk header"
1287 msgstr "Diff: cabeçalho do bloco"
1288
1218 -#: gitk:10796
1289 +#: gitk:11419
1290 msgid "diff hunk header"
1291 msgstr "cabeçalho do bloco"
1292
1222 -#: gitk:10800
1293 +#: gitk:11423
1294 msgid "Marked line bg"
1295 msgstr "2º plano da linha marcada"
1296
1226 -#: gitk:10802
1297 +#: gitk:11425
1298 msgid "marked line background"
1299 msgstr "segundo plano da linha marcada"
1300
1230 -#: gitk:10806
1301 +#: gitk:11429
1302 msgid "Select bg"
1303 msgstr "2º plano da seleção"
1304
1234 -#: gitk:10810
1305 +#: gitk:11438
1306 msgid "Fonts: press to choose"
1307 msgstr "Fontes: clique para escolher"
1308
1238 -#: gitk:10812
1309 +#: gitk:11440
1310 msgid "Main font"
1311 msgstr "Fonte principal"
1312
1242 -#: gitk:10813
1313 +#: gitk:11441
1314 msgid "Diff display font"
1315 msgstr "Fonte da lista de mudanças"
1316
1246 -#: gitk:10814
1317 +#: gitk:11442
1318 msgid "User interface font"
1319 msgstr "Fonte da interface"
1320
1250 -#: gitk:10842
1321 +#: gitk:11464
1322 +msgid "Gitk preferences"
1323 +msgstr "Preferências do Gitk"
1324 +
1325 +#: gitk:11473
1326 +#, fuzzy
1327 +msgid "General"
1328 +msgstr "Gerar"
1329 +
1330 +#: gitk:11474
1331 +msgid "Colors"
1332 +msgstr ""
1333 +
1334 +#: gitk:11475
1335 +msgid "Fonts"
1336 +msgstr ""
1337 +
1338 +#: gitk:11525
1339 #, tcl-format
1340 msgid "Gitk: choose color for %s"
1341 msgstr "Gitk: selecionar cor para %s"
1342
1255 -#: gitk:11445
1343 +#: gitk:12242
1344 msgid "Cannot find a git repository here."
1345 msgstr "Não há nenhum repositório git aqui."
1346
1259 -#: gitk:11449
1260 -#, tcl-format
1261 -msgid "Cannot find the git directory \"%s\"."
1262 -msgstr "Impossível encontrar o diretório git \"%s\"."
1263 -
1264 -#: gitk:11496
1347 +#: gitk:12289
1348 #, tcl-format
1349 msgid "Ambiguous argument '%s': both revision and filename"
1350 msgstr ""
1351 "O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de "
1352 "arquivo)"
1353
1271 -#: gitk:11508
1354 +#: gitk:12301
1355 msgid "Bad arguments to gitk:"
1356 msgstr "Argumentos incorretos para o gitk:"
1357
1275 -#: gitk:11604
1358 +#: gitk:12405
1359 msgid "Command line"
1360 msgstr "Linha de comando"
1361 +
1362 +#~ msgid "next"
1363 +#~ msgstr "Próximo"
1364 +
1365 +#~ msgid "prev"
1366 +#~ msgstr "Anterior"
1367 +
1368 +#~ msgid "CDate"
1369 +#~ msgstr "DataR"
1370 +
1371 +#~ msgid "Cannot find the git directory \"%s\"."
1372 +#~ msgstr "Impossível encontrar o diretório git \"%s\"."
po/ru.po
+642 -329
@@ -5,315 +5,359 @@ msgid ""
5 msgstr ""
6 "Project-Id-Version: gitk\n"
7 "Report-Msgid-Bugs-To: \n"
8 -"POT-Creation-Date: 2009-04-24 16:00+0200\n"
8 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
12 +"Language: \n"
13 "MIME-Version: 1.0\n"
14 "Content-Type: text/plain; charset=UTF-8\n"
15 "Content-Transfer-Encoding: 8bit\n"
16
16 -#: gitk:113
17 +#: gitk:140
18 msgid "Couldn't get list of unmerged files:"
19 +msgstr "Невозможно получить список файлов незавершённой операции слияния:"
20 +
21 +#: gitk:212 gitk:2381
22 +msgid "Color words"
23 +msgstr ""
24 +
25 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
26 +msgid "Markup words"
27 msgstr ""
19 -"Невозможно получить список файлов незавершённой операции слияния:"
28
21 -#: gitk:268
29 +#: gitk:324
30 msgid "Error parsing revisions:"
31 msgstr "Ошибка в идентификаторе версии:"
32
25 -#: gitk:323
33 +#: gitk:380
34 msgid "Error executing --argscmd command:"
35 msgstr "Ошибка выполнения команды заданной --argscmd:"
36
29 -#: gitk:336
37 +#: gitk:393
38 msgid "No files selected: --merge specified but no files are unmerged."
39 msgstr ""
32 -"Файлы не выбраны: указан --merge, но не было найдено ни одного файла "
33 -"где эта операция должна быть завершена."
40 +"Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта "
41 +"операция должна быть завершена."
42
35 -#: gitk:339
43 +#: gitk:396
44 msgid ""
45 "No files selected: --merge specified but no unmerged files are within file "
46 "limit."
47 msgstr ""
40 -"Файлы не выбраны: указан --merge, но в рамках указанного "
41 -"ограничения на имена файлов нет ни одного "
42 -"где эта операция должна быть завершена."
48 +"Файлы не выбраны: указан --merge, но в рамках указанного ограничения на "
49 +"имена файлов нет ни одного где эта операция должна быть завершена."
50
44 -#: gitk:361 gitk:508
51 +#: gitk:418 gitk:566
52 msgid "Error executing git log:"
53 msgstr "Ошибка запуска git log:"
54
48 -#: gitk:379
55 +#: gitk:436 gitk:582
56 msgid "Reading"
57 msgstr "Чтение"
58
52 -#: gitk:439 gitk:4021
59 +#: gitk:496 gitk:4508
60 msgid "Reading commits..."
61 msgstr "Чтение версий..."
62
56 -#: gitk:442 gitk:1560 gitk:4024
63 +#: gitk:499 gitk:1637 gitk:4511
64 msgid "No commits selected"
65 msgstr "Ничего не выбрано"
66
60 -#: gitk:1436
67 +#: gitk:1511
68 msgid "Can't parse git log output:"
69 msgstr "Ошибка обработки вывода команды git log:"
70
64 -#: gitk:1656
71 +#: gitk:1740
72 msgid "No commit information available"
73 msgstr "Нет информации о состоянии"
74
68 -#: gitk:1791 gitk:1815 gitk:3814 gitk:8478 gitk:10014 gitk:10186
75 +#: gitk:1897
76 +msgid "mc"
77 +msgstr ""
78 +
79 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
80 msgid "OK"
81 msgstr "Ok"
82
72 -#: gitk:1817 gitk:3816 gitk:8078 gitk:8152 gitk:8259 gitk:8308 gitk:8480
73 -#: gitk:10015 gitk:10187
83 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
84 +#: gitk:11221 gitk:11501
85 msgid "Cancel"
86 msgstr "Отмена"
87
77 -#: gitk:1915
88 +#: gitk:2069
89 msgid "Update"
90 msgstr "Обновить"
91
81 -#: gitk:1916
92 +#: gitk:2070
93 msgid "Reload"
94 msgstr "Перечитать"
95
85 -#: gitk:1917
96 +#: gitk:2071
97 msgid "Reread references"
98 msgstr "Обновить список ссылок"
99
89 -#: gitk:1918
100 +#: gitk:2072
101 msgid "List references"
102 msgstr "Список ссылок"
103
93 -#: gitk:1920
104 +#: gitk:2074
105 msgid "Start git gui"
106 msgstr "Запустить git gui"
107
97 -#: gitk:1922
108 +#: gitk:2076
109 msgid "Quit"
110 msgstr "Завершить"
111
101 -#: gitk:1914
112 +#: gitk:2068
113 msgid "File"
114 msgstr "Файл"
115
105 -#: gitk:1925
116 +#: gitk:2080
117 msgid "Preferences"
118 msgstr "Настройки"
119
109 -#: gitk:1924
120 +#: gitk:2079
121 msgid "Edit"
122 msgstr "Редактировать"
123
113 -#: gitk:1928
124 +#: gitk:2084
125 msgid "New view..."
126 msgstr "Новое представление..."
127
117 -#: gitk:1929
128 +#: gitk:2085
129 msgid "Edit view..."
130 msgstr "Редактировать представление..."
131
121 -#: gitk:1930
132 +#: gitk:2086
133 msgid "Delete view"
134 msgstr "Удалить представление"
135
125 -#: gitk:1932
136 +#: gitk:2088
137 msgid "All files"
138 msgstr "Все файлы"
139
129 -#: gitk:1927 gitk:3626
140 +#: gitk:2083 gitk:4050
141 msgid "View"
142 msgstr "Представление"
143
133 -#: gitk:1935 gitk:2609
144 +#: gitk:2093 gitk:2103 gitk:3009
145 msgid "About gitk"
146 msgstr "О gitk"
147
137 -#: gitk:1936
148 +#: gitk:2094 gitk:2108
149 msgid "Key bindings"
150 msgstr "Назначения клавиатуры"
151
141 -#: gitk:1934
152 +#: gitk:2092 gitk:2107
153 msgid "Help"
154 msgstr "Подсказка"
155
145 -#: gitk:1994
146 -msgid "SHA1 ID: "
147 -msgstr "SHA1:"
156 +#: gitk:2185 gitk:8633
157 +msgid "SHA1 ID:"
158 +msgstr "SHA1 ID:"
159
149 -#: gitk:2025
160 +#: gitk:2229
161 msgid "Row"
162 msgstr "Строка"
163
153 -#: gitk:2056
164 +#: gitk:2267
165 msgid "Find"
166 msgstr "Поиск"
167
157 -#: gitk:2057
158 -msgid "next"
159 -msgstr "След."
160 -
161 -#: gitk:2058
162 -msgid "prev"
163 -msgstr "Пред."
164 -
165 -#: gitk:2059
168 +#: gitk:2295
169 msgid "commit"
170 msgstr "состояние"
171
169 -#: gitk:2062 gitk:2064 gitk:4179 gitk:4202 gitk:4226 gitk:6164 gitk:6236
170 -#: gitk:6320
172 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
173 +#: gitk:6893
174 msgid "containing:"
175 msgstr "содержащее:"
176
174 -#: gitk:2065 gitk:3117 gitk:3122 gitk:4254
177 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
178 msgid "touching paths:"
179 msgstr "касательно файлов:"
180
178 -#: gitk:2066 gitk:4259
181 +#: gitk:2303 gitk:4759
182 msgid "adding/removing string:"
183 msgstr "добавив/удалив строку:"
184
182 -#: gitk:2075 gitk:2077
185 +#: gitk:2304 gitk:4761
186 +msgid "changing lines matching:"
187 +msgstr ""
188 +
189 +#: gitk:2313 gitk:2315 gitk:4748
190 msgid "Exact"
191 msgstr "Точно"
192
186 -#: gitk:2077 gitk:4334 gitk:6132
193 +#: gitk:2315 gitk:4836 gitk:6704
194 msgid "IgnCase"
195 msgstr "Игнорировать большие/маленькие"
196
190 -#: gitk:2077 gitk:4228 gitk:4332 gitk:6128
197 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
198 msgid "Regexp"
199 msgstr "Регулярные выражения"
200
194 -#: gitk:2079 gitk:2080 gitk:4353 gitk:4383 gitk:4390 gitk:6256 gitk:6324
201 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
202 msgid "All fields"
203 msgstr "Во всех полях"
204
198 -#: gitk:2080 gitk:4351 gitk:4383 gitk:6195
205 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
206 msgid "Headline"
207 msgstr "Заголовок"
208
202 -#: gitk:2081 gitk:4351 gitk:6195 gitk:6324 gitk:6737
209 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
210 msgid "Comments"
211 msgstr "Комментарии"
212
206 -#: gitk:2081 gitk:4351 gitk:4355 gitk:4390 gitk:6195 gitk:6672 gitk:7923
207 -#: gitk:7938
213 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
214 +#: gitk:8826
215 msgid "Author"
216 msgstr "Автор"
217
211 -#: gitk:2081 gitk:4351 gitk:6195 gitk:6674
218 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
219 msgid "Committer"
220 msgstr "Сохранивший состояние"
221
215 -#: gitk:2110
222 +#: gitk:2350
223 msgid "Search"
224 msgstr "Найти"
225
219 -#: gitk:2117
226 +#: gitk:2358
227 msgid "Diff"
228 msgstr "Сравнить"
229
223 -#: gitk:2119
230 +#: gitk:2360
231 msgid "Old version"
232 msgstr "Старая версия"
233
227 -#: gitk:2121
234 +#: gitk:2362
235 msgid "New version"
236 msgstr "Новая версия"
237
231 -#: gitk:2123
238 +#: gitk:2364
239 msgid "Lines of context"
240 msgstr "Строк контекста"
241
235 -#: gitk:2133
242 +#: gitk:2374
243 msgid "Ignore space change"
244 msgstr "Игнорировать пробелы"
245
239 -#: gitk:2191
246 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
247 +msgid "Line diff"
248 +msgstr ""
249 +
250 +#: gitk:2445
251 msgid "Patch"
252 msgstr "Патч"
253
243 -#: gitk:2193
254 +#: gitk:2447
255 msgid "Tree"
256 msgstr "Файлы"
257
247 -#: gitk:2326 gitk:2339
258 +#: gitk:2616 gitk:2636
259 msgid "Diff this -> selected"
260 msgstr "Сравнить это состояние с выделенным"
261
251 -#: gitk:2327 gitk:2340
262 +#: gitk:2617 gitk:2637
263 msgid "Diff selected -> this"
264 msgstr "Сравнить выделенное с этим состоянием"
265
255 -#: gitk:2328 gitk:2341
266 +#: gitk:2618 gitk:2638
267 msgid "Make patch"
268 msgstr "Создать патч"
269
259 -#: gitk:2329 gitk:8136
270 +#: gitk:2619 gitk:9235
271 msgid "Create tag"
272 msgstr "Создать метку"
273
263 -#: gitk:2330 gitk:8239
274 +#: gitk:2620 gitk:9352
275 msgid "Write commit to file"
276 msgstr "Сохранить изменения в файл"
277
267 -#: gitk:2331 gitk:8296
278 +#: gitk:2621 gitk:9409
279 msgid "Create new branch"
280 msgstr "Создать ветвь"
281
271 -#: gitk:2332
282 +#: gitk:2622
283 msgid "Cherry-pick this commit"
284 msgstr "Скопировать это состояние"
285
275 -#: gitk:2333
286 +#: gitk:2623
287 msgid "Reset HEAD branch to here"
288 msgstr "Установить HEAD на это состояние"
289
279 -#: gitk:2347
290 +#: gitk:2624
291 +#, fuzzy
292 +msgid "Mark this commit"
293 +msgstr "Скопировать это состояние"
294 +
295 +#: gitk:2625
296 +msgid "Return to mark"
297 +msgstr ""
298 +
299 +#: gitk:2626
300 +msgid "Find descendant of this and mark"
301 +msgstr ""
302 +
303 +#: gitk:2627
304 +msgid "Compare with marked commit"
305 +msgstr ""
306 +
307 +#: gitk:2628 gitk:2639
308 +#, fuzzy
309 +msgid "Diff this -> marked commit"
310 +msgstr "Сравнить это состояние с выделенным"
311 +
312 +#: gitk:2629 gitk:2640
313 +#, fuzzy
314 +msgid "Diff marked commit -> this"
315 +msgstr "Сравнить выделенное с этим состоянием"
316 +
317 +#: gitk:2630
318 +#, fuzzy
319 +msgid "Revert this commit"
320 +msgstr "Скопировать это состояние"
321 +
322 +#: gitk:2646
323 msgid "Check out this branch"
324 msgstr "Перейти на эту ветвь"
325
283 -#: gitk:2348
326 +#: gitk:2647
327 msgid "Remove this branch"
328 msgstr "Удалить эту ветвь"
329
287 -#: gitk:2355
330 +#: gitk:2654
331 msgid "Highlight this too"
332 msgstr "Подсветить этот тоже"
333
291 -#: gitk:2356
334 +#: gitk:2655
335 msgid "Highlight this only"
336 msgstr "Подсветить только этот"
337
295 -#: gitk:2357
338 +#: gitk:2656
339 msgid "External diff"
340 msgstr "Программа сравнения"
341
299 -#: gitk:2358
342 +#: gitk:2657
343 msgid "Blame parent commit"
344 msgstr "Аннотировать родительское состояние"
345
303 -#: gitk:2365
346 +#: gitk:2664
347 msgid "Show origin of this line"
348 msgstr "Показать источник этой строки"
349
307 -#: gitk:2366
350 +#: gitk:2665
351 msgid "Run git gui blame on this line"
352 msgstr "Запустить git gui blame для этой строки"
353
311 -#: gitk:2611
354 +#: gitk:3011
355 +#, fuzzy
356 msgid ""
357 "\n"
358 "Gitk - a commit viewer for git\n"
359 "\n"
316 -"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
360 +"Copyright © 2005-2014 Paul Mackerras\n"
361 "\n"
362 "Use and redistribute under the terms of the GNU General Public License"
363 msgstr ""
@@ -324,497 +368,667 @@ msgstr ""
368 "\n"
369 "Использование и распространение согласно условиям GNU General Public License"
370
327 -#: gitk:2619 gitk:2681 gitk:8661
371 +#: gitk:3019 gitk:3085 gitk:9836
372 msgid "Close"
373 msgstr "Закрыть"
374
331 -#: gitk:2638
375 +#: gitk:3040
376 msgid "Gitk key bindings"
377 msgstr "Назначения клавиатуры в Gitk"
378
335 -#: gitk:2641
379 +#: gitk:3043
380 msgid "Gitk key bindings:"
381 msgstr "Назначения клавиатуры в Gitk:"
382
339 -#: gitk:2643
383 +#: gitk:3045
384 #, tcl-format
385 msgid "<%s-Q>\t\tQuit"
386 msgstr "<%s-Q>\t\tЗавершить"
387
344 -#: gitk:2644
388 +#: gitk:3046
389 +#, fuzzy, tcl-format
390 +msgid "<%s-W>\t\tClose window"
391 +msgstr "<%s-F>\t\tПоиск"
392 +
393 +#: gitk:3047
394 msgid "<Home>\t\tMove to first commit"
395 msgstr "<Home>\t\tПерейти к первому состоянию"
396
348 -#: gitk:2645
397 +#: gitk:3048
398 msgid "<End>\t\tMove to last commit"
399 msgstr "<End>\t\tПерейти к последнему состоянию"
400
352 -#: gitk:2646
353 -msgid "<Up>, p, i\tMove up one commit"
401 +#: gitk:3049
402 +#, fuzzy
403 +msgid "<Up>, p, k\tMove up one commit"
404 msgstr "<Up>, p, i\tПерейти к следующему состоянию"
405
356 -#: gitk:2647
357 -msgid "<Down>, n, k\tMove down one commit"
406 +#: gitk:3050
407 +#, fuzzy
408 +msgid "<Down>, n, j\tMove down one commit"
409 msgstr "<Down>, n, k\tПерейти к предыдущему состоянию"
410
360 -#: gitk:2648
361 -msgid "<Left>, z, j\tGo back in history list"
411 +#: gitk:3051
412 +#, fuzzy
413 +msgid "<Left>, z, h\tGo back in history list"
414 msgstr "<Left>, z, j\tПоказать ранее посещённое состояние"
415
364 -#: gitk:2649
416 +#: gitk:3052
417 msgid "<Right>, x, l\tGo forward in history list"
418 msgstr "<Right>, x, l\tПоказать следующее посещённое состояние"
419
368 -#: gitk:2650
420 +#: gitk:3053
421 +#, tcl-format
422 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
423 +msgstr ""
424 +
425 +#: gitk:3054
426 msgid "<PageUp>\tMove up one page in commit list"
427 msgstr "<PageUp>\tПерейти на страницу выше в списке состояний"
428
372 -#: gitk:2651
429 +#: gitk:3055
430 msgid "<PageDown>\tMove down one page in commit list"
431 msgstr "<PageDown>\tПерейти на страницу ниже в списке состояний"
432
376 -#: gitk:2652
433 +#: gitk:3056
434 #, tcl-format
435 msgid "<%s-Home>\tScroll to top of commit list"
436 msgstr "<%s-Home>\tПоказать начало списка состояний"
437
381 -#: gitk:2653
438 +#: gitk:3057
439 #, tcl-format
440 msgid "<%s-End>\tScroll to bottom of commit list"
441 msgstr "<%s-End>\tПоказать конец списка состояний"
442
386 -#: gitk:2654
443 +#: gitk:3058
444 #, tcl-format
445 msgid "<%s-Up>\tScroll commit list up one line"
446 msgstr "<%s-Up>\tПровернуть список состояний вверх"
447
391 -#: gitk:2655
448 +#: gitk:3059
449 #, tcl-format
450 msgid "<%s-Down>\tScroll commit list down one line"
451 msgstr "<%s-Down>\tПровернуть список состояний вниз"
452
396 -#: gitk:2656
453 +#: gitk:3060
454 #, tcl-format
455 msgid "<%s-PageUp>\tScroll commit list up one page"
456 msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх"
457
401 -#: gitk:2657
458 +#: gitk:3061
459 #, tcl-format
460 msgid "<%s-PageDown>\tScroll commit list down one page"
461 msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз"
462
406 -#: gitk:2658
463 +#: gitk:3062
464 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
408 -msgstr ""
409 -"<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)"
465 +msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)"
466
411 -#: gitk:2659
467 +#: gitk:3063
468 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
469 msgstr "<Shift-Down>\tПоиск (вниз, среди старых состояний)"
470
415 -#: gitk:2660
471 +#: gitk:3064
472 msgid "<Delete>, b\tScroll diff view up one page"
473 msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше"
474
419 -#: gitk:2661
475 +#: gitk:3065
476 msgid "<Backspace>\tScroll diff view up one page"
477 msgstr "<Backspace>\tПрокрутить список изменений на страницу выше"
478
423 -#: gitk:2662
479 +#: gitk:3066
480 msgid "<Space>\t\tScroll diff view down one page"
481 msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже"
482
427 -#: gitk:2663
483 +#: gitk:3067
484 msgid "u\t\tScroll diff view up 18 lines"
485 msgstr "u\t\tПрокрутить список изменений на 18 строк вверх"
486
431 -#: gitk:2664
487 +#: gitk:3068
488 msgid "d\t\tScroll diff view down 18 lines"
489 msgstr "d\t\tПрокрутить список изменений на 18 строк вниз"
490
435 -#: gitk:2665
491 +#: gitk:3069
492 #, tcl-format
493 msgid "<%s-F>\t\tFind"
494 msgstr "<%s-F>\t\tПоиск"
495
440 -#: gitk:2666
496 +#: gitk:3070
497 #, tcl-format
498 msgid "<%s-G>\t\tMove to next find hit"
499 msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию"
500
445 -#: gitk:2667
501 +#: gitk:3071
502 msgid "<Return>\tMove to next find hit"
503 msgstr "<Return>\tПерейти к следующему найденному состоянию"
504
449 -#: gitk:2668
505 +#: gitk:3072
506 msgid "/\t\tFocus the search box"
507 msgstr "/\t\tПерейти к полю поиска"
508
453 -#: gitk:2669
509 +#: gitk:3073
510 msgid "?\t\tMove to previous find hit"
511 msgstr "?\t\tПерейти к предыдущему найденному состоянию"
512
457 -#: gitk:2670
513 +#: gitk:3074
514 msgid "f\t\tScroll diff view to next file"
515 msgstr "f\t\tПрокрутить список изменений к следующему файлу"
516
461 -#: gitk:2671
517 +#: gitk:3075
518 #, tcl-format
519 msgid "<%s-S>\t\tSearch for next hit in diff view"
520 msgstr "<%s-S>\t\tПродолжить поиск в списке изменений"
521
466 -#: gitk:2672
522 +#: gitk:3076
523 #, tcl-format
524 msgid "<%s-R>\t\tSearch for previous hit in diff view"
525 msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений"
526
471 -#: gitk:2673
527 +#: gitk:3077
528 #, tcl-format
529 msgid "<%s-KP+>\tIncrease font size"
530 msgstr "<%s-KP+>\tУвеличить размер шрифта"
531
476 -#: gitk:2674
532 +#: gitk:3078
533 #, tcl-format
534 msgid "<%s-plus>\tIncrease font size"
535 msgstr "<%s-plus>\tУвеличить размер шрифта"
536
481 -#: gitk:2675
537 +#: gitk:3079
538 #, tcl-format
539 msgid "<%s-KP->\tDecrease font size"
540 msgstr "<%s-KP->\tУменьшить размер шрифта"
541
486 -#: gitk:2676
542 +#: gitk:3080
543 #, tcl-format
544 msgid "<%s-minus>\tDecrease font size"
545 msgstr "<%s-minus>\tУменьшить размер шрифта"
546
491 -#: gitk:2677
547 +#: gitk:3081
548 msgid "<F5>\t\tUpdate"
549 msgstr "<F5>\t\tОбновить"
550
495 -#: gitk:3132
496 -#, tcl-format
497 -msgid "Error getting \"%s\" from %s:"
498 -msgstr "Ошибка получения \"%s\" из %s:"
499 -
500 -#: gitk:3189 gitk:3198
551 +#: gitk:3546 gitk:3555
552 #, tcl-format
553 msgid "Error creating temporary directory %s:"
554 msgstr "Ошибка создания временного каталога %s:"
555
505 -#: gitk:3211
556 +#: gitk:3568
557 +#, tcl-format
558 +msgid "Error getting \"%s\" from %s:"
559 +msgstr "Ошибка получения \"%s\" из %s:"
560 +
561 +#: gitk:3631
562 msgid "command failed:"
563 msgstr "ошибка выполнения команды:"
564
509 -#: gitk:3357
565 +#: gitk:3780
566 msgid "No such commit"
567 msgstr "Состояние не найдено"
568
513 -#: gitk:3371
569 +#: gitk:3794
570 msgid "git gui blame: command failed:"
571 msgstr "git gui blame: ошибка выполнения команды:"
572
517 -#: gitk:3402
573 +#: gitk:3825
574 #, tcl-format
575 msgid "Couldn't read merge head: %s"
576 msgstr "Ошибка чтения MERGE_HEAD: %s"
577
522 -#: gitk:3410
578 +#: gitk:3833
579 #, tcl-format
580 msgid "Error reading index: %s"
581 msgstr "Ошибка чтения индекса: %s"
582
527 -#: gitk:3435
583 +#: gitk:3858
584 #, tcl-format
585 msgid "Couldn't start git blame: %s"
586 msgstr "Ошибка запуска git blame: %s"
587
532 -#: gitk:3438 gitk:6163
588 +#: gitk:3861 gitk:6735
589 msgid "Searching"
590 msgstr "Поиск"
591
536 -#: gitk:3470
592 +#: gitk:3893
593 #, tcl-format
594 msgid "Error running git blame: %s"
595 msgstr "Ошибка выполнения git blame: %s"
596
541 -#: gitk:3498
597 +#: gitk:3921
598 #, tcl-format
599 msgid "That line comes from commit %s, which is not in this view"
600 msgstr ""
545 -"Эта строка принадлежит состоянию %s, которое не показано в этом "
546 -"представлении"
601 +"Эта строка принадлежит состоянию %s, которое не показано в этом представлении"
602
548 -#: gitk:3512
603 +#: gitk:3935
604 msgid "External diff viewer failed:"
605 msgstr "Ошибка выполнения программы сравнения:"
606
552 -#: gitk:3630
607 +#: gitk:4053
608 msgid "Gitk view definition"
609 msgstr "Gitk определение представлений"
610
556 -#: gitk:3634
611 +#: gitk:4057
612 msgid "Remember this view"
613 msgstr "Запомнить представление"
614
560 -#: gitk:3635
561 -msgid "Commits to include (arguments to git log):"
562 -msgstr "Включить состояния (аргументы для git-log):"
615 +#: gitk:4058
616 +msgid "References (space separated list):"
617 +msgstr ""
618 +
619 +#: gitk:4059
620 +msgid "Branches & tags:"
621 +msgstr ""
622
564 -#: gitk:3636
565 -msgid "Use all refs"
566 -msgstr "Использовать все ветви"
623 +#: gitk:4060
624 +#, fuzzy
625 +msgid "All refs"
626 +msgstr "Все файлы"
627
568 -#: gitk:3637
569 -msgid "Strictly sort by date"
570 -msgstr "Строгая сортировка по дате"
628 +#: gitk:4061
629 +msgid "All (local) branches"
630 +msgstr ""
631
572 -#: gitk:3638
573 -msgid "Mark branch sides"
574 -msgstr "Отметить стороны ветвей"
632 +#: gitk:4062
633 +msgid "All tags"
634 +msgstr ""
635 +
636 +#: gitk:4063
637 +msgid "All remote-tracking branches"
638 +msgstr ""
639 +
640 +#: gitk:4064
641 +msgid "Commit Info (regular expressions):"
642 +msgstr ""
643 +
644 +#: gitk:4065
645 +#, fuzzy
646 +msgid "Author:"
647 +msgstr "Автор"
648 +
649 +#: gitk:4066
650 +#, fuzzy
651 +msgid "Committer:"
652 +msgstr "Сохранивший состояние"
653 +
654 +#: gitk:4067
655 +msgid "Commit Message:"
656 +msgstr ""
657 +
658 +#: gitk:4068
659 +msgid "Matches all Commit Info criteria"
660 +msgstr ""
661 +
662 +#: gitk:4069
663 +msgid "Matches none Commit Info criteria"
664 +msgstr ""
665 +
666 +#: gitk:4070
667 +msgid "Changes to Files:"
668 +msgstr ""
669 +
670 +#: gitk:4071
671 +msgid "Fixed String"
672 +msgstr ""
673 +
674 +#: gitk:4072
675 +msgid "Regular Expression"
676 +msgstr ""
677
576 -#: gitk:3639
577 -msgid "Since date:"
678 +#: gitk:4073
679 +#, fuzzy
680 +msgid "Search string:"
681 +msgstr "Поиск"
682 +
683 +#: gitk:4074
684 +msgid ""
685 +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
686 +"15:27:38\"):"
687 +msgstr ""
688 +
689 +#: gitk:4075
690 +#, fuzzy
691 +msgid "Since:"
692 msgstr "С даты:"
693
580 -#: gitk:3640
581 -msgid "Until date:"
694 +#: gitk:4076
695 +#, fuzzy
696 +msgid "Until:"
697 msgstr "По дату:"
698
584 -#: gitk:3641
585 -msgid "Max count:"
586 -msgstr "Макс. количество:"
699 +#: gitk:4077
700 +msgid "Limit and/or skip a number of revisions (positive integer):"
701 +msgstr ""
702 +
703 +#: gitk:4078
704 +msgid "Number to show:"
705 +msgstr ""
706 +
707 +#: gitk:4079
708 +msgid "Number to skip:"
709 +msgstr ""
710 +
711 +#: gitk:4080
712 +msgid "Miscellaneous options:"
713 +msgstr ""
714 +
715 +#: gitk:4081
716 +msgid "Strictly sort by date"
717 +msgstr "Строгая сортировка по дате"
718
588 -#: gitk:3642
589 -msgid "Skip:"
590 -msgstr "Пропустить:"
719 +#: gitk:4082
720 +msgid "Mark branch sides"
721 +msgstr "Отметить стороны ветвей"
722
592 -#: gitk:3643
723 +#: gitk:4083
724 msgid "Limit to first parent"
725 msgstr "Ограничить первым предком"
726
596 -#: gitk:3644
597 -msgid "Command to generate more commits to include:"
598 -msgstr "Дополнительная команда для списка состояний:"
727 +#: gitk:4084
728 +msgid "Simple history"
729 +msgstr ""
730
600 -#: gitk:3753
601 -msgid "Name"
602 -msgstr "Имя"
731 +#: gitk:4085
732 +#, fuzzy
733 +msgid "Additional arguments to git log:"
734 +msgstr "Включить состояния (аргументы для git-log):"
735
604 -#: gitk:3801
736 +#: gitk:4086
737 msgid "Enter files and directories to include, one per line:"
738 msgstr "Файлы и каталоги для ограничения истории, по одному на строку:"
739
608 -#: gitk:3815
740 +#: gitk:4087
741 +msgid "Command to generate more commits to include:"
742 +msgstr "Дополнительная команда для списка состояний:"
743 +
744 +#: gitk:4211
745 +msgid "Gitk: edit view"
746 +msgstr ""
747 +
748 +#: gitk:4219
749 +#, fuzzy
750 +msgid "-- criteria for selecting revisions"
751 +msgstr "Ошибка в идентификаторе версии:"
752 +
753 +#: gitk:4224
754 +#, fuzzy
755 +msgid "View Name"
756 +msgstr "Представление"
757 +
758 +#: gitk:4299
759 msgid "Apply (F5)"
760 msgstr "Применить (F5)"
761
612 -#: gitk:3853
762 +#: gitk:4337
763 msgid "Error in commit selection arguments:"
764 msgstr "Ошибка в параметрах выбора состояний:"
765
616 -#: gitk:3906 gitk:3958 gitk:4403 gitk:4417 gitk:5675 gitk:10867 gitk:10868
766 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
767 msgid "None"
768 msgstr "Ни одного"
769
620 -#: gitk:4351 gitk:6195 gitk:7925 gitk:7940
621 -msgid "Date"
622 -msgstr "Дата"
623 -
624 -#: gitk:4351 gitk:6195
625 -msgid "CDate"
626 -msgstr "Дата ввода"
627 -
628 -#: gitk:4500 gitk:4505
770 +#: gitk:5003 gitk:5008
771 msgid "Descendant"
772 msgstr "Порождённое"
773
632 -#: gitk:4501
774 +#: gitk:5004
775 msgid "Not descendant"
776 msgstr "Не порождённое"
777
636 -#: gitk:4508 gitk:4513
778 +#: gitk:5011 gitk:5016
779 msgid "Ancestor"
780 msgstr "Предок"
781
640 -#: gitk:4509
782 +#: gitk:5012
783 msgid "Not ancestor"
784 msgstr "Не предок"
785
644 -#: gitk:4799
786 +#: gitk:5306
787 msgid "Local changes checked in to index but not committed"
788 msgstr "Изменения зарегистрированные в индексе, но не сохранённые"
789
648 -#: gitk:4835
790 +#: gitk:5342
791 msgid "Local uncommitted changes, not checked in to index"
792 msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе"
793
652 -#: gitk:6676
794 +#: gitk:7115
795 +msgid "and many more"
796 +msgstr ""
797 +
798 +#: gitk:7118
799 +msgid "many"
800 +msgstr ""
801 +
802 +#: gitk:7309
803 msgid "Tags:"
804 msgstr "Таги:"
805
656 -#: gitk:6693 gitk:6699 gitk:7918
806 +#: gitk:7326 gitk:7332 gitk:8806
807 msgid "Parent"
808 msgstr "Предок"
809
660 -#: gitk:6704
810 +#: gitk:7337
811 msgid "Child"
812 msgstr "Потомок"
813
664 -#: gitk:6713
814 +#: gitk:7346
815 msgid "Branch"
816 msgstr "Ветвь"
817
668 -#: gitk:6716
818 +#: gitk:7349
819 msgid "Follows"
820 msgstr "Следует за"
821
672 -#: gitk:6719
822 +#: gitk:7352
823 msgid "Precedes"
824 msgstr "Предшествует"
825
676 -#: gitk:7212
826 +#: gitk:7947
827 #, tcl-format
828 msgid "Error getting diffs: %s"
829 msgstr "Ошибка получения изменений: %s"
830
681 -#: gitk:7751
831 +#: gitk:8631
832 msgid "Goto:"
833 msgstr "Перейти к:"
834
685 -#: gitk:7753
686 -msgid "SHA1 ID:"
687 -msgstr "SHA1 ID:"
688 -
689 -#: gitk:7772
835 +#: gitk:8652
836 #, tcl-format
837 msgid "Short SHA1 id %s is ambiguous"
838 msgstr "Сокращённый SHA1 идентификатор %s неоднозначен"
839
694 -#: gitk:7784
840 +#: gitk:8659
841 +#, fuzzy, tcl-format
842 +msgid "Revision %s is not known"
843 +msgstr "SHA1 идентификатор %s не найден"
844 +
845 +#: gitk:8669
846 #, tcl-format
847 msgid "SHA1 id %s is not known"
848 msgstr "SHA1 идентификатор %s не найден"
849
699 -#: gitk:7786
850 +#: gitk:8671
851 #, tcl-format
701 -msgid "Tag/Head %s is not known"
702 -msgstr "Метка или ветвь %s не найдена"
852 +msgid "Revision %s is not in the current view"
853 +msgstr ""
854
704 -#: gitk:7928
855 +#: gitk:8813 gitk:8828
856 +msgid "Date"
857 +msgstr "Дата"
858 +
859 +#: gitk:8816
860 msgid "Children"
861 msgstr "Потомки"
862
708 -#: gitk:7985
863 +#: gitk:8879
864 #, tcl-format
865 msgid "Reset %s branch to here"
866 msgstr "Установить ветвь %s на это состояние"
867
713 -#: gitk:7987
868 +#: gitk:8881
869 msgid "Detached head: can't reset"
870 msgstr "Состояние не принадлежит ни одной ветви, переход невозможен"
871
717 -#: gitk:8019
872 +#: gitk:8986 gitk:8992
873 +msgid "Skipping merge commit "
874 +msgstr ""
875 +
876 +#: gitk:9001 gitk:9006
877 +#, fuzzy
878 +msgid "Error getting patch ID for "
879 +msgstr "Ошибка создания патча:"
880 +
881 +#: gitk:9002 gitk:9007
882 +msgid " - stopping\n"
883 +msgstr ""
884 +
885 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
886 +#, fuzzy
887 +msgid "Commit "
888 +msgstr "состояние"
889 +
890 +#: gitk:9016
891 +msgid ""
892 +" is the same patch as\n"
893 +" "
894 +msgstr ""
895 +
896 +#: gitk:9024
897 +msgid ""
898 +" differs from\n"
899 +" "
900 +msgstr ""
901 +
902 +#: gitk:9026
903 +msgid ""
904 +"Diff of commits:\n"
905 +"\n"
906 +msgstr ""
907 +
908 +#: gitk:9038 gitk:9047
909 +#, tcl-format
910 +msgid " has %s children - stopping\n"
911 +msgstr ""
912 +
913 +#: gitk:9066
914 +#, fuzzy, tcl-format
915 +msgid "Error writing commit to file: %s"
916 +msgstr "Ошибка сохранения состояния:"
917 +
918 +#: gitk:9072
919 +#, fuzzy, tcl-format
920 +msgid "Error diffing commits: %s"
921 +msgstr "Ошибка сохранения состояния:"
922 +
923 +#: gitk:9118
924 msgid "Top"
925 msgstr "Верх"
926
721 -#: gitk:8020
927 +#: gitk:9119
928 msgid "From"
929 msgstr "От"
930
725 -#: gitk:8025
931 +#: gitk:9124
932 msgid "To"
933 msgstr "До"
934
729 -#: gitk:8049
935 +#: gitk:9148
936 msgid "Generate patch"
937 msgstr "Создать патч"
938
733 -#: gitk:8051
939 +#: gitk:9150
940 msgid "From:"
941 msgstr "От:"
942
737 -#: gitk:8060
943 +#: gitk:9159
944 msgid "To:"
945 msgstr "До:"
946
741 -#: gitk:8069
947 +#: gitk:9168
948 msgid "Reverse"
949 msgstr "В обратном порядке"
950
745 -#: gitk:8071 gitk:8253
951 +#: gitk:9170 gitk:9366
952 msgid "Output file:"
953 msgstr "Файл для сохранения:"
954
749 -#: gitk:8077
955 +#: gitk:9176
956 msgid "Generate"
957 msgstr "Создать"
958
753 -#: gitk:8115
959 +#: gitk:9214
960 msgid "Error creating patch:"
961 msgstr "Ошибка создания патча:"
962
757 -#: gitk:8138 gitk:8241 gitk:8298
963 +#: gitk:9237 gitk:9354 gitk:9411
964 msgid "ID:"
965 msgstr "ID:"
966
761 -#: gitk:8147
967 +#: gitk:9246
968 msgid "Tag name:"
969 msgstr "Имя метки:"
970
765 -#: gitk:8151 gitk:8307
971 +#: gitk:9249
972 +msgid "Tag message is optional"
973 +msgstr ""
974 +
975 +#: gitk:9251
976 +#, fuzzy
977 +msgid "Tag message:"
978 +msgstr "Имя метки:"
979 +
980 +#: gitk:9255 gitk:9420
981 msgid "Create"
982 msgstr "Создать"
983
769 -#: gitk:8168
984 +#: gitk:9273
985 msgid "No tag name specified"
986 msgstr "Не задано имя метки"
987
773 -#: gitk:8172
988 +#: gitk:9277
989 #, tcl-format
990 msgid "Tag \"%s\" already exists"
991 msgstr "Метка \"%s\" уже существует"
992
778 -#: gitk:8178
993 +#: gitk:9287
994 msgid "Error creating tag:"
995 msgstr "Ошибка создания метки:"
996
782 -#: gitk:8250
997 +#: gitk:9363
998 msgid "Command:"
999 msgstr "Команда:"
1000
786 -#: gitk:8258
1001 +#: gitk:9371
1002 msgid "Write"
1003 msgstr "Запись"
1004
790 -#: gitk:8276
1005 +#: gitk:9389
1006 msgid "Error writing commit:"
1007 msgstr "Ошибка сохранения состояния:"
1008
794 -#: gitk:8303
1009 +#: gitk:9416
1010 msgid "Name:"
1011 msgstr "Имя:"
1012
798 -#: gitk:8326
1013 +#: gitk:9439
1014 msgid "Please specify a name for the new branch"
1015 msgstr "Укажите имя для новой ветви"
1016
802 -#: gitk:8331
1017 +#: gitk:9444
1018 #, tcl-format
1019 msgid "Branch '%s' already exists. Overwrite?"
1020 msgstr "Ветвь '%s' уже существует. Переписать?"
1021
807 -#: gitk:8397
1022 +#: gitk:9511
1023 #, tcl-format
1024 msgid "Commit %s is already included in branch %s -- really re-apply it?"
810 -msgstr ""
811 -"Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
1025 +msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
1026
813 -#: gitk:8402
1027 +#: gitk:9516
1028 msgid "Cherry-picking"
1029 msgstr "Копирование изменений"
1030
817 -#: gitk:8411
1031 +#: gitk:9525
1032 #, tcl-format
1033 msgid ""
1034 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -823,41 +1037,68 @@ msgstr ""
1037 "Копирование невозможно из-за изменений в файле '%s'.\n"
1038 "Сохраните или отмените изменения и повторите операцию."
1039
826 -#: gitk:8417
1040 +#: gitk:9531
1041 msgid ""
1042 "Cherry-pick failed because of merge conflict.\n"
1043 "Do you wish to run git citool to resolve it?"
1044 msgstr ""
831 -"Копирование изменений невозможно из-за незавершённой операции "
832 -"слияния.\nЗапустить git citool для завершения этой операции?"
1045 +"Копирование изменений невозможно из-за незавершённой операции слияния.\n"
1046 +"Запустить git citool для завершения этой операции?"
1047
834 -#: gitk:8433
1048 +#: gitk:9547 gitk:9605
1049 msgid "No changes committed"
1050 msgstr "Изменения не сохранены"
1051
838 -#: gitk:8459
1052 +#: gitk:9574
1053 +#, fuzzy, tcl-format
1054 +msgid "Commit %s is not included in branch %s -- really revert it?"
1055 +msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
1056 +
1057 +#: gitk:9579
1058 +#, fuzzy
1059 +msgid "Reverting"
1060 +msgstr "Установка"
1061 +
1062 +#: gitk:9587
1063 +#, fuzzy, tcl-format
1064 +msgid ""
1065 +"Revert failed because of local changes to the following files:%s Please "
1066 +"commit, reset or stash your changes and try again."
1067 +msgstr ""
1068 +"Копирование невозможно из-за изменений в файле '%s'.\n"
1069 +"Сохраните или отмените изменения и повторите операцию."
1070 +
1071 +#: gitk:9591
1072 +#, fuzzy
1073 +msgid ""
1074 +"Revert failed because of merge conflict.\n"
1075 +" Do you wish to run git citool to resolve it?"
1076 +msgstr ""
1077 +"Копирование изменений невозможно из-за незавершённой операции слияния.\n"
1078 +"Запустить git citool для завершения этой операции?"
1079 +
1080 +#: gitk:9634
1081 msgid "Confirm reset"
1082 msgstr "Подтвердите операцию перехода"
1083
842 -#: gitk:8461
1084 +#: gitk:9636
1085 #, tcl-format
1086 msgid "Reset branch %s to %s?"
1087 msgstr "Установить ветвь %s на состояние %s?"
1088
847 -#: gitk:8465
1089 +#: gitk:9638
1090 msgid "Reset type:"
1091 msgstr "Тип операции перехода:"
1092
851 -#: gitk:8469
1093 +#: gitk:9641
1094 msgid "Soft: Leave working tree and index untouched"
1095 msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными"
1096
855 -#: gitk:8472
1097 +#: gitk:9644
1098 msgid "Mixed: Leave working tree untouched, reset index"
857 -msgstr ""
858 -"Смешанный: оставить рабочий каталог неизменным, установить индекс"
1099 +msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс"
1100
860 -#: gitk:8475
1101 +#: gitk:9647
1102 msgid ""
1103 "Hard: Reset working tree and index\n"
1104 "(discard ALL local changes)"
@@ -865,19 +1106,19 @@ msgstr ""
1106 "Жесткий: переписать индекс и рабочий каталог\n"
1107 "(все изменения в рабочем каталоге будут потеряны)"
1108
868 -#: gitk:8492
1109 +#: gitk:9664
1110 msgid "Resetting"
1111 msgstr "Установка"
1112
872 -#: gitk:8549
1113 +#: gitk:9724
1114 msgid "Checking out"
1115 msgstr "Переход"
1116
876 -#: gitk:8602
1117 +#: gitk:9777
1118 msgid "Cannot delete the currently checked-out branch"
1119 msgstr "Активная ветвь не может быть удалена"
1120
880 -#: gitk:8608
1121 +#: gitk:9783
1122 #, tcl-format
1123 msgid ""
1124 "The commits on branch %s aren't on any other branch.\n"
@@ -886,200 +1127,272 @@ msgstr ""
1127 "Состояния ветви %s больше не принадлежат никакой другой ветви.\n"
1128 "Действительно удалить ветвь %s?"
1129
889 -#: gitk:8639
1130 +#: gitk:9814
1131 #, tcl-format
1132 msgid "Tags and heads: %s"
1133 msgstr "Метки и ветви: %s"
1134
894 -#: gitk:8654
1135 +#: gitk:9829
1136 msgid "Filter"
1137 msgstr "Фильтровать"
1138
898 -#: gitk:8949
1139 +#: gitk:10125
1140 msgid ""
1141 "Error reading commit topology information; branch and preceding/following "
1142 "tag information will be incomplete."
1143 msgstr ""
903 -"Ошибка чтения истории проекта; информация о ветвях и состояниях "
904 -"вокруг меток (до/после) может быть неполной."
1144 +"Ошибка чтения истории проекта; информация о ветвях и состояниях вокруг меток "
1145 +"(до/после) может быть неполной."
1146
906 -#: gitk:9935
1147 +#: gitk:11102
1148 msgid "Tag"
1149 msgstr "Метка"
1150
910 -#: gitk:9935
1151 +#: gitk:11106
1152 msgid "Id"
1153 msgstr "Id"
1154
914 -#: gitk:9983
1155 +#: gitk:11189
1156 msgid "Gitk font chooser"
1157 msgstr "Шрифт Gitk"
1158
918 -#: gitk:10000
1159 +#: gitk:11206
1160 msgid "B"
1161 msgstr "Ж"
1162
922 -#: gitk:10003
1163 +#: gitk:11209
1164 msgid "I"
1165 msgstr "К"
1166
926 -#: gitk:10098
927 -msgid "Gitk preferences"
928 -msgstr "Настройки Gitk"
929 -
930 -#: gitk:10100
1167 +#: gitk:11327
1168 msgid "Commit list display options"
1169 msgstr "Параметры показа списка состояний"
1170
934 -#: gitk:10103
1171 +#: gitk:11330
1172 msgid "Maximum graph width (lines)"
1173 msgstr "Макс. ширина графа (строк)"
1174
938 -#: gitk:10107
939 -#, tcl-format
1175 +#: gitk:11334
1176 +#, no-tcl-format
1177 msgid "Maximum graph width (% of pane)"
1178 msgstr "Макс. ширина графа (% ширины панели)"
1179
943 -#: gitk:10111
1180 +#: gitk:11337
1181 msgid "Show local changes"
1182 msgstr "Показывать изменения в рабочем каталоге"
1183
947 -#: gitk:10114
948 -msgid "Auto-select SHA1"
1184 +#: gitk:11340
1185 +#, fuzzy
1186 +msgid "Auto-select SHA1 (length)"
1187 msgstr "Выделить SHA1"
1188
951 -#: gitk:10118
1189 +#: gitk:11344
1190 +msgid "Hide remote refs"
1191 +msgstr ""
1192 +
1193 +#: gitk:11348
1194 msgid "Diff display options"
1195 msgstr "Параметры показа изменений"
1196
955 -#: gitk:10120
1197 +#: gitk:11350
1198 msgid "Tab spacing"
1199 msgstr "Ширина табуляции"
1200
959 -#: gitk:10123
960 -msgid "Display nearby tags"
1201 +#: gitk:11353
1202 +#, fuzzy
1203 +msgid "Display nearby tags/heads"
1204 msgstr "Показывать близкие метки"
1205
963 -#: gitk:10126
1206 +#: gitk:11356
1207 +msgid "Maximum # tags/heads to show"
1208 +msgstr ""
1209 +
1210 +#: gitk:11359
1211 msgid "Limit diffs to listed paths"
1212 msgstr "Ограничить показ изменений выбранными файлами"
1213
967 -#: gitk:10129
1214 +#: gitk:11362
1215 msgid "Support per-file encodings"
1216 msgstr "Поддержка кодировок в отдельных файлах"
1217
971 -#: gitk:10135
1218 +#: gitk:11368 gitk:11515
1219 msgid "External diff tool"
1220 msgstr "Программа для показа изменений"
1221
975 -#: gitk:10137
1222 +#: gitk:11369
1223 msgid "Choose..."
1224 msgstr "Выберите..."
1225
979 -#: gitk:10142
1226 +#: gitk:11374
1227 +#, fuzzy
1228 +msgid "General options"
1229 +msgstr "Создать патч"
1230 +
1231 +#: gitk:11377
1232 +msgid "Use themed widgets"
1233 +msgstr ""
1234 +
1235 +#: gitk:11379
1236 +msgid "(change requires restart)"
1237 +msgstr ""
1238 +
1239 +#: gitk:11381
1240 +msgid "(currently unavailable)"
1241 +msgstr ""
1242 +
1243 +#: gitk:11392
1244 msgid "Colors: press to choose"
1245 msgstr "Цвета: нажмите для выбора"
1246
983 -#: gitk:10145
1247 +#: gitk:11395
1248 +msgid "Interface"
1249 +msgstr ""
1250 +
1251 +#: gitk:11396
1252 +#, fuzzy
1253 +msgid "interface"
1254 +msgstr "Шрифт интерфейса"
1255 +
1256 +#: gitk:11399
1257 msgid "Background"
1258 msgstr "Фон"
1259
987 -#: gitk:10146 gitk:10176
1260 +#: gitk:11400 gitk:11430
1261 msgid "background"
1262 msgstr "фон"
1263
991 -#: gitk:10149
1264 +#: gitk:11403
1265 msgid "Foreground"
1266 msgstr "Передний план"
1267
995 -#: gitk:10150
1268 +#: gitk:11404
1269 msgid "foreground"
1270 msgstr "передний план"
1271
999 -#: gitk:10153
1272 +#: gitk:11407
1273 msgid "Diff: old lines"
1274 msgstr "Изменения: старый текст"
1275
1003 -#: gitk:10154
1276 +#: gitk:11408
1277 msgid "diff old lines"
1278 msgstr "старый текст изменения"
1279
1007 -#: gitk:10158
1280 +#: gitk:11412
1281 msgid "Diff: new lines"
1282 msgstr "Изменения: новый текст"
1283
1011 -#: gitk:10159
1284 +#: gitk:11413
1285 msgid "diff new lines"
1286 msgstr "новый текст изменения"
1287
1015 -#: gitk:10163
1288 +#: gitk:11417
1289 msgid "Diff: hunk header"
1290 msgstr "Изменения: заголовок блока"
1291
1019 -#: gitk:10165
1292 +#: gitk:11419
1293 msgid "diff hunk header"
1294 msgstr "заголовок блока изменений"
1295
1023 -#: gitk:10169
1296 +#: gitk:11423
1297 msgid "Marked line bg"
1298 msgstr "Фон выбранной строки"
1299
1027 -#: gitk:10171
1300 +#: gitk:11425
1301 msgid "marked line background"
1302 msgstr "фон выбранной строки"
1303
1031 -#: gitk:10175
1304 +#: gitk:11429
1305 msgid "Select bg"
1306 msgstr "Выберите фон"
1307
1035 -#: gitk:10179
1308 +#: gitk:11438
1309 msgid "Fonts: press to choose"
1310 msgstr "Шрифт: нажмите для выбора"
1311
1039 -#: gitk:10181
1312 +#: gitk:11440
1313 msgid "Main font"
1314 msgstr "Основной шрифт"
1315
1043 -#: gitk:10182
1316 +#: gitk:11441
1317 msgid "Diff display font"
1318 msgstr "Шрифт показа изменений"
1319
1047 -#: gitk:10183
1320 +#: gitk:11442
1321 msgid "User interface font"
1322 msgstr "Шрифт интерфейса"
1323
1051 -#: gitk:10210
1324 +#: gitk:11464
1325 +msgid "Gitk preferences"
1326 +msgstr "Настройки Gitk"
1327 +
1328 +#: gitk:11473
1329 +#, fuzzy
1330 +msgid "General"
1331 +msgstr "Создать"
1332 +
1333 +#: gitk:11474
1334 +msgid "Colors"
1335 +msgstr ""
1336 +
1337 +#: gitk:11475
1338 +msgid "Fonts"
1339 +msgstr ""
1340 +
1341 +#: gitk:11525
1342 #, tcl-format
1343 msgid "Gitk: choose color for %s"
1344 msgstr "Gitk: выберите цвет для %s"
1345
1056 -#: gitk:10656
1057 -msgid ""
1058 -"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
1059 -" Gitk requires at least Tcl/Tk 8.4."
1060 -msgstr ""
1061 -"К сожалению gitk не может работать с этой версий Tcl/Tk.\n"
1062 -"Требуется как минимум Tcl/Tk 8.4."
1063 -
1064 -#: gitk:10773
1346 +#: gitk:12242
1347 msgid "Cannot find a git repository here."
1348 msgstr "Git-репозитарий не найден в текущем каталоге."
1349
1068 -#: gitk:10777
1069 -#, tcl-format
1070 -msgid "Cannot find the git directory \"%s\"."
1071 -msgstr "Git-репозитарий \"%s\" не найден."
1072 -
1073 -#: gitk:10824
1350 +#: gitk:12289
1351 #, tcl-format
1352 msgid "Ambiguous argument '%s': both revision and filename"
1353 msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла"
1354
1078 -#: gitk:10836
1355 +#: gitk:12301
1356 msgid "Bad arguments to gitk:"
1357 msgstr "Неправильные аргументы для gitk:"
1358
1082 -#: gitk:10896
1359 +#: gitk:12405
1360 msgid "Command line"
1361 msgstr "Командная строка"
1362
1363 +#~ msgid "SHA1 ID: "
1364 +#~ msgstr "SHA1:"
1365 +
1366 +#~ msgid "next"
1367 +#~ msgstr "След."
1368 +
1369 +#~ msgid "prev"
1370 +#~ msgstr "Пред."
1371 +
1372 +#~ msgid "Use all refs"
1373 +#~ msgstr "Использовать все ветви"
1374 +
1375 +#~ msgid "Max count:"
1376 +#~ msgstr "Макс. количество:"
1377 +
1378 +#~ msgid "Skip:"
1379 +#~ msgstr "Пропустить:"
1380 +
1381 +#~ msgid "Name"
1382 +#~ msgstr "Имя"
1383 +
1384 +#~ msgid "CDate"
1385 +#~ msgstr "Дата ввода"
1386 +
1387 +#~ msgid "Tag/Head %s is not known"
1388 +#~ msgstr "Метка или ветвь %s не найдена"
1389 +
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 +
1397 +#~ msgid "Cannot find the git directory \"%s\"."
1398 +#~ msgstr "Git-репозитарий \"%s\" не найден."
po/sv.po
+324 -315
@@ -9,7 +9,7 @@ msgid ""
9 msgstr ""
10 "Project-Id-Version: sv\n"
11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2013-05-16 08:06+0100\n"
12 +"POT-Creation-Date: 2015-03-15 14:37+1100\n"
13 "PO-Revision-Date: 2013-05-16 08:12+0100\n"
14 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
15 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -22,29 +22,29 @@ msgstr ""
22 msgid "Couldn't get list of unmerged files:"
23 msgstr "Kunde inte hämta lista över ej sammanslagna filer:"
24
25 -#: gitk:210 gitk:2334
25 +#: gitk:212 gitk:2381
26 msgid "Color words"
27 msgstr "Färga ord"
28
29 -#: gitk:215 gitk:2334 gitk:7977 gitk:8010
29 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
30 msgid "Markup words"
31 msgstr "Märk upp ord"
32
33 -#: gitk:312
33 +#: gitk:324
34 msgid "Error parsing revisions:"
35 msgstr "Fel vid tolkning av revisioner:"
36
37 -#: gitk:368
37 +#: gitk:380
38 msgid "Error executing --argscmd command:"
39 msgstr "Fel vid körning av --argscmd-kommando:"
40
41 -#: gitk:381
41 +#: gitk:393
42 msgid "No files selected: --merge specified but no files are unmerged."
43 msgstr ""
44 "Inga filer valdes: --merge angavs men det finns inga filer som inte har "
45 "slagits samman."
46
47 -#: gitk:384
47 +#: gitk:396
48 msgid ""
49 "No files selected: --merge specified but no unmerged files are within file "
50 "limit."
@@ -52,319 +52,312 @@ msgstr ""
52 "Inga filer valdes: --merge angavs men det finns inga filer inom "
53 "filbegränsningen."
54
55 -#: gitk:406 gitk:554
55 +#: gitk:418 gitk:566
56 msgid "Error executing git log:"
57 msgstr "Fel vid körning av git log:"
58
59 -#: gitk:424 gitk:570
59 +#: gitk:436 gitk:582
60 msgid "Reading"
61 msgstr "Läser"
62
63 -#: gitk:484 gitk:4409
63 +#: gitk:496 gitk:4508
64 msgid "Reading commits..."
65 msgstr "Läser incheckningar..."
66
67 -#: gitk:487 gitk:1625 gitk:4412
67 +#: gitk:499 gitk:1637 gitk:4511
68 msgid "No commits selected"
69 msgstr "Inga incheckningar markerade"
70
71 -#: gitk:1499
71 +#: gitk:1511
72 msgid "Can't parse git log output:"
73 msgstr "Kan inte tolka utdata från git log:"
74
75 -#: gitk:1719
75 +#: gitk:1740
76 msgid "No commit information available"
77 msgstr "Ingen incheckningsinformation är tillgänglig"
78
79 -#: gitk:1876
79 +#: gitk:1897
80 msgid "mc"
81 msgstr "mc"
82
83 -#: gitk:1911 gitk:4202 gitk:9437 gitk:10979 gitk:11258
83 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
84 msgid "OK"
85 msgstr "OK"
86
87 -#: gitk:1913 gitk:4204 gitk:8964 gitk:9043 gitk:9159 gitk:9208 gitk:9439
88 -#: gitk:10980 gitk:11259
87 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
88 +#: gitk:11221 gitk:11501
89 msgid "Cancel"
90 msgstr "Avbryt"
91
92 -#: gitk:2048
92 +#: gitk:2069
93 msgid "Update"
94 msgstr "Uppdatera"
95
96 -#: gitk:2049
96 +#: gitk:2070
97 msgid "Reload"
98 msgstr "Ladda om"
99
100 -#: gitk:2050
100 +#: gitk:2071
101 msgid "Reread references"
102 msgstr "Läs om referenser"
103
104 -#: gitk:2051
104 +#: gitk:2072
105 msgid "List references"
106 msgstr "Visa referenser"
107
108 -#: gitk:2053
108 +#: gitk:2074
109 msgid "Start git gui"
110 msgstr "Starta git gui"
111
112 -#: gitk:2055
112 +#: gitk:2076
113 msgid "Quit"
114 msgstr "Avsluta"
115
116 -#: gitk:2047
116 +#: gitk:2068
117 msgid "File"
118 msgstr "Arkiv"
119
120 -#: gitk:2059
120 +#: gitk:2080
121 msgid "Preferences"
122 msgstr "Inställningar"
123
124 -#: gitk:2058
124 +#: gitk:2079
125 msgid "Edit"
126 msgstr "Redigera"
127
128 -#: gitk:2063
128 +#: gitk:2084
129 msgid "New view..."
130 msgstr "Ny vy..."
131
132 -#: gitk:2064
132 +#: gitk:2085
133 msgid "Edit view..."
134 msgstr "Ändra vy..."
135
136 -#: gitk:2065
136 +#: gitk:2086
137 msgid "Delete view"
138 msgstr "Ta bort vy"
139
140 -#: gitk:2067
140 +#: gitk:2088
141 msgid "All files"
142 msgstr "Alla filer"
143
144 -#: gitk:2062 gitk:3955
144 +#: gitk:2083 gitk:4050
145 msgid "View"
146 msgstr "Visa"
147
148 -#: gitk:2072 gitk:2082 gitk:2925
148 +#: gitk:2093 gitk:2103 gitk:3009
149 msgid "About gitk"
150 msgstr "Om gitk"
151
152 -#: gitk:2073 gitk:2087
152 +#: gitk:2094 gitk:2108
153 msgid "Key bindings"
154 msgstr "Tangentbordsbindningar"
155
156 -#: gitk:2071 gitk:2086
156 +#: gitk:2092 gitk:2107
157 msgid "Help"
158 msgstr "Hjälp"
159
160 -#: gitk:2164 gitk:8420
160 +#: gitk:2185 gitk:8633
161 msgid "SHA1 ID:"
162 msgstr "SHA1-id:"
163
164 -#: gitk:2208
164 +#: gitk:2229
165 msgid "Row"
166 msgstr "Rad"
167
168 -#: gitk:2246
168 +#: gitk:2267
169 msgid "Find"
170 msgstr "Sök"
171
172 -#: gitk:2247
173 -msgid "next"
174 -msgstr "nästa"
175 -
176 -#: gitk:2248
177 -msgid "prev"
178 -msgstr "föreg"
179 -
180 -#: gitk:2249
172 +#: gitk:2295
173 msgid "commit"
174 msgstr "incheckning"
175
184 -#: gitk:2252 gitk:2254 gitk:4570 gitk:4593 gitk:4617 gitk:6592 gitk:6664
185 -#: gitk:6749
176 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
177 +#: gitk:6893
178 msgid "containing:"
179 msgstr "som innehåller:"
180
189 -#: gitk:2255 gitk:3437 gitk:3442 gitk:4646
181 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
182 msgid "touching paths:"
183 msgstr "som rör sökväg:"
184
193 -#: gitk:2256 gitk:4660
185 +#: gitk:2303 gitk:4759
186 msgid "adding/removing string:"
187 msgstr "som lägger/till tar bort sträng:"
188
197 -#: gitk:2257 gitk:4662
189 +#: gitk:2304 gitk:4761
190 msgid "changing lines matching:"
191 msgstr "ändrar rader som matchar:"
192
201 -#: gitk:2266 gitk:2268 gitk:4649
193 +#: gitk:2313 gitk:2315 gitk:4748
194 msgid "Exact"
195 msgstr "Exakt"
196
205 -#: gitk:2268 gitk:4737 gitk:6560
197 +#: gitk:2315 gitk:4836 gitk:6704
198 msgid "IgnCase"
199 msgstr "IgnVersaler"
200
209 -#: gitk:2268 gitk:4619 gitk:4735 gitk:6556
201 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
202 msgid "Regexp"
203 msgstr "Reg.uttr."
204
213 -#: gitk:2270 gitk:2271 gitk:4757 gitk:4787 gitk:4794 gitk:6685 gitk:6753
205 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
206 msgid "All fields"
207 msgstr "Alla fält"
208
217 -#: gitk:2271 gitk:4754 gitk:4787 gitk:6623
209 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
210 msgid "Headline"
211 msgstr "Rubrik"
212
221 -#: gitk:2272 gitk:4754 gitk:6623 gitk:6753 gitk:7221
213 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
214 msgid "Comments"
215 msgstr "Kommentarer"
216
225 -#: gitk:2272 gitk:4754 gitk:4759 gitk:4794 gitk:6623 gitk:7156 gitk:8598
226 -#: gitk:8613
217 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
218 +#: gitk:8826
219 msgid "Author"
220 msgstr "Författare"
221
230 -#: gitk:2272 gitk:4754 gitk:6623 gitk:7158
222 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
223 msgid "Committer"
224 msgstr "Incheckare"
225
234 -#: gitk:2303
226 +#: gitk:2350
227 msgid "Search"
228 msgstr "Sök"
229
238 -#: gitk:2311
230 +#: gitk:2358
231 msgid "Diff"
232 msgstr "Diff"
233
242 -#: gitk:2313
234 +#: gitk:2360
235 msgid "Old version"
236 msgstr "Gammal version"
237
246 -#: gitk:2315
238 +#: gitk:2362
239 msgid "New version"
240 msgstr "Ny version"
241
250 -#: gitk:2317
242 +#: gitk:2364
243 msgid "Lines of context"
244 msgstr "Rader sammanhang"
245
254 -#: gitk:2327
246 +#: gitk:2374
247 msgid "Ignore space change"
248 msgstr "Ignorera ändringar i blanksteg"
249
258 -#: gitk:2331 gitk:2333 gitk:7735 gitk:7963
250 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
251 msgid "Line diff"
252 msgstr "Rad-diff"
253
262 -#: gitk:2397
254 +#: gitk:2445
255 msgid "Patch"
256 msgstr "Patch"
257
266 -#: gitk:2399
258 +#: gitk:2447
259 msgid "Tree"
260 msgstr "Träd"
261
270 -#: gitk:2557 gitk:2577
262 +#: gitk:2616 gitk:2636
263 msgid "Diff this -> selected"
264 msgstr "Diff denna -> markerad"
265
274 -#: gitk:2558 gitk:2578
266 +#: gitk:2617 gitk:2637
267 msgid "Diff selected -> this"
268 msgstr "Diff markerad -> denna"
269
278 -#: gitk:2559 gitk:2579
270 +#: gitk:2618 gitk:2638
271 msgid "Make patch"
272 msgstr "Skapa patch"
273
282 -#: gitk:2560 gitk:9022
274 +#: gitk:2619 gitk:9235
275 msgid "Create tag"
276 msgstr "Skapa tagg"
277
286 -#: gitk:2561 gitk:9139
278 +#: gitk:2620 gitk:9352
279 msgid "Write commit to file"
280 msgstr "Skriv incheckning till fil"
281
290 -#: gitk:2562 gitk:9196
282 +#: gitk:2621 gitk:9409
283 msgid "Create new branch"
284 msgstr "Skapa ny gren"
285
294 -#: gitk:2563
286 +#: gitk:2622
287 msgid "Cherry-pick this commit"
288 msgstr "Plocka denna incheckning"
289
298 -#: gitk:2564
290 +#: gitk:2623
291 msgid "Reset HEAD branch to here"
292 msgstr "Återställ HEAD-grenen hit"
293
302 -#: gitk:2565
294 +#: gitk:2624
295 msgid "Mark this commit"
296 msgstr "Markera denna incheckning"
297
306 -#: gitk:2566
298 +#: gitk:2625
299 msgid "Return to mark"
300 msgstr "Återgå till markering"
301
310 -#: gitk:2567
302 +#: gitk:2626
303 msgid "Find descendant of this and mark"
304 msgstr "Hitta efterföljare till denna och markera"
305
314 -#: gitk:2568
306 +#: gitk:2627
307 msgid "Compare with marked commit"
308 msgstr "Jämför med markerad incheckning"
309
318 -#: gitk:2569 gitk:2580
310 +#: gitk:2628 gitk:2639
311 msgid "Diff this -> marked commit"
312 msgstr "Diff denna -> markerad incheckning"
313
322 -#: gitk:2570 gitk:2581
314 +#: gitk:2629 gitk:2640
315 msgid "Diff marked commit -> this"
316 msgstr "Diff markerad incheckning -> denna"
317
326 -#: gitk:2571
318 +#: gitk:2630
319 msgid "Revert this commit"
320 msgstr "Ångra denna incheckning"
321
330 -#: gitk:2587
322 +#: gitk:2646
323 msgid "Check out this branch"
324 msgstr "Checka ut denna gren"
325
334 -#: gitk:2588
326 +#: gitk:2647
327 msgid "Remove this branch"
328 msgstr "Ta bort denna gren"
329
338 -#: gitk:2595
330 +#: gitk:2654
331 msgid "Highlight this too"
332 msgstr "Markera även detta"
333
342 -#: gitk:2596
334 +#: gitk:2655
335 msgid "Highlight this only"
336 msgstr "Markera bara detta"
337
346 -#: gitk:2597
338 +#: gitk:2656
339 msgid "External diff"
340 msgstr "Extern diff"
341
350 -#: gitk:2598
342 +#: gitk:2657
343 msgid "Blame parent commit"
344 msgstr "Klandra föräldraincheckning"
345
354 -#: gitk:2605
346 +#: gitk:2664
347 msgid "Show origin of this line"
348 msgstr "Visa ursprunget för den här raden"
349
358 -#: gitk:2606
350 +#: gitk:2665
351 msgid "Run git gui blame on this line"
352 msgstr "Kör git gui blame på den här raden"
353
362 -#: gitk:2927
354 +#: gitk:3011
355 +#, fuzzy
356 msgid ""
357 "\n"
358 "Gitk - a commit viewer for git\n"
359 "\n"
367 -"Copyright ©9 2005-2011 Paul Mackerras\n"
360 +"Copyright © 2005-2014 Paul Mackerras\n"
361 "\n"
362 "Use and redistribute under the terms of the GNU General Public License"
363 msgstr ""
@@ -375,302 +368,312 @@ msgstr ""
368 "\n"
369 "Använd och vidareförmedla enligt villkoren i GNU General Public License"
370
378 -#: gitk:2935 gitk:3000 gitk:9623
371 +#: gitk:3019 gitk:3085 gitk:9836
372 msgid "Close"
373 msgstr "Stäng"
374
382 -#: gitk:2956
375 +#: gitk:3040
376 msgid "Gitk key bindings"
377 msgstr "Tangentbordsbindningar för Gitk"
378
386 -#: gitk:2959
379 +#: gitk:3043
380 msgid "Gitk key bindings:"
381 msgstr "Tangentbordsbindningar för Gitk:"
382
390 -#: gitk:2961
383 +#: gitk:3045
384 #, tcl-format
385 msgid "<%s-Q>\t\tQuit"
386 msgstr "<%s-Q>\t\tAvsluta"
387
395 -#: gitk:2962
388 +#: gitk:3046
389 #, tcl-format
390 msgid "<%s-W>\t\tClose window"
391 msgstr "<%s-W>\t\tStäng fönster"
392
400 -#: gitk:2963
393 +#: gitk:3047
394 msgid "<Home>\t\tMove to first commit"
395 msgstr "<Home>\t\tGå till första incheckning"
396
404 -#: gitk:2964
397 +#: gitk:3048
398 msgid "<End>\t\tMove to last commit"
399 msgstr "<End>\t\tGå till sista incheckning"
400
408 -#: gitk:2965
401 +#: gitk:3049
402 msgid "<Up>, p, k\tMove up one commit"
403 msgstr "<Upp>, p, k\tGå en incheckning upp"
404
412 -#: gitk:2966
405 +#: gitk:3050
406 msgid "<Down>, n, j\tMove down one commit"
407 msgstr "<Ned>, n, j\tGå en incheckning ned"
408
416 -#: gitk:2967
409 +#: gitk:3051
410 msgid "<Left>, z, h\tGo back in history list"
411 msgstr "<Vänster>, z, h\tGå bakåt i historiken"
412
420 -#: gitk:2968
413 +#: gitk:3052
414 msgid "<Right>, x, l\tGo forward in history list"
415 msgstr "<Höger>, x, l\tGå framåt i historiken"
416
424 -#: gitk:2969
417 +#: gitk:3053
418 +#, tcl-format
419 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
420 +msgstr ""
421 +
422 +#: gitk:3054
423 msgid "<PageUp>\tMove up one page in commit list"
424 msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
425
428 -#: gitk:2970
426 +#: gitk:3055
427 msgid "<PageDown>\tMove down one page in commit list"
428 msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
429
432 -#: gitk:2971
430 +#: gitk:3056
431 #, tcl-format
432 msgid "<%s-Home>\tScroll to top of commit list"
433 msgstr "<%s-Home>\tRulla till början av incheckningslistan"
434
437 -#: gitk:2972
435 +#: gitk:3057
436 #, tcl-format
437 msgid "<%s-End>\tScroll to bottom of commit list"
438 msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
439
442 -#: gitk:2973
440 +#: gitk:3058
441 #, tcl-format
442 msgid "<%s-Up>\tScroll commit list up one line"
443 msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
444
447 -#: gitk:2974
445 +#: gitk:3059
446 #, tcl-format
447 msgid "<%s-Down>\tScroll commit list down one line"
448 msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
449
452 -#: gitk:2975
450 +#: gitk:3060
451 #, tcl-format
452 msgid "<%s-PageUp>\tScroll commit list up one page"
453 msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
454
457 -#: gitk:2976
455 +#: gitk:3061
456 #, tcl-format
457 msgid "<%s-PageDown>\tScroll commit list down one page"
458 msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
459
462 -#: gitk:2977
460 +#: gitk:3062
461 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
462 msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
463
466 -#: gitk:2978
464 +#: gitk:3063
465 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
466 msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
467
470 -#: gitk:2979
468 +#: gitk:3064
469 msgid "<Delete>, b\tScroll diff view up one page"
470 msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
471
474 -#: gitk:2980
472 +#: gitk:3065
473 msgid "<Backspace>\tScroll diff view up one page"
474 msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
475
478 -#: gitk:2981
476 +#: gitk:3066
477 msgid "<Space>\t\tScroll diff view down one page"
478 msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
479
482 -#: gitk:2982
480 +#: gitk:3067
481 msgid "u\t\tScroll diff view up 18 lines"
482 msgstr "u\t\tRulla diffvisningen upp 18 rader"
483
486 -#: gitk:2983
484 +#: gitk:3068
485 msgid "d\t\tScroll diff view down 18 lines"
486 msgstr "d\t\tRulla diffvisningen ned 18 rader"
487
490 -#: gitk:2984
488 +#: gitk:3069
489 #, tcl-format
490 msgid "<%s-F>\t\tFind"
491 msgstr "<%s-F>\t\tSök"
492
495 -#: gitk:2985
493 +#: gitk:3070
494 #, tcl-format
495 msgid "<%s-G>\t\tMove to next find hit"
496 msgstr "<%s-G>\t\tGå till nästa sökträff"
497
500 -#: gitk:2986
498 +#: gitk:3071
499 msgid "<Return>\tMove to next find hit"
500 msgstr "<Return>\t\tGå till nästa sökträff"
501
504 -#: gitk:2987
502 +#: gitk:3072
503 msgid "/\t\tFocus the search box"
504 msgstr "/\t\tFokusera sökrutan"
505
508 -#: gitk:2988
506 +#: gitk:3073
507 msgid "?\t\tMove to previous find hit"
508 msgstr "?\t\tGå till föregående sökträff"
509
512 -#: gitk:2989
510 +#: gitk:3074
511 msgid "f\t\tScroll diff view to next file"
512 msgstr "f\t\tRulla diffvisningen till nästa fil"
513
516 -#: gitk:2990
514 +#: gitk:3075
515 #, tcl-format
516 msgid "<%s-S>\t\tSearch for next hit in diff view"
517 msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
518
521 -#: gitk:2991
519 +#: gitk:3076
520 #, tcl-format
521 msgid "<%s-R>\t\tSearch for previous hit in diff view"
522 msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
523
526 -#: gitk:2992
524 +#: gitk:3077
525 #, tcl-format
526 msgid "<%s-KP+>\tIncrease font size"
527 msgstr "<%s-Num+>\tÖka teckenstorlek"
528
531 -#: gitk:2993
529 +#: gitk:3078
530 #, tcl-format
531 msgid "<%s-plus>\tIncrease font size"
532 msgstr "<%s-plus>\tÖka teckenstorlek"
533
536 -#: gitk:2994
534 +#: gitk:3079
535 #, tcl-format
536 msgid "<%s-KP->\tDecrease font size"
537 msgstr "<%s-Num->\tMinska teckenstorlek"
538
541 -#: gitk:2995
539 +#: gitk:3080
540 #, tcl-format
541 msgid "<%s-minus>\tDecrease font size"
542 msgstr "<%s-minus>\tMinska teckenstorlek"
543
546 -#: gitk:2996
544 +#: gitk:3081
545 msgid "<F5>\t\tUpdate"
546 msgstr "<F5>\t\tUppdatera"
547
550 -#: gitk:3451 gitk:3460
548 +#: gitk:3546 gitk:3555
549 #, tcl-format
550 msgid "Error creating temporary directory %s:"
551 msgstr "Fel vid skapande av temporär katalog %s:"
552
555 -#: gitk:3473
553 +#: gitk:3568
554 #, tcl-format
555 msgid "Error getting \"%s\" from %s:"
556 msgstr "Fel vid hämtning av \"%s\" från %s:"
557
560 -#: gitk:3536
558 +#: gitk:3631
559 msgid "command failed:"
560 msgstr "kommando misslyckades:"
561
564 -#: gitk:3685
562 +#: gitk:3780
563 msgid "No such commit"
564 msgstr "Incheckning saknas"
565
568 -#: gitk:3699
566 +#: gitk:3794
567 msgid "git gui blame: command failed:"
568 msgstr "git gui blame: kommando misslyckades:"
569
572 -#: gitk:3730
570 +#: gitk:3825
571 #, tcl-format
572 msgid "Couldn't read merge head: %s"
573 msgstr "Kunde inte läsa sammanslagningshuvud: %s"
574
577 -#: gitk:3738
575 +#: gitk:3833
576 #, tcl-format
577 msgid "Error reading index: %s"
578 msgstr "Fel vid läsning av index: %s"
579
582 -#: gitk:3763
580 +#: gitk:3858
581 #, tcl-format
582 msgid "Couldn't start git blame: %s"
583 msgstr "Kunde inte starta git blame: %s"
584
587 -#: gitk:3766 gitk:6591
585 +#: gitk:3861 gitk:6735
586 msgid "Searching"
587 msgstr "Söker"
588
591 -#: gitk:3798
589 +#: gitk:3893
590 #, tcl-format
591 msgid "Error running git blame: %s"
592 msgstr "Fel vid körning av git blame: %s"
593
596 -#: gitk:3826
594 +#: gitk:3921
595 #, tcl-format
596 msgid "That line comes from commit %s, which is not in this view"
597 msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy"
598
601 -#: gitk:3840
599 +#: gitk:3935
600 msgid "External diff viewer failed:"
601 msgstr "Externt diff-verktyg misslyckades:"
602
605 -#: gitk:3958
603 +#: gitk:4053
604 msgid "Gitk view definition"
605 msgstr "Definition av Gitk-vy"
606
609 -#: gitk:3962
607 +#: gitk:4057
608 msgid "Remember this view"
609 msgstr "Spara denna vy"
610
613 -#: gitk:3963
611 +#: gitk:4058
612 msgid "References (space separated list):"
613 msgstr "Referenser (blankstegsavdelad lista):"
614
617 -#: gitk:3964
615 +#: gitk:4059
616 msgid "Branches & tags:"
617 msgstr "Grenar & taggar:"
618
621 -#: gitk:3965
619 +#: gitk:4060
620 msgid "All refs"
621 msgstr "Alla referenser"
622
625 -#: gitk:3966
623 +#: gitk:4061
624 msgid "All (local) branches"
625 msgstr "Alla (lokala) grenar"
626
629 -#: gitk:3967
627 +#: gitk:4062
628 msgid "All tags"
629 msgstr "Alla taggar"
630
633 -#: gitk:3968
631 +#: gitk:4063
632 msgid "All remote-tracking branches"
633 msgstr "Alla fjärrspårande grenar"
634
637 -#: gitk:3969
635 +#: gitk:4064
636 msgid "Commit Info (regular expressions):"
637 msgstr "Incheckningsinfo (reguljära uttryck):"
638
641 -#: gitk:3970
639 +#: gitk:4065
640 msgid "Author:"
641 msgstr "Författare:"
642
645 -#: gitk:3971
643 +#: gitk:4066
644 msgid "Committer:"
645 msgstr "Incheckare:"
646
649 -#: gitk:3972
647 +#: gitk:4067
648 msgid "Commit Message:"
649 msgstr "Incheckningsmeddelande:"
650
653 -#: gitk:3973
651 +#: gitk:4068
652 msgid "Matches all Commit Info criteria"
653 msgstr "Motsvarar alla kriterier för incheckningsinfo"
654
657 -#: gitk:3974
655 +#: gitk:4069
656 +#, fuzzy
657 +msgid "Matches none Commit Info criteria"
658 +msgstr "Motsvarar alla kriterier för incheckningsinfo"
659 +
660 +#: gitk:4070
661 msgid "Changes to Files:"
662 msgstr "Ändringar av filer:"
663
661 -#: gitk:3975
664 +#: gitk:4071
665 msgid "Fixed String"
666 msgstr "Fast sträng"
667
665 -#: gitk:3976
668 +#: gitk:4072
669 msgid "Regular Expression"
670 msgstr "Reguljärt uttryck"
671
669 -#: gitk:3977
672 +#: gitk:4073
673 msgid "Search string:"
674 msgstr "Söksträng:"
675
673 -#: gitk:3978
676 +#: gitk:4074
677 msgid ""
678 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
679 "15:27:38\"):"
@@ -678,201 +681,201 @@ msgstr ""
681 "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
682 "15:27:38\"):"
683
681 -#: gitk:3979
684 +#: gitk:4075
685 msgid "Since:"
686 msgstr "Från:"
687
685 -#: gitk:3980
688 +#: gitk:4076
689 msgid "Until:"
690 msgstr "Till:"
691
689 -#: gitk:3981
692 +#: gitk:4077
693 msgid "Limit and/or skip a number of revisions (positive integer):"
694 msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):"
695
693 -#: gitk:3982
696 +#: gitk:4078
697 msgid "Number to show:"
698 msgstr "Antal att visa:"
699
697 -#: gitk:3983
700 +#: gitk:4079
701 msgid "Number to skip:"
702 msgstr "Antal att hoppa över:"
703
701 -#: gitk:3984
704 +#: gitk:4080
705 msgid "Miscellaneous options:"
706 msgstr "Diverse alternativ:"
707
705 -#: gitk:3985
708 +#: gitk:4081
709 msgid "Strictly sort by date"
710 msgstr "Strikt datumsortering"
711
709 -#: gitk:3986
712 +#: gitk:4082
713 msgid "Mark branch sides"
714 msgstr "Markera sidogrenar"
715
713 -#: gitk:3987
716 +#: gitk:4083
717 msgid "Limit to first parent"
718 msgstr "Begränsa till första förälder"
719
717 -#: gitk:3988
720 +#: gitk:4084
721 msgid "Simple history"
722 msgstr "Enkel historik"
723
721 -#: gitk:3989
724 +#: gitk:4085
725 msgid "Additional arguments to git log:"
726 msgstr "Ytterligare argument till git log:"
727
725 -#: gitk:3990
728 +#: gitk:4086
729 msgid "Enter files and directories to include, one per line:"
730 msgstr "Ange filer och kataloger att ta med, en per rad:"
731
729 -#: gitk:3991
732 +#: gitk:4087
733 msgid "Command to generate more commits to include:"
734 msgstr "Kommando för att generera fler incheckningar att ta med:"
735
733 -#: gitk:4115
736 +#: gitk:4211
737 msgid "Gitk: edit view"
738 msgstr "Gitk: redigera vy"
739
737 -#: gitk:4123
740 +#: gitk:4219
741 msgid "-- criteria for selecting revisions"
742 msgstr " - kriterier för val av revisioner"
743
741 -#: gitk:4128
744 +#: gitk:4224
745 msgid "View Name"
746 msgstr "Namn på vy"
747
745 -#: gitk:4203
748 +#: gitk:4299
749 msgid "Apply (F5)"
750 msgstr "Använd (F5)"
751
749 -#: gitk:4241
752 +#: gitk:4337
753 msgid "Error in commit selection arguments:"
754 msgstr "Fel i argument för val av incheckningar:"
755
753 -#: gitk:4294 gitk:4346 gitk:4807 gitk:4821 gitk:6087 gitk:12041 gitk:12042
756 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
757 msgid "None"
758 msgstr "Inget"
759
757 -#: gitk:4904 gitk:4909
760 +#: gitk:5003 gitk:5008
761 msgid "Descendant"
762 msgstr "Avkomling"
763
761 -#: gitk:4905
764 +#: gitk:5004
765 msgid "Not descendant"
766 msgstr "Inte avkomling"
767
765 -#: gitk:4912 gitk:4917
768 +#: gitk:5011 gitk:5016
769 msgid "Ancestor"
770 msgstr "Förfader"
771
769 -#: gitk:4913
772 +#: gitk:5012
773 msgid "Not ancestor"
774 msgstr "Inte förfader"
775
773 -#: gitk:5203
776 +#: gitk:5306
777 msgid "Local changes checked in to index but not committed"
778 msgstr "Lokala ändringar sparade i indexet men inte incheckade"
779
777 -#: gitk:5239
780 +#: gitk:5342
781 msgid "Local uncommitted changes, not checked in to index"
782 msgstr "Lokala ändringar, ej sparade i indexet"
783
781 -#: gitk:6971
784 +#: gitk:7115
785 msgid "and many more"
786 msgstr "med många flera"
787
785 -#: gitk:6974
788 +#: gitk:7118
789 msgid "many"
790 msgstr "många"
791
789 -#: gitk:7160
792 +#: gitk:7309
793 msgid "Tags:"
794 msgstr "Taggar:"
795
793 -#: gitk:7177 gitk:7183 gitk:8593
796 +#: gitk:7326 gitk:7332 gitk:8806
797 msgid "Parent"
798 msgstr "Förälder"
799
797 -#: gitk:7188
800 +#: gitk:7337
801 msgid "Child"
802 msgstr "Barn"
803
801 -#: gitk:7197
804 +#: gitk:7346
805 msgid "Branch"
806 msgstr "Gren"
807
805 -#: gitk:7200
808 +#: gitk:7349
809 msgid "Follows"
810 msgstr "Följer"
811
809 -#: gitk:7203
812 +#: gitk:7352
813 msgid "Precedes"
814 msgstr "Föregår"
815
813 -#: gitk:7742
816 +#: gitk:7947
817 #, tcl-format
818 msgid "Error getting diffs: %s"
819 msgstr "Fel vid hämtning av diff: %s"
820
818 -#: gitk:8418
821 +#: gitk:8631
822 msgid "Goto:"
823 msgstr "Gå till:"
824
822 -#: gitk:8439
825 +#: gitk:8652
826 #, tcl-format
827 msgid "Short SHA1 id %s is ambiguous"
828 msgstr "Förkortat SHA1-id %s är tvetydigt"
829
827 -#: gitk:8446
830 +#: gitk:8659
831 #, tcl-format
832 msgid "Revision %s is not known"
833 msgstr "Revisionen %s är inte känd"
834
832 -#: gitk:8456
835 +#: gitk:8669
836 #, tcl-format
837 msgid "SHA1 id %s is not known"
838 msgstr "SHA-id:t %s är inte känt"
839
837 -#: gitk:8458
840 +#: gitk:8671
841 #, tcl-format
842 msgid "Revision %s is not in the current view"
843 msgstr "Revisionen %s finns inte i den nuvarande vyn"
844
842 -#: gitk:8600 gitk:8615
845 +#: gitk:8813 gitk:8828
846 msgid "Date"
847 msgstr "Datum"
848
846 -#: gitk:8603
849 +#: gitk:8816
850 msgid "Children"
851 msgstr "Barn"
852
850 -#: gitk:8666
853 +#: gitk:8879
854 #, tcl-format
855 msgid "Reset %s branch to here"
856 msgstr "Återställ grenen %s hit"
857
855 -#: gitk:8668
858 +#: gitk:8881
859 msgid "Detached head: can't reset"
860 msgstr "Frånkopplad head: kan inte återställa"
861
859 -#: gitk:8773 gitk:8779
862 +#: gitk:8986 gitk:8992
863 msgid "Skipping merge commit "
864 msgstr "Hoppar över sammanslagningsincheckning "
865
863 -#: gitk:8788 gitk:8793
866 +#: gitk:9001 gitk:9006
867 msgid "Error getting patch ID for "
868 msgstr "Fel vid hämtning av patch-id för "
869
867 -#: gitk:8789 gitk:8794
870 +#: gitk:9002 gitk:9007
871 msgid " - stopping\n"
872 msgstr " - stannar\n"
873
871 -#: gitk:8799 gitk:8802 gitk:8810 gitk:8824 gitk:8833
874 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
875 msgid "Commit "
876 msgstr "Incheckning "
877
875 -#: gitk:8803
878 +#: gitk:9016
879 msgid ""
880 " is the same patch as\n"
881 " "
@@ -880,7 +883,7 @@ msgstr ""
883 " är samma patch som\n"
884 " "
885
883 -#: gitk:8811
886 +#: gitk:9024
887 msgid ""
888 " differs from\n"
889 " "
@@ -888,7 +891,7 @@ msgstr ""
891 " skiljer sig från\n"
892 " "
893
891 -#: gitk:8813
894 +#: gitk:9026
895 msgid ""
896 "Diff of commits:\n"
897 "\n"
@@ -896,131 +899,131 @@ msgstr ""
899 "Skillnad mellan incheckningar:\n"
900 "\n"
901
899 -#: gitk:8825 gitk:8834
902 +#: gitk:9038 gitk:9047
903 #, tcl-format
904 msgid " has %s children - stopping\n"
905 msgstr " har %s barn - stannar\n"
906
904 -#: gitk:8853
907 +#: gitk:9066
908 #, tcl-format
909 msgid "Error writing commit to file: %s"
910 msgstr "Fel vid skrivning av incheckning till fil: %s"
911
909 -#: gitk:8859
912 +#: gitk:9072
913 #, tcl-format
914 msgid "Error diffing commits: %s"
915 msgstr "Fel vid jämförelse av incheckningar: %s"
916
914 -#: gitk:8905
917 +#: gitk:9118
918 msgid "Top"
919 msgstr "Topp"
920
918 -#: gitk:8906
921 +#: gitk:9119
922 msgid "From"
923 msgstr "Från"
924
922 -#: gitk:8911
925 +#: gitk:9124
926 msgid "To"
927 msgstr "Till"
928
926 -#: gitk:8935
929 +#: gitk:9148
930 msgid "Generate patch"
931 msgstr "Generera patch"
932
930 -#: gitk:8937
933 +#: gitk:9150
934 msgid "From:"
935 msgstr "Från:"
936
934 -#: gitk:8946
937 +#: gitk:9159
938 msgid "To:"
939 msgstr "Till:"
940
938 -#: gitk:8955
941 +#: gitk:9168
942 msgid "Reverse"
943 msgstr "Vänd"
944
942 -#: gitk:8957 gitk:9153
945 +#: gitk:9170 gitk:9366
946 msgid "Output file:"
947 msgstr "Utdatafil:"
948
946 -#: gitk:8963
949 +#: gitk:9176
950 msgid "Generate"
951 msgstr "Generera"
952
950 -#: gitk:9001
953 +#: gitk:9214
954 msgid "Error creating patch:"
955 msgstr "Fel vid generering av patch:"
956
954 -#: gitk:9024 gitk:9141 gitk:9198
957 +#: gitk:9237 gitk:9354 gitk:9411
958 msgid "ID:"
959 msgstr "Id:"
960
958 -#: gitk:9033
961 +#: gitk:9246
962 msgid "Tag name:"
963 msgstr "Taggnamn:"
964
962 -#: gitk:9036
965 +#: gitk:9249
966 msgid "Tag message is optional"
967 msgstr "Taggmeddelandet är valfritt"
968
966 -#: gitk:9038
969 +#: gitk:9251
970 msgid "Tag message:"
971 msgstr "Taggmeddelande:"
972
970 -#: gitk:9042 gitk:9207
973 +#: gitk:9255 gitk:9420
974 msgid "Create"
975 msgstr "Skapa"
976
974 -#: gitk:9060
977 +#: gitk:9273
978 msgid "No tag name specified"
979 msgstr "Inget taggnamn angavs"
980
978 -#: gitk:9064
981 +#: gitk:9277
982 #, tcl-format
983 msgid "Tag \"%s\" already exists"
984 msgstr "Taggen \"%s\" finns redan"
985
983 -#: gitk:9074
986 +#: gitk:9287
987 msgid "Error creating tag:"
988 msgstr "Fel vid skapande av tagg:"
989
987 -#: gitk:9150
990 +#: gitk:9363
991 msgid "Command:"
992 msgstr "Kommando:"
993
991 -#: gitk:9158
994 +#: gitk:9371
995 msgid "Write"
996 msgstr "Skriv"
997
995 -#: gitk:9176
998 +#: gitk:9389
999 msgid "Error writing commit:"
1000 msgstr "Fel vid skrivning av incheckning:"
1001
999 -#: gitk:9203
1002 +#: gitk:9416
1003 msgid "Name:"
1004 msgstr "Namn:"
1005
1003 -#: gitk:9226
1006 +#: gitk:9439
1007 msgid "Please specify a name for the new branch"
1008 msgstr "Ange ett namn för den nya grenen"
1009
1007 -#: gitk:9231
1010 +#: gitk:9444
1011 #, tcl-format
1012 msgid "Branch '%s' already exists. Overwrite?"
1013 msgstr "Grenen \"%s\" finns redan. Skriva över?"
1014
1012 -#: gitk:9298
1015 +#: gitk:9511
1016 #, tcl-format
1017 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1018 msgstr ""
1019 "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
1020 "på nytt?"
1021
1019 -#: gitk:9303
1022 +#: gitk:9516
1023 msgid "Cherry-picking"
1024 msgstr "Plockar"
1025
1023 -#: gitk:9312
1026 +#: gitk:9525
1027 #, tcl-format
1028 msgid ""
1029 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1030,7 +1033,7 @@ msgstr ""
1033 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
1034 "igen."
1035
1033 -#: gitk:9318
1036 +#: gitk:9531
1037 msgid ""
1038 "Cherry-pick failed because of merge conflict.\n"
1039 "Do you wish to run git citool to resolve it?"
@@ -1038,20 +1041,20 @@ msgstr ""
1041 "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n"
1042 "Vill du köra git citool för att lösa den?"
1043
1041 -#: gitk:9334 gitk:9392
1044 +#: gitk:9547 gitk:9605
1045 msgid "No changes committed"
1046 msgstr "Inga ändringar incheckade"
1047
1045 -#: gitk:9361
1048 +#: gitk:9574
1049 #, tcl-format
1050 msgid "Commit %s is not included in branch %s -- really revert it?"
1051 msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?"
1052
1050 -#: gitk:9366
1053 +#: gitk:9579
1054 msgid "Reverting"
1055 msgstr "Ångrar"
1056
1054 -#: gitk:9374
1057 +#: gitk:9587
1058 #, tcl-format
1059 msgid ""
1060 "Revert failed because of local changes to the following files:%s Please "
@@ -1061,7 +1064,7 @@ msgstr ""
1064 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
1065 "igen."
1066
1064 -#: gitk:9378
1067 +#: gitk:9591
1068 msgid ""
1069 "Revert failed because of merge conflict.\n"
1070 " Do you wish to run git citool to resolve it?"
@@ -1069,28 +1072,28 @@ msgstr ""
1072 "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n"
1073 " Vill du köra git citool för att lösa den?"
1074
1072 -#: gitk:9421
1075 +#: gitk:9634
1076 msgid "Confirm reset"
1077 msgstr "Bekräfta återställning"
1078
1076 -#: gitk:9423
1079 +#: gitk:9636
1080 #, tcl-format
1081 msgid "Reset branch %s to %s?"
1082 msgstr "Återställa grenen %s till %s?"
1083
1081 -#: gitk:9425
1084 +#: gitk:9638
1085 msgid "Reset type:"
1086 msgstr "Typ av återställning:"
1087
1085 -#: gitk:9428
1088 +#: gitk:9641
1089 msgid "Soft: Leave working tree and index untouched"
1090 msgstr "Mjuk: Rör inte utcheckning och index"
1091
1089 -#: gitk:9431
1092 +#: gitk:9644
1093 msgid "Mixed: Leave working tree untouched, reset index"
1094 msgstr "Blandad: Rör inte utcheckning, återställ index"
1095
1093 -#: gitk:9434
1096 +#: gitk:9647
1097 msgid ""
1098 "Hard: Reset working tree and index\n"
1099 "(discard ALL local changes)"
@@ -1098,19 +1101,19 @@ msgstr ""
1101 "Hård: Återställ utcheckning och index\n"
1102 "(förkastar ALLA lokala ändringar)"
1103
1101 -#: gitk:9451
1104 +#: gitk:9664
1105 msgid "Resetting"
1106 msgstr "Återställer"
1107
1105 -#: gitk:9511
1108 +#: gitk:9724
1109 msgid "Checking out"
1110 msgstr "Checkar ut"
1111
1109 -#: gitk:9564
1112 +#: gitk:9777
1113 msgid "Cannot delete the currently checked-out branch"
1114 msgstr "Kan inte ta bort den just nu utcheckade grenen"
1115
1113 -#: gitk:9570
1116 +#: gitk:9783
1117 #, tcl-format
1118 msgid ""
1119 "The commits on branch %s aren't on any other branch.\n"
@@ -1119,16 +1122,16 @@ msgstr ""
1122 "Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
1123 "Vill du verkligen ta bort grenen %s?"
1124
1122 -#: gitk:9601
1125 +#: gitk:9814
1126 #, tcl-format
1127 msgid "Tags and heads: %s"
1128 msgstr "Taggar och huvuden: %s"
1129
1127 -#: gitk:9616
1130 +#: gitk:9829
1131 msgid "Filter"
1132 msgstr "Filter"
1133
1131 -#: gitk:9912
1134 +#: gitk:10125
1135 msgid ""
1136 "Error reading commit topology information; branch and preceding/following "
1137 "tag information will be incomplete."
@@ -1136,217 +1139,223 @@ msgstr ""
1139 "Fel vid läsning av information om incheckningstopologi; information om "
1140 "grenar och föregående/senare taggar kommer inte vara komplett."
1141
1139 -#: gitk:10899
1142 +#: gitk:11102
1143 msgid "Tag"
1144 msgstr "Tagg"
1145
1143 -#: gitk:10899
1146 +#: gitk:11106
1147 msgid "Id"
1148 msgstr "Id"
1149
1147 -#: gitk:10948
1150 +#: gitk:11189
1151 msgid "Gitk font chooser"
1152 msgstr "Teckensnittsväljare för Gitk"
1153
1151 -#: gitk:10965
1154 +#: gitk:11206
1155 msgid "B"
1156 msgstr "F"
1157
1155 -#: gitk:10968
1158 +#: gitk:11209
1159 msgid "I"
1160 msgstr "K"
1161
1159 -#: gitk:11086
1162 +#: gitk:11327
1163 msgid "Commit list display options"
1164 msgstr "Alternativ för incheckningslistvy"
1165
1163 -#: gitk:11089
1166 +#: gitk:11330
1167 msgid "Maximum graph width (lines)"
1168 msgstr "Maximal grafbredd (rader)"
1169
1167 -#: gitk:11092
1168 -#, tcl-format
1170 +#: gitk:11334
1171 +#, no-tcl-format
1172 msgid "Maximum graph width (% of pane)"
1173 msgstr "Maximal grafbredd (% av ruta)"
1174
1172 -#: gitk:11095
1175 +#: gitk:11337
1176 msgid "Show local changes"
1177 msgstr "Visa lokala ändringar"
1178
1176 -#: gitk:11098
1179 +#: gitk:11340
1180 msgid "Auto-select SHA1 (length)"
1181 msgstr "Välj SHA1 (längd) automatiskt"
1182
1180 -#: gitk:11102
1183 +#: gitk:11344
1184 msgid "Hide remote refs"
1185 msgstr "Dölj fjärr-referenser"
1186
1184 -#: gitk:11106
1187 +#: gitk:11348
1188 msgid "Diff display options"
1189 msgstr "Alternativ för diffvy"
1190
1188 -#: gitk:11108
1191 +#: gitk:11350
1192 msgid "Tab spacing"
1193 msgstr "Blanksteg för tabulatortecken"
1194
1192 -#: gitk:11111
1195 +#: gitk:11353
1196 msgid "Display nearby tags/heads"
1197 msgstr "Visa närliggande taggar/huvuden"
1198
1196 -#: gitk:11114
1199 +#: gitk:11356
1200 msgid "Maximum # tags/heads to show"
1201 msgstr "Maximalt antal taggar/huvuden att visa"
1202
1200 -#: gitk:11117
1203 +#: gitk:11359
1204 msgid "Limit diffs to listed paths"
1205 msgstr "Begränsa diff till listade sökvägar"
1206
1204 -#: gitk:11120
1207 +#: gitk:11362
1208 msgid "Support per-file encodings"
1209 msgstr "Stöd för filspecifika teckenkodningar"
1210
1208 -#: gitk:11126 gitk:11273
1211 +#: gitk:11368 gitk:11515
1212 msgid "External diff tool"
1213 msgstr "Externt diff-verktyg"
1214
1212 -#: gitk:11127
1215 +#: gitk:11369
1216 msgid "Choose..."
1217 msgstr "Välj..."
1218
1216 -#: gitk:11132
1219 +#: gitk:11374
1220 msgid "General options"
1221 msgstr "Allmänna inställningar"
1222
1220 -#: gitk:11135
1223 +#: gitk:11377
1224 msgid "Use themed widgets"
1225 msgstr "Använd tema på fönsterelement"
1226
1224 -#: gitk:11137
1227 +#: gitk:11379
1228 msgid "(change requires restart)"
1229 msgstr "(ändringen kräver omstart)"
1230
1228 -#: gitk:11139
1231 +#: gitk:11381
1232 msgid "(currently unavailable)"
1233 msgstr "(för närvarande inte tillgängligt)"
1234
1232 -#: gitk:11150
1235 +#: gitk:11392
1236 msgid "Colors: press to choose"
1237 msgstr "Färger: tryck för att välja"
1238
1236 -#: gitk:11153
1239 +#: gitk:11395
1240 msgid "Interface"
1241 msgstr "Gränssnitt"
1242
1240 -#: gitk:11154
1243 +#: gitk:11396
1244 msgid "interface"
1245 msgstr "gränssnitt"
1246
1244 -#: gitk:11157
1247 +#: gitk:11399
1248 msgid "Background"
1249 msgstr "Bakgrund"
1250
1248 -#: gitk:11158 gitk:11188
1251 +#: gitk:11400 gitk:11430
1252 msgid "background"
1253 msgstr "bakgrund"
1254
1252 -#: gitk:11161
1255 +#: gitk:11403
1256 msgid "Foreground"
1257 msgstr "Förgrund"
1258
1256 -#: gitk:11162
1259 +#: gitk:11404
1260 msgid "foreground"
1261 msgstr "förgrund"
1262
1260 -#: gitk:11165
1263 +#: gitk:11407
1264 msgid "Diff: old lines"
1265 msgstr "Diff: gamla rader"
1266
1264 -#: gitk:11166
1267 +#: gitk:11408
1268 msgid "diff old lines"
1269 msgstr "diff gamla rader"
1270
1268 -#: gitk:11170
1271 +#: gitk:11412
1272 msgid "Diff: new lines"
1273 msgstr "Diff: nya rader"
1274
1272 -#: gitk:11171
1275 +#: gitk:11413
1276 msgid "diff new lines"
1277 msgstr "diff nya rader"
1278
1276 -#: gitk:11175
1279 +#: gitk:11417
1280 msgid "Diff: hunk header"
1281 msgstr "Diff: delhuvud"
1282
1280 -#: gitk:11177
1283 +#: gitk:11419
1284 msgid "diff hunk header"
1285 msgstr "diff delhuvud"
1286
1284 -#: gitk:11181
1287 +#: gitk:11423
1288 msgid "Marked line bg"
1289 msgstr "Markerad rad bakgrund"
1290
1288 -#: gitk:11183
1291 +#: gitk:11425
1292 msgid "marked line background"
1293 msgstr "markerad rad bakgrund"
1294
1292 -#: gitk:11187
1295 +#: gitk:11429
1296 msgid "Select bg"
1297 msgstr "Markerad bakgrund"
1298
1296 -#: gitk:11196
1299 +#: gitk:11438
1300 msgid "Fonts: press to choose"
1301 msgstr "Teckensnitt: tryck för att välja"
1302
1300 -#: gitk:11198
1303 +#: gitk:11440
1304 msgid "Main font"
1305 msgstr "Huvudteckensnitt"
1306
1304 -#: gitk:11199
1307 +#: gitk:11441
1308 msgid "Diff display font"
1309 msgstr "Teckensnitt för diffvisning"
1310
1308 -#: gitk:11200
1311 +#: gitk:11442
1312 msgid "User interface font"
1313 msgstr "Teckensnitt för användargränssnitt"
1314
1312 -#: gitk:11222
1315 +#: gitk:11464
1316 msgid "Gitk preferences"
1317 msgstr "Inställningar för Gitk"
1318
1316 -#: gitk:11231
1319 +#: gitk:11473
1320 msgid "General"
1321 msgstr "Allmänt"
1322
1320 -#: gitk:11232
1323 +#: gitk:11474
1324 msgid "Colors"
1325 msgstr "Färger"
1326
1324 -#: gitk:11233
1327 +#: gitk:11475
1328 msgid "Fonts"
1329 msgstr "Teckensnitt"
1330
1328 -#: gitk:11283
1331 +#: gitk:11525
1332 #, tcl-format
1333 msgid "Gitk: choose color for %s"
1334 msgstr "Gitk: välj färg för %s"
1335
1333 -#: gitk:11937
1336 +#: gitk:12242
1337 msgid "Cannot find a git repository here."
1338 msgstr "Hittar inget git-arkiv här."
1339
1337 -#: gitk:11984
1340 +#: gitk:12289
1341 #, tcl-format
1342 msgid "Ambiguous argument '%s': both revision and filename"
1343 msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
1344
1342 -#: gitk:11996
1345 +#: gitk:12301
1346 msgid "Bad arguments to gitk:"
1347 msgstr "Felaktiga argument till gitk:"
1348
1346 -#: gitk:12099
1349 +#: gitk:12405
1350 msgid "Command line"
1351 msgstr "Kommandorad"
1352
1353 +#~ msgid "next"
1354 +#~ msgstr "nästa"
1355 +
1356 +#~ msgid "prev"
1357 +#~ msgstr "föreg"
1358 +
1359 #~ msgid "CDate"
1360 #~ msgstr "Skapat datum"
1361
po/vi.po
+325 -316
@@ -6,8 +6,8 @@
6 msgid ""
7 msgstr ""
8 "Project-Id-Version: gitk @@GIT_VERSION@@\n"
9 -"Report-Msgid-Bugs-To: Paul Mackerras <paulus@samba.org>\n"
10 -"POT-Creation-Date: 2013-12-14 09:24+0700\n"
9 +"Report-Msgid-Bugs-To: \n"
10 +"POT-Creation-Date: 2015-03-15 14:37+1100\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"
@@ -21,28 +21,28 @@ msgstr ""
21 msgid "Couldn't get list of unmerged files:"
22 msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn:"
23
24 -#: gitk:212 gitk:2353
24 +#: gitk:212 gitk:2381
25 msgid "Color words"
26 msgstr "Tô màu chữ"
27
28 -#: gitk:217 gitk:2353 gitk:8103 gitk:8136
28 +#: gitk:217 gitk:2381 gitk:8201 gitk:8234
29 msgid "Markup words"
30 msgstr "Đánh dấu chữ"
31
32 -#: gitk:322
32 +#: gitk:324
33 msgid "Error parsing revisions:"
34 msgstr "Gặp lỗi khi phân tích điểm xét duyệt:"
35
36 -#: gitk:378
36 +#: gitk:380
37 msgid "Error executing --argscmd command:"
38 msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:"
39
40 -#: gitk:391
40 +#: gitk:393
41 msgid "No files selected: --merge specified but no files are unmerged."
42 msgstr ""
43 "Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn."
44
45 -#: gitk:394
45 +#: gitk:396
46 msgid ""
47 "No files selected: --merge specified but no unmerged files are within file "
48 "limit."
@@ -50,319 +50,312 @@ msgstr ""
50 "Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn "
51 "trong giới hạn tập tin."
52
53 -#: gitk:416 gitk:564
53 +#: gitk:418 gitk:566
54 msgid "Error executing git log:"
55 msgstr "Gặp lỗi khi thực hiện lệnh git log:"
56
57 -#: gitk:434 gitk:580
57 +#: gitk:436 gitk:582
58 msgid "Reading"
59 msgstr "Đang đọc"
60
61 -#: gitk:494 gitk:4429
61 +#: gitk:496 gitk:4508
62 msgid "Reading commits..."
63 msgstr "Đang đọc các lần chuyển giao..."
64
65 -#: gitk:497 gitk:1635 gitk:4432
65 +#: gitk:499 gitk:1637 gitk:4511
66 msgid "No commits selected"
67 msgstr "Chưa chọn các lần chuyển giao"
68
69 -#: gitk:1509
69 +#: gitk:1511
70 msgid "Can't parse git log output:"
71 msgstr "Không thể phân tích kết xuất từ lệnh git log:"
72
73 -#: gitk:1738
73 +#: gitk:1740
74 msgid "No commit information available"
75 msgstr "Không có thông tin về lần chuyển giao nào"
76
77 -#: gitk:1895
77 +#: gitk:1897
78 msgid "mc"
79 msgstr "mc"
80
81 -#: gitk:1930 gitk:4222 gitk:9552 gitk:11122 gitk:11401
81 +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
82 msgid "OK"
83 msgstr "Đồng ý"
84
85 -#: gitk:1932 gitk:4224 gitk:9079 gitk:9158 gitk:9274 gitk:9323 gitk:9554
86 -#: gitk:11123 gitk:11402
85 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
86 +#: gitk:11221 gitk:11501
87 msgid "Cancel"
88 msgstr "Thôi"
89
90 -#: gitk:2067
90 +#: gitk:2069
91 msgid "Update"
92 msgstr "Cập nhật"
93
94 -#: gitk:2068
94 +#: gitk:2070
95 msgid "Reload"
96 msgstr "Tải lại"
97
98 -#: gitk:2069
98 +#: gitk:2071
99 msgid "Reread references"
100 msgstr "Đọc lại tham chiếu"
101
102 -#: gitk:2070
102 +#: gitk:2072
103 msgid "List references"
104 msgstr "Liệt kê các tham chiếu"
105
106 -#: gitk:2072
106 +#: gitk:2074
107 msgid "Start git gui"
108 msgstr "Khởi chạy git gui"
109
110 -#: gitk:2074
110 +#: gitk:2076
111 msgid "Quit"
112 msgstr "Thoát"
113
114 -#: gitk:2066
114 +#: gitk:2068
115 msgid "File"
116 msgstr "Chính"
117
118 -#: gitk:2078
118 +#: gitk:2080
119 msgid "Preferences"
120 msgstr "Cá nhân hóa"
121
122 -#: gitk:2077
122 +#: gitk:2079
123 msgid "Edit"
124 msgstr "Chỉnh sửa"
125
126 -#: gitk:2082
126 +#: gitk:2084
127 msgid "New view..."
128 msgstr "Thêm trình bày mới..."
129
130 -#: gitk:2083
130 +#: gitk:2085
131 msgid "Edit view..."
132 msgstr "Sửa cách trình bày..."
133
134 -#: gitk:2084
134 +#: gitk:2086
135 msgid "Delete view"
136 msgstr "Xóa cách trình bày"
137
138 -#: gitk:2086
138 +#: gitk:2088
139 msgid "All files"
140 msgstr "Mọi tập tin"
141
142 -#: gitk:2081 gitk:3975
142 +#: gitk:2083 gitk:4050
143 msgid "View"
144 msgstr "Trình bày"
145
146 -#: gitk:2091 gitk:2101 gitk:2945
146 +#: gitk:2093 gitk:2103 gitk:3009
147 msgid "About gitk"
148 msgstr "Giới thiệu về gitk"
149
150 -#: gitk:2092 gitk:2106
150 +#: gitk:2094 gitk:2108
151 msgid "Key bindings"
152 msgstr "Tổ hợp phím"
153
154 -#: gitk:2090 gitk:2105
154 +#: gitk:2092 gitk:2107
155 msgid "Help"
156 msgstr "Trợ giúp"
157
158 -#: gitk:2183 gitk:8535
158 +#: gitk:2185 gitk:8633
159 msgid "SHA1 ID:"
160 msgstr "SHA1 ID:"
161
162 -#: gitk:2227
162 +#: gitk:2229
163 msgid "Row"
164 msgstr "Hàng"
165
166 -#: gitk:2265
166 +#: gitk:2267
167 msgid "Find"
168 msgstr "Tìm"
169
170 -#: gitk:2266
171 -msgid "next"
172 -msgstr "tiếp"
173 -
174 -#: gitk:2267
175 -msgid "prev"
176 -msgstr "trước"
177 -
178 -#: gitk:2268
170 +#: gitk:2295
171 msgid "commit"
172 msgstr "lần chuyển giao"
173
182 -#: gitk:2271 gitk:2273 gitk:4590 gitk:4613 gitk:4637 gitk:6653 gitk:6725
183 -#: gitk:6810
174 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
175 +#: gitk:6893
176 msgid "containing:"
177 msgstr "có chứa:"
178
187 -#: gitk:2274 gitk:3457 gitk:3462 gitk:4666
179 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745
180 msgid "touching paths:"
181 msgstr "đang chạm đường dẫn:"
182
191 -#: gitk:2275 gitk:4680
183 +#: gitk:2303 gitk:4759
184 msgid "adding/removing string:"
185 msgstr "thêm/gỡ bỏ chuỗi:"
186
195 -#: gitk:2276 gitk:4682
187 +#: gitk:2304 gitk:4761
188 msgid "changing lines matching:"
189 msgstr "những dòng thay đổi khớp mẫu:"
190
199 -#: gitk:2285 gitk:2287 gitk:4669
191 +#: gitk:2313 gitk:2315 gitk:4748
192 msgid "Exact"
193 msgstr "Chính xác"
194
203 -#: gitk:2287 gitk:4757 gitk:6621
195 +#: gitk:2315 gitk:4836 gitk:6704
196 msgid "IgnCase"
197 msgstr "BquaHt"
198
207 -#: gitk:2287 gitk:4639 gitk:4755 gitk:6617
199 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700
200 msgid "Regexp"
201 msgstr "BTCQ"
202
211 -#: gitk:2289 gitk:2290 gitk:4777 gitk:4807 gitk:4814 gitk:6746 gitk:6814
203 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
204 msgid "All fields"
205 msgstr "Mọi trường"
206
215 -#: gitk:2290 gitk:4774 gitk:4807 gitk:6684
207 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767
208 msgid "Headline"
209 msgstr "Nội dung chính"
210
219 -#: gitk:2291 gitk:4774 gitk:6684 gitk:6814 gitk:7283
211 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
212 msgid "Comments"
213 msgstr "Ghi chú"
214
223 -#: gitk:2291 gitk:4774 gitk:4779 gitk:4814 gitk:6684 gitk:7218 gitk:8713
224 -#: gitk:8728
215 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
216 +#: gitk:8826
217 msgid "Author"
218 msgstr "Tác giả"
219
228 -#: gitk:2291 gitk:4774 gitk:6684 gitk:7220
220 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307
221 msgid "Committer"
222 msgstr "Người chuyển giao"
223
232 -#: gitk:2322
224 +#: gitk:2350
225 msgid "Search"
226 msgstr "Tìm kiếm"
227
236 -#: gitk:2330
228 +#: gitk:2358
229 msgid "Diff"
230 msgstr "So sánh"
231
240 -#: gitk:2332
232 +#: gitk:2360
233 msgid "Old version"
234 msgstr "Phiên bản cũ"
235
244 -#: gitk:2334
236 +#: gitk:2362
237 msgid "New version"
238 msgstr "Phiên bản mới"
239
248 -#: gitk:2336
240 +#: gitk:2364
241 msgid "Lines of context"
242 msgstr "Các dòng của nội dung"
243
252 -#: gitk:2346
244 +#: gitk:2374
245 msgid "Ignore space change"
246 msgstr "Không xét đến thay đổi do khoảng trắng"
247
256 -#: gitk:2350 gitk:2352 gitk:7842 gitk:8089
248 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187
249 msgid "Line diff"
250 msgstr "Khác biệt theo dòng"
251
260 -#: gitk:2417
252 +#: gitk:2445
253 msgid "Patch"
254 msgstr "Vá"
255
264 -#: gitk:2419
256 +#: gitk:2447
257 msgid "Tree"
258 msgstr "Cây"
259
268 -#: gitk:2577 gitk:2597
260 +#: gitk:2616 gitk:2636
261 msgid "Diff this -> selected"
262 msgstr "So sánh cái này -> cái đã chọn"
263
272 -#: gitk:2578 gitk:2598
264 +#: gitk:2617 gitk:2637
265 msgid "Diff selected -> this"
266 msgstr "So sánh cái đã chọn -> cái này"
267
276 -#: gitk:2579 gitk:2599
268 +#: gitk:2618 gitk:2638
269 msgid "Make patch"
270 msgstr "Tạo miếng vá"
271
280 -#: gitk:2580 gitk:9137
272 +#: gitk:2619 gitk:9235
273 msgid "Create tag"
274 msgstr "Tạo thẻ"
275
284 -#: gitk:2581 gitk:9254
276 +#: gitk:2620 gitk:9352
277 msgid "Write commit to file"
278 msgstr "Ghi lần chuyển giao ra tập tin"
279
288 -#: gitk:2582 gitk:9311
280 +#: gitk:2621 gitk:9409
281 msgid "Create new branch"
282 msgstr "Tạo nhánh mới"
283
292 -#: gitk:2583
284 +#: gitk:2622
285 msgid "Cherry-pick this commit"
286 msgstr "Cherry-pick lần chuyển giao này"
287
296 -#: gitk:2584
288 +#: gitk:2623
289 msgid "Reset HEAD branch to here"
290 msgstr "Đặt lại HEAD của nhánh vào đây"
291
300 -#: gitk:2585
292 +#: gitk:2624
293 msgid "Mark this commit"
294 msgstr "Đánh dấu lần chuyển giao này"
295
304 -#: gitk:2586
296 +#: gitk:2625
297 msgid "Return to mark"
298 msgstr "Quay lại vị trí dấu"
299
308 -#: gitk:2587
300 +#: gitk:2626
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
312 -#: gitk:2588
304 +#: gitk:2627
305 msgid "Compare with marked commit"
306 msgstr "So sánh với lần chuyển giao đã đánh dấu"
307
316 -#: gitk:2589 gitk:2600
308 +#: gitk:2628 gitk:2639
309 msgid "Diff this -> marked commit"
310 msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu"
311
320 -#: gitk:2590 gitk:2601
312 +#: gitk:2629 gitk:2640
313 msgid "Diff marked commit -> this"
314 msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này"
315
324 -#: gitk:2591
316 +#: gitk:2630
317 msgid "Revert this commit"
318 msgstr "Hoàn lại lần chuyển giao này"
319
328 -#: gitk:2607
320 +#: gitk:2646
321 msgid "Check out this branch"
322 msgstr "Checkout nhánh này"
323
332 -#: gitk:2608
324 +#: gitk:2647
325 msgid "Remove this branch"
326 msgstr "Gỡ bỏ nhánh này"
327
336 -#: gitk:2615
328 +#: gitk:2654
329 msgid "Highlight this too"
330 msgstr "Cũng tô sáng nó"
331
340 -#: gitk:2616
332 +#: gitk:2655
333 msgid "Highlight this only"
334 msgstr "Chỉ tô sáng cái này"
335
344 -#: gitk:2617
336 +#: gitk:2656
337 msgid "External diff"
338 msgstr "diff từ bên ngoài"
339
348 -#: gitk:2618
340 +#: gitk:2657
341 msgid "Blame parent commit"
342 msgstr "Xem công trạng lần chuyển giao cha mẹ"
343
352 -#: gitk:2625
344 +#: gitk:2664
345 msgid "Show origin of this line"
346 msgstr "Hiển thị nguyên gốc của dòng này"
347
356 -#: gitk:2626
348 +#: gitk:2665
349 msgid "Run git gui blame on this line"
350 msgstr "Chạy lệnh git gui blame cho dòng này"
351
360 -#: gitk:2947
352 +#: gitk:3011
353 +#, fuzzy
354 msgid ""
355 "\n"
356 "Gitk - a commit viewer for git\n"
357 "\n"
365 -"Copyright © 2005-2011 Paul Mackerras\n"
358 +"Copyright © 2005-2014 Paul Mackerras\n"
359 "\n"
360 "Use and redistribute under the terms of the GNU General Public License"
361 msgstr ""
@@ -373,304 +366,314 @@ msgstr ""
366 "\n"
367 "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"
368
376 -#: gitk:2955 gitk:3020 gitk:9738
369 +#: gitk:3019 gitk:3085 gitk:9836
370 msgid "Close"
371 msgstr "Đóng"
372
380 -#: gitk:2976
373 +#: gitk:3040
374 msgid "Gitk key bindings"
375 msgstr "Tổ hợp phím gitk"
376
384 -#: gitk:2979
377 +#: gitk:3043
378 msgid "Gitk key bindings:"
379 msgstr "Tổ hợp phím gitk:"
380
388 -#: gitk:2981
381 +#: gitk:3045
382 #, tcl-format
383 msgid "<%s-Q>\t\tQuit"
384 msgstr "<%s-Q>\t\tThoát"
385
393 -#: gitk:2982
386 +#: gitk:3046
387 #, tcl-format
388 msgid "<%s-W>\t\tClose window"
389 msgstr "<%s-W>\t\tĐóng cửa sổ"
390
398 -#: gitk:2983
391 +#: gitk:3047
392 msgid "<Home>\t\tMove to first commit"
393 msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên"
394
402 -#: gitk:2984
395 +#: gitk:3048
396 msgid "<End>\t\tMove to last commit"
397 msgstr "<End>\t\tChuyển đến lần chuyển giao cuối"
398
406 -#: gitk:2985
399 +#: gitk:3049
400 msgid "<Up>, p, k\tMove up one commit"
401 msgstr "<Up>, p, k\tDi chuyển lên một lần chuyển giao"
402
410 -#: gitk:2986
403 +#: gitk:3050
404 msgid "<Down>, n, j\tMove down one commit"
405 msgstr "<Down>, n, j\tDi chuyển xuống một lần chuyển giao"
406
414 -#: gitk:2987
407 +#: gitk:3051
408 msgid "<Left>, z, h\tGo back in history list"
409 msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sử"
410
418 -#: gitk:2988
411 +#: gitk:3052
412 msgid "<Right>, x, l\tGo forward in history list"
413 msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sử"
414
422 -#: gitk:2989
415 +#: gitk:3053
416 +#, tcl-format
417 +msgid "<%s-n>\tGo to n-th parent of current commit in history list"
418 +msgstr ""
419 +
420 +#: gitk:3054
421 msgid "<PageUp>\tMove up one page in commit list"
422 msgstr "<PageUp>\tDi chuyển lên một trang trong danh sách lần chuyển giao"
423
426 -#: gitk:2990
424 +#: gitk:3055
425 msgid "<PageDown>\tMove down one page in commit list"
426 msgstr "<PageDown>\tDi chuyển xuống một trang trong danh sách lần chuyển giao"
427
430 -#: gitk:2991
428 +#: gitk:3056
429 #, tcl-format
430 msgid "<%s-Home>\tScroll to top of commit list"
431 msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao"
432
435 -#: gitk:2992
433 +#: gitk:3057
434 #, tcl-format
435 msgid "<%s-End>\tScroll to bottom of commit list"
436 msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao"
437
440 -#: gitk:2993
438 +#: gitk:3058
439 #, tcl-format
440 msgid "<%s-Up>\tScroll commit list up one line"
441 msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng"
442
445 -#: gitk:2994
443 +#: gitk:3059
444 #, tcl-format
445 msgid "<%s-Down>\tScroll commit list down one line"
446 msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng"
447
450 -#: gitk:2995
448 +#: gitk:3060
449 #, tcl-format
450 msgid "<%s-PageUp>\tScroll commit list up one page"
451 msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang"
452
455 -#: gitk:2996
453 +#: gitk:3061
454 #, tcl-format
455 msgid "<%s-PageDown>\tScroll commit list down one page"
456 msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang"
457
460 -#: gitk:2997
458 +#: gitk:3062
459 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
460 msgstr "<Shift-Up>\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)"
461
464 -#: gitk:2998
462 +#: gitk:3063
463 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
464 msgstr ""
465 "<Shift-Down>\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)"
466
469 -#: gitk:2999
467 +#: gitk:3064
468 msgid "<Delete>, b\tScroll diff view up one page"
469 msgstr "<Delete>, b\tCuộn phần trình bày diff lên một trang"
470
473 -#: gitk:3000
471 +#: gitk:3065
472 msgid "<Backspace>\tScroll diff view up one page"
473 msgstr "<Backspace>\tCuộn phần trình bày diff lên một trang"
474
477 -#: gitk:3001
475 +#: gitk:3066
476 msgid "<Space>\t\tScroll diff view down one page"
477 msgstr "<Space>\t\tCuộn phần trình bày diff xuống một trang"
478
481 -#: gitk:3002
479 +#: gitk:3067
480 msgid "u\t\tScroll diff view up 18 lines"
481 msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng"
482
485 -#: gitk:3003
483 +#: gitk:3068
484 msgid "d\t\tScroll diff view down 18 lines"
485 msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng"
486
489 -#: gitk:3004
487 +#: gitk:3069
488 #, tcl-format
489 msgid "<%s-F>\t\tFind"
490 msgstr "<%s-F>\t\tTìm kiếm"
491
494 -#: gitk:3005
492 +#: gitk:3070
493 #, tcl-format
494 msgid "<%s-G>\t\tMove to next find hit"
495 msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp"
496
499 -#: gitk:3006
497 +#: gitk:3071
498 msgid "<Return>\tMove to next find hit"
499 msgstr "<Return>\t\tDi chuyển đến chỗ gặp kế tiếp"
500
503 -#: gitk:3007
501 +#: gitk:3072
502 msgid "/\t\tFocus the search box"
503 msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm"
504
507 -#: gitk:3008
505 +#: gitk:3073
506 msgid "?\t\tMove to previous find hit"
507 msgstr "?\t\tDi chuyển đến chỗ gặp kế trước"
508
511 -#: gitk:3009
509 +#: gitk:3074
510 msgid "f\t\tScroll diff view to next file"
511 msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế"
512
515 -#: gitk:3010
513 +#: gitk:3075
514 #, tcl-format
515 msgid "<%s-S>\t\tSearch for next hit in diff view"
516 msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp"
517
520 -#: gitk:3011
518 +#: gitk:3076
519 #, tcl-format
520 msgid "<%s-R>\t\tSearch for previous hit in diff view"
521 msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước"
522
525 -#: gitk:3012
523 +#: gitk:3077
524 #, tcl-format
525 msgid "<%s-KP+>\tIncrease font size"
526 msgstr "<%s-KP+>\tTăng cỡ chữ"
527
530 -#: gitk:3013
528 +#: gitk:3078
529 #, tcl-format
530 msgid "<%s-plus>\tIncrease font size"
531 msgstr "<%s-plus>\tTăng cỡ chữ"
532
535 -#: gitk:3014
533 +#: gitk:3079
534 #, tcl-format
535 msgid "<%s-KP->\tDecrease font size"
536 msgstr "<%s-KP->\tGiảm cỡ chữ"
537
540 -#: gitk:3015
538 +#: gitk:3080
539 #, tcl-format
540 msgid "<%s-minus>\tDecrease font size"
541 msgstr "<%s-minus>\tGiảm cỡ chữ"
542
545 -#: gitk:3016
543 +#: gitk:3081
544 msgid "<F5>\t\tUpdate"
545 msgstr "<F5>\t\tCập nhật"
546
549 -#: gitk:3471 gitk:3480
547 +#: gitk:3546 gitk:3555
548 #, tcl-format
549 msgid "Error creating temporary directory %s:"
550 msgstr "Gặp lỗi khi tạo thư mục tạm %s:"
551
554 -#: gitk:3493
552 +#: gitk:3568
553 #, tcl-format
554 msgid "Error getting \"%s\" from %s:"
555 msgstr "Lỗi chào hỏi \"%s\" từ %s:"
556
559 -#: gitk:3556
557 +#: gitk:3631
558 msgid "command failed:"
559 msgstr "lệnh gặp lỗi:"
560
563 -#: gitk:3705
561 +#: gitk:3780
562 msgid "No such commit"
563 msgstr "Không có lần chuyển giao như vậy"
564
567 -#: gitk:3719
565 +#: gitk:3794
566 msgid "git gui blame: command failed:"
567 msgstr "git gui blame: lệnh gặp lỗi:"
568
571 -#: gitk:3750
569 +#: gitk:3825
570 #, tcl-format
571 msgid "Couldn't read merge head: %s"
572 msgstr "Không thể độc đầu của hòa trộn: %s"
573
574 # tcl-format
577 -#: gitk:3758
575 +#: gitk:3833
576 #, tcl-format
577 msgid "Error reading index: %s"
578 msgstr "Gặp lỗi khi đọc chỉ mục: %s"
579
582 -#: gitk:3783
580 +#: gitk:3858
581 #, tcl-format
582 msgid "Couldn't start git blame: %s"
583 msgstr "Không thể khởi chạy git blame: %s"
584
587 -#: gitk:3786 gitk:6652
585 +#: gitk:3861 gitk:6735
586 msgid "Searching"
587 msgstr "Đang tìm kiếm"
588
591 -#: gitk:3818
589 +#: gitk:3893
590 #, tcl-format
591 msgid "Error running git blame: %s"
592 msgstr "Gặp lỗi khi chạy git blame: %s"
593
596 -#: gitk:3846
594 +#: gitk:3921
595 #, tcl-format
596 msgid "That line comes from commit %s, which is not in this view"
597 msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này"
598
601 -#: gitk:3860
599 +#: gitk:3935
600 msgid "External diff viewer failed:"
601 msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:"
602
605 -#: gitk:3978
603 +#: gitk:4053
604 msgid "Gitk view definition"
605 msgstr "Định nghĩa cách trình bày gitk"
606
609 -#: gitk:3982
607 +#: gitk:4057
608 msgid "Remember this view"
609 msgstr "Nhớ cách trình bày này"
610
613 -#: gitk:3983
611 +#: gitk:4058
612 msgid "References (space separated list):"
613 msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):"
614
617 -#: gitk:3984
615 +#: gitk:4059
616 msgid "Branches & tags:"
617 msgstr "Nhánh & thẻ:"
618
621 -#: gitk:3985
619 +#: gitk:4060
620 msgid "All refs"
621 msgstr "Mọi tham chiếu"
622
625 -#: gitk:3986
623 +#: gitk:4061
624 msgid "All (local) branches"
625 msgstr "Mọi nhánh (nội bộ)"
626
629 -#: gitk:3987
627 +#: gitk:4062
628 msgid "All tags"
629 msgstr "Mọi thẻ"
630
633 -#: gitk:3988
631 +#: gitk:4063
632 msgid "All remote-tracking branches"
633 msgstr "Mọi nhánh remote-tracking"
634
637 -#: gitk:3989
635 +#: gitk:4064
636 msgid "Commit Info (regular expressions):"
637 msgstr "Thông tin chuyển giao (biểu thức chính quy):"
638
641 -#: gitk:3990
639 +#: gitk:4065
640 msgid "Author:"
641 msgstr "Tác giả:"
642
645 -#: gitk:3991
643 +#: gitk:4066
644 msgid "Committer:"
645 msgstr "Người chuyển giao:"
646
649 -#: gitk:3992
647 +#: gitk:4067
648 msgid "Commit Message:"
649 msgstr "Chú thích của lần chuyển giao:"
650
653 -#: gitk:3993
651 +#: gitk:4068
652 msgid "Matches all Commit Info criteria"
653 msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
654
657 -#: gitk:3994
655 +#: gitk:4069
656 +#, fuzzy
657 +msgid "Matches none Commit Info criteria"
658 +msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
659 +
660 +#: gitk:4070
661 msgid "Changes to Files:"
662 msgstr "Đổi thành Tập tin:"
663
661 -#: gitk:3995
664 +#: gitk:4071
665 msgid "Fixed String"
666 msgstr "Chuỗi cố định"
667
665 -#: gitk:3996
668 +#: gitk:4072
669 msgid "Regular Expression"
670 msgstr "Biểu thức chính quy"
671
669 -#: gitk:3997
672 +#: gitk:4073
673 msgid "Search string:"
674 msgstr "Chuỗi tìm kiếm:"
675
673 -#: gitk:3998
676 +#: gitk:4074
677 msgid ""
678 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
679 "15:27:38\"):"
@@ -678,203 +681,203 @@ msgstr ""
681 "Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
682 "15:27:38\"):"
683
681 -#: gitk:3999
684 +#: gitk:4075
685 msgid "Since:"
686 msgstr "Kể từ:"
687
685 -#: gitk:4000
688 +#: gitk:4076
689 msgid "Until:"
690 msgstr "Đến:"
691
689 -#: gitk:4001
692 +#: gitk:4077
693 msgid "Limit and/or skip a number of revisions (positive integer):"
694 msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):"
695
693 -#: gitk:4002
696 +#: gitk:4078
697 msgid "Number to show:"
698 msgstr "Số lượng hiển thị:"
699
697 -#: gitk:4003
700 +#: gitk:4079
701 msgid "Number to skip:"
702 msgstr "Số lượng sẽ bỏ qua:"
703
701 -#: gitk:4004
704 +#: gitk:4080
705 msgid "Miscellaneous options:"
706 msgstr "Tuỳ chọn hỗn hợp:"
707
705 -#: gitk:4005
708 +#: gitk:4081
709 msgid "Strictly sort by date"
710 msgstr "Sắp xếp chặt chẽ theo ngày"
711
709 -#: gitk:4006
712 +#: gitk:4082
713 msgid "Mark branch sides"
714 msgstr "Đánh dấu các cạnh nhánh"
715
713 -#: gitk:4007
716 +#: gitk:4083
717 msgid "Limit to first parent"
718 msgstr "Giới hạn thành cha mẹ đầu tiên"
719
717 -#: gitk:4008
720 +#: gitk:4084
721 msgid "Simple history"
722 msgstr "Lịch sử dạng đơn giản"
723
721 -#: gitk:4009
724 +#: gitk:4085
725 msgid "Additional arguments to git log:"
726 msgstr "Đối số bổ xung cho lệnh git log:"
727
725 -#: gitk:4010
728 +#: gitk:4086
729 msgid "Enter files and directories to include, one per line:"
730 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:"
731
729 -#: gitk:4011
732 +#: gitk:4087
733 msgid "Command to generate more commits to include:"
734 msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:"
735
733 -#: gitk:4135
736 +#: gitk:4211
737 msgid "Gitk: edit view"
738 msgstr "Gitk: sửa cách trình bày"
739
737 -#: gitk:4143
740 +#: gitk:4219
741 msgid "-- criteria for selecting revisions"
742 msgstr "-- tiêu chuẩn chọn điểm xét duyệt"
743
741 -#: gitk:4148
744 +#: gitk:4224
745 msgid "View Name"
746 msgstr "Tên cách trình bày"
747
745 -#: gitk:4223
748 +#: gitk:4299
749 msgid "Apply (F5)"
750 msgstr "Áp dụng (F5)"
751
749 -#: gitk:4261
752 +#: gitk:4337
753 msgid "Error in commit selection arguments:"
754 msgstr "Lỗi trong các đối số chọn chuyển giao:"
755
753 -#: gitk:4314 gitk:4366 gitk:4827 gitk:4841 gitk:6107 gitk:12184 gitk:12185
756 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
757 msgid "None"
758 msgstr "Không"
759
757 -#: gitk:4924 gitk:4929
760 +#: gitk:5003 gitk:5008
761 msgid "Descendant"
762 msgstr "Con cháu"
763
761 -#: gitk:4925
764 +#: gitk:5004
765 msgid "Not descendant"
766 msgstr "Không có con cháu"
767
765 -#: gitk:4932 gitk:4937
768 +#: gitk:5011 gitk:5016
769 msgid "Ancestor"
770 msgstr "Tổ tiên chung"
771
769 -#: gitk:4933
772 +#: gitk:5012
773 msgid "Not ancestor"
774 msgstr "Không có chung tổ tiên"
775
773 -#: gitk:5223
776 +#: gitk:5306
777 msgid "Local changes checked in to index but not committed"
778 msgstr ""
779 "Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao"
780
778 -#: gitk:5259
781 +#: gitk:5342
782 msgid "Local uncommitted changes, not checked in to index"
783 msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục"
784
782 -#: gitk:7032
785 +#: gitk:7115
786 msgid "and many more"
787 msgstr "và nhiều nữa"
788
786 -#: gitk:7035
789 +#: gitk:7118
790 msgid "many"
791 msgstr "nhiều"
792
790 -#: gitk:7222
793 +#: gitk:7309
794 msgid "Tags:"
795 msgstr "Thẻ:"
796
794 -#: gitk:7239 gitk:7245 gitk:8708
797 +#: gitk:7326 gitk:7332 gitk:8806
798 msgid "Parent"
799 msgstr "Cha"
800
798 -#: gitk:7250
801 +#: gitk:7337
802 msgid "Child"
803 msgstr "Con"
804
802 -#: gitk:7259
805 +#: gitk:7346
806 msgid "Branch"
807 msgstr "Nhánh"
808
806 -#: gitk:7262
809 +#: gitk:7349
810 msgid "Follows"
811 msgstr "Đứng sau"
812
810 -#: gitk:7265
813 +#: gitk:7352
814 msgid "Precedes"
815 msgstr "Đứng trước"
816
817 # tcl-format
815 -#: gitk:7849
818 +#: gitk:7947
819 #, tcl-format
820 msgid "Error getting diffs: %s"
821 msgstr "Lỗi lấy diff: %s"
822
820 -#: gitk:8533
823 +#: gitk:8631
824 msgid "Goto:"
825 msgstr "Nhảy tới:"
826
824 -#: gitk:8554
827 +#: gitk:8652
828 #, tcl-format
829 msgid "Short SHA1 id %s is ambiguous"
830 msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng"
831
829 -#: gitk:8561
832 +#: gitk:8659
833 #, tcl-format
834 msgid "Revision %s is not known"
835 msgstr "Không hiểu điểm xét duyệt %s"
836
834 -#: gitk:8571
837 +#: gitk:8669
838 #, tcl-format
839 msgid "SHA1 id %s is not known"
840 msgstr "Không hiểu định danh SHA1 %s"
841
839 -#: gitk:8573
842 +#: gitk:8671
843 #, tcl-format
844 msgid "Revision %s is not in the current view"
845 msgstr "Điểm %s không ở trong phần hiển thị hiện tại"
846
844 -#: gitk:8715 gitk:8730
847 +#: gitk:8813 gitk:8828
848 msgid "Date"
849 msgstr "Ngày"
850
848 -#: gitk:8718
851 +#: gitk:8816
852 msgid "Children"
853 msgstr "Con cháu"
854
852 -#: gitk:8781
855 +#: gitk:8879
856 #, tcl-format
857 msgid "Reset %s branch to here"
858 msgstr "Đặt lại nhánh %s tại đây"
859
857 -#: gitk:8783
860 +#: gitk:8881
861 msgid "Detached head: can't reset"
862 msgstr "Head đã bị tách rời: không thể đặt lại"
863
861 -#: gitk:8888 gitk:8894
864 +#: gitk:8986 gitk:8992
865 msgid "Skipping merge commit "
866 msgstr "Bỏ qua lần chuyển giao hòa trộn "
867
865 -#: gitk:8903 gitk:8908
868 +#: gitk:9001 gitk:9006
869 msgid "Error getting patch ID for "
870 msgstr "Gặp lỗi khi lấy ID miếng vá cho "
871
869 -#: gitk:8904 gitk:8909
872 +#: gitk:9002 gitk:9007
873 msgid " - stopping\n"
874 msgstr " - dừng\n"
875
873 -#: gitk:8914 gitk:8917 gitk:8925 gitk:8939 gitk:8948
876 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
877 msgid "Commit "
878 msgstr "Commit "
879
877 -#: gitk:8918
880 +#: gitk:9016
881 msgid ""
882 " is the same patch as\n"
883 " "
@@ -882,7 +885,7 @@ msgstr ""
885 " là cùng một miếng vá với\n"
886 " "
887
885 -#: gitk:8926
888 +#: gitk:9024
889 msgid ""
890 " differs from\n"
891 " "
@@ -890,7 +893,7 @@ msgstr ""
893 " khác biệt từ\n"
894 " "
895
893 -#: gitk:8928
896 +#: gitk:9026
897 msgid ""
898 "Diff of commits:\n"
899 "\n"
@@ -898,131 +901,131 @@ msgstr ""
901 "Khác biệt của lần chuyển giao (commit):\n"
902 "\n"
903
901 -#: gitk:8940 gitk:8949
904 +#: gitk:9038 gitk:9047
905 #, tcl-format
906 msgid " has %s children - stopping\n"
907 msgstr " có %s con - dừng\n"
908
906 -#: gitk:8968
909 +#: gitk:9066
910 #, tcl-format
911 msgid "Error writing commit to file: %s"
912 msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s"
913
911 -#: gitk:8974
914 +#: gitk:9072
915 #, tcl-format
916 msgid "Error diffing commits: %s"
917 msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s"
918
916 -#: gitk:9020
919 +#: gitk:9118
920 msgid "Top"
921 msgstr "Đỉnh"
922
920 -#: gitk:9021
923 +#: gitk:9119
924 msgid "From"
925 msgstr "Từ"
926
924 -#: gitk:9026
927 +#: gitk:9124
928 msgid "To"
929 msgstr "Đến"
930
928 -#: gitk:9050
931 +#: gitk:9148
932 msgid "Generate patch"
933 msgstr "Tạo miếng vá"
934
932 -#: gitk:9052
935 +#: gitk:9150
936 msgid "From:"
937 msgstr "Từ:"
938
936 -#: gitk:9061
939 +#: gitk:9159
940 msgid "To:"
941 msgstr "Đến:"
942
940 -#: gitk:9070
943 +#: gitk:9168
944 msgid "Reverse"
945 msgstr "Đảo ngược"
946
944 -#: gitk:9072 gitk:9268
947 +#: gitk:9170 gitk:9366
948 msgid "Output file:"
949 msgstr "Tập tin kết xuất:"
950
948 -#: gitk:9078
951 +#: gitk:9176
952 msgid "Generate"
953 msgstr "Tạo"
954
952 -#: gitk:9116
955 +#: gitk:9214
956 msgid "Error creating patch:"
957 msgstr "Gặp lỗi khi tạo miếng vá:"
958
956 -#: gitk:9139 gitk:9256 gitk:9313
959 +#: gitk:9237 gitk:9354 gitk:9411
960 msgid "ID:"
961 msgstr "ID:"
962
960 -#: gitk:9148
963 +#: gitk:9246
964 msgid "Tag name:"
965 msgstr "Tên thẻ:"
966
964 -#: gitk:9151
967 +#: gitk:9249
968 msgid "Tag message is optional"
969 msgstr "Ghi chú thẻ chỉ là tùy chọn"
970
968 -#: gitk:9153
971 +#: gitk:9251
972 msgid "Tag message:"
973 msgstr "Ghi chú cho thẻ:"
974
972 -#: gitk:9157 gitk:9322
975 +#: gitk:9255 gitk:9420
976 msgid "Create"
977 msgstr "Tạo"
978
976 -#: gitk:9175
979 +#: gitk:9273
980 msgid "No tag name specified"
981 msgstr "Chưa chỉ ra tên của thẻ"
982
980 -#: gitk:9179
983 +#: gitk:9277
984 #, tcl-format
985 msgid "Tag \"%s\" already exists"
986 msgstr "Thẻ “%s” đã có sẵn rồi"
987
985 -#: gitk:9189
988 +#: gitk:9287
989 msgid "Error creating tag:"
990 msgstr "Gặp lỗi khi tạo thẻ:"
991
989 -#: gitk:9265
992 +#: gitk:9363
993 msgid "Command:"
994 msgstr "Lệnh:"
995
993 -#: gitk:9273
996 +#: gitk:9371
997 msgid "Write"
998 msgstr "Ghi"
999
997 -#: gitk:9291
1000 +#: gitk:9389
1001 msgid "Error writing commit:"
1002 msgstr "Gặp lỗi trong quá trình ghi chuyển giao:"
1003
1001 -#: gitk:9318
1004 +#: gitk:9416
1005 msgid "Name:"
1006 msgstr "Tên:"
1007
1005 -#: gitk:9341
1008 +#: gitk:9439
1009 msgid "Please specify a name for the new branch"
1010 msgstr "Vui lòng chỉ định tên cho nhánh mới"
1011
1009 -#: gitk:9346
1012 +#: gitk:9444
1013 #, tcl-format
1014 msgid "Branch '%s' already exists. Overwrite?"
1015 msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?"
1016
1014 -#: gitk:9413
1017 +#: gitk:9511
1018 #, tcl-format
1019 msgid "Commit %s is already included in branch %s -- really re-apply it?"
1020 msgstr ""
1021 "Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn "
1022 "áp dụng lại nó không?"
1023
1021 -#: gitk:9418
1024 +#: gitk:9516
1025 msgid "Cherry-picking"
1026 msgstr "Đang cherry-pick"
1027
1025 -#: gitk:9427
1028 +#: gitk:9525
1029 #, tcl-format
1030 msgid ""
1031 "Cherry-pick failed because of local changes to file '%s'.\n"
@@ -1031,7 +1034,7 @@ msgstr ""
1034 "Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n"
1035 "Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại."
1036
1034 -#: gitk:9433
1037 +#: gitk:9531
1038 msgid ""
1039 "Cherry-pick failed because of merge conflict.\n"
1040 "Do you wish to run git citool to resolve it?"
@@ -1039,22 +1042,22 @@ msgstr ""
1042 "Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n"
1043 "Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?"
1044
1042 -#: gitk:9449 gitk:9507
1045 +#: gitk:9547 gitk:9605
1046 msgid "No changes committed"
1047 msgstr "Không có thay đổi nào cần chuyển giao"
1048
1046 -#: gitk:9476
1049 +#: gitk:9574
1050 #, tcl-format
1051 msgid "Commit %s is not included in branch %s -- really revert it?"
1052 msgstr ""
1053 "Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn "
1054 "“revert” nó không?"
1055
1053 -#: gitk:9481
1056 +#: gitk:9579
1057 msgid "Reverting"
1058 msgstr "Đang hoàn tác"
1059
1057 -#: gitk:9489
1060 +#: gitk:9587
1061 #, tcl-format
1062 msgid ""
1063 "Revert failed because of local changes to the following files:%s Please "
@@ -1063,7 +1066,7 @@ msgstr ""
1066 "Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n"
1067 "Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại."
1068
1066 -#: gitk:9493
1069 +#: gitk:9591
1070 msgid ""
1071 "Revert failed because of merge conflict.\n"
1072 " Do you wish to run git citool to resolve it?"
@@ -1071,29 +1074,29 @@ msgstr ""
1074 "Revert gặp lỗi bởi vì xung đột hòa trộn.\n"
1075 " Bạn có muốn chạy lệnh “git citool” để phân giải nó không?"
1076
1074 -#: gitk:9536
1077 +#: gitk:9634
1078 msgid "Confirm reset"
1079 msgstr "Xác nhật đặt lại"
1080
1078 -#: gitk:9538
1081 +#: gitk:9636
1082 #, tcl-format
1083 msgid "Reset branch %s to %s?"
1084 msgstr "Đặt lại nhánh “%s” thành “%s”?"
1085
1083 -#: gitk:9540
1086 +#: gitk:9638
1087 msgid "Reset type:"
1088 msgstr "Kiểu đặt lại:"
1089
1087 -#: gitk:9543
1090 +#: gitk:9641
1091 msgid "Soft: Leave working tree and index untouched"
1092 msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục"
1093
1091 -#: gitk:9546
1094 +#: gitk:9644
1095 msgid "Mixed: Leave working tree untouched, reset index"
1096 msgstr ""
1097 "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"
1098
1096 -#: gitk:9549
1099 +#: gitk:9647
1100 msgid ""
1101 "Hard: Reset working tree and index\n"
1102 "(discard ALL local changes)"
@@ -1101,19 +1104,19 @@ msgstr ""
1104 "Hard: Đặt lại cây làm việc và mục lục\n"
1105 "(hủy bỏ MỌI thay đổi nội bộ)"
1106
1104 -#: gitk:9566
1107 +#: gitk:9664
1108 msgid "Resetting"
1109 msgstr "Đang đặt lại"
1110
1108 -#: gitk:9626
1111 +#: gitk:9724
1112 msgid "Checking out"
1113 msgstr "Đang checkout"
1114
1112 -#: gitk:9679
1115 +#: gitk:9777
1116 msgid "Cannot delete the currently checked-out branch"
1117 msgstr "Không thể xóa nhánh hiện tại đang được lấy ra"
1118
1116 -#: gitk:9685
1119 +#: gitk:9783
1120 #, tcl-format
1121 msgid ""
1122 "The commits on branch %s aren't on any other branch.\n"
@@ -1122,16 +1125,16 @@ msgstr ""
1125 "Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n"
1126 "Thực sự muốn xóa nhánh %s?"
1127
1125 -#: gitk:9716
1128 +#: gitk:9814
1129 #, tcl-format
1130 msgid "Tags and heads: %s"
1131 msgstr "Thẻ và Đầu: %s"
1132
1130 -#: gitk:9731
1133 +#: gitk:9829
1134 msgid "Filter"
1135 msgstr "Bộ lọc"
1136
1134 -#: gitk:10027
1137 +#: gitk:10125
1138 msgid ""
1139 "Error reading commit topology information; branch and preceding/following "
1140 "tag information will be incomplete."
@@ -1139,213 +1142,219 @@ msgstr ""
1142 "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ẻ "
1143 "trước/sau sẽ không hoàn thiện."
1144
1142 -#: gitk:11004
1145 +#: gitk:11102
1146 msgid "Tag"
1147 msgstr "Thẻ"
1148
1146 -#: gitk:11008
1149 +#: gitk:11106
1150 msgid "Id"
1151 msgstr "Id"
1152
1150 -#: gitk:11091
1153 +#: gitk:11189
1154 msgid "Gitk font chooser"
1155 msgstr "Hộp thoại chọn phông Gitk"
1156
1154 -#: gitk:11108
1157 +#: gitk:11206
1158 msgid "B"
1159 msgstr "B"
1160
1158 -#: gitk:11111
1161 +#: gitk:11209
1162 msgid "I"
1163 msgstr "I"
1164
1162 -#: gitk:11229
1165 +#: gitk:11327
1166 msgid "Commit list display options"
1167 msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao"
1168
1166 -#: gitk:11232
1169 +#: gitk:11330
1170 msgid "Maximum graph width (lines)"
1171 msgstr "Độ rộng biểu đồ tối đa (dòng)"
1172
1170 -#: gitk:11235
1171 -#, tcl-format
1173 +#: gitk:11334
1174 +#, no-tcl-format
1175 msgid "Maximum graph width (% of pane)"
1176 msgstr "Độ rộng biểu đồ tối đa (% của bảng)"
1177
1175 -#: gitk:11238
1178 +#: gitk:11337
1179 msgid "Show local changes"
1180 msgstr "Hiển thị các thay đổi nội bộ"
1181
1179 -#: gitk:11241
1182 +#: gitk:11340
1183 msgid "Auto-select SHA1 (length)"
1184 msgstr "Tự chọn SHA1 (độ dài)"
1185
1183 -#: gitk:11245
1186 +#: gitk:11344
1187 msgid "Hide remote refs"
1188 msgstr "Ẩn tham chiếu đến máy chủ"
1189
1187 -#: gitk:11249
1190 +#: gitk:11348
1191 msgid "Diff display options"
1192 msgstr "Các tùy chọn trình bày các khác biệt"
1193
1191 -#: gitk:11251
1194 +#: gitk:11350
1195 msgid "Tab spacing"
1196 msgstr "Khoảng cách tab"
1197
1195 -#: gitk:11254
1198 +#: gitk:11353
1199 msgid "Display nearby tags/heads"
1200 msgstr "Hiển thị các thẻ/đầu xung quanh"
1201
1199 -#: gitk:11257
1202 +#: gitk:11356
1203 msgid "Maximum # tags/heads to show"
1204 msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị"
1205
1203 -#: gitk:11260
1206 +#: gitk:11359
1207 msgid "Limit diffs to listed paths"
1208 msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê"
1209
1207 -#: gitk:11263
1210 +#: gitk:11362
1211 msgid "Support per-file encodings"
1212 msgstr "Hỗ trợ mã hóa mỗi-dòng"
1213
1211 -#: gitk:11269 gitk:11416
1214 +#: gitk:11368 gitk:11515
1215 msgid "External diff tool"
1216 msgstr "Công cụ so sánh từ bên ngoài"
1217
1215 -#: gitk:11270
1218 +#: gitk:11369
1219 msgid "Choose..."
1220 msgstr "Chọn..."
1221
1219 -#: gitk:11275
1222 +#: gitk:11374
1223 msgid "General options"
1224 msgstr "Các tùy chọn chung"
1225
1223 -#: gitk:11278
1226 +#: gitk:11377
1227 msgid "Use themed widgets"
1228 msgstr "Dùng các widget chủ đề"
1229
1227 -#: gitk:11280
1230 +#: gitk:11379
1231 msgid "(change requires restart)"
1232 msgstr "(để thay đổi cần khởi động lại)"
1233
1231 -#: gitk:11282
1234 +#: gitk:11381
1235 msgid "(currently unavailable)"
1236 msgstr "(hiện tại không sẵn sàng)"
1237
1235 -#: gitk:11293
1238 +#: gitk:11392
1239 msgid "Colors: press to choose"
1240 msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu"
1241
1239 -#: gitk:11296
1242 +#: gitk:11395
1243 msgid "Interface"
1244 msgstr "Giao diện"
1245
1243 -#: gitk:11297
1246 +#: gitk:11396
1247 msgid "interface"
1248 msgstr "giao diện"
1249
1247 -#: gitk:11300
1250 +#: gitk:11399
1251 msgid "Background"
1252 msgstr "Nền"
1253
1251 -#: gitk:11301 gitk:11331
1254 +#: gitk:11400 gitk:11430
1255 msgid "background"
1256 msgstr "nền"
1257
1255 -#: gitk:11304
1258 +#: gitk:11403
1259 msgid "Foreground"
1260 msgstr "Tiền cảnh"
1261
1259 -#: gitk:11305
1262 +#: gitk:11404
1263 msgid "foreground"
1264 msgstr "tiền cảnh"
1265
1263 -#: gitk:11308
1266 +#: gitk:11407
1267 msgid "Diff: old lines"
1268 msgstr "So sánh: dòng cũ"
1269
1267 -#: gitk:11309
1270 +#: gitk:11408
1271 msgid "diff old lines"
1272 msgstr "diff dòng cũ"
1273
1271 -#: gitk:11313
1274 +#: gitk:11412
1275 msgid "Diff: new lines"
1276 msgstr "So sánh: dòng mới"
1277
1275 -#: gitk:11314
1278 +#: gitk:11413
1279 msgid "diff new lines"
1280 msgstr "màu dòng mới"
1281
1279 -#: gitk:11318
1282 +#: gitk:11417
1283 msgid "Diff: hunk header"
1284 msgstr "So sánh: phần đầu của đoạn"
1285
1283 -#: gitk:11320
1286 +#: gitk:11419
1287 msgid "diff hunk header"
1288 msgstr "màu của phần đầu của đoạn khi so sánh"
1289
1287 -#: gitk:11324
1290 +#: gitk:11423
1291 msgid "Marked line bg"
1292 msgstr "Nền dòng đánh dấu"
1293
1291 -#: gitk:11326
1294 +#: gitk:11425
1295 msgid "marked line background"
1296 msgstr "nền dòng được đánh dấu"
1297
1295 -#: gitk:11330
1298 +#: gitk:11429
1299 msgid "Select bg"
1300 msgstr "Màu nền"
1301
1299 -#: gitk:11339
1302 +#: gitk:11438
1303 msgid "Fonts: press to choose"
1304 msgstr "Phông chữ: bấm vào các nút ở dưới để chọn"
1305
1303 -#: gitk:11341
1306 +#: gitk:11440
1307 msgid "Main font"
1308 msgstr "Phông chữ chính"
1309
1307 -#: gitk:11342
1310 +#: gitk:11441
1311 msgid "Diff display font"
1312 msgstr "Phông chữ dùng khi so sánh"
1313
1311 -#: gitk:11343
1314 +#: gitk:11442
1315 msgid "User interface font"
1316 msgstr "Phông chữ giao diện"
1317
1315 -#: gitk:11365
1318 +#: gitk:11464
1319 msgid "Gitk preferences"
1320 msgstr "Cá nhân hóa các cài đặt cho Gitk"
1321
1319 -#: gitk:11374
1322 +#: gitk:11473
1323 msgid "General"
1324 msgstr "Chung"
1325
1323 -#: gitk:11375
1326 +#: gitk:11474
1327 msgid "Colors"
1328 msgstr "Màu sắc"
1329
1327 -#: gitk:11376
1330 +#: gitk:11475
1331 msgid "Fonts"
1332 msgstr "Phông chữ"
1333
1331 -#: gitk:11426
1334 +#: gitk:11525
1335 #, tcl-format
1336 msgid "Gitk: choose color for %s"
1337 msgstr "Gitk: chọn màu cho %s"
1338
1336 -#: gitk:12080
1339 +#: gitk:12242
1340 msgid "Cannot find a git repository here."
1341 msgstr "Không thể tìm thấy kho git ở đây."
1342
1340 -#: gitk:12127
1343 +#: gitk:12289
1344 #, tcl-format
1345 msgid "Ambiguous argument '%s': both revision and filename"
1346 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"
1347
1345 -#: gitk:12139
1348 +#: gitk:12301
1349 msgid "Bad arguments to gitk:"
1350 msgstr "Đối số không hợp lệ cho gitk:"
1351
1349 -#: gitk:12242
1352 +#: gitk:12405
1353 msgid "Command line"
1354 msgstr "Dòng lệnh"
1355 +
1356 +#~ msgid "next"
1357 +#~ msgstr "tiếp"
1358 +
1359 +#~ msgid "prev"
1360 +#~ msgstr "trước"