1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-12 22:16:13 +02:00
* 'master' of git://ozlabs.org/~paulus/gitk:
  gitk: Follow themed bgcolor in help dialogs
  gitk: fr.po: Sync translations with git
  gitk: Update French translation (311t)
  gitk: Update German translation
  gitk: Update Bulgarian translation (311t)
This commit is contained in:
Junio C Hamano 2016-03-20 18:05:10 -07:00
commit 257000c617
4 changed files with 803 additions and 819 deletions

View File

@ -3021,7 +3021,7 @@ proc bindall {event action} {
}
proc about {} {
global uifont NS
global bgcolor NS
set w .about
if {[winfo exists $w]} {
raise $w
@ -3036,7 +3036,7 @@ Gitk - a commit viewer for git
Copyright \u00a9 2005-2014 Paul Mackerras
Use and redistribute under the terms of the GNU General Public License"] \
-justify center -aspect 400 -border 2 -bg white -relief groove
-justify center -aspect 400 -border 2 -bg $bgcolor -relief groove
pack $w.m -side top -fill x -padx 2 -pady 2
${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
pack $w.ok -side bottom
@ -3047,7 +3047,7 @@ Use and redistribute under the terms of the GNU General Public License"] \
}
proc keys {} {
global NS
global bgcolor NS
set w .keys
if {[winfo exists $w]} {
raise $w
@ -3103,7 +3103,7 @@ proc keys {} {
[mc "<%s-minus> Decrease font size" $M1T]
[mc "<F5> Update"]
" \
-justify left -bg white -border 2 -relief groove
-justify left -bg $bgcolor -border 2 -relief groove
pack $w.m -side top -fill both -padx 2 -pady 2
${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
bind $w <Key-Escape> [list destroy $w]

View File

@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gitk master\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-27 20:44+0300\n"
"PO-Revision-Date: 2015-06-27 20:46+0300\n"
"POT-Creation-Date: 2015-12-19 11:48+0200\n"
"PO-Revision-Date: 2015-12-19 11:49+0200\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@ -22,11 +22,11 @@ msgstr ""
msgid "Couldn't get list of unmerged files:"
msgstr "Списъкът с неслети файлове не може да бъде получен:"
#: gitk:212 gitk:2381
#: gitk:212 gitk:2399
msgid "Color words"
msgstr "Оцветяване на думите"
#: gitk:217 gitk:2381 gitk:8220 gitk:8253
#: gitk:217 gitk:2399 gitk:8239 gitk:8272
msgid "Markup words"
msgstr "Отбелязване на думите"
@ -59,15 +59,15 @@ msgstr "Грешка при изпълнение на „git log“:"
msgid "Reading"
msgstr "Прочитане"
#: gitk:496 gitk:4525
#: gitk:496 gitk:4544
msgid "Reading commits..."
msgstr "Прочитане на подаванията…"
#: gitk:499 gitk:1637 gitk:4528
#: gitk:499 gitk:1637 gitk:4547
msgid "No commits selected"
msgstr "Не са избрани подавания"
#: gitk:1445 gitk:4045 gitk:12432
#: gitk:1445 gitk:4064 gitk:12469
msgid "Command line"
msgstr "Команден ред"
@ -79,286 +79,294 @@ msgstr "Изходът от „git log“ не може да се анализи
msgid "No commit information available"
msgstr "Липсва информация за подавания"
#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
msgid "OK"
msgstr "Добре"
#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
#: gitk:11242 gitk:11522
#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
#: gitk:11275 gitk:11555
msgid "Cancel"
msgstr "Отказ"
#: gitk:2069
#: gitk:2083
msgid "&Update"
msgstr "Обновяване"
#: gitk:2070
msgid "&Reload"
msgstr "Презареждане"
#: gitk:2071
msgid "Reread re&ferences"
msgstr "Наново прочитане на настройките"
#: gitk:2072
msgid "&List references"
msgstr "Изброяване на указателите"
#: gitk:2074
msgid "Start git &gui"
msgstr "Стартиране на „git gui“"
#: gitk:2076
msgid "&Quit"
msgstr "Спиране на програмата"
#: gitk:2068
msgid "&File"
msgstr "Файл"
#: gitk:2080
msgid "&Preferences"
msgstr "Настройки"
#: gitk:2079
msgid "&Edit"
msgstr "Редактиране"
msgstr "&Обновяване"
#: gitk:2084
msgid "&New view..."
msgstr "Нов изглед…"
msgid "&Reload"
msgstr "&Презареждане"
#: gitk:2085
msgid "&Edit view..."
msgstr "Редактиране на изгледа…"
msgid "Reread re&ferences"
msgstr "&Наново прочитане на настройките"
#: gitk:2086
msgid "&List references"
msgstr "&Изброяване на указателите"
#: gitk:2088
msgid "Start git &gui"
msgstr "&Стартиране на „git gui“"
#: gitk:2090
msgid "&Quit"
msgstr "&Спиране на програмата"
#: gitk:2082
msgid "&File"
msgstr "&Файл"
#: gitk:2094
msgid "&Preferences"
msgstr "&Настройки"
#: gitk:2093
msgid "&Edit"
msgstr "&Редактиране"
#: gitk:2098
msgid "&New view..."
msgstr "&Нов изглед…"
#: gitk:2099
msgid "&Edit view..."
msgstr "&Редактиране на изгледа…"
#: gitk:2100
msgid "&Delete view"
msgstr "Изтриване на изгледа"
msgstr "&Изтриване на изгледа"
#: gitk:2088 gitk:4043
#: gitk:2102
msgid "&All files"
msgstr "Всички файлове"
msgstr "&Всички файлове"
#: gitk:2083 gitk:4067
#: gitk:2097
msgid "&View"
msgstr "Изглед"
msgstr "&Изглед"
#: gitk:2093 gitk:2103 gitk:3012
#: gitk:2107 gitk:2117
msgid "&About gitk"
msgstr "Относно gitk"
msgstr "&Относно gitk"
#: gitk:2094 gitk:2108
#: gitk:2108 gitk:2122
msgid "&Key bindings"
msgstr "Клавишни комбинации"
msgstr "&Клавишни комбинации"
#: gitk:2092 gitk:2107
#: gitk:2106 gitk:2121
msgid "&Help"
msgstr "Помощ"
msgstr "Помо&щ"
#: gitk:2185 gitk:8652
#: gitk:2199 gitk:8671
msgid "SHA1 ID:"
msgstr "SHA1:"
#: gitk:2229
#: gitk:2243
msgid "Row"
msgstr "Ред"
#: gitk:2267
#: gitk:2281
msgid "Find"
msgstr "Търсене"
#: gitk:2295
#: gitk:2309
msgid "commit"
msgstr "подаване"
#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
#: gitk:6912
#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
#: gitk:6931
msgid "containing:"
msgstr "съдържащо:"
#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
msgid "touching paths:"
msgstr "засягащо пътищата:"
#: gitk:2303 gitk:4777
#: gitk:2317 gitk:4796
msgid "adding/removing string:"
msgstr "добавящо/премахващо низ"
#: gitk:2304 gitk:4779
#: gitk:2318 gitk:4798
msgid "changing lines matching:"
msgstr "променящо редове напасващи:"
#: gitk:2313 gitk:2315 gitk:4766
#: gitk:2327 gitk:2329 gitk:4785
msgid "Exact"
msgstr "Точно"
#: gitk:2315 gitk:4854 gitk:6723
#: gitk:2329 gitk:4873 gitk:6742
msgid "IgnCase"
msgstr "Без регистър"
#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
msgid "Regexp"
msgstr "Рег. израз"
#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
msgid "All fields"
msgstr "Всички полета"
#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
msgid "Headline"
msgstr "Първи ред"
#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
msgid "Comments"
msgstr "Коментари"
#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
#: gitk:8845
#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
#: gitk:8864
msgid "Author"
msgstr "Автор"
#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
msgid "Committer"
msgstr "Подаващ"
#: gitk:2350
#: gitk:2367
msgid "Search"
msgstr "Търсене"
#: gitk:2358
#: gitk:2375
msgid "Diff"
msgstr "Разлики"
#: gitk:2360
#: gitk:2377
msgid "Old version"
msgstr "Стара версия"
#: gitk:2362
#: gitk:2379
msgid "New version"
msgstr "Нова версия"
#: gitk:2364
#: gitk:2382
msgid "Lines of context"
msgstr "Контекст в редове"
#: gitk:2374
#: gitk:2392
msgid "Ignore space change"
msgstr "Празните знаци без значение"
#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
msgid "Line diff"
msgstr "Поредови разлики"
#: gitk:2445
#: gitk:2463
msgid "Patch"
msgstr "Кръпка"
#: gitk:2447
#: gitk:2465
msgid "Tree"
msgstr "Дърво"
#: gitk:2617 gitk:2637
#: gitk:2635 gitk:2656
msgid "Diff this -> selected"
msgstr "Разлики между това и избраното"
#: gitk:2618 gitk:2638
#: gitk:2636 gitk:2657
msgid "Diff selected -> this"
msgstr "Разлики между избраното и това"
#: gitk:2619 gitk:2639
#: gitk:2637 gitk:2658
msgid "Make patch"
msgstr "Създаване на кръпка"
#: gitk:2620 gitk:9254
#: gitk:2638 gitk:9273
msgid "Create tag"
msgstr "Създаване на етикет"
#: gitk:2621 gitk:9371
#: gitk:2639
msgid "Copy commit summary"
msgstr "Копиране на информацията за подаване"
#: gitk:2640 gitk:9404
msgid "Write commit to file"
msgstr "Запазване на подаването във файл"
#: gitk:2622 gitk:9428
#: gitk:2641 gitk:9461
msgid "Create new branch"
msgstr "Създаване на нов клон"
#: gitk:2623
#: gitk:2642
msgid "Cherry-pick this commit"
msgstr "Отбиране на това подаване"
#: gitk:2624
#: gitk:2643
msgid "Reset HEAD branch to here"
msgstr "Привеждане на върха на клона към текущото подаване"
#: gitk:2625
#: gitk:2644
msgid "Mark this commit"
msgstr "Отбелязване на това подаване"
#: gitk:2626
#: gitk:2645
msgid "Return to mark"
msgstr "Връщане към отбелязаното подаване"
#: gitk:2627
#: gitk:2646
msgid "Find descendant of this and mark"
msgstr "Откриване и отбелязване на наследниците"
#: gitk:2628
#: gitk:2647
msgid "Compare with marked commit"
msgstr "Сравнение с отбелязаното подаване"
#: gitk:2629 gitk:2640
#: gitk:2648 gitk:2659
msgid "Diff this -> marked commit"
msgstr "Разлики между това и отбелязаното"
#: gitk:2630 gitk:2641
#: gitk:2649 gitk:2660
msgid "Diff marked commit -> this"
msgstr "Разлики между отбелязаното и това"
#: gitk:2631
#: gitk:2650
msgid "Revert this commit"
msgstr "Отмяна на това подаване"
#: gitk:2647
#: gitk:2666
msgid "Check out this branch"
msgstr "Изтегляне на този клон"
#: gitk:2648
#: gitk:2667
msgid "Remove this branch"
msgstr "Изтриване на този клон"
#: gitk:2649
#: gitk:2668
msgid "Copy branch name"
msgstr "Копиране на името на клона"
#: gitk:2656
#: gitk:2675
msgid "Highlight this too"
msgstr "Отбелязване и на това"
#: gitk:2657
#: gitk:2676
msgid "Highlight this only"
msgstr "Отбелязване само на това"
#: gitk:2658
#: gitk:2677
msgid "External diff"
msgstr "Външна програма за разлики"
#: gitk:2659
#: gitk:2678
msgid "Blame parent commit"
msgstr "Анотиране на родителското подаване"
#: gitk:2660
#: gitk:2679
msgid "Copy path"
msgstr "Копиране на пътя"
#: gitk:2667
#: gitk:2686
msgid "Show origin of this line"
msgstr "Показване на произхода на този ред"
#: gitk:2668
#: gitk:2687
msgid "Run git gui blame on this line"
msgstr "Изпълнение на „git gui blame“ върху този ред"
#: gitk:3014
#: gitk:3031
msgid "About gitk"
msgstr "Относно gitk"
#: gitk:3033
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@ -374,316 +382,324 @@ msgstr ""
"\n"
"Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
#: gitk:3022 gitk:3089 gitk:9857
#: gitk:3041 gitk:3108 gitk:9890
msgid "Close"
msgstr "Затваряне"
#: gitk:3043
#: gitk:3062
msgid "Gitk key bindings"
msgstr "Клавишни комбинации"
#: gitk:3046
#: gitk:3065
msgid "Gitk key bindings:"
msgstr "Клавишни комбинации:"
#: gitk:3048
#: gitk:3067
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tСпиране на програмата"
#: gitk:3049
#: gitk:3068
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-W>\t\tЗатваряне на прозореца"
#: gitk:3050
#: gitk:3069
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tКъм първото подаване"
#: gitk:3051
#: gitk:3070
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tКъм последното подаване"
#: gitk:3052
#: gitk:3071
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Up>, p, k\tЕдно подаване нагоре"
#: gitk:3053
#: gitk:3072
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Down>, n, j\tЕдно подаване надолу"
#: gitk:3054
#: gitk:3073
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Left>, z, h\tНазад в историята"
#: gitk:3055
#: gitk:3074
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Right>, x, l\tНапред в историята"
#: gitk:3056
#: gitk:3075
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята"
#: gitk:3057
#: gitk:3076
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
#: gitk:3058
#: gitk:3077
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
#: gitk:3059
#: gitk:3078
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
#: gitk:3060
#: gitk:3079
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tКъм края на списъка с подаванията"
#: gitk:3061
#: gitk:3080
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
#: gitk:3062
#: gitk:3081
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tРед надолу в списъка с подавания"
#: gitk:3063
#: gitk:3082
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
#: gitk:3064
#: gitk:3083
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
#: gitk:3065
#: gitk:3084
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
#: gitk:3066
#: gitk:3085
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr ""
"<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
#: gitk:3067
#: gitk:3086
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
#: gitk:3068
#: gitk:3087
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
#: gitk:3069
#: gitk:3088
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
#: gitk:3070
#: gitk:3089
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\t18 реда нагоре в изгледа за разлики"
#: gitk:3071
#: gitk:3090
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\t18 реда надолу в изгледа за разлики"
#: gitk:3072
#: gitk:3091
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tТърсене"
#: gitk:3073
#: gitk:3092
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tКъм следващата поява"
#: gitk:3074
#: gitk:3093
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\tКъм следващата поява"
#: gitk:3075
#: gitk:3094
msgid "g\t\tGo to commit"
msgstr "g\t\tКъм последното подаване"
#: gitk:3076
#: gitk:3095
msgid "/\t\tFocus the search box"
msgstr "/\t\tФокус върху полето за търсене"
#: gitk:3077
#: gitk:3096
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tКъм предишната поява"
#: gitk:3078
#: gitk:3097
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tСледващ файл в изгледа за разлики"
#: gitk:3079
#: gitk:3098
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
#: gitk:3080
#: gitk:3099
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
#: gitk:3081
#: gitk:3100
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tПо-голям размер на шрифта"
#: gitk:3082
#: gitk:3101
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tПо-голям размер на шрифта"
#: gitk:3083
#: gitk:3102
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tПо-малък размер на шрифта"
#: gitk:3084
#: gitk:3103
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tПо-малък размер на шрифта"
#: gitk:3085
#: gitk:3104
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tОбновяване"
#: gitk:3550 gitk:3559
#: gitk:3569 gitk:3578
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Грешка при създаването на временната директория „%s“:"
#: gitk:3572
#: gitk:3591
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Грешка при получаването на „%s“ от %s:"
#: gitk:3635
#: gitk:3654
msgid "command failed:"
msgstr "неуспешно изпълнение на команда:"
#: gitk:3784
#: gitk:3803
msgid "No such commit"
msgstr "Такова подаване няма"
#: gitk:3798
#: gitk:3817
msgid "git gui blame: command failed:"
msgstr "„git gui blame“: неуспешно изпълнение на команда:"
#: gitk:3829
#: gitk:3848
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Върхът за сливане не може да бъде прочетен: %s"
#: gitk:3837
#: gitk:3856
#, tcl-format
msgid "Error reading index: %s"
msgstr "Грешка при прочитане на индекса: %s"
#: gitk:3862
#: gitk:3881
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Командата „git blame“ не може да бъде стартирана: %s"
#: gitk:3865 gitk:6754
#: gitk:3884 gitk:6773
msgid "Searching"
msgstr "Търсене"
#: gitk:3897
#: gitk:3916
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Грешка при изпълнението на „git blame“: %s"
#: gitk:3925
#: gitk:3944
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Този ред идва от подаването %s, което не е в изгледа"
#: gitk:3939
#: gitk:3958
msgid "External diff viewer failed:"
msgstr "Неуспешно изпълнение на външната програма за разлики:"
#: gitk:4070
#: gitk:4062
msgid "All files"
msgstr "Всички файлове"
#: gitk:4086
msgid "View"
msgstr "Изглед"
#: gitk:4089
msgid "Gitk view definition"
msgstr "Дефиниция на изглед в Gitk"
#: gitk:4074
#: gitk:4093
msgid "Remember this view"
msgstr "Запазване на този изглед"
#: gitk:4075
#: gitk:4094
msgid "References (space separated list):"
msgstr "Указатели (списък с разделител интервал):"
#: gitk:4076
#: gitk:4095
msgid "Branches & tags:"
msgstr "Клони и етикети:"
#: gitk:4077
#: gitk:4096
msgid "All refs"
msgstr "Всички указатели"
#: gitk:4078
#: gitk:4097
msgid "All (local) branches"
msgstr "Всички (локални) клони"
#: gitk:4079
#: gitk:4098
msgid "All tags"
msgstr "Всички етикети"
#: gitk:4080
#: gitk:4099
msgid "All remote-tracking branches"
msgstr "Всички следящи клони"
#: gitk:4081
#: gitk:4100
msgid "Commit Info (regular expressions):"
msgstr "Информация за подаване (рег. изр.):"
#: gitk:4082
#: gitk:4101
msgid "Author:"
msgstr "Автор:"
#: gitk:4083
#: gitk:4102
msgid "Committer:"
msgstr "Подал:"
#: gitk:4084
#: gitk:4103
msgid "Commit Message:"
msgstr "Съобщение при подаване:"
#: gitk:4085
#: gitk:4104
msgid "Matches all Commit Info criteria"
msgstr "Съвпадение по всички характеристики на подаването"
#: gitk:4086
#: gitk:4105
msgid "Matches no Commit Info criteria"
msgstr "Не съвпада по никоя от характеристиките на подаването"
#: gitk:4087
#: gitk:4106
msgid "Changes to Files:"
msgstr "Промени по файловете:"
#: gitk:4088
#: gitk:4107
msgid "Fixed String"
msgstr "Дословен низ"
#: gitk:4089
#: gitk:4108
msgid "Regular Expression"
msgstr "Регулярен израз"
#: gitk:4090
#: gitk:4109
msgid "Search string:"
msgstr "Низ за търсене:"
#: gitk:4091
#: gitk:4110
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@ -691,204 +707,204 @@ msgstr ""
"Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
"„March 17, 2009 15:27:38“):"
#: gitk:4092
#: gitk:4111
msgid "Since:"
msgstr "От:"
#: gitk:4093
#: gitk:4112
msgid "Until:"
msgstr "До:"
#: gitk:4094
#: gitk:4113
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr ""
"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
"число):"
#: gitk:4095
#: gitk:4114
msgid "Number to show:"
msgstr "Брой показани:"
#: gitk:4096
#: gitk:4115
msgid "Number to skip:"
msgstr "Брой прескочени:"
#: gitk:4097
#: gitk:4116
msgid "Miscellaneous options:"
msgstr "Разни:"
#: gitk:4098
#: gitk:4117
msgid "Strictly sort by date"
msgstr "Подреждане по дата"
#: gitk:4099
#: gitk:4118
msgid "Mark branch sides"
msgstr "Отбелязване на страните по клона"
#: gitk:4100
#: gitk:4119
msgid "Limit to first parent"
msgstr "Само първия родител"
#: gitk:4101
#: gitk:4120
msgid "Simple history"
msgstr "Опростена история"
#: gitk:4102
#: gitk:4121
msgid "Additional arguments to git log:"
msgstr "Допълнителни аргументи към „git log“:"
#: gitk:4103
#: gitk:4122
msgid "Enter files and directories to include, one per line:"
msgstr "Въведете файловете и директориите за включване, по елемент на ред"
#: gitk:4104
#: gitk:4123
msgid "Command to generate more commits to include:"
msgstr ""
"Команда за генерирането на допълнителни подавания, които да бъдат включени:"
#: gitk:4228
#: gitk:4247
msgid "Gitk: edit view"
msgstr "Gitk: редактиране на изглед"
#: gitk:4236
#: gitk:4255
msgid "-- criteria for selecting revisions"
msgstr "— критерии за избор на версии"
#: gitk:4241
#: gitk:4260
msgid "View Name"
msgstr "Име на изглед"
#: gitk:4316
#: gitk:4335
msgid "Apply (F5)"
msgstr "Прилагане (F5)"
#: gitk:4354
#: gitk:4373
msgid "Error in commit selection arguments:"
msgstr "Грешка в аргументите за избор на подавания:"
#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
msgid "None"
msgstr "Няма"
#: gitk:5021 gitk:5026
#: gitk:5040 gitk:5045
msgid "Descendant"
msgstr "Наследник"
#: gitk:5022
#: gitk:5041
msgid "Not descendant"
msgstr "Не е наследник"
#: gitk:5029 gitk:5034
#: gitk:5048 gitk:5053
msgid "Ancestor"
msgstr "Предшественик"
#: gitk:5030
#: gitk:5049
msgid "Not ancestor"
msgstr "Не е предшественик"
#: gitk:5324
#: gitk:5343
msgid "Local changes checked in to index but not committed"
msgstr "Локални промени добавени към индекса, но неподадени"
#: gitk:5360
#: gitk:5379
msgid "Local uncommitted changes, not checked in to index"
msgstr "Локални промени извън индекса"
#: gitk:7134
#: gitk:7153
msgid "and many more"
msgstr "и още много"
#: gitk:7137
#: gitk:7156
msgid "many"
msgstr "много"
#: gitk:7328
#: gitk:7347
msgid "Tags:"
msgstr "Етикети:"
#: gitk:7345 gitk:7351 gitk:8825
#: gitk:7364 gitk:7370 gitk:8844
msgid "Parent"
msgstr "Родител"
#: gitk:7356
#: gitk:7375
msgid "Child"
msgstr "Дете"
#: gitk:7365
#: gitk:7384
msgid "Branch"
msgstr "Клон"
#: gitk:7368
#: gitk:7387
msgid "Follows"
msgstr "Следва"
#: gitk:7371
#: gitk:7390
msgid "Precedes"
msgstr "Предшества"
#: gitk:7966
#: gitk:7985
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Грешка при получаването на разликите: %s"
#: gitk:8650
#: gitk:8669
msgid "Goto:"
msgstr "Към ред:"
#: gitk:8671
#: gitk:8690
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Съкратената сума по SHA1 %s не е еднозначна"
#: gitk:8678
#: gitk:8697
#, tcl-format
msgid "Revision %s is not known"
msgstr "Непозната версия %s"
#: gitk:8688
#: gitk:8707
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "Непозната сума по SHA1 %s"
#: gitk:8690
#: gitk:8709
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "Версия %s не е в текущия изглед"
#: gitk:8832 gitk:8847
#: gitk:8851 gitk:8866
msgid "Date"
msgstr "Дата"
#: gitk:8835
#: gitk:8854
msgid "Children"
msgstr "Деца"
#: gitk:8898
#: gitk:8917
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Зануляване на клона „%s“ към текущото подаване"
#: gitk:8900
#: gitk:8919
msgid "Detached head: can't reset"
msgstr "Несвързан връх: невъзможно зануляване"
#: gitk:9005 gitk:9011
#: gitk:9024 gitk:9030
msgid "Skipping merge commit "
msgstr "Пропускане на подаването на сливането"
#: gitk:9020 gitk:9025
#: gitk:9039 gitk:9044
msgid "Error getting patch ID for "
msgstr "Грешка при получаването на идентификатора на "
#: gitk:9021 gitk:9026
#: gitk:9040 gitk:9045
msgid " - stopping\n"
msgstr " — спиране\n"
#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
msgid "Commit "
msgstr "Подаване"
#: gitk:9035
#: gitk:9054
msgid ""
" is the same patch as\n"
" "
@ -896,7 +912,7 @@ msgstr ""
" е същата кръпка като\n"
" "
#: gitk:9043
#: gitk:9062
msgid ""
" differs from\n"
" "
@ -904,7 +920,7 @@ msgstr ""
" се различава от\n"
" "
#: gitk:9045
#: gitk:9064
msgid ""
"Diff of commits:\n"
"\n"
@ -912,130 +928,130 @@ msgstr ""
"Разлика между подаванията:\n"
"\n"
#: gitk:9057 gitk:9066
#: gitk:9076 gitk:9085
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " има %s деца — спиране\n"
#: gitk:9085
#: gitk:9104
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Грешка при запазването на подаването във файл: %s"
#: gitk:9091
#: gitk:9110
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "Грешка при изчисляването на разликите между подаванията: %s"
#: gitk:9137
#: gitk:9156
msgid "Top"
msgstr "Най-горе"
#: gitk:9138
#: gitk:9157
msgid "From"
msgstr "От"
#: gitk:9143
#: gitk:9162
msgid "To"
msgstr "До"
#: gitk:9167
#: gitk:9186
msgid "Generate patch"
msgstr "Генериране на кръпка"
#: gitk:9169
#: gitk:9188
msgid "From:"
msgstr "От:"
#: gitk:9178
#: gitk:9197
msgid "To:"
msgstr "До:"
#: gitk:9187
#: gitk:9206
msgid "Reverse"
msgstr "Обръщане"
#: gitk:9189 gitk:9385
#: gitk:9208 gitk:9418
msgid "Output file:"
msgstr "Запазване във файла:"
#: gitk:9195
#: gitk:9214
msgid "Generate"
msgstr "Генериране"
#: gitk:9233
#: gitk:9252
msgid "Error creating patch:"
msgstr "Грешка при създаването на кръпка:"
#: gitk:9256 gitk:9373 gitk:9430
#: gitk:9275 gitk:9406 gitk:9463
msgid "ID:"
msgstr "Идентификатор:"
#: gitk:9265
#: gitk:9284
msgid "Tag name:"
msgstr "Име на етикет:"
#: gitk:9268
#: gitk:9287
msgid "Tag message is optional"
msgstr "Съобщението за етикет е незадължително"
#: gitk:9270
#: gitk:9289
msgid "Tag message:"
msgstr "Съобщение за етикет:"
#: gitk:9274 gitk:9439
#: gitk:9293 gitk:9472
msgid "Create"
msgstr "Създаване"
#: gitk:9292
#: gitk:9311
msgid "No tag name specified"
msgstr "Липсва име на етикет"
#: gitk:9296
#: gitk:9315
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Етикетът „%s“ вече съществува"
#: gitk:9306
#: gitk:9325
msgid "Error creating tag:"
msgstr "Грешка при създаването на етикет:"
#: gitk:9382
#: gitk:9415
msgid "Command:"
msgstr "Команда:"
#: gitk:9390
#: gitk:9423
msgid "Write"
msgstr "Запазване"
#: gitk:9408
#: gitk:9441
msgid "Error writing commit:"
msgstr "Грешка при запазването на подаването:"
#: gitk:9435
#: gitk:9468
msgid "Name:"
msgstr "Име:"
#: gitk:9458
#: gitk:9491
msgid "Please specify a name for the new branch"
msgstr "Укажете име за новия клон"
#: gitk:9463
#: gitk:9496
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?"
#: gitk:9530
#: gitk:9563
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?"
#: gitk:9535
#: gitk:9568
msgid "Cherry-picking"
msgstr "Отбиране"
#: gitk:9544
#: gitk:9577
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
@ -1044,7 +1060,7 @@ msgstr ""
"Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
"Подайте, занулете или ги скатайте и пробвайте отново."
#: gitk:9550
#: gitk:9583
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
@ -1052,20 +1068,20 @@ msgstr ""
"Неуспешно отбиране поради конфликти при сливане.\n"
"Искате ли да ги коригирате чрез „git citool“?"
#: gitk:9566 gitk:9624
#: gitk:9599 gitk:9657
msgid "No changes committed"
msgstr "Не са подадени промени"
#: gitk:9593
#: gitk:9626
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?"
#: gitk:9598
#: gitk:9631
msgid "Reverting"
msgstr "Отмяна"
#: gitk:9606
#: gitk:9639
#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
@ -1074,7 +1090,7 @@ msgstr ""
"Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
"Подайте, занулете или ги скатайте и пробвайте отново.<"
#: gitk:9610
#: gitk:9643
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
@ -1082,28 +1098,28 @@ msgstr ""
"Неуспешно отмяна поради конфликти при сливане.\n"
"Искате ли да ги коригирате чрез „git citool“?"
#: gitk:9653
#: gitk:9686
msgid "Confirm reset"
msgstr "Потвърждаване на зануляването"
#: gitk:9655
#: gitk:9688
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Да се занули ли клонът „%s“ към „%s“?"
#: gitk:9657
#: gitk:9690
msgid "Reset type:"
msgstr "Вид зануляване:"
#: gitk:9660
#: gitk:9693
msgid "Soft: Leave working tree and index untouched"
msgstr "Слабо: работното дърво и индекса остават същите"
#: gitk:9663
#: gitk:9696
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Смесено: работното дърво остава същото, индексът се занулява"
#: gitk:9666
#: gitk:9699
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@ -1111,19 +1127,19 @@ msgstr ""
"Силно: зануляване и на работното дърво, и на индекса\n"
"(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)"
#: gitk:9683
#: gitk:9716
msgid "Resetting"
msgstr "Зануляване"
#: gitk:9743
#: gitk:9776
msgid "Checking out"
msgstr "Изтегляне"
#: gitk:9796
#: gitk:9829
msgid "Cannot delete the currently checked-out branch"
msgstr "Текущо изтегленият клон не може да бъде изтрит"
#: gitk:9802
#: gitk:9835
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@ -1132,16 +1148,16 @@ msgstr ""
"Подаванията на клона „%s“ не са на никой друг клон.\n"
"Наистина ли да се изтрие клонът „%s“?"
#: gitk:9833
#: gitk:9866
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Етикети и върхове: %s"
#: gitk:9850
#: gitk:9883
msgid "Filter"
msgstr "Филтриране"
#: gitk:10146
#: gitk:10179
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@ -1149,201 +1165,201 @@ msgstr ""
"Грешка при прочитането на топологията на подаванията. Информацията за клона "
"и предшестващите/следващите етикети ще е непълна."
#: gitk:11123
#: gitk:11156
msgid "Tag"
msgstr "Етикет"
#: gitk:11127
#: gitk:11160
msgid "Id"
msgstr "Идентификатор"
#: gitk:11210
#: gitk:11243
msgid "Gitk font chooser"
msgstr "Избор на шрифт за Gitk"
#: gitk:11227
#: gitk:11260
msgid "B"
msgstr "Ч"
#: gitk:11230
#: gitk:11263
msgid "I"
msgstr "К"
#: gitk:11348
#: gitk:11381
msgid "Commit list display options"
msgstr "Настройки на списъка с подавания"
#: gitk:11351
#: gitk:11384
msgid "Maximum graph width (lines)"
msgstr "Максимална широчина на графа (в редове)"
#: gitk:11355
#: gitk:11388
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Максимална широчина на графа (% от панела)"
#: gitk:11358
#: gitk:11391
msgid "Show local changes"
msgstr "Показване на локалните промени"
#: gitk:11361
#: gitk:11394
msgid "Auto-select SHA1 (length)"
msgstr "Автоматично избиране на SHA1 (дължина)"
#: gitk:11365
#: gitk:11398
msgid "Hide remote refs"
msgstr "Скриване на отдалечените указатели"
#: gitk:11369
#: gitk:11402
msgid "Diff display options"
msgstr "Настройки на показването на разликите"
#: gitk:11371
#: gitk:11404
msgid "Tab spacing"
msgstr "Широчина на табулатора"
#: gitk:11374
#: gitk:11407
msgid "Display nearby tags/heads"
msgstr "Извеждане на близките етикети и върхове"
#: gitk:11377
#: gitk:11410
msgid "Maximum # tags/heads to show"
msgstr "Максимален брой етикети/върхове за показване"
#: gitk:11380
#: gitk:11413
msgid "Limit diffs to listed paths"
msgstr "Разлика само в избраните пътища"
#: gitk:11383
#: gitk:11416
msgid "Support per-file encodings"
msgstr "Поддръжка на различни кодирания за всеки файл"
#: gitk:11389 gitk:11536
#: gitk:11422 gitk:11569
msgid "External diff tool"
msgstr "Външен инструмент за разлики"
#: gitk:11390
#: gitk:11423
msgid "Choose..."
msgstr "Избор…"
#: gitk:11395
#: gitk:11428
msgid "General options"
msgstr "Общи настройки"
#: gitk:11398
#: gitk:11431
msgid "Use themed widgets"
msgstr "Използване на тема за графичните обекти"
#: gitk:11400
#: gitk:11433
msgid "(change requires restart)"
msgstr "(промяната изисква рестартиране на Gitk)"
#: gitk:11402
#: gitk:11435
msgid "(currently unavailable)"
msgstr "(в момента недостъпно)"
#: gitk:11413
#: gitk:11446
msgid "Colors: press to choose"
msgstr "Цветове: избира се с натискане"
#: gitk:11416
#: gitk:11449
msgid "Interface"
msgstr "Интерфейс"
#: gitk:11417
#: gitk:11450
msgid "interface"
msgstr "интерфейс"
#: gitk:11420
#: gitk:11453
msgid "Background"
msgstr "Фон"
#: gitk:11421 gitk:11451
#: gitk:11454 gitk:11484
msgid "background"
msgstr "фон"
#: gitk:11424
#: gitk:11457
msgid "Foreground"
msgstr "Знаци"
#: gitk:11425
#: gitk:11458
msgid "foreground"
msgstr "знаци"
#: gitk:11428
#: gitk:11461
msgid "Diff: old lines"
msgstr "Разлика: стари редове"
#: gitk:11429
#: gitk:11462
msgid "diff old lines"
msgstr "разлика, стари редове"
#: gitk:11433
#: gitk:11466
msgid "Diff: new lines"
msgstr "Разлика: нови редове"
#: gitk:11434
#: gitk:11467
msgid "diff new lines"
msgstr "разлика, нови редове"
#: gitk:11438
#: gitk:11471
msgid "Diff: hunk header"
msgstr "Разлика: начало на парче"
#: gitk:11440
#: gitk:11473
msgid "diff hunk header"
msgstr "разлика, начало на парче"
#: gitk:11444
#: gitk:11477
msgid "Marked line bg"
msgstr "Фон на отбелязан ред"
#: gitk:11446
#: gitk:11479
msgid "marked line background"
msgstr "фон на отбелязан ред"
#: gitk:11450
#: gitk:11483
msgid "Select bg"
msgstr "Избор на фон"
#: gitk:11459
#: gitk:11492
msgid "Fonts: press to choose"
msgstr "Шрифтове: избира се с натискане"
#: gitk:11461
#: gitk:11494
msgid "Main font"
msgstr "Основен шрифт"
#: gitk:11462
#: gitk:11495
msgid "Diff display font"
msgstr "Шрифт за разликите"
#: gitk:11463
#: gitk:11496
msgid "User interface font"
msgstr "Шрифт на интерфейса"
#: gitk:11485
#: gitk:11518
msgid "Gitk preferences"
msgstr "Настройки на Gitk"
#: gitk:11494
#: gitk:11527
msgid "General"
msgstr "Общи"
#: gitk:11495
#: gitk:11528
msgid "Colors"
msgstr "Цветове"
#: gitk:11496
#: gitk:11529
msgid "Fonts"
msgstr "Шрифтове"
#: gitk:11546
#: gitk:11579
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: избор на цвят на „%s“"
#: gitk:12059
#: gitk:12092
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
@ -1351,15 +1367,15 @@ msgstr ""
"Тази версия на Tcl/Tk не се поддържа от Gitk.\n"
" Необходима ви е поне Tcl/Tk 8.4."
#: gitk:12269
#: gitk:12302
msgid "Cannot find a git repository here."
msgstr "Тук липсва хранилище на Git."
#: gitk:12316
#: gitk:12349
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
#: gitk:12328
#: gitk:12361
msgid "Bad arguments to gitk:"
msgstr "Неправилни аргументи на gitk:"

View File

@ -23,11 +23,11 @@ msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
#: gitk:212 gitk:2381
msgid "Color words"
msgstr ""
msgstr "Wörter einfärben"
#: gitk:217 gitk:2381 gitk:8220 gitk:8253
msgid "Markup words"
msgstr ""
msgstr "Wörter kennzeichnen"
#: gitk:324
msgid "Error parsing revisions:"
@ -187,7 +187,7 @@ msgstr "Änderungen:"
#: gitk:2304 gitk:4779
msgid "changing lines matching:"
msgstr ""
msgstr "Geänderte Zeilen entsprechen:"
#: gitk:2313 gitk:2315 gitk:4766
msgid "Exact"
@ -248,7 +248,7 @@ msgstr "Leerzeichenänderungen ignorieren"
#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
msgid "Line diff"
msgstr ""
msgstr "Zeilenunterschied"
#: gitk:2445
msgid "Patch"
@ -307,19 +307,16 @@ msgid "Compare with marked commit"
msgstr "Mit Lesezeichen vergleichen"
#: gitk:2629 gitk:2640
#, fuzzy
msgid "Diff this -> marked commit"
msgstr "Vergleich: diese -> gewählte"
msgstr "Vergleich: diese -> gewählte Version"
#: gitk:2630 gitk:2641
#, fuzzy
msgid "Diff marked commit -> this"
msgstr "Vergleich: gewählte -> diese"
msgstr "Vergleich: gewählte -> diese Version"
#: gitk:2631
#, fuzzy
msgid "Revert this commit"
msgstr "Lesezeichen setzen"
msgstr "Version umkehren"
#: gitk:2647
msgid "Check out this branch"
@ -331,7 +328,7 @@ msgstr "Zweig löschen"
#: gitk:2649
msgid "Copy branch name"
msgstr ""
msgstr "Zweigname kopieren"
#: gitk:2656
msgid "Highlight this too"
@ -351,7 +348,7 @@ msgstr "Annotieren der Elternversion"
#: gitk:2660
msgid "Copy path"
msgstr ""
msgstr "Pfad kopieren"
#: gitk:2667
msgid "Show origin of this line"
@ -362,7 +359,6 @@ msgid "Run git gui blame on this line"
msgstr "Diese Zeile annotieren (»git gui blame«)"
#: gitk:3014
#, fuzzy
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@ -374,7 +370,7 @@ msgstr ""
"\n"
"Gitk - eine Visualisierung der Git-Historie\n"
"\n"
"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
"Copyright \\u00a9 2005-2014 Paul Mackerras\n"
"\n"
"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
"License"
@ -397,9 +393,9 @@ msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tBeenden"
#: gitk:3049
#, fuzzy, tcl-format
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-F>\t\tSuchen"
msgstr "<%s-F>\t\tFenster schließen"
#: gitk:3050
msgid "<Home>\t\tMove to first commit"
@ -410,19 +406,16 @@ msgid "<End>\t\tMove to last commit"
msgstr "<Ende>\t\tZur ältesten Version springen"
#: gitk:3052
#, fuzzy
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Hoch>, p, i\tNächste neuere Version"
msgstr "<Hoch>, p, k\tNächste neuere Version"
#: gitk:3053
#, fuzzy
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Runter>, n, k\tNächste ältere Version"
msgstr "<Runter>, n, j\tNächste ältere Version"
#: gitk:3054
#, fuzzy
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Links>, z, j\tEine Version zurückgehen"
msgstr "<Links>, z, h\tEine Version zurückgehen"
#: gitk:3055
msgid "<Right>, x, l\tGo forward in history list"
@ -431,7 +424,7 @@ msgstr "<Rechts>, x, l\tEine Version weitergehen"
#: gitk:3056
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr ""
msgstr "<%s-n>\tZu n-ter Elternversion in Versionshistorie springen"
#: gitk:3057
msgid "<PageUp>\tMove up one page in commit list"
@ -514,9 +507,8 @@ msgid "<Return>\tMove to next find hit"
msgstr "<Eingabetaste>\tWeitersuchen"
#: gitk:3075
#, fuzzy
msgid "g\t\tGo to commit"
msgstr "<Ende>\t\tZur ältesten Version springen"
msgstr "g\t\tZu Version springen"
#: gitk:3076
msgid "/\t\tFocus the search box"
@ -673,9 +665,8 @@ msgid "Matches all Commit Info criteria"
msgstr "Alle Versionsinformationen-Kriterien erfüllen"
#: gitk:4086
#, fuzzy
msgid "Matches no Commit Info criteria"
msgstr "Alle Versionsinformationen-Kriterien erfüllen"
msgstr "keine Versionsinformationen-Kriterien erfüllen"
#: gitk:4087
msgid "Changes to Files:"
@ -802,7 +793,7 @@ msgstr "Lokale Änderungen, nicht bereitgestellt"
#: gitk:7134
msgid "and many more"
msgstr ""
msgstr "und weitere"
#: gitk:7137
msgid "many"
@ -1066,34 +1057,31 @@ msgid "No changes committed"
msgstr "Keine Änderungen eingetragen"
#: gitk:9593
#, fuzzy, tcl-format
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr ""
"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
"eintragen?"
"Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?"
#: gitk:9598
#, fuzzy
msgid "Reverting"
msgstr "Zurücksetzen"
msgstr "Umkehren"
#: gitk:9606
#, fuzzy, tcl-format
#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
"commit, reset or stash your changes and try again."
msgstr ""
"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n"
"Umkehren fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n"
"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
"zwischenspeichern (»git stash«) und dann erneut versuchen."
#: gitk:9610
#, fuzzy
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
msgstr ""
"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n"
"Umkehren fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n"
"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
"werden, um diesen Konflikt aufzulösen?"
@ -1206,9 +1194,8 @@ msgid "Show local changes"
msgstr "Lokale Änderungen anzeigen"
#: gitk:11361
#, fuzzy
msgid "Auto-select SHA1 (length)"
msgstr "SHA1-Hashwert automatisch auswählen"
msgstr "SHA1-Hashwert (Länge) automatisch auswählen"
#: gitk:11365
msgid "Hide remote refs"
@ -1223,13 +1210,12 @@ msgid "Tab spacing"
msgstr "Tabulatorbreite"
#: gitk:11374
#, fuzzy
msgid "Display nearby tags/heads"
msgstr "Naheliegende Markierungen anzeigen"
msgstr "Naheliegende Markierungen/Zweigspitzen anzeigen"
#: gitk:11377
msgid "Maximum # tags/heads to show"
msgstr ""
msgstr "Maximale Anzahl anzuzeigender Markierungen/Zweigspitzen"
#: gitk:11380
msgid "Limit diffs to listed paths"
@ -1348,17 +1334,16 @@ msgid "Gitk preferences"
msgstr "Gitk-Einstellungen"
#: gitk:11494
#, fuzzy
msgid "General"
msgstr "Erzeugen"
msgstr "Allgemein"
#: gitk:11495
msgid "Colors"
msgstr ""
msgstr "Farben"
#: gitk:11496
msgid "Fonts"
msgstr ""
msgstr "Schriftarten"
#: gitk:11546
#, tcl-format
@ -1370,6 +1355,8 @@ msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
msgstr ""
"Entschuldigung, gitk kann nicht mit dieser Tcl/Tk Version ausgeführt werden.\n"
" Gitk erfordert mindestens Tcl/Tk 8.4."
#: gitk:12269
msgid "Cannot find a git repository here."

View File

@ -3,14 +3,14 @@
# This file is distributed under the same license as the gitk package.
# Translators:
# Emmanuel Trillaud <etrillaud@gmail.com>
#
# Jean-Noël Avila <jn.avila@free.fr>
msgid ""
msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 14:32+1000\n"
"PO-Revision-Date: 2009-11-19 22:13+0100\n"
"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n"
"POT-Creation-Date: 2016-01-22 22:04+0100\n"
"PO-Revision-Date: 2016-01-22 23:28+0100\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: git@vger.kernel.org\n"
"Language: \n"
"MIME-Version: 1.0\n"
@ -23,13 +23,13 @@ msgstr ""
msgid "Couldn't get list of unmerged files:"
msgstr "Impossible de récupérer la liste des fichiers non fusionnés :"
#: gitk:212 gitk:2381
#: gitk:212 gitk:2399
msgid "Color words"
msgstr ""
msgstr "Colorier les mots différents"
#: gitk:217 gitk:2381 gitk:8220 gitk:8253
#: gitk:217 gitk:2399 gitk:8239 gitk:8272
msgid "Markup words"
msgstr ""
msgstr "Marquer les mots différents"
#: gitk:324
msgid "Error parsing revisions:"
@ -47,13 +47,10 @@ msgstr ""
# FIXME : améliorer la traduction de 'file limite'
#: gitk:396
#, fuzzy
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
msgstr ""
"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné "
"n'est dans la limite des fichiers."
msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers."
#: gitk:418 gitk:566
msgid "Error executing git log:"
@ -63,15 +60,15 @@ msgstr "Erreur à l'exécution de git log :"
msgid "Reading"
msgstr "Lecture en cours"
#: gitk:496 gitk:4525
#: gitk:496 gitk:4544
msgid "Reading commits..."
msgstr "Lecture des commits..."
#: gitk:499 gitk:1637 gitk:4528
#: gitk:499 gitk:1637 gitk:4547
msgid "No commits selected"
msgstr "Aucun commit sélectionné"
#: gitk:1445 gitk:4045 gitk:12432
#: gitk:1445 gitk:4064 gitk:12469
msgid "Command line"
msgstr "Ligne de commande"
@ -83,290 +80,294 @@ msgstr "Impossible de lire la sortie de git log :"
msgid "No commit information available"
msgstr "Aucune information disponible sur le commit"
#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
msgid "OK"
msgstr "OK"
#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
#: gitk:11242 gitk:11522
#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
#: gitk:11275 gitk:11555
msgid "Cancel"
msgstr "Annuler"
#: gitk:2069
#: gitk:2083
msgid "&Update"
msgstr "Mise à jour"
#: gitk:2070
#: gitk:2084
msgid "&Reload"
msgstr "Recharger"
msgstr "&Recharger"
#: gitk:2071
#: gitk:2085
msgid "Reread re&ferences"
msgstr "Relire les références"
msgstr "Relire les ré&férences"
#: gitk:2072
#: gitk:2086
msgid "&List references"
msgstr "Lister les références"
msgstr "&Lister les références"
#: gitk:2074
#: gitk:2088
msgid "Start git &gui"
msgstr "Démarrer git gui"
msgstr "Démarrer git &gui"
#: gitk:2076
#: gitk:2090
msgid "&Quit"
msgstr "Quitter"
msgstr "&Quitter"
#: gitk:2068
#: gitk:2082
msgid "&File"
msgstr "Fichier"
msgstr "&Fichier"
#: gitk:2080
#: gitk:2094
msgid "&Preferences"
msgstr "Préférences"
#: gitk:2079
#: gitk:2093
msgid "&Edit"
msgstr "Éditer"
msgstr "&Éditer"
#: gitk:2084
#: gitk:2098
msgid "&New view..."
msgstr "Nouvelle vue..."
msgstr "&Nouvelle vue..."
#: gitk:2085
#: gitk:2099
msgid "&Edit view..."
msgstr "Éditer la vue..."
msgstr "&Éditer la vue..."
#: gitk:2086
#: gitk:2100
msgid "&Delete view"
msgstr "Supprimer la vue"
#: gitk:2088 gitk:4043
#: gitk:2102
msgid "&All files"
msgstr "Tous les fichiers"
#: gitk:2083 gitk:4067
#: gitk:2097
msgid "&View"
msgstr "Vue"
msgstr "&Vue"
#: gitk:2093 gitk:2103 gitk:3012
#: gitk:2107 gitk:2117
msgid "&About gitk"
msgstr "À propos de gitk"
#: gitk:2094 gitk:2108
#: gitk:2108 gitk:2122
msgid "&Key bindings"
msgstr "Raccourcis clavier"
#: gitk:2092 gitk:2107
#: gitk:2106 gitk:2121
msgid "&Help"
msgstr "Aide"
#: gitk:2185 gitk:8652
#: gitk:2199 gitk:8671
msgid "SHA1 ID:"
msgstr "Id SHA1 :"
#: gitk:2229
#: gitk:2243
msgid "Row"
msgstr "Colonne"
#: gitk:2267
#: gitk:2281
msgid "Find"
msgstr "Recherche"
#: gitk:2295
#: gitk:2309
msgid "commit"
msgstr "commit"
#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
#: gitk:6912
#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
#: gitk:6931
msgid "containing:"
msgstr "contient :"
#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
msgid "touching paths:"
msgstr "chemins modifiés :"
#: gitk:2303 gitk:4777
#: gitk:2317 gitk:4796
msgid "adding/removing string:"
msgstr "ajoute/supprime la chaîne :"
#: gitk:2304 gitk:4779
#: gitk:2318 gitk:4798
msgid "changing lines matching:"
msgstr ""
msgstr "modifie les lignes vérifiant :"
#: gitk:2313 gitk:2315 gitk:4766
#: gitk:2327 gitk:2329 gitk:4785
msgid "Exact"
msgstr "Exact"
#: gitk:2315 gitk:4854 gitk:6723
#: gitk:2329 gitk:4873 gitk:6742
msgid "IgnCase"
msgstr "Ignorer la casse"
#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
msgid "Regexp"
msgstr "Expression régulière"
#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
msgid "All fields"
msgstr "Tous les champs"
#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
msgid "Headline"
msgstr "Surligner"
msgstr "Titre"
#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
msgid "Comments"
msgstr "Commentaires"
#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
#: gitk:8845
#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
#: gitk:8864
msgid "Author"
msgstr "Auteur"
#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
msgid "Committer"
msgstr "Auteur du commit"
msgstr "Validateur"
#: gitk:2350
#: gitk:2367
msgid "Search"
msgstr "Rechercher"
#: gitk:2358
#: gitk:2375
msgid "Diff"
msgstr "Diff"
#: gitk:2360
#: gitk:2377
msgid "Old version"
msgstr "Ancienne version"
#: gitk:2362
#: gitk:2379
msgid "New version"
msgstr "Nouvelle version"
#: gitk:2364
#: gitk:2382
msgid "Lines of context"
msgstr "Lignes de contexte"
#: gitk:2374
#: gitk:2392
msgid "Ignore space change"
msgstr "Ignorer les modifications d'espace"
#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
msgid "Line diff"
msgstr ""
msgstr "différence par ligne"
#: gitk:2445
#: gitk:2463
msgid "Patch"
msgstr "Patch"
#: gitk:2447
#: gitk:2465
msgid "Tree"
msgstr "Arbre"
#: gitk:2617 gitk:2637
#: gitk:2635 gitk:2656
msgid "Diff this -> selected"
msgstr "Diff entre ceci et la sélection"
msgstr "Diff ceci -> la sélection"
#: gitk:2618 gitk:2638
#: gitk:2636 gitk:2657
msgid "Diff selected -> this"
msgstr "Diff entre sélection et ceci"
msgstr "Diff sélection -> ceci"
#: gitk:2619 gitk:2639
#: gitk:2637 gitk:2658
msgid "Make patch"
msgstr "Créer patch"
#: gitk:2620 gitk:9254
#: gitk:2638 gitk:9273
msgid "Create tag"
msgstr "Créer tag"
msgstr "Créer étiquette"
#: gitk:2621 gitk:9371
#: gitk:2639
msgid "Copy commit summary"
msgstr "Copié le résumé du commit"
#: gitk:2640 gitk:9404
msgid "Write commit to file"
msgstr "Écrire le commit dans un fichier"
#: gitk:2622 gitk:9428
#: gitk:2641 gitk:9461
msgid "Create new branch"
msgstr "Créer une nouvelle branche"
#: gitk:2623
#: gitk:2642
msgid "Cherry-pick this commit"
msgstr "Cueillir (cherry-pick) ce commit"
#: gitk:2624
#: gitk:2643
msgid "Reset HEAD branch to here"
msgstr "Réinitialiser la branche HEAD vers cet état"
#: gitk:2625
#: gitk:2644
msgid "Mark this commit"
msgstr "Marquer ce commit"
#: gitk:2626
#: gitk:2645
msgid "Return to mark"
msgstr "Retourner à la marque"
#: gitk:2627
#: gitk:2646
msgid "Find descendant of this and mark"
msgstr "Chercher le descendant de ceci et le marquer"
#: gitk:2628
#: gitk:2647
msgid "Compare with marked commit"
msgstr "Comparer avec le commit marqué"
#: gitk:2629 gitk:2640
#, fuzzy
#: gitk:2648 gitk:2659
msgid "Diff this -> marked commit"
msgstr "Diff entre ceci et la sélection"
msgstr "Diff ceci -> sélection"
#: gitk:2630 gitk:2641
#, fuzzy
#: gitk:2649 gitk:2660
msgid "Diff marked commit -> this"
msgstr "Diff entre sélection et ceci"
msgstr "Diff entre sélection -> ceci"
#: gitk:2631
#, fuzzy
#: gitk:2650
msgid "Revert this commit"
msgstr "Marquer ce commit"
msgstr "Défaire ce commit"
#: gitk:2647
#: gitk:2666
msgid "Check out this branch"
msgstr "Récupérer cette branche"
#: gitk:2648
#: gitk:2667
msgid "Remove this branch"
msgstr "Supprimer cette branche"
#: gitk:2649
#: gitk:2668
msgid "Copy branch name"
msgstr ""
msgstr "Copier la nom de la branche"
#: gitk:2656
#: gitk:2675
msgid "Highlight this too"
msgstr "Surligner également ceci"
#: gitk:2657
#: gitk:2676
msgid "Highlight this only"
msgstr "Surligner seulement ceci"
#: gitk:2658
#: gitk:2677
msgid "External diff"
msgstr "Diff externe"
#: gitk:2659
#: gitk:2678
msgid "Blame parent commit"
msgstr "Blâmer le commit parent"
#: gitk:2660
#: gitk:2679
msgid "Copy path"
msgstr ""
msgstr "Copier le chemin"
#: gitk:2667
#: gitk:2686
msgid "Show origin of this line"
msgstr "Montrer l'origine de cette ligne"
#: gitk:2668
#: gitk:2687
msgid "Run git gui blame on this line"
msgstr "Exécuter git gui blame sur cette ligne"
#: gitk:3014
#, fuzzy
#: gitk:3031
msgid "About gitk"
msgstr "À propos de gitk"
#: gitk:3033
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
@ -378,327 +379,329 @@ msgstr ""
"\n"
"Gitk - visualisateur de commit pour git\n"
"\n"
"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
"Copyright \\u00a9 2005-2014 Paul Mackerras\n"
"\n"
"Utilisation et redistribution soumises aux termes de la GNU General Public "
"License"
"Utilisation et redistribution soumises aux termes de la GNU General Public License"
#: gitk:3022 gitk:3089 gitk:9857
#: gitk:3041 gitk:3108 gitk:9890
msgid "Close"
msgstr "Fermer"
#: gitk:3043
#: gitk:3062
msgid "Gitk key bindings"
msgstr "Raccourcis clavier de Gitk"
#: gitk:3046
#: gitk:3065
msgid "Gitk key bindings:"
msgstr "Raccourcis clavier de Gitk :"
#: gitk:3048
#: gitk:3067
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tQuitter"
#: gitk:3049
#, fuzzy, tcl-format
#: gitk:3068
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-F>\t\tRechercher"
msgstr "<%s-W>\t\tFermer la fenêtre"
#: gitk:3050
#: gitk:3069
msgid "<Home>\t\tMove to first commit"
msgstr "<Début>\t\tAller au premier commit"
#: gitk:3051
#: gitk:3070
msgid "<End>\t\tMove to last commit"
msgstr "<Fin>\t\tAller au dernier commit"
#: gitk:3052
#, fuzzy
#: gitk:3071
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Haut>, p, i\t Aller au commit suivant"
msgstr "<Haut>, p, k\t Aller au commit précédent"
#: gitk:3053
#, fuzzy
#: gitk:3072
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Bas>, n, k\t Aller au commit précédent"
msgstr "<Bas>, n, j\t Aller au commit suivant"
#: gitk:3054
#, fuzzy
#: gitk:3073
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Gauche>, z, j\tReculer dans l'historique"
msgstr "<Gauche>, z, h\tReculer dans l'historique"
#: gitk:3055
#: gitk:3074
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Droite>, x, l\tAvancer dans l'historique"
#: gitk:3056
#: gitk:3075
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr ""
msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique"
#: gitk:3057
#: gitk:3076
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
#: gitk:3058
#: gitk:3077
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
#: gitk:3059
#: gitk:3078
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Début>\tAller en haut de la liste des commits"
#: gitk:3060
#: gitk:3079
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tAller en bas de la liste des commits"
#: gitk:3061
#: gitk:3080
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
#: gitk:3062
#: gitk:3081
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
#: gitk:3063
#: gitk:3082
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
#: gitk:3064
#: gitk:3083
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
#: gitk:3065
#: gitk:3084
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr ""
"<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
#: gitk:3066
#: gitk:3085
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr ""
"<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
#: gitk:3067
#: gitk:3086
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
#: gitk:3068
#: gitk:3087
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
#: gitk:3069
#: gitk:3088
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
#: gitk:3070
#: gitk:3089
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
#: gitk:3071
#: gitk:3090
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
#: gitk:3072
#: gitk:3091
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tRechercher"
#: gitk:3073
#: gitk:3092
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
#: gitk:3074
#: gitk:3093
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t\tAller au résultat de recherche suivant"
#: gitk:3075
#, fuzzy
#: gitk:3094
msgid "g\t\tGo to commit"
msgstr "<Fin>\t\tAller au dernier commit"
msgstr "g\t\tAller au commit"
#: gitk:3076
#: gitk:3095
msgid "/\t\tFocus the search box"
msgstr "/\t\tFocus sur la zone de recherche"
#: gitk:3077
#: gitk:3096
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tAller au résultat de recherche précédent"
#: gitk:3078
#: gitk:3097
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tAller au prochain fichier dans la vue des diff"
#: gitk:3079
#: gitk:3098
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff"
#: gitk:3080
#: gitk:3099
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff"
#: gitk:3081
#: gitk:3100
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tAugmenter la taille de la police"
#: gitk:3082
#: gitk:3101
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tAugmenter la taille de la police"
#: gitk:3083
#: gitk:3102
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tDiminuer la taille de la police"
#: gitk:3084
#: gitk:3103
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tDiminuer la taille de la police"
#: gitk:3085
#: gitk:3104
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tMise à jour"
#: gitk:3550 gitk:3559
#: gitk:3569 gitk:3578
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Erreur lors de la création du répertoire temporaire %s :"
#: gitk:3572
#: gitk:3591
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Erreur en obtenant \"%s\" de %s:"
#: gitk:3635
#: gitk:3654
msgid "command failed:"
msgstr "échec de la commande :"
#: gitk:3784
#: gitk:3803
msgid "No such commit"
msgstr "Commit inexistant"
#: gitk:3798
#: gitk:3817
msgid "git gui blame: command failed:"
msgstr "git gui blame : échec de la commande :"
#: gitk:3829
#: gitk:3848
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Impossible de lire le head de la fusion : %s"
#: gitk:3837
#: gitk:3856
#, tcl-format
msgid "Error reading index: %s"
msgstr "Erreur à la lecture de l'index : %s"
#: gitk:3862
#: gitk:3881
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Impossible de démarrer git blame : %s"
#: gitk:3865 gitk:6754
#: gitk:3884 gitk:6773
msgid "Searching"
msgstr "Recherche en cours"
#: gitk:3897
#: gitk:3916
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Erreur à l'exécution de git blame : %s"
#: gitk:3925
#: gitk:3944
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue"
#: gitk:3939
#: gitk:3958
msgid "External diff viewer failed:"
msgstr "Échec de l'outil externe de visualisation des diff"
msgstr "Échec de l'outil externe de visualisation des diff :"
#: gitk:4070
#: gitk:4062
msgid "All files"
msgstr "Tous les fichiers"
#: gitk:4086
msgid "View"
msgstr "Vue"
#: gitk:4089
msgid "Gitk view definition"
msgstr "Définition des vues de Gitk"
#: gitk:4074
#: gitk:4093
msgid "Remember this view"
msgstr "Se souvenir de cette vue"
#: gitk:4075
#: gitk:4094
msgid "References (space separated list):"
msgstr "Références (liste d'éléments séparés par des espaces) :"
#: gitk:4076
#: gitk:4095
msgid "Branches & tags:"
msgstr "Branches & tags :"
msgstr "Branches & étiquettes :"
#: gitk:4077
#: gitk:4096
msgid "All refs"
msgstr "Toutes les références"
#: gitk:4078
#: gitk:4097
msgid "All (local) branches"
msgstr "Toutes les branches (locales)"
#: gitk:4079
#: gitk:4098
msgid "All tags"
msgstr "Tous les tags"
msgstr "Toutes les étiquettes"
#: gitk:4080
#: gitk:4099
msgid "All remote-tracking branches"
msgstr "Toutes les branches de suivi à distance"
#: gitk:4081
#: gitk:4100
msgid "Commit Info (regular expressions):"
msgstr "Info sur les commits (expressions régulières) :"
#: gitk:4082
#: gitk:4101
msgid "Author:"
msgstr "Auteur :"
#: gitk:4083
#: gitk:4102
msgid "Committer:"
msgstr "Commiteur :"
msgstr "Validateur :"
#: gitk:4084
#: gitk:4103
msgid "Commit Message:"
msgstr "Message de commit :"
#: gitk:4085
#: gitk:4104
msgid "Matches all Commit Info criteria"
msgstr "Correspond à tous les critères d'Info sur les commits"
#: gitk:4086
#, fuzzy
#: gitk:4105
msgid "Matches no Commit Info criteria"
msgstr "Correspond à tous les critères d'Info sur les commits"
msgstr "Ne correspond à aucun des critères d'Info sur les commits"
#: gitk:4087
#: gitk:4106
msgid "Changes to Files:"
msgstr "Changements des fichiers :"
#: gitk:4088
#: gitk:4107
msgid "Fixed String"
msgstr "Chaîne Figée"
#: gitk:4089
#: gitk:4108
msgid "Regular Expression"
msgstr "Expression Régulière"
#: gitk:4090
#: gitk:4109
msgid "Search string:"
msgstr "Recherche de la chaîne :"
#: gitk:4091
#: gitk:4110
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
@ -706,204 +709,201 @@ msgstr ""
"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
"2009 15:27:38\") :"
#: gitk:4092
#: gitk:4111
msgid "Since:"
msgstr "De :"
msgstr "Depuis :"
#: gitk:4093
#: gitk:4112
msgid "Until:"
msgstr "Jusqu'au :"
#: gitk:4094
#: gitk:4113
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :"
#: gitk:4095
#: gitk:4114
msgid "Number to show:"
msgstr "Nombre à afficher :"
#: gitk:4096
#: gitk:4115
msgid "Number to skip:"
msgstr "Nombre à sauter :"
#: gitk:4097
#: gitk:4116
msgid "Miscellaneous options:"
msgstr "Options diverses :"
#: gitk:4098
#: gitk:4117
msgid "Strictly sort by date"
msgstr "Trier par date"
# FIXME : traduction de "branch sides"
#: gitk:4099
#, fuzzy
#: gitk:4118
msgid "Mark branch sides"
msgstr "Marquer les extrémités des branches"
msgstr "Indiquer les côtés des branches"
#: gitk:4100
#: gitk:4119
msgid "Limit to first parent"
msgstr "Limiter au premier ancêtre"
#: gitk:4101
#: gitk:4120
msgid "Simple history"
msgstr "Historique simple"
#: gitk:4102
#: gitk:4121
msgid "Additional arguments to git log:"
msgstr "Arguments supplémentaires de git log :"
#: gitk:4103
#: gitk:4122
msgid "Enter files and directories to include, one per line:"
msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
#: gitk:4104
#: gitk:4123
msgid "Command to generate more commits to include:"
msgstr "Commande pour générer plus de commits à inclure :"
#: gitk:4228
#: gitk:4247
msgid "Gitk: edit view"
msgstr "Gitk : éditer la vue"
#: gitk:4236
#: gitk:4255
msgid "-- criteria for selecting revisions"
msgstr "-- critère pour la sélection des révisions"
#: gitk:4241
#, fuzzy
#: gitk:4260
msgid "View Name"
msgstr "Nom de la vue :"
msgstr "Nom de la vue"
#: gitk:4316
#: gitk:4335
msgid "Apply (F5)"
msgstr "Appliquer (F5)"
#: gitk:4354
#: gitk:4373
msgid "Error in commit selection arguments:"
msgstr "Erreur dans les arguments de sélection des commits :"
#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
msgid "None"
msgstr "Aucun"
#: gitk:5021 gitk:5026
#: gitk:5040 gitk:5045
msgid "Descendant"
msgstr "Descendant"
#: gitk:5022
#: gitk:5041
msgid "Not descendant"
msgstr "Pas un descendant"
#: gitk:5029 gitk:5034
#: gitk:5048 gitk:5053
msgid "Ancestor"
msgstr "Ancêtre"
#: gitk:5030
#: gitk:5049
msgid "Not ancestor"
msgstr "Pas un ancêtre"
#: gitk:5324
#: gitk:5343
msgid "Local changes checked in to index but not committed"
msgstr "Modifications locales enregistrées dans l'index mais non commitées"
msgstr "Modifications locales enregistrées dans l'index mais non validées"
#: gitk:5360
#: gitk:5379
msgid "Local uncommitted changes, not checked in to index"
msgstr "Modifications locales non enregistrées dans l'index et non commitées"
msgstr "Modifications locales non enregistrées dans l'index et non validées"
#: gitk:7134
#: gitk:7153
msgid "and many more"
msgstr ""
msgstr "et beaucoup plus"
#: gitk:7137
#: gitk:7156
msgid "many"
msgstr "nombreux"
#: gitk:7328
#: gitk:7347
msgid "Tags:"
msgstr "Tags :"
msgstr "Étiquettes :"
#: gitk:7345 gitk:7351 gitk:8825
#: gitk:7364 gitk:7370 gitk:8844
msgid "Parent"
msgstr "Parent"
#: gitk:7356
#: gitk:7375
msgid "Child"
msgstr "Enfant"
#: gitk:7365
#: gitk:7384
msgid "Branch"
msgstr "Branche"
#: gitk:7368
#: gitk:7387
msgid "Follows"
msgstr "Suit"
#: gitk:7371
#: gitk:7390
msgid "Precedes"
msgstr "Précède"
#: gitk:7966
#: gitk:7985
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Erreur lors de la récupération des diff : %s"
#: gitk:8650
#: gitk:8669
msgid "Goto:"
msgstr "Aller à :"
#: gitk:8671
#: gitk:8690
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Id SHA1 court %s est ambigu"
msgstr "L'id SHA1 court %s est ambigu"
#: gitk:8678
#: gitk:8697
#, tcl-format
msgid "Revision %s is not known"
msgstr "Id SHA1 %s est inconnu"
msgstr "La révision %s est inconnu"
#: gitk:8688
#: gitk:8707
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "Id SHA1 %s est inconnu"
msgstr "L'id SHA1 %s est inconnu"
#: gitk:8690
#: gitk:8709
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "La révision %s n'est pas dans la vue courante"
#: gitk:8832 gitk:8847
#: gitk:8851 gitk:8866
msgid "Date"
msgstr "Date"
#: gitk:8835
#: gitk:8854
msgid "Children"
msgstr "Enfants"
#: gitk:8898
#: gitk:8917
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Réinitialiser la branche %s vers cet état"
#: gitk:8900
#: gitk:8919
msgid "Detached head: can't reset"
msgstr "Head détaché : impossible de réinitialiser"
#: gitk:9005 gitk:9011
#: gitk:9024 gitk:9030
msgid "Skipping merge commit "
msgstr "Éviter le commit de la fusion "
#: gitk:9020 gitk:9025
#: gitk:9039 gitk:9044
msgid "Error getting patch ID for "
msgstr "Erreur à l'obtention de l'ID du patch pour "
#: gitk:9021 gitk:9026
#: gitk:9040 gitk:9045
msgid " - stopping\n"
msgstr " - arrêt en cours\n"
#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
msgid "Commit "
msgstr "Commit "
#: gitk:9035
#: gitk:9054
msgid ""
" is the same patch as\n"
" "
@ -911,7 +911,7 @@ msgstr ""
"est le même patch que \n"
" "
#: gitk:9043
#: gitk:9062
msgid ""
" differs from\n"
" "
@ -919,240 +919,226 @@ msgstr ""
" diffère de\n"
" "
#: gitk:9045
#: gitk:9064
msgid ""
"Diff of commits:\n"
"\n"
msgstr ""
msgstr "Diff des commits :\n\n"
#: gitk:9057 gitk:9066
#: gitk:9076 gitk:9085
#, tcl-format
msgid " has %s children - stopping\n"
msgstr "a %s enfants - arrêt en cours\n"
msgstr " a %s enfants - arrêt en cours\n"
#: gitk:9085
#, fuzzy, tcl-format
#: gitk:9104
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Erreur à l'ecriture du commit :"
msgstr "Erreur à l'écriture du commit dans le fichier : %s"
#: gitk:9091
#, fuzzy, tcl-format
#: gitk:9110
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "Erreur à l'ecriture du commit :"
msgstr "Erreur à la différence des commits : %s"
#: gitk:9137
#: gitk:9156
msgid "Top"
msgstr "Haut"
#: gitk:9138
#: gitk:9157
msgid "From"
msgstr "De"
#: gitk:9143
#: gitk:9162
msgid "To"
msgstr "À"
#: gitk:9167
#: gitk:9186
msgid "Generate patch"
msgstr "Générer le patch"
#: gitk:9169
#: gitk:9188
msgid "From:"
msgstr "De :"
#: gitk:9178
#: gitk:9197
msgid "To:"
msgstr "À :"
#: gitk:9187
#: gitk:9206
msgid "Reverse"
msgstr "Inverser"
#: gitk:9189 gitk:9385
#: gitk:9208 gitk:9418
msgid "Output file:"
msgstr "Fichier de sortie :"
#: gitk:9195
#: gitk:9214
msgid "Generate"
msgstr "Générer"
#: gitk:9233
#: gitk:9252
msgid "Error creating patch:"
msgstr "Erreur à la création du patch :"
#: gitk:9256 gitk:9373 gitk:9430
#: gitk:9275 gitk:9406 gitk:9463
msgid "ID:"
msgstr "ID :"
#: gitk:9265
#: gitk:9284
msgid "Tag name:"
msgstr "Nom du Tag :"
msgstr "Nom de l'étiquette :"
#: gitk:9268
#: gitk:9287
msgid "Tag message is optional"
msgstr ""
msgstr "Le message d'étiquette est optionnel"
#: gitk:9270
#, fuzzy
#: gitk:9289
msgid "Tag message:"
msgstr "Nom du Tag :"
msgstr "Message d'étiquette :"
#: gitk:9274 gitk:9439
#: gitk:9293 gitk:9472
msgid "Create"
msgstr "Créer"
#: gitk:9292
#: gitk:9311
msgid "No tag name specified"
msgstr "Aucun nom de tag spécifié"
msgstr "Aucun nom d'étiquette spécifié"
#: gitk:9296
#: gitk:9315
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Le tag \"%s\" existe déjà"
msgstr "L'étiquette \"%s\" existe déjà"
#: gitk:9306
#: gitk:9325
msgid "Error creating tag:"
msgstr "Erreur à la création du tag :"
msgstr "Erreur à la création de l'étiquette :"
#: gitk:9382
#: gitk:9415
msgid "Command:"
msgstr "Commande :"
#: gitk:9390
#: gitk:9423
msgid "Write"
msgstr "Écrire"
#: gitk:9408
#: gitk:9441
msgid "Error writing commit:"
msgstr "Erreur à l'ecriture du commit :"
#: gitk:9435
#: gitk:9468
msgid "Name:"
msgstr "Nom :"
#: gitk:9458
#: gitk:9491
msgid "Please specify a name for the new branch"
msgstr "Veuillez spécifier un nom pour la nouvelle branche"
#: gitk:9463
#: gitk:9496
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "La branche '%s' existe déjà. Écraser?"
#: gitk:9530
#: gitk:9563
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr ""
"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
"tout?"
#: gitk:9535
#: gitk:9568
msgid "Cherry-picking"
msgstr "Cueillir (Cherry-picking)"
msgstr "Picorer (Cherry-picking)"
#: gitk:9544
#: gitk:9577
#, tcl-format
msgid ""
"Cherry-pick failed because of local changes to file '%s'.\n"
"Please commit, reset or stash your changes and try again."
msgstr ""
"La cueillette (cherry-pick) a échouée à cause de modifications locales du "
"fichier '%s'.\n"
"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
"nouveau."
"Le picorage (cherry-pick) a échouée à cause de modifications locales du fichier '%s'.\n"
"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de nouveau."
#: gitk:9550
#: gitk:9583
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
msgstr ""
"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une "
"fusion.\n"
"Le picorage (cherry-pick) a échouée à cause d'un conflit lors d'une fusion.\n"
"Souhaitez-vous exécuter git citool pour le résoudre ?"
#: gitk:9566 gitk:9624
#: gitk:9599 gitk:9657
msgid "No changes committed"
msgstr "Aucun changement commité"
msgstr "Aucune modification validée"
#: gitk:9593
#, fuzzy, tcl-format
#: gitk:9626
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr ""
"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré "
"tout?"
msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?"
#: gitk:9598
#, fuzzy
#: gitk:9631
msgid "Reverting"
msgstr "Réinitialisation"
msgstr "Commit défait"
#: gitk:9606
#, fuzzy, tcl-format
#: gitk:9639
#, tcl-format
msgid ""
"Revert failed because of local changes to the following files:%s Please "
"commit, reset or stash your changes and try again."
msgstr ""
"La cueillette (cherry-pick) a échouée à cause de modifications locales du "
"fichier '%s'.\n"
"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de "
"nouveau."
msgstr "Échec en tentant de défaire le commit à cause de modifications locales des fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications et essayer de nouveau."
#: gitk:9610
#, fuzzy
#: gitk:9643
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
msgstr ""
"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une "
"fusion.\n"
"Échec en tentant de défaire à cause d'un conflit de fusion.\n"
"Souhaitez-vous exécuter git citool pour le résoudre ?"
#: gitk:9653
#: gitk:9686
msgid "Confirm reset"
msgstr "Confirmer la réinitialisation"
#: gitk:9655
#: gitk:9688
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Réinitialiser la branche %s à %s?"
#: gitk:9657
#: gitk:9690
msgid "Reset type:"
msgstr "Type de réinitialisation :"
#: gitk:9660
#: gitk:9693
msgid "Soft: Leave working tree and index untouched"
msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
#: gitk:9663
#: gitk:9696
msgid "Mixed: Leave working tree untouched, reset index"
msgstr ""
"Hybride : Laisse le répertoire de travail dans son état courant, "
"réinitialise l'index"
#: gitk:9666
#: gitk:9699
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr ""
"Dure : Réinitialise le répertoire de travail et l'index\n"
"(abandonne TOUS les changements locaux)"
"(abandonne TOUTES les modifications locale)"
#: gitk:9683
#: gitk:9716
msgid "Resetting"
msgstr "Réinitialisation"
# Fixme: Récupération est-il vraiment une mauvaise traduction?
#: gitk:9743
#, fuzzy
#: gitk:9776
msgid "Checking out"
msgstr "Récupération"
msgstr "Extraction"
#: gitk:9796
#: gitk:9829
msgid "Cannot delete the currently checked-out branch"
msgstr "Impossible de supprimer la branche en cours"
msgstr "Impossible de supprimer la branche extraite"
#: gitk:9802
#: gitk:9835
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@ -1161,16 +1147,16 @@ msgstr ""
"Les commits de la branche %s ne sont dans aucune autre branche.\n"
"Voulez-vous vraiment supprimer cette branche %s ?"
#: gitk:9833
#: gitk:9866
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Tags et heads : %s"
msgstr "Étiquettes et heads : %s"
#: gitk:9850
#: gitk:9883
msgid "Filter"
msgstr "Filtrer"
#: gitk:10146
#: gitk:10179
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@ -1179,207 +1165,202 @@ msgstr ""
"informations sur les branches et les tags précédents/suivants seront "
"incomplètes."
#: gitk:11123
#: gitk:11156
msgid "Tag"
msgstr "Tag"
msgstr "Étiquette"
#: gitk:11127
#: gitk:11160
msgid "Id"
msgstr "Id"
#: gitk:11210
#: gitk:11243
msgid "Gitk font chooser"
msgstr "Sélecteur de police de Gitk"
#: gitk:11227
#: gitk:11260
msgid "B"
msgstr "B"
#: gitk:11230
#: gitk:11263
msgid "I"
msgstr "I"
#: gitk:11348
#: gitk:11381
msgid "Commit list display options"
msgstr "Options d'affichage de la liste des commits"
#: gitk:11351
#: gitk:11384
msgid "Maximum graph width (lines)"
msgstr "Longueur maximum du graphe (lignes)"
# FIXME : Traduction standard de "pane"?
#: gitk:11355
#, fuzzy, no-tcl-format
#: gitk:11388
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Longueur maximum du graphe (% du panneau)"
msgstr "Largeur maximum du graphe (% du panneau)"
#: gitk:11358
#: gitk:11391
msgid "Show local changes"
msgstr "Montrer les changements locaux"
msgstr "Montrer les modifications locales"
#: gitk:11361
#, fuzzy
#: gitk:11394
msgid "Auto-select SHA1 (length)"
msgstr "Sélection auto. du SHA1"
msgstr "Sélection auto. du SHA1 (longueur)"
#: gitk:11365
#: gitk:11398
msgid "Hide remote refs"
msgstr "Cacher les refs distantes"
#: gitk:11369
#: gitk:11402
msgid "Diff display options"
msgstr "Options d'affichage des diff"
#: gitk:11371
#: gitk:11404
msgid "Tab spacing"
msgstr "Taille des tabulations"
#: gitk:11374
#, fuzzy
#: gitk:11407
msgid "Display nearby tags/heads"
msgstr "Afficher les tags les plus proches"
#: gitk:11377
#: gitk:11410
msgid "Maximum # tags/heads to show"
msgstr ""
msgstr "Nombre maximum d'étiquettes/heads à afficher"
#: gitk:11380
#: gitk:11413
msgid "Limit diffs to listed paths"
msgstr "Limiter les différences aux chemins listés"
#: gitk:11383
#: gitk:11416
msgid "Support per-file encodings"
msgstr "Support pour un encodage des caractères par fichier"
#: gitk:11389 gitk:11536
#: gitk:11422 gitk:11569
msgid "External diff tool"
msgstr "Outil diff externe"
#: gitk:11390
#: gitk:11423
msgid "Choose..."
msgstr "Choisir..."
#: gitk:11395
#, fuzzy
#: gitk:11428
msgid "General options"
msgstr "Générer le patch"
msgstr "Options générales"
#: gitk:11398
#: gitk:11431
msgid "Use themed widgets"
msgstr ""
msgstr "Utiliser des widgets en thème"
#: gitk:11400
#: gitk:11433
msgid "(change requires restart)"
msgstr ""
msgstr "(la modification nécessite un redémarrage)"
#: gitk:11402
#: gitk:11435
msgid "(currently unavailable)"
msgstr ""
msgstr "(non disponible actuellement)"
#: gitk:11413
#: gitk:11446
msgid "Colors: press to choose"
msgstr "Couleurs : cliquer pour choisir"
#: gitk:11416
#: gitk:11449
msgid "Interface"
msgstr ""
msgstr "Interface"
#: gitk:11417
#, fuzzy
#: gitk:11450
msgid "interface"
msgstr "Police de l'interface utilisateur"
msgstr "interface"
#: gitk:11420
#: gitk:11453
msgid "Background"
msgstr "Arrière-plan"
#: gitk:11421 gitk:11451
#: gitk:11454 gitk:11484
msgid "background"
msgstr "arrière-plan"
#: gitk:11424
#: gitk:11457
msgid "Foreground"
msgstr "Premier plan"
#: gitk:11425
#: gitk:11458
msgid "foreground"
msgstr "premier plan"
#: gitk:11428
#: gitk:11461
msgid "Diff: old lines"
msgstr "Diff : anciennes lignes"
#: gitk:11429
#: gitk:11462
msgid "diff old lines"
msgstr "diff anciennes lignes"
#: gitk:11433
#: gitk:11466
msgid "Diff: new lines"
msgstr "Diff : nouvelles lignes"
#: gitk:11434
#: gitk:11467
msgid "diff new lines"
msgstr "diff nouvelles lignes"
#: gitk:11438
#: gitk:11471
msgid "Diff: hunk header"
msgstr "Diff : entête du hunk"
#: gitk:11440
#: gitk:11473
msgid "diff hunk header"
msgstr "diff : entête du hunk"
#: gitk:11444
#: gitk:11477
msgid "Marked line bg"
msgstr "Arrière-plan de la ligne marquée"
msgstr "Fond de la ligne marquée"
#: gitk:11446
#: gitk:11479
msgid "marked line background"
msgstr "Arrière-plan de la ligne marquée"
msgstr "Fond de la ligne marquée"
#: gitk:11450
#: gitk:11483
msgid "Select bg"
msgstr "Sélectionner l'arrière-plan"
msgstr "Sélectionner le fond"
#: gitk:11459
#: gitk:11492
msgid "Fonts: press to choose"
msgstr "Polices : cliquer pour choisir"
#: gitk:11461
#: gitk:11494
msgid "Main font"
msgstr "Police principale"
#: gitk:11462
#: gitk:11495
msgid "Diff display font"
msgstr "Police d'affichage des diff"
#: gitk:11463
#: gitk:11496
msgid "User interface font"
msgstr "Police de l'interface utilisateur"
#: gitk:11485
#: gitk:11518
msgid "Gitk preferences"
msgstr "Préférences de Gitk"
#: gitk:11494
#, fuzzy
#: gitk:11527
msgid "General"
msgstr "Générer"
msgstr "Général"
#: gitk:11495
#: gitk:11528
msgid "Colors"
msgstr ""
msgstr "Couleurs"
#: gitk:11496
#: gitk:11529
msgid "Fonts"
msgstr ""
msgstr "Polices"
#: gitk:11546
#: gitk:11579
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk : choisir la couleur de %s"
#: gitk:12059
#: gitk:12092
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
@ -1387,16 +1368,16 @@ msgstr ""
"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n"
" Gitk requiert Tcl/Tk version 8.4 ou supérieur."
#: gitk:12269
#: gitk:12302
msgid "Cannot find a git repository here."
msgstr "Impossible de trouver un dépôt git ici."
#: gitk:12316
#: gitk:12349
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier"
#: gitk:12328
#: gitk:12361
msgid "Bad arguments to gitk:"
msgstr "Arguments invalides pour gitk :"