--- /dev/null
- # Copyright (C) 2014 Alexander Shopov <ash@kambanaria.org>.
+# Bulgarian translation of gitk po-file.
- # Alexander Shopov <ash@kambanaria.org>, 2014.
++# Copyright (C) 2014, 2015 Alexander Shopov <ash@kambanaria.org>.
+# This file is distributed under the same license as the git package.
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
- "PO-Revision-Date: 2014-07-28 07:32+0300\n"
++# Alexander Shopov <ash@kambanaria.org>, 2014, 2015.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk master\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-06-27 20:44+0300\n"
++"PO-Revision-Date: 2015-06-27 20:46+0300\n"
+"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "Списъкът с неслети файлове не може да бъде получен:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr "Оцветяване на думите"
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr "Отбелязване на думите"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Грешка при разбор на версиите:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Грешка при изпълнение на командата с „--argscmd“."
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове "
+"в ограниченията."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Грешка при изпълнение на „git log“:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Прочитане"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Прочитане на подаванията…"
+
- #: gitk:1897
- msgid "mc"
- msgstr "mc"
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Не са избрани подавания"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Команден ред"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Изходът от „git log“ не може да се анализира:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Липсва информация за подавания"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "Добре"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Отказ"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Обновяване"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Презареждане"
+
+#: gitk:2071
+msgid "Reread references"
+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 "Редактиране"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Нов изглед…"
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Редактиране на изгледа…"
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Изтриване на изгледа"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Всички файлове"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Изглед"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "Относно gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Клавишни комбинации"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Помощ"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "SHA1:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Ред"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Търсене"
+
+#: gitk:2295
+msgid "commit"
+msgstr "подаване"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "съдържащо:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "засягащо пътищата:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "добавящо/премахващо низ"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr "променящо редове напасващи:"
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Точно"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "Без регистър"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "Рег. израз"
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Всички полета"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Първи ред"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Коментари"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Автор"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Подаващ"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Търсене"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "Разлики"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Стара версия"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Нова версия"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Контекст в редове"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Празните знаци без значение"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr "Поредови разлики"
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Кръпка"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Дърво"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Разлики между това и избраното"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Разлики между избраното и това"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Създаване на кръпка"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Създаване на етикет"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Запазване на подаването във файл"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Създаване на нов клон"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Отбиране на това подаване"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Привеждане на върха на клона към текущото подаване"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Отбелязване на това подаване"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Връщане към отбелязаното подаване"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Откриване и отбелязване на наследниците"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "Сравнение с отбелязаното подаване"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+msgid "Diff this -> marked commit"
+msgstr "Разлики между това и отбелязаното"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+msgid "Diff marked commit -> this"
+msgstr "Разлики между отбелязаното и това"
+
- #: gitk:2646
++#: gitk:2631
+msgid "Revert this commit"
+msgstr "Отмяна на това подаване"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Изтегляне на този клон"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Изтриване на този клон"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr "Копиране на името на клона"
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Отбелязване и на това"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Отбелязване само на това"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Външна програма за разлики"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Анотиране на родителското подаване"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr "Копиране на пътя"
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Показване на произхода на този ред"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Изпълнение на „git gui blame“ върху този ред"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk — визуализация на подаванията в Git\n"
+"\n"
+"Авторски права: © 2005-2014 Paul Mackerras\n"
+"\n"
+"Използвайте и разпространявайте при условията на ОПЛ на ГНУ"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Затваряне"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Клавишни комбинации"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Клавишни комбинации:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tСпиране на програмата"
+
- #: gitk:3047
++#: gitk:3049
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\tЗатваряне на прозореца"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\tКъм първото подаване"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\tКъм последното подаване"
+
- #: gitk:3050
++#: gitk:3052
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Up>, p, k\tЕдно подаване нагоре"
+
- #: gitk:3051
++#: gitk:3053
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Down>, n, j\tЕдно подаване надолу"
+
- #: gitk:3052
++#: gitk:3054
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Left>, z, h\tНазад в историята"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Right>, x, l\tНапред в историята"
+
- msgstr ""
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
- #: gitk:3054
++msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята"
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tСтраница надолу в списъка с подаванията"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\tКъм началото на списъка с подаванията"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tКъм края на списъка с подаванията"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\tРед нагоре в списъка с подавания"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\tРед надолу в списъка с подавания"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr ""
+"<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tСтраница надолу в изгледа за разлики"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Space>\t\tСтраница надолу в изгледа за разлики"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\t18 реда нагоре в изгледа за разлики"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\t18 реда надолу в изгледа за разлики"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tТърсене"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tКъм следващата поява"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\tКъм следващата поява"
+
- #: gitk:3073
++#: gitk:3075
++msgid "g\t\tGo to commit"
++msgstr "g\t\tКъм последното подаване"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tФокус върху полето за търсене"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tКъм предишната поява"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tСледващ файл в изгледа за разлики"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tПо-голям размер на шрифта"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tПо-голям размер на шрифта"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tПо-малък размер на шрифта"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tПо-малък размер на шрифта"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tОбновяване"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Грешка при създаването на временната директория „%s“:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Грешка при получаването на „%s“ от %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "неуспешно изпълнение на команда:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Такова подаване няма"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "„git gui blame“: неуспешно изпълнение на команда:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Върхът за сливане не може да бъде прочетен: %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Грешка при прочитане на индекса: %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "Командата „git blame“ не може да бъде стартирана: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Търсене"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Грешка при изпълнението на „git blame“: %s"
+
- msgstr "Този ред идва от подаването %s, което не е в изгледа"
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
- #: gitk:3935
++msgstr "Този ред идва от подаването %s, което не е в изгледа"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Неуспешно изпълнение на външната програма за разлики:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Дефиниция на изглед в Gitk"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Запазване на този изглед"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Указатели (списък с разделител интервал):"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Клони и етикети:"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Всички указатели"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Всички (локални) клони"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Всички етикети"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Всички следящи клони"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Информация за подаване (рег. изр.):"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Автор:"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Подал:"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Съобщение при подаване:"
+
- msgstr "Съвпадение по коя да е информация за подаването"
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
- #: gitk:4069
- #, fuzzy
- msgid "Matches none Commit Info criteria"
- msgstr "Съвпадение по коя да е информация за подаването"
++msgstr "Съвпадение по всички характеристики на подаването"
+
- #: gitk:4070
++#: gitk:4086
++msgid "Matches no Commit Info criteria"
++msgstr "Не съвпада по никоя от характеристиките на подаването"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Промени по файловете:"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Дословен низ"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Регулярен израз"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Низ за търсене:"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, "
+"„March 17, 2009 15:27:38“):"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "От:"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "До:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr ""
+"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло "
+"число):"
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Брой показани:"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Брой прескочени:"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Разни:"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Подреждане по дата"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Отбелязване на страните по клона"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Само първия родител"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Опростена история"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Допълнителни аргументи към „git log“:"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Въведете файловете и директориите за включване, по елемент на ред"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr ""
+"Команда за генерирането на допълнителни подавания, които да бъдат включени:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk: редактиране на изглед"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr "— критерии за избор на версии"
+
- #: gitk:4299
++#: gitk:4241
+msgid "View Name"
+msgstr "Име на изглед"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Прилагане (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Грешка в аргументите за избор на подавания:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Няма"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Наследник"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Не е наследник"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Предшественик"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Не е предшественик"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Локални промени добавени към индекса, но неподадени"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Локални промени извън индекса"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr "и още много"
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "много"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Етикети:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Родител"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Дете"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Клон"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Следва"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Предшества"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Грешка при получаването на разликите: %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Към ред:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Съкратената сума по SHA1 %s не е еднозначна"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Непозната версия %s"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "Непозната сума по SHA1 %s"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "Версия %s не е в текущия изглед"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Дата"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Деца"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Зануляване на клона „%s“ към текущото подаване"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Несвързан връх: невъзможно зануляване"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Пропускане на подаването на сливането"
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Грешка при получаването на идентификатора на "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " — спиране\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "Подаване"
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+" е същата кръпка като\n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" се различава от\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Разлика между подаванията:\n"
+"\n"
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr " има %s деца — спиране\n"
+
- #: gitk:9072
++#: gitk:9085
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Грешка при запазването на подаването във файл: %s"
+
- #: gitk:9118
++#: gitk:9091
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Грешка при изчисляването на разликите между подаванията: %s"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Най-горе"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "От"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "До"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Генериране на кръпка"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "От:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "До:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Обръщане"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Запазване във файла:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Генериране"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Грешка при създаването на кръпка:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "Идентификатор:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Име на етикет:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr "Съобщението за етикет е незадължително"
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+msgid "Tag message:"
+msgstr "Съобщение за етикет:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Създаване"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Липсва име на етикет"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Етикетът „%s“ вече съществува"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Грешка при създаването на етикет:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Команда:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Запазване"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Грешка при запазването на подаването:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Име:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Укажете име за новия клон"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr ""
+"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Отбиране"
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"Неуспешно отбиране, защото във файла „%s“ има локални промени.\n"
+"Подайте, занулете или ги скатайте и пробвайте отново."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"Неуспешно отбиране поради конфликти при сливане.\n"
+"Искате ли да ги коригирате чрез „git citool“?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Не са подадени промени"
+
- #: gitk:9579
++#: gitk:9593
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?"
+
- #: gitk:9587
++#: gitk:9598
+msgid "Reverting"
+msgstr "Отмяна"
+
- #: gitk:9591
++#: gitk:9606
+#, 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 ""
+"Неуспешна отмяна, защото във файла „%s“ има локални промени.\n"
+"Подайте, занулете или ги скатайте и пробвайте отново.<"
+
- #: gitk:9634
++#: gitk:9610
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+"Неуспешно отмяна поради конфликти при сливане.\n"
+"Искате ли да ги коригирате чрез „git citool“?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Потвърждаване на зануляването"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Да се занули ли клонът „%s“ към „%s“?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Вид зануляване:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Слабо: работното дърво и индекса остават същите"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "Смесено: работното дърво остава същото, индексът се занулява"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Силно: зануляване и на работното дърво, и на индекса\n"
+"(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Зануляване"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Изтегляне"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Текущо изтегленият клон не може да бъде изтрит"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Подаванията на клона „%s“ не са на никой друг клон.\n"
+"Наистина ли да се изтрие клонът „%s“?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Етикети и върхове: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Филтриране"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Грешка при прочитането на топологията на подаванията. Информацията за клона "
+"и предшестващите/следващите етикети ще е непълна."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Етикет"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Идентификатор"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Избор на шрифт за Gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "Ч"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "К"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Настройки на списъка с подавания"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Максимална широчина на графа (в редове)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Максимална широчина на графа (% от панела)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Показване на локалните промени"
+
- #: gitk:11344
++#: gitk:11361
+msgid "Auto-select SHA1 (length)"
+msgstr "Автоматично избиране на SHA1 (дължина)"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Скриване на отдалечените указатели"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Настройки на показването на разликите"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Широчина на табулатора"
+
- #: gitk:11356
++#: gitk:11374
+msgid "Display nearby tags/heads"
+msgstr "Извеждане на близките етикети и върхове"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr "Максимален брой етикети/върхове за показване"
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Разлика само в избраните пътища"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Поддръжка на различни кодирания за всеки файл"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Външен инструмент за разлики"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Избор…"
+
- #: gitk:11377
++#: gitk:11395
+msgid "General options"
+msgstr "Общи настройки"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr "Използване на тема за графичните обекти"
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr "(промяната изисква рестартиране на Gitk)"
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr "(в момента недостъпно)"
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Цветове: избира се с натискане"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr "Интерфейс"
+
- #: gitk:11399
++#: gitk:11417
+msgid "interface"
+msgstr "интерфейс"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Фон"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "фон"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Знаци"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "знаци"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Разлика: стари редове"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "разлика, стари редове"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Разлика: нови редове"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "разлика, нови редове"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Разлика: начало на парче"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "разлика, начало на парче"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Фон на отбелязан ред"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "фон на отбелязан ред"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Избор на фон"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Шрифтове: избира се с натискане"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Основен шрифт"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Шрифт за разликите"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Шрифт на интерфейса"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Настройки на Gitk"
+
- #: gitk:11474
++#: gitk:11494
+msgid "General"
+msgstr "Общи"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr "Цветове"
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr "Шрифтове"
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: избор на цвят на „%s“"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++"Тази версия на Tcl/Tk не се поддържа от Gitk.\n"
++" Необходима ви е поне Tcl/Tk 8.4."
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "Тук липсва хранилище на Git."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл"
+
-
- #: gitk:12405
- msgid "Command line"
- msgstr "Команден ред"
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Неправилни аргументи на gitk:"
--- /dev/null
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
+# Translation of gitk
+# Copyright (C) 2005-2014 Paul Mackerras
+# This file is distributed under the same license as the gitk package.
+# Alex Henrie <alexhenrie24@gmail.com>, 2015.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-05-17 14:32+1000\n"
+"PO-Revision-Date: 2015-02-01 22:49-0700\n"
+"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n"
+"Language-Team: Catalan\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.7.3\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr "Colora les paraules"
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr "Marca les paraules"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Error en analitzar les revisions:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Error en executar l'ordre --argscmd:"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està "
+"sense fusionar."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer "
+"sense fusionar està dins del límit de fitxers."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Error en executar git log:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Llegint"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Llegint les revisions..."
+
- #: gitk:1897
- msgid "mc"
- msgstr "mc"
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Cap comissió seleccionada"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Línia d'ordres"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "No es pot analitzar la sortida del git log:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Cap informació de comissió disponible"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "D'acord"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Cancel·la"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Actualitza"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Recarrega"
+
+#: gitk:2071
+msgid "Reread references"
+msgstr "Rellegeix les referències"
+
+#: gitk:2072
+msgid "List references"
+msgstr "Llista les referències"
+
+#: gitk:2074
+msgid "Start git gui"
+msgstr "Inicia el git gui"
+
+#: gitk:2076
+msgid "Quit"
+msgstr "Surt"
+
+#: gitk:2068
+msgid "File"
+msgstr "Fitxer"
+
+#: gitk:2080
+msgid "Preferences"
+msgstr "Preferències"
+
+#: gitk:2079
+msgid "Edit"
+msgstr "Edita"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Vista nova..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Edita la vista..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Suprimeix vista"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Tots els fitxers"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Vista"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "Quant al gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Associacions de tecles"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Ajuda"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "ID SHA1:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Fila"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Cerca"
+
+#: gitk:2295
+msgid "commit"
+msgstr "comissió"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "que contingui:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "que toqui els camins:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "que afegeixi/elimini la cadena:"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr "que tingui línies canviades coincidents amb:"
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Exacte"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "Ignora majúscula i minúscula"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "Regexp"
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Tots els camps"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Titular"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Comentaris"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Autor"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Comitent"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Cerca"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "Diferència"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Versió antiga"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Versió nova"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Línies de context"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Ignora canvis d'espai"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr "Diferència de línies"
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Pedaç"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Arbre"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Diferencia aquesta -> la seleccionada"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Diferencia la seleccionada -> aquesta"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Fes pedaç"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Crea etiqueta"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Escriu la comissió a un fitxer"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Crea una branca nova"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Recull aquesta comissió com a cirera"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Restableix la branca HEAD aquí"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Marca aquesta comissió"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Torna a la marca"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Troba la descendent d'aquesta i marca-la"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "Compara amb la comissió marcada"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+msgid "Diff this -> marked commit"
+msgstr "Diferencia aquesta -> la comissió marcada"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+msgid "Diff marked commit -> this"
+msgstr "Diferencia la comissió seleccionada -> aquesta"
+
- #: gitk:2646
++#: gitk:2631
+msgid "Revert this commit"
+msgstr "Reverteix aquesta comissió"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Agafa aquesta branca"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Elimina aquesta branca"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Ressalta aquest també"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Ressalta només aquest"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Diferència externa"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Culpabilitat de la comissió mare"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Mostra l'origen d'aquesta línia"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Executa git gui blame en aquesta línia"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - visualitzador de comissions per al git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Tanca"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Associacions de tecles del Gitk"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Associacions de tecles del Gitk:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tSurt"
+
- #: gitk:3047
++#: gitk:3049
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\tTanca la finestra"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Inici>\t\tVés a la primera comissió"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<Fi>\t\tVés a l'última comissió"
+
- #: gitk:3050
++#: gitk:3052
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Amunt>, p, k\tMou-te una comissió amunt"
+
- #: gitk:3051
++#: gitk:3053
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Avall>, n, j\tMou-te una comissió avall"
+
- #: gitk:3052
++#: gitk:3054
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Dreta>, x, l\tAvança en la llista d'història"
+
- #: gitk:3054
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+"<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història"
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<RePàg>\tBaixa una pàgina en la llista de comissions"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<AvPàg>\tBaixa per una pàgina en la llista de comissions"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Amunt>\tDesplaça la llista de comissions una línia cap amunt"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Avall>\tDesplaça la llista de comissions una línia cap avall"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-RePàg>\tDesplaça la llista de comissions amunt per una pàgina"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-AvPàg>\tDesplaça la llista de comissions una pàgina cap avall"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Maj-Amunt>\tCerca cap enrere (amunt, les comissions més noves)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Maj-Avall>\tCerca cap endavant (avall, les comissions més velles)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Supr>, b\tDesplaça la vista de diferència una pàgina cap amunt"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Retrocés>\tDesplaça la vista de diferència una pàgina cap amunt"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Espai>\t\tDesplaça la vista de diferència una pàgina cap avall"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tDesplaça la vista de diferència 18 línies cap amunt"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tDesplaça la vista de diferència 18 línies cap avall "
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tCerca"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Retorn>\tMou-te a la propera coincidència de la cerca"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<Fi>\t\tVés a l'última comissió"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tPosa el focus a la caixa de cerca"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tMou a la coincidència prèvia de la cerca"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tDesplaça la vista de diferència al proper fitxer"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tAugmenta la mida de lletra"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-més>\tAugmenta la mida de lletra"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tDisminueix la mida de lletra"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-menys>\tDisminueix la mida de lletra"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tActualitza"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Error en crear el directori temporal %s:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Error en obtenir \"%s\" de %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "l'ordre ha fallat:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Cap comissió així"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame: l'ordre ha fallat:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "No s'ha pogut llegir el cap de fusió: %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Error en llegir l'índex: %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "No s'ha pogut iniciar el git blame: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Cercant"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Error en executar el git blame: %s"
+
- #: gitk:3935
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr ""
+"Aquella línia ve de la comissió %s, la qual no és en aquesta visualització"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "El visualitzador de diferència extern ha fallat:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Definició de vista del Gitk"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Recorda aquesta vista"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Referències (llista separada per espais)"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Branques i etiquetes:"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Totes les referències"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Totes les branques (locals)"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Totes les etiquetes"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Totes les branques amb seguiment remot"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Informació de comissió (expressions regulars):"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Autor:"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Comitent:"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Missatge de comissió:"
+
- #: gitk:4069
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr "Coincideix amb tots els criteris d'informació de comissió"
+
- msgid "Matches none Commit Info criteria"
++#: gitk:4086
+#, fuzzy
- #: gitk:4070
++msgid "Matches no Commit Info criteria"
+msgstr "Coincideix amb tots els criteris d'informació de comissió"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Canvis als fitxers:"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Cadena fixa"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Expressió regular"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Cadena de cerca:"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 "
+"15:27:38\"):"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "Des de:"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "Fins:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Limita o salta un nombre de revisions (nombre enter positiu)"
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Nombre a mostrar:"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Nombre a saltar:"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Opcions miscel·lànies:"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Ordena estrictament per data"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Marca els costats de les branques"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Limita a la primera mare"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Història senzilla"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Paràmetres addicionals al git log:"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Introduïu els fitxers i directoris a incloure, un per línia:"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Ordre per a generar més comissions a incloure:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk: vista d'edició"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr "-- criteris per a seleccionar les revisions"
+
- #: gitk:4299
++#: gitk:4241
+msgid "View Name"
+msgstr "Nom de vista"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Aplica (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Error en els paràmetres de selecció de comissions:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Cap"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Descendent"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "No descendent"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Avantpassat"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "No avantpassat"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Canvis locals registrats en l'índex però no comesos"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Canvis locals sense cometre, no registrats en l'índex"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr "i moltes més"
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "moltes"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Etiquetes:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Mare"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Filla"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Branca"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Segueix"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Precedeix"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Error en obtenir les diferències: %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Vés a:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "L'id SHA1 curta %s és ambigua"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "La revisió %s és desconeguda"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "L'id SHA1 %s és desconeguda"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "La revisió %s no és en la vista actual"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Data"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Filles"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Restableix la branca %s aquí"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Cap separat: no es pot restablir"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Saltant la comissió de fusió "
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Error en obtenir l'ID de pedaç de "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " - aturant\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "Comissió "
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+" és el mateix pedaç que\n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" difereix de\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Diferència entre comissions:\n"
+"\n"
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr " té %s filles - aturant\n"
+
- #: gitk:9072
++#: gitk:9085
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Error en escriure la comissió al fitxer: %s"
+
- #: gitk:9118
++#: gitk:9091
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Error en diferenciar les comissions: %s"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Part superior"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "De"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "A"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Genera pedaç"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "De:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "A:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Inverteix"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Fitxer de sortida:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Genera"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Error en crear el pedaç:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "ID:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Nom d'etiqueta:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr "El missatge d'etiqueta és opcional"
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+msgid "Tag message:"
+msgstr "Missatge d'etiqueta:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Crea"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "No s'ha especificat cap nom d'etiqueta"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "L'etiqueta \"%s\" ja existeix"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Error en crear l'etiqueta:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Ordre:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Escriu"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Error en escriure la comissió:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Nom:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Si us plau, especifiqueu un nom per a la branca nova"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "La branca '%s' ja existeix. Voleu sobreescriure?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr ""
+"La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a "
+"aplicar-la?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Recollint cireres"
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"El recull de cireres ha fallat a causa de canvis locals al fitxer '%s'.\n"
+"Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a "
+"intentar."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"El recull de cireres ha fallat a causa d'un conflicte de fusió.\n"
+"Voleu executar el git citool per a resoldre'l?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Cap canvi comès"
+
- #: gitk:9579
++#: gitk:9593
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr ""
+"La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?"
+
- #: gitk:9587
++#: gitk:9598
+msgid "Reverting"
+msgstr "Revertint"
+
- #: gitk:9591
++#: gitk:9606
+#, 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 reversió ha fallat a causa de canvis locals als fitxers següents:%s Si us "
+"plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a "
+"intentar."
+
- #: gitk:9634
++#: gitk:9610
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+"La reversió ha fallat a causa d'un conflicte de fusió.\n"
+" Voleu executar el git citool per a resoldre'l?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Confirma el restabliment"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Voleu restablir la branca %s a %s?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Tipus de restabliment:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Dur: Restableix l'arbre de treball i l'índex\n"
+"(descarta TOTS els canvis locals)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Restablint"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Agafant"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "No es pot suprimir la branca actualment agafada"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Les comissions en la branca %s no són en cap altra branca.\n"
+"Realment voleu suprimir la branca %s?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Etiquetes i caps: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Filtre"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Error en llegir la informació de topologia de comissió; la informació sobre "
+"branques i etiquetes precedents/següents serà incompleta."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Etiqueta"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Selector de tipus de lletra del Gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "B"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "I"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Opcions de visualització de la llista de comissions"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Amplada màxima del gràfic (línies)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Amplada màxima del gràfic (% del panell)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Mostra els canvis locals"
+
- #: gitk:11344
++#: gitk:11361
+msgid "Auto-select SHA1 (length)"
+msgstr "Selecciona automàticament l'SHA1 (longitud)"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Amaga les referències remotes"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Opcions de visualització de diferència"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Espaiat de tabulació"
+
- #: gitk:11356
++#: gitk:11374
+msgid "Display nearby tags/heads"
+msgstr "Mostra etiquetes/caps propers"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr "Nombre màxim d'etiquetes/caps a mostrar"
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Limita les diferències als camins llistats"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Admet codificacions específiques per a cada fitxer"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Eina de diferència externa"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Trieu..."
+
- #: gitk:11377
++#: gitk:11395
+msgid "General options"
+msgstr "Opcions generals"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr "Usa els ginys tematitzats"
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr "(el canvi requereix reiniciar)"
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr "(actualment no disponible)"
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Colors: pressiona per a triar"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr "Interfície"
+
- #: gitk:11399
++#: gitk:11417
+msgid "interface"
+msgstr "interfície"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Fons"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "fons"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Primer pla"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "primer pla"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Diferència: línies velles"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "diferencia les línies velles"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Diferència: línies noves"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "diferencia les línies noves"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Diferència: capçalera de tros"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "diferencia la capçalera de tros"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Fons de la línia marcada"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "fons de la línia marcada"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "fons de la selecció"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Tipus de lletra: pressiona per a triar"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Tipus de lletra principal"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Tipus de lletra de visualització de diferència"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Tipus de lletra de la interfície d'usuari"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Preferències del Gitk"
+
- #: gitk:11474
++#: gitk:11494
+msgid "General"
+msgstr "General"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr "Colors"
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr "Tipus de lletra"
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: tria el color per a %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "No es pot trobar cap dipòsit de git aquí."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer"
+
- #: gitk:12405
- msgid "Command line"
- msgstr "Línia d'ordres"
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Paràmetres dolents al gitk:"
+
++#~ msgid "mc"
++#~ msgstr "mc"
--- /dev/null
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
+# Translation of gitk to German.
+# Copyright (C) 2007 Paul Mackerras.
+# This file is distributed under the same license as the gitk package.
+#
+# Christian Stimming <stimming@tuhh.de>, 2007.
+# Frederik Schwarzer <schwarzerf@gmail.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: git-gui\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-05-17 14:32+1000\n"
+"PO-Revision-Date: 2010-01-27 20:27+0100\n"
+"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
+"Language-Team: German\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr ""
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr ""
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Fehler beim Laden der Versionen:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Fehler beim Ausführen des --argscmd-Kommandos:"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren "
+"keine nicht zusammengeführten Dateien."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine "
+"nicht zusammengeführten Dateien in der Dateiauswahl."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Fehler beim Ausführen von »git log«:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Lesen"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Versionen werden gelesen ..."
+
- #: gitk:1897
- msgid "mc"
- msgstr "mc"
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Keine Versionen ausgewählt"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Kommandozeile"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Ausgabe von »git log« kann nicht erkannt werden:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Keine Versionsinformation verfügbar"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "Ok"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Abbrechen"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Neu laden"
+
+#: gitk:2071
+msgid "Reread references"
+msgstr "Zweige neu laden"
+
+#: gitk:2072
+msgid "List references"
+msgstr "Zweige/Markierungen auflisten"
+
+#: gitk:2074
+msgid "Start git gui"
+msgstr "»git gui« starten"
+
+#: gitk:2076
+msgid "Quit"
+msgstr "Beenden"
+
+#: gitk:2068
+msgid "File"
+msgstr "Datei"
+
+#: gitk:2080
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: gitk:2079
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Neue Ansicht ..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Ansicht bearbeiten ..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Ansicht entfernen"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Alle Dateien"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Ansicht"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "Über gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Tastenkürzel"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Hilfe"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Zeile"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Suche"
+
+#: gitk:2295
+msgid "commit"
+msgstr "Version nach"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "Beschreibung:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "Dateien:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "Änderungen:"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr ""
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Exakt"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "Kein Groß/Klein"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "Regexp"
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Alle Felder"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Überschrift"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Beschreibung"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Autor"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Eintragender"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Suchen"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "Vergleich"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Alte Version"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Neue Version"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Kontextzeilen"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Leerzeichenänderungen ignorieren"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr ""
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Patch"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Baum"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Vergleich: diese -> gewählte"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Vergleich: gewählte -> diese"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Patch erstellen"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Markierung erstellen"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Version in Datei schreiben"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Neuen Zweig erstellen"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Diese Version pflücken"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "HEAD-Zweig auf diese Version zurücksetzen"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Lesezeichen setzen"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Zum Lesezeichen"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Abkömmling von Lesezeichen und dieser Version finden"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "Mit Lesezeichen vergleichen"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+#, fuzzy
+msgid "Diff this -> marked commit"
+msgstr "Vergleich: diese -> gewählte"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+#, fuzzy
+msgid "Diff marked commit -> this"
+msgstr "Vergleich: gewählte -> diese"
+
- #: gitk:2646
++#: gitk:2631
+#, fuzzy
+msgid "Revert this commit"
+msgstr "Lesezeichen setzen"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Auf diesen Zweig umstellen"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Zweig löschen"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Diesen auch hervorheben"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Nur diesen hervorheben"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Externes Diff-Programm"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Annotieren der Elternversion"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Herkunft dieser Zeile anzeigen"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Diese Zeile annotieren (»git gui blame«)"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+#, fuzzy
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - eine Visualisierung der Git-Historie\n"
+"\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"\n"
+"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
+"License"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Schließen"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Gitk-Tastaturbelegung"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Gitk-Tastaturbelegung:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tBeenden"
+
- #: gitk:3047
++#: gitk:3049
+#, fuzzy, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-F>\t\tSuchen"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Pos1>\t\tZur neuesten Version springen"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<Ende>\t\tZur ältesten Version springen"
+
- #: gitk:3050
++#: gitk:3052
+#, fuzzy
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Hoch>, p, i\tNächste neuere Version"
+
- #: gitk:3051
++#: gitk:3053
+#, fuzzy
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Runter>, n, k\tNächste ältere Version"
+
- #: gitk:3052
++#: gitk:3054
+#, fuzzy
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Links>, z, j\tEine Version zurückgehen"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Rechts>, x, l\tEine Version weitergehen"
+
- #: gitk:3054
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<BildHoch>\tEine Seite nach oben blättern"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<BildRunter>\tEine Seite nach unten blättern"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tSuchen"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tWeitersuchen"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Eingabetaste>\tWeitersuchen"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<Ende>\t\tZur ältesten Version springen"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tTastaturfokus ins Suchfeld"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tRückwärts weitersuchen"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tVergleich zur nächsten Datei blättern"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-Plus>\tSchrift vergrößern"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-Nummernblock-Minus> Schrift verkleinern"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-Minus>\tSchrift verkleinern"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tAktualisieren"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Fehler beim Holen von »%s« von »%s«:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "Kommando fehlgeschlagen:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Version nicht gefunden"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame: Kommando fehlgeschlagen:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "»git blame« konnte nicht gestartet werden: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Suchen"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Fehler beim Ausführen von »git blame«: %s"
+
- #: gitk:3935
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr ""
+"Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Externes Diff-Programm fehlgeschlagen:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Gitk-Ansichten"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Diese Ansicht speichern"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Zweige/Markierungen:"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Alle Markierungen und Zweige"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Alle (lokalen) Zweige"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Alle Markierungen"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Alle Übernahmezweige"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Versionsinformationen (reguläre Ausdrücke):"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Autor:"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Eintragender:"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Versionsbeschreibung:"
+
- #: gitk:4069
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr "Alle Versionsinformationen-Kriterien erfüllen"
+
- msgid "Matches none Commit Info criteria"
++#: gitk:4086
+#, fuzzy
- #: gitk:4070
++msgid "Matches no Commit Info criteria"
+msgstr "Alle Versionsinformationen-Kriterien erfüllen"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Dateien:"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Zeichenkette"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Regulärer Ausdruck"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Suchausdruck:"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "Von:"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "Bis:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):"
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Anzeigen:"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Überspringen:"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Sonstiges:"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Streng nach Datum sortieren"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Zweig-Seiten markieren"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Auf erste Elternversion beschränken"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Einfache Historie"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Zusätzliche Argumente für »git log«:"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk: Ansicht bearbeiten"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr "-- Auswahl der angezeigten Versionen"
+
- #: gitk:4299
++#: gitk:4241
+msgid "View Name"
+msgstr "Ansichtsname"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Anwenden (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Fehler in den ausgewählten Versionen:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Keine"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Abkömmling"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Kein Abkömmling"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Vorgänger"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Kein Vorgänger"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Lokale Änderungen, nicht bereitgestellt"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr ""
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "viele"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Markierungen:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Eltern"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Kind"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Zweig"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Folgt auf"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Vorgänger von"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Fehler beim Laden des Vergleichs: %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Gehe zu:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Version »%s« ist unbekannt"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "SHA1-Hashwert »%s« ist unbekannt"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Datum"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Kinder"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Zweig »%s« hierher zurücksetzen"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Überspringe Zusammenführungs-Version "
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Fehler beim Holen der Patch-ID für "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " - Abbruch.\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "Version "
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+" ist das gleiche Patch wie\n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" ist unterschiedlich von\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Vergleich der Versionen:\n"
+"\n"
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr " hat %s Kinder. Abbruch\n"
+
- #: gitk:9072
++#: gitk:9085
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Fehler beim Schreiben der Version in Datei: %s"
+
- #: gitk:9118
++#: gitk:9091
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Fehler beim Vergleichen der Versionen: %s"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Oben"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "Von"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "bis"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Patch erstellen"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "Von:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "bis:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Umgekehrt"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Ausgabedatei:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Erzeugen"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Fehler beim Erzeugen des Patches:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "ID:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Markierungsname:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr "Eine Markierungsbeschreibung ist optional"
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+msgid "Tag message:"
+msgstr "Markierungsbeschreibung:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Erstellen"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Kein Markierungsname angegeben"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Markierung »%s« existiert bereits."
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Fehler beim Erstellen der Markierung:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Kommando:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Schreiben"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Fehler beim Schreiben der Version:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Name:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr ""
+"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
+"eintragen?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Version pflücken"
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"Pflücken 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:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick 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"
+"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
+"werden, um diesen Konflikt aufzulösen?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Keine Änderungen eingetragen"
+
- #: gitk:9579
++#: gitk:9593
+#, fuzzy, 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?"
+
- #: gitk:9587
++#: gitk:9598
+#, fuzzy
+msgid "Reverting"
+msgstr "Zurücksetzen"
+
- #: gitk:9591
++#: gitk:9606
+#, fuzzy, 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"
+"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n"
+"zwischenspeichern (»git stash«) und dann erneut versuchen."
+
- #: gitk:9634
++#: 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"
+"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n"
+"werden, um diesen Konflikt aufzulösen?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Zurücksetzen bestätigen"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Zweig »%s« auf »%s« zurücksetzen?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Art des Zurücksetzens:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr ""
+"Gemischt: Arbeitskopie unverändert,\n"
+"Bereitstellung zurückgesetzt"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Hart: Arbeitskopie und Bereitstellung\n"
+"(Alle lokalen Änderungen werden gelöscht)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Zurücksetzen"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Umstellen"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr ""
+"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
+"gelöscht werden."
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
+"Zweig »%s« trotzdem löschen?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Markierungen und Zweige: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Filtern"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu "
+"Vorgänger/Nachfolger werden unvollständig sein."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Markierung"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Gitk-Schriften wählen"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "F"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "K"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Anzeige der Versionsliste"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Maximale Graphenbreite (Zeilen)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Maximale Graphenbreite (% des Fensters)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Lokale Änderungen anzeigen"
+
- #: gitk:11344
++#: gitk:11361
+#, fuzzy
+msgid "Auto-select SHA1 (length)"
+msgstr "SHA1-Hashwert automatisch auswählen"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Entfernte Zweige/Markierungen ausblenden"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Anzeige des Vergleichs"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Tabulatorbreite"
+
- #: gitk:11356
++#: gitk:11374
+#, fuzzy
+msgid "Display nearby tags/heads"
+msgstr "Naheliegende Markierungen anzeigen"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr ""
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Vergleich nur für angezeigte Pfade"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Zeichenkodierung pro Datei ermitteln"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Externes Diff-Programm"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Wählen ..."
+
- #: gitk:11377
++#: gitk:11395
+msgid "General options"
+msgstr "Allgemeine Optionen"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen"
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr "(Änderungen werden erst nach Neustart wirksam)"
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr "(Momentan nicht verfügbar)"
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Farben: Klicken zum Wählen"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr "Benutzeroberfläche"
+
- #: gitk:11399
++#: gitk:11417
+msgid "interface"
+msgstr "Benutzeroberfläche"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Hintergrund"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "Hintergrund"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Vordergrund"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "Vordergrund"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Vergleich: Alte Zeilen"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "Vergleich - Alte Zeilen"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Vergleich: Neue Zeilen"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "Vergleich - Neue Zeilen"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Vergleich: Änderungstitel"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "Vergleich - Änderungstitel"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Hintergrund für markierte Zeile"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "Hintergrund für markierte Zeile"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Hintergrundfarbe auswählen"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Schriftart: Klicken zum Wählen"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Programmschriftart"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Schriftart für Vergleich"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Beschriftungen"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Gitk-Einstellungen"
+
- #: gitk:11474
++#: gitk:11494
+#, fuzzy
+msgid "General"
+msgstr "Erzeugen"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr ""
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr ""
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: Farbe wählen für %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "Kein Git-Projektarchiv gefunden."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
+
- #: gitk:12405
- msgid "Command line"
- msgstr "Kommandozeile"
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Falsche Kommandozeilen-Parameter für gitk:"
+
++#~ msgid "mc"
++#~ msgstr "mc"
+
+#~ msgid "next"
+#~ msgstr "nächste"
+
+#~ msgid "prev"
+#~ msgstr "vorige"
+
+#~ msgid "CDate"
+#~ msgstr "Eintragedatum"
+
+#~ msgid "Cannot find the git directory \"%s\"."
+#~ msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
--- /dev/null
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
+# French translation of the gitk package
+# Copyright (C) 2005-2008 Paul Mackerras. All rights reserved.
+# This file is distributed under the same license as the gitk package.
+# Translators:
+# Emmanuel Trillaud <etrillaud@gmail.com>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"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"
+"Language-Team: git@vger.kernel.org\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: French\n"
+"X-Poedit-Country: FRANCE\n"
+
+#: gitk:140
+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
+msgid "Color words"
+msgstr ""
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr ""
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Erreur lors du parcours des révisions :"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Erreur à l'exécution de la commande --argscmd :"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont "
+"fusionnés."
+
+# 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."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Erreur à l'exécution de git log :"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Lecture en cours"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Lecture des commits..."
+
- #: gitk:1897
- msgid "mc"
- msgstr ""
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Aucun commit sélectionné"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Ligne de commande"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Impossible de lire la sortie de git log :"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Aucune information disponible sur le commit"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "OK"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Annuler"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Mise à jour"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Recharger"
+
+#: gitk:2071
+msgid "Reread references"
+msgstr "Relire les références"
+
+#: gitk:2072
+msgid "List references"
+msgstr "Lister les références"
+
+#: gitk:2074
+msgid "Start git gui"
+msgstr "Démarrer git gui"
+
+#: gitk:2076
+msgid "Quit"
+msgstr "Quitter"
+
+#: gitk:2068
+msgid "File"
+msgstr "Fichier"
+
+#: gitk:2080
+msgid "Preferences"
+msgstr "Préférences"
+
+#: gitk:2079
+msgid "Edit"
+msgstr "Éditer"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Nouvelle vue..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Éditer la vue..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Supprimer la vue"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Tous les fichiers"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Vue"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "À propos de gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Raccourcis clavier"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Aide"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "Id SHA1 :"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Colonne"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Recherche"
+
+#: gitk:2295
+msgid "commit"
+msgstr "commit"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "contient :"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "chemins modifiés :"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "ajoute/supprime la chaîne :"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr ""
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Exact"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "Ignorer la casse"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "Expression régulière"
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Tous les champs"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Surligner"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Commentaires"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Auteur"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Auteur du commit"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Rechercher"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "Diff"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Ancienne version"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Nouvelle version"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Lignes de contexte"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Ignorer les modifications d'espace"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr ""
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Patch"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Arbre"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Diff entre ceci et la sélection"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Diff entre sélection et ceci"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Créer patch"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Créer tag"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Écrire le commit dans un fichier"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Créer une nouvelle branche"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Cueillir (cherry-pick) ce commit"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Réinitialiser la branche HEAD vers cet état"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Marquer ce commit"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Retourner à la marque"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Chercher le descendant de ceci et le marquer"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "Comparer avec le commit marqué"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+#, fuzzy
+msgid "Diff this -> marked commit"
+msgstr "Diff entre ceci et la sélection"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+#, fuzzy
+msgid "Diff marked commit -> this"
+msgstr "Diff entre sélection et ceci"
+
- #: gitk:2646
++#: gitk:2631
+#, fuzzy
+msgid "Revert this commit"
+msgstr "Marquer ce commit"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Récupérer cette branche"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Supprimer cette branche"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Surligner également ceci"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Surligner seulement ceci"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Diff externe"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Blâmer le commit parent"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Montrer l'origine de cette ligne"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Exécuter git gui blame sur cette ligne"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+#, fuzzy
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - visualisateur de commit pour git\n"
+"\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"\n"
+"Utilisation et redistribution soumises aux termes de la GNU General Public "
+"License"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Fermer"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Raccourcis clavier de Gitk"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Raccourcis clavier de Gitk :"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tQuitter"
+
- #: gitk:3047
++#: gitk:3049
+#, fuzzy, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-F>\t\tRechercher"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Début>\t\tAller au premier commit"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<Fin>\t\tAller au dernier commit"
+
- #: gitk:3050
++#: gitk:3052
+#, fuzzy
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Haut>, p, i\t Aller au commit suivant"
+
- #: gitk:3051
++#: gitk:3053
+#, fuzzy
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Bas>, n, k\t Aller au commit précédent"
+
- #: gitk:3052
++#: gitk:3054
+#, fuzzy
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Gauche>, z, j\tReculer dans l'historique"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Droite>, x, l\tAvancer dans l'historique"
+
- #: gitk:3054
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tMonter d'une page dans la liste des commits"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tDescendre d'une page dans la liste des commits"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Début>\tAller en haut de la liste des commits"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tAller en bas de la liste des commits"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr ""
+"<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr ""
+"<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tMonter d'une page dans la vue des diff"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tMonter de 18 lignes dans la vue des diff"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tDescendre de 18 lignes dans la vue des diff"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tRechercher"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tAller au résultat de recherche suivant"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\tAller au résultat de recherche suivant"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<Fin>\t\tAller au dernier commit"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tFocus sur la zone de recherche"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tAller au résultat de recherche précédent"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tAller au prochain fichier dans la vue des diff"
+
- #: gitk:3076
++#: gitk:3079
+#, 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:3077
++#: gitk:3080
+#, 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:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tAugmenter la taille de la police"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tAugmenter la taille de la police"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tDiminuer la taille de la police"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tDiminuer la taille de la police"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tMise à jour"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Erreur lors de la création du répertoire temporaire %s :"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Erreur en obtenant \"%s\" de %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "échec de la commande :"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Commit inexistant"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame : échec de la commande :"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Impossible de lire le head de la fusion : %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Erreur à la lecture de l'index : %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "Impossible de démarrer git blame : %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Recherche en cours"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Erreur à l'exécution de git blame : %s"
+
- #: gitk:3935
++#: gitk:3925
+#, 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:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Échec de l'outil externe de visualisation des diff"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Définition des vues de Gitk"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Se souvenir de cette vue"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Références (liste d'éléments séparés par des espaces) :"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Branches & tags :"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Toutes les références"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Toutes les branches (locales)"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Tous les tags"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Toutes les branches de suivi à distance"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Info sur les commits (expressions régulières) :"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Auteur :"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Commiteur :"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Message de commit :"
+
- #: gitk:4069
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr "Correspond à tous les critères d'Info sur les commits"
+
- msgid "Matches none Commit Info criteria"
++#: gitk:4086
+#, fuzzy
- #: gitk:4070
++msgid "Matches no Commit Info criteria"
+msgstr "Correspond à tous les critères d'Info sur les commits"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Changements des fichiers :"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Chaîne Figée"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Expression Régulière"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Recherche de la chaîne :"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
+"2009 15:27:38\") :"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "De :"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "Jusqu'au :"
+
- #: gitk:4078
++#: gitk:4094
+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:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Nombre à afficher :"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Nombre à sauter :"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Options diverses :"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Trier par date"
+
+# FIXME : traduction de "branch sides"
- #: gitk:4083
++#: gitk:4099
+#, fuzzy
+msgid "Mark branch sides"
+msgstr "Marquer les extrémités des branches"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Limiter au premier ancêtre"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Historique simple"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Arguments supplémentaires de git log :"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Commande pour générer plus de commits à inclure :"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk : éditer la vue"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr "-- critère pour la sélection des révisions"
+
- #: gitk:4299
++#: gitk:4241
+#, fuzzy
+msgid "View Name"
+msgstr "Nom de la vue :"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Appliquer (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Erreur dans les arguments de sélection des commits :"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Aucun"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Descendant"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Pas un descendant"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Ancêtre"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Pas un ancêtre"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Modifications locales enregistrées dans l'index mais non commitées"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Modifications locales non enregistrées dans l'index et non commitées"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr ""
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "nombreux"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Tags :"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Parent"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Enfant"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Branche"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Suit"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Précède"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Erreur lors de la récupération des diff : %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Aller à :"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Id SHA1 court %s est ambigu"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Id SHA1 %s est inconnu"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "Id SHA1 %s est inconnu"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "La révision %s n'est pas dans la vue courante"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Date"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Enfants"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Réinitialiser la branche %s vers cet état"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Head détaché : impossible de réinitialiser"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Éviter le commit de la fusion "
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Erreur à l'obtention de l'ID du patch pour "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " - arrêt en cours\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "Commit "
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+"est le même patch que \n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" diffère de\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr "a %s enfants - arrêt en cours\n"
+
- #: gitk:9072
++#: gitk:9085
+#, fuzzy, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Erreur à l'ecriture du commit :"
+
- #: gitk:9118
++#: gitk:9091
+#, fuzzy, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Erreur à l'ecriture du commit :"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Haut"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "De"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "À"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Générer le patch"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "De :"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "À :"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Inverser"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Fichier de sortie :"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Générer"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Erreur à la création du patch :"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "ID :"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Nom du Tag :"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr ""
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+#, fuzzy
+msgid "Tag message:"
+msgstr "Nom du Tag :"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Créer"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Aucun nom de tag spécifié"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Le tag \"%s\" existe déjà"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Erreur à la création du tag :"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Commande :"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Écrire"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Erreur à l'ecriture du commit :"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Nom :"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Veuillez spécifier un nom pour la nouvelle branche"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "La branche '%s' existe déjà. Écraser?"
+
- #: gitk:9516
++#: gitk:9530
+#, 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:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Cueillir (Cherry-picking)"
+
- #: gitk:9531
++#: gitk:9544
+#, 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."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+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"
+"Souhaitez-vous exécuter git citool pour le résoudre ?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Aucun changement commité"
+
- #: gitk:9579
++#: gitk:9593
+#, fuzzy, 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?"
+
- #: gitk:9587
++#: gitk:9598
+#, fuzzy
+msgid "Reverting"
+msgstr "Réinitialisation"
+
- #: gitk:9591
++#: gitk:9606
+#, fuzzy, 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."
+
- #: gitk:9634
++#: gitk:9610
+#, fuzzy
+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"
+"Souhaitez-vous exécuter git citool pour le résoudre ?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Confirmer la réinitialisation"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Réinitialiser la branche %s à %s?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Type de réinitialisation :"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Douce : Laisse le répertoire de travail et l'index intacts"
+
- #: gitk:9647
++#: gitk:9663
+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:9664
++#: gitk:9666
+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)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Réinitialisation"
+
+# Fixme: Récupération est-il vraiment une mauvaise traduction?
- #: gitk:9777
++#: gitk:9743
+#, fuzzy
+msgid "Checking out"
+msgstr "Récupération"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Impossible de supprimer la branche en cours"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Les commits de la branche %s ne sont dans aucune autre branche.\n"
+"Voulez-vous vraiment supprimer cette branche %s ?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Tags et heads : %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Filtrer"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Erreur à la lecture des informations sur la topologie des commits, les "
+"informations sur les branches et les tags précédents/suivants seront "
+"incomplètes."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Tag"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Sélecteur de police de Gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "B"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "I"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Options d'affichage de la liste des commits"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Longueur maximum du graphe (lignes)"
+
+# FIXME : Traduction standard de "pane"?
- #: gitk:11337
++#: gitk:11355
+#, fuzzy, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Longueur maximum du graphe (% du panneau)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Montrer les changements locaux"
+
- #: gitk:11344
++#: gitk:11361
+#, fuzzy
+msgid "Auto-select SHA1 (length)"
+msgstr "Sélection auto. du SHA1"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Cacher les refs distantes"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Options d'affichage des diff"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Taille des tabulations"
+
- #: gitk:11356
++#: gitk:11374
+#, fuzzy
+msgid "Display nearby tags/heads"
+msgstr "Afficher les tags les plus proches"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr ""
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Limiter les différences aux chemins listés"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Support pour un encodage des caractères par fichier"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Outil diff externe"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Choisir..."
+
- #: gitk:11377
++#: gitk:11395
+#, fuzzy
+msgid "General options"
+msgstr "Générer le patch"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr ""
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr ""
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr ""
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Couleurs : cliquer pour choisir"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr ""
+
- #: gitk:11399
++#: gitk:11417
+#, fuzzy
+msgid "interface"
+msgstr "Police de l'interface utilisateur"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Arrière-plan"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "arrière-plan"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Premier plan"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "premier plan"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Diff : anciennes lignes"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "diff anciennes lignes"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Diff : nouvelles lignes"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "diff nouvelles lignes"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Diff : entête du hunk"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "diff : entête du hunk"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Arrière-plan de la ligne marquée"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "Arrière-plan de la ligne marquée"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Sélectionner l'arrière-plan"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Polices : cliquer pour choisir"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Police principale"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Police d'affichage des diff"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Police de l'interface utilisateur"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Préférences de Gitk"
+
- #: gitk:11474
++#: gitk:11494
+#, fuzzy
+msgid "General"
+msgstr "Générer"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr ""
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr ""
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk : choisir la couleur de %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++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
+msgid "Cannot find a git repository here."
+msgstr "Impossible de trouver un dépôt git ici."
+
- #: gitk:12301
++#: gitk:12316
+#, 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:12405
- msgid "Command line"
- msgstr "Ligne de commande"
-
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Arguments invalides pour gitk :"
+
- #~ msgid ""
- #~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
- #~ " Gitk requires at least Tcl/Tk 8.4."
- #~ 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."
-
+#~ msgid "SHA1 ID: "
+#~ msgstr "ID SHA1 :"
+
+#~ msgid "next"
+#~ msgstr "suivant"
+
+#~ msgid "prev"
+#~ msgstr "précédent"
+
+#~ msgid "CDate"
+#~ msgstr "CDate"
+
+#~ msgid "- stopping\n"
+#~ msgstr "- arrêt en cours\n"
+
+#~ msgid "Cannot find the git directory \"%s\"."
+#~ msgstr "Impossible de trouver le répertoire git \"%s\"."
--- /dev/null
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
+# Translation of gitk
+# Copyright (C) 2005-2008 Paul Mackerras
+# This file is distributed under the same license as the gitk package.
+# Michele Ballabio <barra_cuda@katamail.com>, 2008.
+#
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-05-17 14:32+1000\n"
+"PO-Revision-Date: 2010-01-28 18:41+0100\n"
+"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
+"Language-Team: Italian\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr ""
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr ""
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Errore nella lettura delle revisioni:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Errore nell'esecuzione del comando specificato con --argscmd:"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Nessun file selezionato: è stata specificata l'opzione --merge ma non ci "
+"sono file in attesa di fusione."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Nessun file selezionato: è stata specificata l'opzione --merge ma i file "
+"specificati non sono in attesa di fusione."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Errore nell'esecuzione di git log:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Lettura in corso"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Lettura delle revisioni in corso..."
+
- #: gitk:1897
- msgid "mc"
- msgstr ""
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Nessuna revisione selezionata"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Linea di comando"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Impossibile elaborare i dati di git log:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Nessuna informazione disponibile sulle revisioni"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "OK"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Annulla"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Aggiorna"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Ricarica"
+
+#: gitk:2071
+msgid "Reread references"
+msgstr "Rileggi riferimenti"
+
+#: gitk:2072
+msgid "List references"
+msgstr "Elenca riferimenti"
+
+#: gitk:2074
+msgid "Start git gui"
+msgstr "Avvia git gui"
+
+#: gitk:2076
+msgid "Quit"
+msgstr "Esci"
+
+#: gitk:2068
+msgid "File"
+msgstr "File"
+
+#: gitk:2080
+msgid "Preferences"
+msgstr "Preferenze"
+
+#: gitk:2079
+msgid "Edit"
+msgstr "Modifica"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Nuova vista..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Modifica vista..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Elimina vista"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Tutti i file"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Vista"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "Informazioni su gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Scorciatoie da tastiera"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Aiuto"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Riga"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Trova"
+
+#: gitk:2295
+msgid "commit"
+msgstr "revisione"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "contenente:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "che riguarda i percorsi:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "che aggiunge/rimuove la stringa:"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr ""
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Esatto"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr ""
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr ""
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Tutti i campi"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Titolo"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Commenti"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Autore"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Revisione creata da"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Cerca"
+
+#: gitk:2358
+msgid "Diff"
+msgstr ""
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Vecchia versione"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Nuova versione"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Linee di contesto"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Ignora modifiche agli spazi"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr ""
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Modifiche"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Directory"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Diff questo -> selezionato"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Diff selezionato -> questo"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Crea patch"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Crea etichetta"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Scrivi revisione in un file"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Crea un nuovo ramo"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Porta questa revisione in cima al ramo attuale"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Aggiorna il ramo HEAD a questa revisione"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Segna questa revisione"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Torna alla revisione segnata"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Trova il discendente di questa revisione e di quella segnata"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "Confronta con la revisione segnata"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+#, fuzzy
+msgid "Diff this -> marked commit"
+msgstr "Diff questo -> selezionato"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+#, fuzzy
+msgid "Diff marked commit -> this"
+msgstr "Diff selezionato -> questo"
+
- #: gitk:2646
++#: gitk:2631
+#, fuzzy
+msgid "Revert this commit"
+msgstr "Segna questa revisione"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Attiva questo ramo"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Elimina questo ramo"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Evidenzia anche questo"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Evidenzia solo questo"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Visualizza differenze in un altro programma"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Annota la revisione precedente"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Mostra la provenienza di questa riga"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Esegui git gui blame su questa riga"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+#, fuzzy
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - un visualizzatore di revisioni per git\n"
+"\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"\n"
+"Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
+"License"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Chiudi"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Scorciatoie da tastiera di Gitk"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Scorciatoie da tastiera di Gitk:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tEsci"
+
- #: gitk:3047
++#: gitk:3049
+#, fuzzy, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-F>\t\tTrova"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\tVai alla prima revisione"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\tVai all'ultima revisione"
+
- #: gitk:3050
++#: gitk:3052
+#, fuzzy
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Su>, p, i\tVai più in alto di una revisione"
+
- #: gitk:3051
++#: gitk:3053
+#, fuzzy
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Giù>, n, k\tVai più in basso di una revisione"
+
- #: gitk:3052
++#: gitk:3054
+#, fuzzy
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Destra>, x, l\tVai avanti nella cronologia"
+
- #: gitk:3054
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr ""
+"<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tScorri alla fine della lista delle revisioni"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tTrova"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tTrova in avanti"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Invio>\tTrova in avanti"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<End>\t\tVai all'ultima revisione"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tCursore nel box di ricerca"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tTrova all'indietro"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tScorri la vista delle differenze al file successivo"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tAumenta dimensione carattere"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-più>\tAumenta dimensione carattere"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tDiminuisci dimensione carattere"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-meno>\tDiminuisci dimensione carattere"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tAggiorna"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Errore durante la creazione della directory temporanea %s:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Errore nella lettura di \"%s\" da %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "impossibile eseguire il comando:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Revisione inesistente"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame: impossibile eseguire il comando:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Impossibile leggere merge head: %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Errore nella lettura dell'indice: %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "Impossibile eseguire git blame: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Ricerca in corso"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Errore nell'esecuzione di git blame: %s"
+
- #: gitk:3935
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Impossibile eseguire il visualizzatore di differenze:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Scelta vista Gitk"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Ricorda questa vista"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Riferimenti (lista di elementi separati da spazi)"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Rami ed etichette"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Tutti i riferimenti"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Tutti i rami (locali)"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Tutte le etichette"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Tutti i rami remoti"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Informazioni sulla revisione (espressioni regolari):"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Autore:"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Revisione creata da:"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Messaggio di revisione:"
+
- #: gitk:4069
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
+
- msgid "Matches none Commit Info criteria"
++#: gitk:4086
+#, fuzzy
- #: gitk:4070
++msgid "Matches no Commit Info criteria"
+msgstr "Risponde a tutti i criteri di ricerca sulle revisioni"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Modifiche ai file:"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Stringa fissa"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Espressione regolare"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Cerca stringa:"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, "
+"2009 15:27:38\"):"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "Da:"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "A:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Limita e/o salta N revisioni (intero positivo):"
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Numero di revisioni da mostrare:"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Numero di revisioni da saltare:"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Altre opzioni:"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Ordina solo per data"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Segna i lati del ramo"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Limita al primo genitore"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Cronologia semplificata"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Ulteriori argomenti da passare a git log:"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Inserire file e directory da includere, uno per riga:"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Comando che genera altre revisioni da visualizzare:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk: modifica vista"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr "-- criteri per la scelta delle revisioni"
+
- #: gitk:4299
++#: gitk:4241
+msgid "View Name"
+msgstr "Nome vista"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Applica (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Errore negli argomenti di selezione delle revisioni:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Nessuno"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Discendente"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Non discendente"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Ascendente"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Non ascendente"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Modifiche locali presenti nell'indice ma non nell'archivio"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Modifiche locali non presenti né nell'archivio né nell'indice"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr ""
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "molti"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Etichette:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Genitore"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Figlio"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Ramo"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Segue"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Precede"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Errore nella lettura delle differenze:"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Vai a:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "La SHA1 id abbreviata %s è ambigua"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "La revisione %s è sconosciuta"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "La SHA1 id %s è sconosciuta"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "La revisione %s non è presente nella vista attuale"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Data"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Figli"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Aggiorna il ramo %s a questa revisione"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Nessun ramo attivo: reset impossibile"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Salto la revisione di fusione "
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Errore nella identificazione della patch per "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " - fine\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "La revisione "
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+" ha le stesse differenze di\n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" è diversa da\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Differenze tra le revisioni:\n"
+"\n"
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr " ha %s figli - fine\n"
+
- #: gitk:9072
++#: gitk:9085
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Errore nella scrittura della revisione nel file: %s"
+
- #: gitk:9118
++#: gitk:9091
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Errore nelle differenze tra le revisioni: %s"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Inizio"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "Da"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "A"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Genera patch"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "Da:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "A:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Inverti"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Scrivi sul file:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Genera"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Errore nella creazione della patch:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "ID:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Nome etichetta:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr "Il messaggio dell'etichetta è opzionale"
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+msgid "Tag message:"
+msgstr "Messaggio dell'etichetta:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Crea"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Nessuna etichetta specificata"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "L'etichetta \"%s\" esiste già"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Errore nella creazione dell'etichetta:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Comando:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Scrivi"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Errore nella scrittura della revisione:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Nome:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Specificare un nome per il nuovo ramo"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "Il ramo '%s' esiste già. Sovrascrivere?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr ""
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato "
+"nella directory di lavoro.\n"
+"Prima di riprovare, bisogna creare una nuova revisione, annullare le "
+"modifiche o usare 'git stash'."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
+"Vuoi avviare git citool per risolverlo?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Nessuna modifica archiviata"
+
- #: gitk:9579
++#: gitk:9593
+#, fuzzy, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
+
- #: gitk:9587
++#: gitk:9598
+#, fuzzy
+msgid "Reverting"
+msgstr "git reset in corso"
+
- #: gitk:9591
++#: gitk:9606
+#, fuzzy, 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 ""
+"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato "
+"nella directory di lavoro.\n"
+"Prima di riprovare, bisogna creare una nuova revisione, annullare le "
+"modifiche o usare 'git stash'."
+
- #: gitk:9634
++#: gitk:9610
+#, fuzzy
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n"
+"Vuoi avviare git citool per risolverlo?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Conferma git reset"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Aggiornare il ramo %s a %s?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Tipo di aggiornamento:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Hard: Aggiorna la directory di lavoro e l'indice\n"
+"(abbandona TUTTE le modifiche locali)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "git reset in corso"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Attivazione in corso"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Impossibile cancellare il ramo attualmente attivo"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Le revisioni nel ramo %s non sono presenti su altri rami.\n"
+"Cancellare il ramo %s?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Etichette e rami: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Filtro"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Errore nella lettura della topologia delle revisioni: le informazioni sul "
+"ramo e le etichette precedenti e seguenti saranno incomplete."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Etichetta"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Scelta caratteri gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "B"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "I"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Opzioni visualizzazione dell'elenco revisioni"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Larghezza massima del grafico (in linee)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Larghezza massima del grafico (% del pannello)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Mostra modifiche locali"
+
- #: gitk:11344
++#: gitk:11361
+#, fuzzy
+msgid "Auto-select SHA1 (length)"
+msgstr "Seleziona automaticamente SHA1 hash"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Nascondi i riferimenti remoti"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Opzioni di visualizzazione delle differenze"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Spaziatura tabulazioni"
+
- #: gitk:11356
++#: gitk:11374
+#, fuzzy
+msgid "Display nearby tags/heads"
+msgstr "Mostra etichette vicine"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr ""
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Limita le differenze ai percorsi elencati"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Attiva codifica file per file"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Visualizzatore di differenze"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Scegli..."
+
- #: gitk:11377
++#: gitk:11395
+msgid "General options"
+msgstr "Opzioni generali"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr "Utilizza interfaccia a tema"
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr "(una modifica richiede il riavvio)"
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr "(momentaneamente non disponibile)"
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Colori: premere per scegliere"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr "Interfaccia"
+
- #: gitk:11399
++#: gitk:11417
+msgid "interface"
+msgstr "interfaccia"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Sfondo"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "sfondo"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Primo piano"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "primo piano"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Diff: vecchie linee"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "vecchie linee"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Diff: nuove linee"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "nuove linee"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Diff: intestazione della sezione"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "intestazione della sezione"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Sfondo riga selezionata"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "sfondo riga selezionata"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Sfondo"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Carattere: premere per scegliere"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Carattere principale"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Carattere per differenze"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Carattere per interfaccia utente"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Preferenze gitk"
+
- #: gitk:11474
++#: gitk:11494
+#, fuzzy
+msgid "General"
+msgstr "Genera"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr ""
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr ""
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: scegliere un colore per %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "Archivio git non trovato."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file"
+
- #: gitk:12405
- msgid "Command line"
- msgstr "Linea di comando"
-
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Gitk: argomenti errati:"
+
+#~ msgid "next"
+#~ msgstr "succ"
+
+#~ msgid "prev"
+#~ msgstr "prec"
+
+#~ msgid "Cannot find the git directory \"%s\"."
+#~ msgstr "Directory git \"%s\" non trovata."
--- /dev/null
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
+#
+# Translation of gitk to Russian.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-05-17 14:32+1000\n"
+"PO-Revision-Date: 2009-04-24 16:00+0200\n"
+"Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n"
+"Language-Team: Russian\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "Невозможно получить список файлов незавершённой операции слияния:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr ""
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr ""
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Ошибка в идентификаторе версии:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Ошибка выполнения команды заданной --argscmd:"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта "
+"операция должна быть завершена."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Файлы не выбраны: указан --merge, но в рамках указанного ограничения на "
+"имена файлов нет ни одного где эта операция должна быть завершена."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Ошибка запуска git log:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Чтение"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Чтение версий..."
+
- #: gitk:1897
- msgid "mc"
- msgstr ""
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Ничего не выбрано"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Командная строка"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Ошибка обработки вывода команды git log:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Нет информации о состоянии"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "Ok"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Отмена"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Обновить"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Перечитать"
+
+#: gitk:2071
+msgid "Reread references"
+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 "Редактировать"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Новое представление..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Редактировать представление..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Удалить представление"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Все файлы"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Представление"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "О gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Назначения клавиатуры"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Подсказка"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Строка"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Поиск"
+
+#: gitk:2295
+msgid "commit"
+msgstr "состояние"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "содержащее:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "касательно файлов:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "добавив/удалив строку:"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr ""
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Точно"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "Игнорировать большие/маленькие"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "Регулярные выражения"
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Во всех полях"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Заголовок"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Комментарии"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Автор"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Сохранивший состояние"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Найти"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "Сравнить"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Старая версия"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Новая версия"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Строк контекста"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Игнорировать пробелы"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr ""
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Патч"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Файлы"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Сравнить это состояние с выделенным"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Сравнить выделенное с этим состоянием"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Создать патч"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Создать метку"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Сохранить изменения в файл"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Создать ветвь"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Скопировать это состояние"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Установить HEAD на это состояние"
+
- #: gitk:2625
++#: gitk:2625
+#, fuzzy
+msgid "Mark this commit"
+msgstr "Скопировать это состояние"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr ""
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr ""
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr ""
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+#, fuzzy
+msgid "Diff this -> marked commit"
+msgstr "Сравнить это состояние с выделенным"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+#, fuzzy
+msgid "Diff marked commit -> this"
+msgstr "Сравнить выделенное с этим состоянием"
+
- #: gitk:2646
++#: gitk:2631
+#, fuzzy
+msgid "Revert this commit"
+msgstr "Скопировать это состояние"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Перейти на эту ветвь"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Удалить эту ветвь"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Подсветить этот тоже"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Подсветить только этот"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Программа сравнения"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Аннотировать родительское состояние"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Показать источник этой строки"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Запустить git gui blame для этой строки"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+#, fuzzy
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - программа просмотра истории репозиториев Git\n"
+"\n"
+"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
+"\n"
+"Использование и распространение согласно условиям GNU General Public License"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Закрыть"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Назначения клавиатуры в Gitk"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Назначения клавиатуры в Gitk:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tЗавершить"
+
- #: gitk:3047
++#: gitk:3049
+#, fuzzy, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-F>\t\tПоиск"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\tПерейти к первому состоянию"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\tПерейти к последнему состоянию"
+
- #: gitk:3050
++#: gitk:3052
+#, fuzzy
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Up>, p, i\tПерейти к следующему состоянию"
+
- #: gitk:3051
++#: gitk:3053
+#, fuzzy
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Down>, n, k\tПерейти к предыдущему состоянию"
+
- #: gitk:3052
++#: gitk:3054
+#, fuzzy
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Left>, z, j\tПоказать ранее посещённое состояние"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Right>, x, l\tПоказать следующее посещённое состояние"
+
- #: gitk:3054
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tПерейти на страницу выше в списке состояний"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tПерейти на страницу ниже в списке состояний"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\tПоказать начало списка состояний"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tПоказать конец списка состояний"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\tПровернуть список состояний вверх"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\tПровернуть список состояний вниз"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Shift-Down>\tПоиск (вниз, среди старых состояний)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tПрокрутить список изменений на страницу выше"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tПрокрутить список изменений на 18 строк вверх"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tПрокрутить список изменений на 18 строк вниз"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tПоиск"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\tПерейти к следующему найденному состоянию"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<End>\t\tПерейти к последнему состоянию"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tПерейти к полю поиска"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tПерейти к предыдущему найденному состоянию"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tПрокрутить список изменений к следующему файлу"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tПродолжить поиск в списке изменений"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tУвеличить размер шрифта"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tУвеличить размер шрифта"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tУменьшить размер шрифта"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tУменьшить размер шрифта"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tОбновить"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Ошибка создания временного каталога %s:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Ошибка получения \"%s\" из %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "ошибка выполнения команды:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Состояние не найдено"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame: ошибка выполнения команды:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Ошибка чтения MERGE_HEAD: %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Ошибка чтения индекса: %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "Ошибка запуска git blame: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Поиск"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Ошибка выполнения git blame: %s"
+
- #: gitk:3935
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr ""
+"Эта строка принадлежит состоянию %s, которое не показано в этом представлении"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Ошибка выполнения программы сравнения:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Gitk определение представлений"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Запомнить представление"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr ""
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr ""
+
- #: gitk:4061
++#: gitk:4077
+#, fuzzy
+msgid "All refs"
+msgstr "Все файлы"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr ""
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr ""
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr ""
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr ""
+
- #: gitk:4066
++#: gitk:4082
+#, fuzzy
+msgid "Author:"
+msgstr "Автор"
+
- #: gitk:4067
++#: gitk:4083
+#, fuzzy
+msgid "Committer:"
+msgstr "Сохранивший состояние"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr ""
+
- #: gitk:4069
- msgid "Matches none Commit Info criteria"
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr ""
+
- #: gitk:4070
++#: gitk:4086
++msgid "Matches no Commit Info criteria"
+msgstr ""
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr ""
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr ""
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr ""
+
- #: gitk:4074
++#: gitk:4090
+#, fuzzy
+msgid "Search string:"
+msgstr "Поиск"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+
- #: gitk:4076
++#: gitk:4092
+#, fuzzy
+msgid "Since:"
+msgstr "С даты:"
+
- #: gitk:4077
++#: gitk:4093
+#, fuzzy
+msgid "Until:"
+msgstr "По дату:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr ""
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr ""
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr ""
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr ""
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Строгая сортировка по дате"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Отметить стороны ветвей"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Ограничить первым предком"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr ""
+
- #: gitk:4086
++#: gitk:4102
+#, fuzzy
+msgid "Additional arguments to git log:"
+msgstr "Включить состояния (аргументы для git-log):"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Файлы и каталоги для ограничения истории, по одному на строку:"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Дополнительная команда для списка состояний:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr ""
+
- #: gitk:4224
++#: gitk:4236
+#, fuzzy
+msgid "-- criteria for selecting revisions"
+msgstr "Ошибка в идентификаторе версии:"
+
- #: gitk:4299
++#: gitk:4241
+#, fuzzy
+msgid "View Name"
+msgstr "Представление"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Применить (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Ошибка в параметрах выбора состояний:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Ни одного"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Порождённое"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Не порождённое"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Предок"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Не предок"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Изменения зарегистрированные в индексе, но не сохранённые"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr ""
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr ""
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Таги:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Предок"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Потомок"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Ветвь"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Следует за"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Предшествует"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Ошибка получения изменений: %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Перейти к:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Сокращённый SHA1 идентификатор %s неоднозначен"
+
- #: gitk:8669
++#: gitk:8678
+#, fuzzy, tcl-format
+msgid "Revision %s is not known"
+msgstr "SHA1 идентификатор %s не найден"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "SHA1 идентификатор %s не найден"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr ""
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Дата"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Потомки"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Установить ветвь %s на это состояние"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Состояние не принадлежит ни одной ветви, переход невозможен"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr ""
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+#, fuzzy
+msgid "Error getting patch ID for "
+msgstr "Ошибка создания патча:"
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr ""
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+#, fuzzy
+msgid "Commit "
+msgstr "состояние"
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr ""
+
- #: gitk:9072
++#: gitk:9085
+#, fuzzy, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Ошибка сохранения состояния:"
+
- #: gitk:9118
++#: gitk:9091
+#, fuzzy, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Ошибка сохранения состояния:"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Верх"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "От"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "До"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Создать патч"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "От:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "До:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "В обратном порядке"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Файл для сохранения:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Создать"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Ошибка создания патча:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "ID:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Имя метки:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr ""
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+#, fuzzy
+msgid "Tag message:"
+msgstr "Имя метки:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Создать"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Не задано имя метки"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Метка \"%s\" уже существует"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Ошибка создания метки:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Команда:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Запись"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Ошибка сохранения состояния:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Имя:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Укажите имя для новой ветви"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "Ветвь '%s' уже существует. Переписать?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Копирование изменений"
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"Копирование невозможно из-за изменений в файле '%s'.\n"
+"Сохраните или отмените изменения и повторите операцию."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"Копирование изменений невозможно из-за незавершённой операции слияния.\n"
+"Запустить git citool для завершения этой операции?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Изменения не сохранены"
+
- #: gitk:9579
++#: gitk:9593
+#, fuzzy, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?"
+
- #: gitk:9587
++#: gitk:9598
+#, fuzzy
+msgid "Reverting"
+msgstr "Установка"
+
- #: gitk:9591
++#: gitk:9606
+#, fuzzy, 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 ""
+"Копирование невозможно из-за изменений в файле '%s'.\n"
+"Сохраните или отмените изменения и повторите операцию."
+
- #: gitk:9634
++#: gitk:9610
+#, fuzzy
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+"Копирование изменений невозможно из-за незавершённой операции слияния.\n"
+"Запустить git citool для завершения этой операции?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Подтвердите операцию перехода"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Установить ветвь %s на состояние %s?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Тип операции перехода:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Жесткий: переписать индекс и рабочий каталог\n"
+"(все изменения в рабочем каталоге будут потеряны)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Установка"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Переход"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Активная ветвь не может быть удалена"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Состояния ветви %s больше не принадлежат никакой другой ветви.\n"
+"Действительно удалить ветвь %s?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Метки и ветви: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Фильтровать"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Ошибка чтения истории проекта; информация о ветвях и состояниях вокруг меток "
+"(до/после) может быть неполной."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Метка"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Шрифт Gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "Ж"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "К"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Параметры показа списка состояний"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Макс. ширина графа (строк)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Макс. ширина графа (% ширины панели)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Показывать изменения в рабочем каталоге"
+
- #: gitk:11344
++#: gitk:11361
+#, fuzzy
+msgid "Auto-select SHA1 (length)"
+msgstr "Выделить SHA1"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr ""
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Параметры показа изменений"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Ширина табуляции"
+
- #: gitk:11356
++#: gitk:11374
+#, fuzzy
+msgid "Display nearby tags/heads"
+msgstr "Показывать близкие метки"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr ""
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Ограничить показ изменений выбранными файлами"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Поддержка кодировок в отдельных файлах"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Программа для показа изменений"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Выберите..."
+
- #: gitk:11377
++#: gitk:11395
+#, fuzzy
+msgid "General options"
+msgstr "Создать патч"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr ""
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr ""
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr ""
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Цвета: нажмите для выбора"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr ""
+
- #: gitk:11399
++#: gitk:11417
+#, fuzzy
+msgid "interface"
+msgstr "Шрифт интерфейса"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Фон"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "фон"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Передний план"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "передний план"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Изменения: старый текст"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "старый текст изменения"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Изменения: новый текст"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "новый текст изменения"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Изменения: заголовок блока"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "заголовок блока изменений"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Фон выбранной строки"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "фон выбранной строки"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Выберите фон"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Шрифт: нажмите для выбора"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Основной шрифт"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Шрифт показа изменений"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Шрифт интерфейса"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Настройки Gitk"
+
- #: gitk:11474
++#: gitk:11494
+#, fuzzy
+msgid "General"
+msgstr "Создать"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr ""
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr ""
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: выберите цвет для %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++"К сожалению gitk не может работать с этой версий Tcl/Tk.\n"
++"Требуется как минимум Tcl/Tk 8.4."
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "Git-репозитарий не найден в текущем каталоге."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла"
+
- #: gitk:12405
- msgid "Command line"
- msgstr "Командная строка"
-
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Неправильные аргументы для gitk:"
+
- #~ msgid ""
- #~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
- #~ " Gitk requires at least Tcl/Tk 8.4."
- #~ msgstr ""
- #~ "К сожалению gitk не может работать с этой версий Tcl/Tk.\n"
- #~ "Требуется как минимум Tcl/Tk 8.4."
-
+#~ msgid "SHA1 ID: "
+#~ msgstr "SHA1:"
+
+#~ msgid "next"
+#~ msgstr "След."
+
+#~ msgid "prev"
+#~ msgstr "Пред."
+
+#~ msgid "Use all refs"
+#~ msgstr "Использовать все ветви"
+
+#~ msgid "Max count:"
+#~ msgstr "Макс. количество:"
+
+#~ msgid "Skip:"
+#~ msgstr "Пропустить:"
+
+#~ msgid "Name"
+#~ msgstr "Имя"
+
+#~ msgid "CDate"
+#~ msgstr "Дата ввода"
+
+#~ msgid "Tag/Head %s is not known"
+#~ msgstr "Метка или ветвь %s не найдена"
+
+#~ msgid "Cannot find the git directory \"%s\"."
+#~ msgstr "Git-репозитарий \"%s\" не найден."
--- /dev/null
- # Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013.
+# Swedish translation for gitk
+# Copyright (C) 2005-2013 Paul Mackerras
+# This file is distributed under the same license as the gitk package.
+#
+# Mikael Magnusson <mikachu@gmail.com>, 2008.
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
- "PO-Revision-Date: 2013-05-16 08:12+0100\n"
++# Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013, 2015.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sv\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-05-17 14:32+1000\n"
++"PO-Revision-Date: 2015-03-27 10:31+0100\n"
+"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
++"Plural-Forms: nplurals=2; plural=(n != 1);\n"
++"X-Generator: Gtranslator 2.91.6\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "Kunde inte hämta lista över ej sammanslagna filer:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr "Färga ord"
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr "Märk upp ord"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Fel vid tolkning av revisioner:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Fel vid körning av --argscmd-kommando:"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Inga filer valdes: --merge angavs men det finns inga filer som inte har "
+"slagits samman."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Inga filer valdes: --merge angavs men det finns inga filer inom "
+"filbegränsningen."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Fel vid körning av git log:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Läser"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Läser incheckningar..."
+
- #: gitk:1897
- msgid "mc"
- msgstr "mc"
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Inga incheckningar markerade"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Kommandorad"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Kan inte tolka utdata från git log:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Ingen incheckningsinformation är tillgänglig"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "OK"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Avbryt"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Uppdatera"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Ladda om"
+
+#: gitk:2071
+msgid "Reread references"
+msgstr "Läs om referenser"
+
+#: gitk:2072
+msgid "List references"
+msgstr "Visa referenser"
+
+#: gitk:2074
+msgid "Start git gui"
+msgstr "Starta git gui"
+
+#: gitk:2076
+msgid "Quit"
+msgstr "Avsluta"
+
+#: gitk:2068
+msgid "File"
+msgstr "Arkiv"
+
+#: gitk:2080
+msgid "Preferences"
+msgstr "Inställningar"
+
+#: gitk:2079
+msgid "Edit"
+msgstr "Redigera"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Ny vy..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Ändra vy..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Ta bort vy"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Alla filer"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Visa"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "Om gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Tangentbordsbindningar"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Hjälp"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "SHA1-id:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Rad"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Sök"
+
+#: gitk:2295
+msgid "commit"
+msgstr "incheckning"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "som innehåller:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "som rör sökväg:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "som lägger/till tar bort sträng:"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr "ändrar rader som matchar:"
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Exakt"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "IgnVersaler"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "Reg.uttr."
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Alla fält"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Rubrik"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Kommentarer"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Författare"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Incheckare"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Sök"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "Diff"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Gammal version"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Ny version"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Rader sammanhang"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Ignorera ändringar i blanksteg"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr "Rad-diff"
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Patch"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Träd"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "Diff denna -> markerad"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "Diff markerad -> denna"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Skapa patch"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Skapa tagg"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Skriv incheckning till fil"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Skapa ny gren"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Plocka denna incheckning"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Återställ HEAD-grenen hit"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Markera denna incheckning"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Återgå till markering"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Hitta efterföljare till denna och markera"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "Jämför med markerad incheckning"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+msgid "Diff this -> marked commit"
+msgstr "Diff denna -> markerad incheckning"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+msgid "Diff marked commit -> this"
+msgstr "Diff markerad incheckning -> denna"
+
- #: gitk:2646
++#: gitk:2631
+msgid "Revert this commit"
+msgstr "Ångra denna incheckning"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Checka ut denna gren"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Ta bort denna gren"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Markera även detta"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Markera bara detta"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "Extern diff"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Klandra föräldraincheckning"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Visa ursprunget för den här raden"
+
- #: gitk:3011
- #, fuzzy
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Kör git gui blame på den här raden"
+
- "Copyright ©9 2005-2011 Paul Mackerras\n"
++#: gitk:3014
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - en incheckningsvisare för git\n"
+"\n"
- #: gitk:3019 gitk:3085 gitk:9836
++"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Använd och vidareförmedla enligt villkoren i GNU General Public License"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Stäng"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Tangentbordsbindningar för Gitk"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Tangentbordsbindningar för Gitk:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tAvsluta"
+
- #: gitk:3047
++#: gitk:3049
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\tStäng fönster"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\tGå till första incheckning"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\tGå till sista incheckning"
+
- #: gitk:3050
++#: gitk:3052
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Upp>, p, k\tGå en incheckning upp"
+
- #: gitk:3051
++#: gitk:3053
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Ned>, n, j\tGå en incheckning ned"
+
- #: gitk:3052
++#: gitk:3054
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Vänster>, z, h\tGå bakåt i historiken"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Höger>, x, l\tGå framåt i historiken"
+
- msgstr ""
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
- #: gitk:3054
++msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan"
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\tRulla till början av incheckningslistan"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tRulla diffvisningen upp 18 rader"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tRulla diffvisningen ned 18 rader"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tSök"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tGå till nästa sökträff"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\tGå till nästa sökträff"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<End>\t\tGå till sista incheckning"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tFokusera sökrutan"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tGå till föregående sökträff"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tRulla diffvisningen till nästa fil"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-Num+>\tÖka teckenstorlek"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tÖka teckenstorlek"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-Num->\tMinska teckenstorlek"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tMinska teckenstorlek"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tUppdatera"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Fel vid skapande av temporär katalog %s:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Fel vid hämtning av \"%s\" från %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "kommando misslyckades:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Incheckning saknas"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame: kommando misslyckades:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Kunde inte läsa sammanslagningshuvud: %s"
+
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Fel vid läsning av index: %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "Kunde inte starta git blame: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Söker"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Fel vid körning av git blame: %s"
+
- #: gitk:3935
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Externt diff-verktyg misslyckades:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Definition av Gitk-vy"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Spara denna vy"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Referenser (blankstegsavdelad lista):"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Grenar & taggar:"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Alla referenser"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Alla (lokala) grenar"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Alla taggar"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Alla fjärrspårande grenar"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Incheckningsinfo (reguljära uttryck):"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Författare:"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Incheckare:"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Incheckningsmeddelande:"
+
- #: gitk:4069
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr "Motsvarar alla kriterier för incheckningsinfo"
+
- msgid "Matches none Commit Info criteria"
- msgstr "Motsvarar alla kriterier för incheckningsinfo"
++#: gitk:4086
+#, fuzzy
- #: gitk:4070
++msgid "Matches no Commit Info criteria"
++msgstr "Motsvarar inga kriterier för incheckningsinfo"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Ändringar av filer:"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Fast sträng"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Reguljärt uttryck"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Söksträng:"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "Från:"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "Till:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):"
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Antal att visa:"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Antal att hoppa över:"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Diverse alternativ:"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Strikt datumsortering"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Markera sidogrenar"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Begränsa till första förälder"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Enkel historik"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Ytterligare argument till git log:"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+msgstr "Ange filer och kataloger att ta med, en per rad:"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Kommando för att generera fler incheckningar att ta med:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk: redigera vy"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr " - kriterier för val av revisioner"
+
- #: gitk:4299
++#: gitk:4241
+msgid "View Name"
+msgstr "Namn på vy"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Använd (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Fel i argument för val av incheckningar:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Inget"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Avkomling"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Inte avkomling"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Förfader"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Inte förfader"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr "Lokala ändringar sparade i indexet men inte incheckade"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Lokala ändringar, ej sparade i indexet"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr "med många flera"
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "många"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Taggar:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Förälder"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Barn"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Gren"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Följer"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Föregår"
+
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Fel vid hämtning av diff: %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Gå till:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Förkortat SHA1-id %s är tvetydigt"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Revisionen %s är inte känd"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "SHA-id:t %s är inte känt"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "Revisionen %s finns inte i den nuvarande vyn"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Datum"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Barn"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Återställ grenen %s hit"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Frånkopplad head: kan inte återställa"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Hoppar över sammanslagningsincheckning "
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Fel vid hämtning av patch-id för "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " - stannar\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "Incheckning "
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+" är samma patch som\n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" skiljer sig från\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Skillnad mellan incheckningar:\n"
+"\n"
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr " har %s barn - stannar\n"
+
- #: gitk:9072
++#: gitk:9085
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Fel vid skrivning av incheckning till fil: %s"
+
- #: gitk:9118
++#: gitk:9091
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Fel vid jämförelse av incheckningar: %s"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Topp"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "Från"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "Till"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Generera patch"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "Från:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "Till:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Vänd"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Utdatafil:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Generera"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Fel vid generering av patch:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "Id:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Taggnamn:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr "Taggmeddelandet är valfritt"
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+msgid "Tag message:"
+msgstr "Taggmeddelande:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Skapa"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Inget taggnamn angavs"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Taggen \"%s\" finns redan"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Fel vid skapande av tagg:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Kommando:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Skriv"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Fel vid skrivning av incheckning:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Namn:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Ange ett namn för den nya grenen"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "Grenen \"%s\" finns redan. Skriva över?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr ""
+"Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
+"på nytt?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Plockar"
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"Cherry-pick misslyckades på grund av lokala ändringar i filen \"%s\".\n"
+"Checka in, återställ eller spara undan (stash) dina ändringar och försök "
+"igen."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n"
+"Vill du köra git citool för att lösa den?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Inga ändringar incheckade"
+
- #: gitk:9579
++#: gitk:9593
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?"
+
- #: gitk:9587
++#: gitk:9598
+msgid "Reverting"
+msgstr "Ångrar"
+
- #: gitk:9591
++#: gitk:9606
+#, 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 ""
+"Misslyckades med att ångra på grund av lokala ändringar i följande filer:%s. "
+"Checka in, återställ eller spara undan (stash) dina ändringar och försök "
+"igen."
+
- #: gitk:9634
++#: gitk:9610
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+"Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n"
+" Vill du köra git citool för att lösa den?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Bekräfta återställning"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Återställa grenen %s till %s?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Typ av återställning:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Mjuk: Rör inte utcheckning och index"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr "Blandad: Rör inte utcheckning, återställ index"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Hård: Återställ utcheckning och index\n"
+"(förkastar ALLA lokala ändringar)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Återställer"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Checkar ut"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Kan inte ta bort den just nu utcheckade grenen"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
+"Vill du verkligen ta bort grenen %s?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Taggar och huvuden: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Filter"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"Fel vid läsning av information om incheckningstopologi; information om "
+"grenar och föregående/senare taggar kommer inte vara komplett."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Tagg"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Teckensnittsväljare för Gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "F"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "K"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Alternativ för incheckningslistvy"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Maximal grafbredd (rader)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Maximal grafbredd (% av ruta)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Visa lokala ändringar"
+
- #: gitk:11344
++#: gitk:11361
+msgid "Auto-select SHA1 (length)"
+msgstr "Välj SHA1 (längd) automatiskt"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Dölj fjärr-referenser"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Alternativ för diffvy"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Blanksteg för tabulatortecken"
+
- #: gitk:11356
++#: gitk:11374
+msgid "Display nearby tags/heads"
+msgstr "Visa närliggande taggar/huvuden"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr "Maximalt antal taggar/huvuden att visa"
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Begränsa diff till listade sökvägar"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Stöd för filspecifika teckenkodningar"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Externt diff-verktyg"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Välj..."
+
- #: gitk:11377
++#: gitk:11395
+msgid "General options"
+msgstr "Allmänna inställningar"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr "Använd tema på fönsterelement"
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr "(ändringen kräver omstart)"
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr "(för närvarande inte tillgängligt)"
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Färger: tryck för att välja"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr "Gränssnitt"
+
- #: gitk:11399
++#: gitk:11417
+msgid "interface"
+msgstr "gränssnitt"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Bakgrund"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "bakgrund"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Förgrund"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "förgrund"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "Diff: gamla rader"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "diff gamla rader"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "Diff: nya rader"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "diff nya rader"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "Diff: delhuvud"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "diff delhuvud"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Markerad rad bakgrund"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "markerad rad bakgrund"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Markerad bakgrund"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Teckensnitt: tryck för att välja"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Huvudteckensnitt"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Teckensnitt för diffvisning"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Teckensnitt för användargränssnitt"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Inställningar för Gitk"
+
- #: gitk:11474
++#: gitk:11494
+msgid "General"
+msgstr "Allmänt"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr "Färger"
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr "Teckensnitt"
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: välj färg för %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
++" Gitk kräver åtminstone Tcl/Tk 8.4."
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "Hittar inget git-arkiv här."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
+
- #: gitk:12405
- msgid "Command line"
- msgstr "Kommandorad"
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Felaktiga argument till gitk:"
+
- #~ msgid ""
- #~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
- #~ " Gitk requires at least Tcl/Tk 8.4."
- #~ msgstr ""
- #~ "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
- #~ " Gitk kräver åtminstone Tcl/Tk 8.4."
-
++#~ msgid "mc"
++#~ msgstr "mc"
++
++#~ msgid ""
++#~ "\n"
++#~ "Gitk - a commit viewer for git\n"
++#~ "\n"
++#~ "Copyright © 2005-2015 Paul Mackerras\n"
++#~ "\n"
++#~ "Use and redistribute under the terms of the GNU General Public License"
++#~ msgstr ""
++#~ "\n"
++#~ "Gitk - en incheckningsvisare för git\n"
++#~ "\n"
++#~ "Copyright © 2005-2015 Paul Mackerras\n"
++#~ "\n"
++#~ "Använd och vidareförmedla enligt villkoren i GNU General Public License"
+
+#~ msgid "next"
+#~ msgstr "nästa"
+
+#~ msgid "prev"
+#~ msgstr "föreg"
+
+#~ msgid "CDate"
+#~ msgstr "Skapat datum"
+
+#~ msgid "Cannot find the git directory \"%s\"."
+#~ msgstr "Hittar inte git-katalogen \"%s\"."
+
+#~ msgid "SHA1 ID: "
+#~ msgstr "SHA1-id: "
+
+#~ msgid "- stopping\n"
+#~ msgstr "- stannar\n"
+
+#~ msgid "Tag/Head %s is not known"
+#~ msgstr "Tagg/huvud %s är okänt"
+
+#~ msgid "/\t\tMove to next find hit, or redo find"
+#~ msgstr "/\t\tGå till nästa sökträff, eller sök på nytt"
+
+#~ msgid "Name"
+#~ msgstr "Namn"
--- /dev/null
- "POT-Creation-Date: 2015-03-15 14:37+1100\n"
+# Vietnamese translations for gitk package.
+# Bản dịch tiếng Việt cho gói gitk.
+# This file is distributed under the same license as the gitk package.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gitk @@GIT_VERSION@@\n"
+"Report-Msgid-Bugs-To: \n"
- #: gitk:217 gitk:2381 gitk:8201 gitk:8234
++"POT-Creation-Date: 2015-05-17 14:32+1000\n"
+"PO-Revision-Date: 2013-12-14 14:40+0700\n"
+"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: gitk:140
+msgid "Couldn't get list of unmerged files:"
+msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn:"
+
+#: gitk:212 gitk:2381
+msgid "Color words"
+msgstr "Tô màu chữ"
+
- #: gitk:496 gitk:4508
++#: gitk:217 gitk:2381 gitk:8220 gitk:8253
+msgid "Markup words"
+msgstr "Đánh dấu chữ"
+
+#: gitk:324
+msgid "Error parsing revisions:"
+msgstr "Gặp lỗi khi phân tích điểm xét duyệt:"
+
+#: gitk:380
+msgid "Error executing --argscmd command:"
+msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:"
+
+#: gitk:393
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn."
+
+#: gitk:396
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn "
+"trong giới hạn tập tin."
+
+#: gitk:418 gitk:566
+msgid "Error executing git log:"
+msgstr "Gặp lỗi khi thực hiện lệnh git log:"
+
+#: gitk:436 gitk:582
+msgid "Reading"
+msgstr "Đang đọc"
+
- #: gitk:499 gitk:1637 gitk:4511
++#: gitk:496 gitk:4525
+msgid "Reading commits..."
+msgstr "Đang đọc các lần chuyển giao..."
+
- #: gitk:1897
- msgid "mc"
- msgstr "mc"
-
- #: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500
++#: gitk:499 gitk:1637 gitk:4528
+msgid "No commits selected"
+msgstr "Chưa chọn các lần chuyển giao"
+
++#: gitk:1445 gitk:4045 gitk:12432
++msgid "Command line"
++msgstr "Dòng lệnh"
++
+#: gitk:1511
+msgid "Can't parse git log output:"
+msgstr "Không thể phân tích kết xuất từ lệnh git log:"
+
+#: gitk:1740
+msgid "No commit information available"
+msgstr "Không có thông tin về lần chuyển giao nào"
+
- #: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652
- #: gitk:11221 gitk:11501
++#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
+msgid "OK"
+msgstr "Đồng ý"
+
- #: gitk:2088
++#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
++#: gitk:11242 gitk:11522
+msgid "Cancel"
+msgstr "Thôi"
+
+#: gitk:2069
+msgid "Update"
+msgstr "Cập nhật"
+
+#: gitk:2070
+msgid "Reload"
+msgstr "Tải lại"
+
+#: gitk:2071
+msgid "Reread references"
+msgstr "Đọc lại tham chiếu"
+
+#: gitk:2072
+msgid "List references"
+msgstr "Liệt kê các tham chiếu"
+
+#: gitk:2074
+msgid "Start git gui"
+msgstr "Khởi chạy git gui"
+
+#: gitk:2076
+msgid "Quit"
+msgstr "Thoát"
+
+#: gitk:2068
+msgid "File"
+msgstr "Chính"
+
+#: gitk:2080
+msgid "Preferences"
+msgstr "Cá nhân hóa"
+
+#: gitk:2079
+msgid "Edit"
+msgstr "Chỉnh sửa"
+
+#: gitk:2084
+msgid "New view..."
+msgstr "Thêm trình bày mới..."
+
+#: gitk:2085
+msgid "Edit view..."
+msgstr "Sửa cách trình bày..."
+
+#: gitk:2086
+msgid "Delete view"
+msgstr "Xóa cách trình bày"
+
- #: gitk:2083 gitk:4050
++#: gitk:2088 gitk:4043
+msgid "All files"
+msgstr "Mọi tập tin"
+
- #: gitk:2093 gitk:2103 gitk:3009
++#: gitk:2083 gitk:4067
+msgid "View"
+msgstr "Trình bày"
+
- #: gitk:2185 gitk:8633
++#: gitk:2093 gitk:2103 gitk:3012
+msgid "About gitk"
+msgstr "Giới thiệu về gitk"
+
+#: gitk:2094 gitk:2108
+msgid "Key bindings"
+msgstr "Tổ hợp phím"
+
+#: gitk:2092 gitk:2107
+msgid "Help"
+msgstr "Trợ giúp"
+
- #: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808
- #: gitk:6893
++#: gitk:2185 gitk:8652
+msgid "SHA1 ID:"
+msgstr "SHA1 ID:"
+
+#: gitk:2229
+msgid "Row"
+msgstr "Hàng"
+
+#: gitk:2267
+msgid "Find"
+msgstr "Tìm"
+
+#: gitk:2295
+msgid "commit"
+msgstr "lần chuyển giao"
+
- #: gitk:2302 gitk:3522 gitk:3527 gitk:4745
++#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
++#: gitk:6912
+msgid "containing:"
+msgstr "có chứa:"
+
- #: gitk:2303 gitk:4759
++#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
+msgid "touching paths:"
+msgstr "đang chạm đường dẫn:"
+
- #: gitk:2304 gitk:4761
++#: gitk:2303 gitk:4777
+msgid "adding/removing string:"
+msgstr "thêm/gỡ bỏ chuỗi:"
+
- #: gitk:2313 gitk:2315 gitk:4748
++#: gitk:2304 gitk:4779
+msgid "changing lines matching:"
+msgstr "những dòng thay đổi khớp mẫu:"
+
- #: gitk:2315 gitk:4836 gitk:6704
++#: gitk:2313 gitk:2315 gitk:4766
+msgid "Exact"
+msgstr "Chính xác"
+
- #: gitk:2315 gitk:4718 gitk:4834 gitk:6700
++#: gitk:2315 gitk:4854 gitk:6723
+msgid "IgnCase"
+msgstr "BquaHt"
+
- #: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897
++#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
+msgid "Regexp"
+msgstr "BTCQ"
+
- #: gitk:2318 gitk:4853 gitk:4886 gitk:6767
++#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
+msgid "All fields"
+msgstr "Mọi trường"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370
++#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
+msgid "Headline"
+msgstr "Nội dung chính"
+
- #: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811
- #: gitk:8826
++#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
+msgid "Comments"
+msgstr "Ghi chú"
+
- #: gitk:2319 gitk:4853 gitk:6767 gitk:7307
++#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
++#: gitk:8845
+msgid "Author"
+msgstr "Tác giả"
+
- #: gitk:2378 gitk:2380 gitk:7940 gitk:8187
++#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
+msgid "Committer"
+msgstr "Người chuyển giao"
+
+#: gitk:2350
+msgid "Search"
+msgstr "Tìm kiếm"
+
+#: gitk:2358
+msgid "Diff"
+msgstr "So sánh"
+
+#: gitk:2360
+msgid "Old version"
+msgstr "Phiên bản cũ"
+
+#: gitk:2362
+msgid "New version"
+msgstr "Phiên bản mới"
+
+#: gitk:2364
+msgid "Lines of context"
+msgstr "Các dòng của nội dung"
+
+#: gitk:2374
+msgid "Ignore space change"
+msgstr "Không xét đến thay đổi do khoảng trắng"
+
- #: gitk:2616 gitk:2636
++#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
+msgid "Line diff"
+msgstr "Khác biệt theo dòng"
+
+#: gitk:2445
+msgid "Patch"
+msgstr "Vá"
+
+#: gitk:2447
+msgid "Tree"
+msgstr "Cây"
+
- #: gitk:2617 gitk:2637
++#: gitk:2617 gitk:2637
+msgid "Diff this -> selected"
+msgstr "So sánh cái này -> cái đã chọn"
+
- #: gitk:2618 gitk:2638
++#: gitk:2618 gitk:2638
+msgid "Diff selected -> this"
+msgstr "So sánh cái đã chọn -> cái này"
+
- #: gitk:2619 gitk:9235
++#: gitk:2619 gitk:2639
+msgid "Make patch"
+msgstr "Tạo miếng vá"
+
- #: gitk:2620 gitk:9352
++#: gitk:2620 gitk:9254
+msgid "Create tag"
+msgstr "Tạo thẻ"
+
- #: gitk:2621 gitk:9409
++#: gitk:2621 gitk:9371
+msgid "Write commit to file"
+msgstr "Ghi lần chuyển giao ra tập tin"
+
- #: gitk:2622
++#: gitk:2622 gitk:9428
+msgid "Create new branch"
+msgstr "Tạo nhánh mới"
+
- #: gitk:2623
++#: gitk:2623
+msgid "Cherry-pick this commit"
+msgstr "Cherry-pick lần chuyển giao này"
+
- #: gitk:2624
++#: gitk:2624
+msgid "Reset HEAD branch to here"
+msgstr "Đặt lại HEAD của nhánh vào đây"
+
- #: gitk:2625
++#: gitk:2625
+msgid "Mark this commit"
+msgstr "Đánh dấu lần chuyển giao này"
+
- #: gitk:2626
++#: gitk:2626
+msgid "Return to mark"
+msgstr "Quay lại vị trí dấu"
+
- #: gitk:2627
++#: gitk:2627
+msgid "Find descendant of this and mark"
+msgstr "Tìm con cháu của cái này và cái đã đánh dấu"
+
- #: gitk:2628 gitk:2639
++#: gitk:2628
+msgid "Compare with marked commit"
+msgstr "So sánh với lần chuyển giao đã đánh dấu"
+
- #: gitk:2629 gitk:2640
++#: gitk:2629 gitk:2640
+msgid "Diff this -> marked commit"
+msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu"
+
- #: gitk:2630
++#: gitk:2630 gitk:2641
+msgid "Diff marked commit -> this"
+msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này"
+
- #: gitk:2646
++#: gitk:2631
+msgid "Revert this commit"
+msgstr "Hoàn lại lần chuyển giao này"
+
- #: gitk:2647
++#: gitk:2647
+msgid "Check out this branch"
+msgstr "Checkout nhánh này"
+
- #: gitk:2654
++#: gitk:2648
+msgid "Remove this branch"
+msgstr "Gỡ bỏ nhánh này"
+
- #: gitk:2655
++#: gitk:2649
++msgid "Copy branch name"
++msgstr ""
++
++#: gitk:2656
+msgid "Highlight this too"
+msgstr "Cũng tô sáng nó"
+
- #: gitk:2656
++#: gitk:2657
+msgid "Highlight this only"
+msgstr "Chỉ tô sáng cái này"
+
- #: gitk:2657
++#: gitk:2658
+msgid "External diff"
+msgstr "diff từ bên ngoài"
+
- #: gitk:2664
++#: gitk:2659
+msgid "Blame parent commit"
+msgstr "Xem công trạng lần chuyển giao cha mẹ"
+
- #: gitk:2665
++#: gitk:2660
++msgid "Copy path"
++msgstr ""
++
++#: gitk:2667
+msgid "Show origin of this line"
+msgstr "Hiển thị nguyên gốc của dòng này"
+
- #: gitk:3011
++#: gitk:2668
+msgid "Run git gui blame on this line"
+msgstr "Chạy lệnh git gui blame cho dòng này"
+
- #: gitk:3019 gitk:3085 gitk:9836
++#: gitk:3014
+#, fuzzy
+msgid ""
+"\n"
+"Gitk - a commit viewer for git\n"
+"\n"
+"Copyright © 2005-2014 Paul Mackerras\n"
+"\n"
+"Use and redistribute under the terms of the GNU General Public License"
+msgstr ""
+"\n"
+"Gitk - phần mềm xem các lần chuyển giao dành cho git\n"
+"\n"
+"Bản quyền © 2005-2011 Paul Mackerras\n"
+"\n"
+"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"
+
- #: gitk:3040
++#: gitk:3022 gitk:3089 gitk:9857
+msgid "Close"
+msgstr "Đóng"
+
- #: gitk:3043
++#: gitk:3043
+msgid "Gitk key bindings"
+msgstr "Tổ hợp phím gitk"
+
- #: gitk:3045
++#: gitk:3046
+msgid "Gitk key bindings:"
+msgstr "Tổ hợp phím gitk:"
+
- #: gitk:3046
++#: gitk:3048
+#, tcl-format
+msgid "<%s-Q>\t\tQuit"
+msgstr "<%s-Q>\t\tThoát"
+
- #: gitk:3047
++#: gitk:3049
+#, tcl-format
+msgid "<%s-W>\t\tClose window"
+msgstr "<%s-W>\t\tĐóng cửa sổ"
+
- #: gitk:3048
++#: gitk:3050
+msgid "<Home>\t\tMove to first commit"
+msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên"
+
- #: gitk:3049
++#: gitk:3051
+msgid "<End>\t\tMove to last commit"
+msgstr "<End>\t\tChuyển đến lần chuyển giao cuối"
+
- #: gitk:3050
++#: gitk:3052
+msgid "<Up>, p, k\tMove up one commit"
+msgstr "<Up>, p, k\tDi chuyển lên một lần chuyển giao"
+
- #: gitk:3051
++#: gitk:3053
+msgid "<Down>, n, j\tMove down one commit"
+msgstr "<Down>, n, j\tDi chuyển xuống một lần chuyển giao"
+
- #: gitk:3052
++#: gitk:3054
+msgid "<Left>, z, h\tGo back in history list"
+msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sử"
+
- #: gitk:3053
++#: gitk:3055
+msgid "<Right>, x, l\tGo forward in history list"
+msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sử"
+
- #: gitk:3054
++#: gitk:3056
+#, tcl-format
+msgid "<%s-n>\tGo to n-th parent of current commit in history list"
+msgstr ""
+
- #: gitk:3055
++#: gitk:3057
+msgid "<PageUp>\tMove up one page in commit list"
+msgstr "<PageUp>\tDi chuyển lên một trang trong danh sách lần chuyển giao"
+
- #: gitk:3056
++#: gitk:3058
+msgid "<PageDown>\tMove down one page in commit list"
+msgstr "<PageDown>\tDi chuyển xuống một trang trong danh sách lần chuyển giao"
+
- #: gitk:3057
++#: gitk:3059
+#, tcl-format
+msgid "<%s-Home>\tScroll to top of commit list"
+msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao"
+
- #: gitk:3058
++#: gitk:3060
+#, tcl-format
+msgid "<%s-End>\tScroll to bottom of commit list"
+msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao"
+
- #: gitk:3059
++#: gitk:3061
+#, tcl-format
+msgid "<%s-Up>\tScroll commit list up one line"
+msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng"
+
- #: gitk:3060
++#: gitk:3062
+#, tcl-format
+msgid "<%s-Down>\tScroll commit list down one line"
+msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng"
+
- #: gitk:3061
++#: gitk:3063
+#, tcl-format
+msgid "<%s-PageUp>\tScroll commit list up one page"
+msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang"
+
- #: gitk:3062
++#: gitk:3064
+#, tcl-format
+msgid "<%s-PageDown>\tScroll commit list down one page"
+msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang"
+
- #: gitk:3063
++#: gitk:3065
+msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
+msgstr "<Shift-Up>\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)"
+
- #: gitk:3064
++#: gitk:3066
+msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
+msgstr ""
+"<Shift-Down>\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)"
+
- #: gitk:3065
++#: gitk:3067
+msgid "<Delete>, b\tScroll diff view up one page"
+msgstr "<Delete>, b\tCuộn phần trình bày diff lên một trang"
+
- #: gitk:3066
++#: gitk:3068
+msgid "<Backspace>\tScroll diff view up one page"
+msgstr "<Backspace>\tCuộn phần trình bày diff lên một trang"
+
- #: gitk:3067
++#: gitk:3069
+msgid "<Space>\t\tScroll diff view down one page"
+msgstr "<Space>\t\tCuộn phần trình bày diff xuống một trang"
+
- #: gitk:3068
++#: gitk:3070
+msgid "u\t\tScroll diff view up 18 lines"
+msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng"
+
- #: gitk:3069
++#: gitk:3071
+msgid "d\t\tScroll diff view down 18 lines"
+msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng"
+
- #: gitk:3070
++#: gitk:3072
+#, tcl-format
+msgid "<%s-F>\t\tFind"
+msgstr "<%s-F>\t\tTìm kiếm"
+
- #: gitk:3071
++#: gitk:3073
+#, tcl-format
+msgid "<%s-G>\t\tMove to next find hit"
+msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp"
+
- #: gitk:3072
++#: gitk:3074
+msgid "<Return>\tMove to next find hit"
+msgstr "<Return>\t\tDi chuyển đến chỗ gặp kế tiếp"
+
- #: gitk:3073
++#: gitk:3075
++#, fuzzy
++msgid "g\t\tGo to commit"
++msgstr "<End>\t\tChuyển đến lần chuyển giao cuối"
++
++#: gitk:3076
+msgid "/\t\tFocus the search box"
+msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm"
+
- #: gitk:3074
++#: gitk:3077
+msgid "?\t\tMove to previous find hit"
+msgstr "?\t\tDi chuyển đến chỗ gặp kế trước"
+
- #: gitk:3075
++#: gitk:3078
+msgid "f\t\tScroll diff view to next file"
+msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế"
+
- #: gitk:3076
++#: gitk:3079
+#, tcl-format
+msgid "<%s-S>\t\tSearch for next hit in diff view"
+msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp"
+
- #: gitk:3077
++#: gitk:3080
+#, tcl-format
+msgid "<%s-R>\t\tSearch for previous hit in diff view"
+msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước"
+
- #: gitk:3078
++#: gitk:3081
+#, tcl-format
+msgid "<%s-KP+>\tIncrease font size"
+msgstr "<%s-KP+>\tTăng cỡ chữ"
+
- #: gitk:3079
++#: gitk:3082
+#, tcl-format
+msgid "<%s-plus>\tIncrease font size"
+msgstr "<%s-plus>\tTăng cỡ chữ"
+
- #: gitk:3080
++#: gitk:3083
+#, tcl-format
+msgid "<%s-KP->\tDecrease font size"
+msgstr "<%s-KP->\tGiảm cỡ chữ"
+
- #: gitk:3081
++#: gitk:3084
+#, tcl-format
+msgid "<%s-minus>\tDecrease font size"
+msgstr "<%s-minus>\tGiảm cỡ chữ"
+
- #: gitk:3546 gitk:3555
++#: gitk:3085
+msgid "<F5>\t\tUpdate"
+msgstr "<F5>\t\tCập nhật"
+
- #: gitk:3568
++#: gitk:3550 gitk:3559
+#, tcl-format
+msgid "Error creating temporary directory %s:"
+msgstr "Gặp lỗi khi tạo thư mục tạm %s:"
+
- #: gitk:3631
++#: gitk:3572
+#, tcl-format
+msgid "Error getting \"%s\" from %s:"
+msgstr "Lỗi chào hỏi \"%s\" từ %s:"
+
- #: gitk:3780
++#: gitk:3635
+msgid "command failed:"
+msgstr "lệnh gặp lỗi:"
+
- #: gitk:3794
++#: gitk:3784
+msgid "No such commit"
+msgstr "Không có lần chuyển giao như vậy"
+
- #: gitk:3825
++#: gitk:3798
+msgid "git gui blame: command failed:"
+msgstr "git gui blame: lệnh gặp lỗi:"
+
- #: gitk:3833
++#: gitk:3829
+#, tcl-format
+msgid "Couldn't read merge head: %s"
+msgstr "Không thể độc đầu của hòa trộn: %s"
+
+# tcl-format
- #: gitk:3858
++#: gitk:3837
+#, tcl-format
+msgid "Error reading index: %s"
+msgstr "Gặp lỗi khi đọc chỉ mục: %s"
+
- #: gitk:3861 gitk:6735
++#: gitk:3862
+#, tcl-format
+msgid "Couldn't start git blame: %s"
+msgstr "Không thể khởi chạy git blame: %s"
+
- #: gitk:3893
++#: gitk:3865 gitk:6754
+msgid "Searching"
+msgstr "Đang tìm kiếm"
+
- #: gitk:3921
++#: gitk:3897
+#, tcl-format
+msgid "Error running git blame: %s"
+msgstr "Gặp lỗi khi chạy git blame: %s"
+
- #: gitk:3935
++#: gitk:3925
+#, tcl-format
+msgid "That line comes from commit %s, which is not in this view"
+msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này"
+
- #: gitk:4053
++#: gitk:3939
+msgid "External diff viewer failed:"
+msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:"
+
- #: gitk:4057
++#: gitk:4070
+msgid "Gitk view definition"
+msgstr "Định nghĩa cách trình bày gitk"
+
- #: gitk:4058
++#: gitk:4074
+msgid "Remember this view"
+msgstr "Nhớ cách trình bày này"
+
- #: gitk:4059
++#: gitk:4075
+msgid "References (space separated list):"
+msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):"
+
- #: gitk:4060
++#: gitk:4076
+msgid "Branches & tags:"
+msgstr "Nhánh & thẻ:"
+
- #: gitk:4061
++#: gitk:4077
+msgid "All refs"
+msgstr "Mọi tham chiếu"
+
- #: gitk:4062
++#: gitk:4078
+msgid "All (local) branches"
+msgstr "Mọi nhánh (nội bộ)"
+
- #: gitk:4063
++#: gitk:4079
+msgid "All tags"
+msgstr "Mọi thẻ"
+
- #: gitk:4064
++#: gitk:4080
+msgid "All remote-tracking branches"
+msgstr "Mọi nhánh remote-tracking"
+
- #: gitk:4065
++#: gitk:4081
+msgid "Commit Info (regular expressions):"
+msgstr "Thông tin chuyển giao (biểu thức chính quy):"
+
- #: gitk:4066
++#: gitk:4082
+msgid "Author:"
+msgstr "Tác giả:"
+
- #: gitk:4067
++#: gitk:4083
+msgid "Committer:"
+msgstr "Người chuyển giao:"
+
- #: gitk:4068
++#: gitk:4084
+msgid "Commit Message:"
+msgstr "Chú thích của lần chuyển giao:"
+
- #: gitk:4069
++#: gitk:4085
+msgid "Matches all Commit Info criteria"
+msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
+
- msgid "Matches none Commit Info criteria"
++#: gitk:4086
+#, fuzzy
- #: gitk:4070
++msgid "Matches no Commit Info criteria"
+msgstr "Khớp mọi điều kiện Thông tin Chuyển giao"
+
- #: gitk:4071
++#: gitk:4087
+msgid "Changes to Files:"
+msgstr "Đổi thành Tập tin:"
+
- #: gitk:4072
++#: gitk:4088
+msgid "Fixed String"
+msgstr "Chuỗi cố định"
+
- #: gitk:4073
++#: gitk:4089
+msgid "Regular Expression"
+msgstr "Biểu thức chính quy"
+
- #: gitk:4074
++#: gitk:4090
+msgid "Search string:"
+msgstr "Chuỗi tìm kiếm:"
+
- #: gitk:4075
++#: gitk:4091
+msgid ""
+"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+msgstr ""
+"Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
+"15:27:38\"):"
+
- #: gitk:4076
++#: gitk:4092
+msgid "Since:"
+msgstr "Kể từ:"
+
- #: gitk:4077
++#: gitk:4093
+msgid "Until:"
+msgstr "Đến:"
+
- #: gitk:4078
++#: gitk:4094
+msgid "Limit and/or skip a number of revisions (positive integer):"
+msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):"
+
- #: gitk:4079
++#: gitk:4095
+msgid "Number to show:"
+msgstr "Số lượng hiển thị:"
+
- #: gitk:4080
++#: gitk:4096
+msgid "Number to skip:"
+msgstr "Số lượng sẽ bỏ qua:"
+
- #: gitk:4081
++#: gitk:4097
+msgid "Miscellaneous options:"
+msgstr "Tuỳ chọn hỗn hợp:"
+
- #: gitk:4082
++#: gitk:4098
+msgid "Strictly sort by date"
+msgstr "Sắp xếp chặt chẽ theo ngày"
+
- #: gitk:4083
++#: gitk:4099
+msgid "Mark branch sides"
+msgstr "Đánh dấu các cạnh nhánh"
+
- #: gitk:4084
++#: gitk:4100
+msgid "Limit to first parent"
+msgstr "Giới hạn thành cha mẹ đầu tiên"
+
- #: gitk:4085
++#: gitk:4101
+msgid "Simple history"
+msgstr "Lịch sử dạng đơn giản"
+
- #: gitk:4086
++#: gitk:4102
+msgid "Additional arguments to git log:"
+msgstr "Đối số bổ xung cho lệnh git log:"
+
- #: gitk:4087
++#: gitk:4103
+msgid "Enter files and directories to include, one per line:"
+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:"
+
- #: gitk:4211
++#: gitk:4104
+msgid "Command to generate more commits to include:"
+msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:"
+
- #: gitk:4219
++#: gitk:4228
+msgid "Gitk: edit view"
+msgstr "Gitk: sửa cách trình bày"
+
- #: gitk:4224
++#: gitk:4236
+msgid "-- criteria for selecting revisions"
+msgstr "-- tiêu chuẩn chọn điểm xét duyệt"
+
- #: gitk:4299
++#: gitk:4241
+msgid "View Name"
+msgstr "Tên cách trình bày"
+
- #: gitk:4337
++#: gitk:4316
+msgid "Apply (F5)"
+msgstr "Áp dụng (F5)"
+
- #: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347
++#: gitk:4354
+msgid "Error in commit selection arguments:"
+msgstr "Lỗi trong các đối số chọn chuyển giao:"
+
- #: gitk:5003 gitk:5008
++#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
+msgid "None"
+msgstr "Không"
+
- #: gitk:5004
++#: gitk:5021 gitk:5026
+msgid "Descendant"
+msgstr "Con cháu"
+
- #: gitk:5011 gitk:5016
++#: gitk:5022
+msgid "Not descendant"
+msgstr "Không có con cháu"
+
- #: gitk:5012
++#: gitk:5029 gitk:5034
+msgid "Ancestor"
+msgstr "Tổ tiên chung"
+
- #: gitk:5306
++#: gitk:5030
+msgid "Not ancestor"
+msgstr "Không có chung tổ tiên"
+
- #: gitk:5342
++#: gitk:5324
+msgid "Local changes checked in to index but not committed"
+msgstr ""
+"Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao"
+
- #: gitk:7115
++#: gitk:5360
+msgid "Local uncommitted changes, not checked in to index"
+msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục"
+
- #: gitk:7118
++#: gitk:7134
+msgid "and many more"
+msgstr "và nhiều nữa"
+
- #: gitk:7309
++#: gitk:7137
+msgid "many"
+msgstr "nhiều"
+
- #: gitk:7326 gitk:7332 gitk:8806
++#: gitk:7328
+msgid "Tags:"
+msgstr "Thẻ:"
+
- #: gitk:7337
++#: gitk:7345 gitk:7351 gitk:8825
+msgid "Parent"
+msgstr "Cha"
+
- #: gitk:7346
++#: gitk:7356
+msgid "Child"
+msgstr "Con"
+
- #: gitk:7349
++#: gitk:7365
+msgid "Branch"
+msgstr "Nhánh"
+
- #: gitk:7352
++#: gitk:7368
+msgid "Follows"
+msgstr "Đứng sau"
+
- #: gitk:7947
++#: gitk:7371
+msgid "Precedes"
+msgstr "Đứng trước"
+
+# tcl-format
- #: gitk:8631
++#: gitk:7966
+#, tcl-format
+msgid "Error getting diffs: %s"
+msgstr "Lỗi lấy diff: %s"
+
- #: gitk:8652
++#: gitk:8650
+msgid "Goto:"
+msgstr "Nhảy tới:"
+
- #: gitk:8659
++#: gitk:8671
+#, tcl-format
+msgid "Short SHA1 id %s is ambiguous"
+msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng"
+
- #: gitk:8669
++#: gitk:8678
+#, tcl-format
+msgid "Revision %s is not known"
+msgstr "Không hiểu điểm xét duyệt %s"
+
- #: gitk:8671
++#: gitk:8688
+#, tcl-format
+msgid "SHA1 id %s is not known"
+msgstr "Không hiểu định danh SHA1 %s"
+
- #: gitk:8813 gitk:8828
++#: gitk:8690
+#, tcl-format
+msgid "Revision %s is not in the current view"
+msgstr "Điểm %s không ở trong phần hiển thị hiện tại"
+
- #: gitk:8816
++#: gitk:8832 gitk:8847
+msgid "Date"
+msgstr "Ngày"
+
- #: gitk:8879
++#: gitk:8835
+msgid "Children"
+msgstr "Con cháu"
+
- #: gitk:8881
++#: gitk:8898
+#, tcl-format
+msgid "Reset %s branch to here"
+msgstr "Đặt lại nhánh %s tại đây"
+
- #: gitk:8986 gitk:8992
++#: gitk:8900
+msgid "Detached head: can't reset"
+msgstr "Head đã bị tách rời: không thể đặt lại"
+
- #: gitk:9001 gitk:9006
++#: gitk:9005 gitk:9011
+msgid "Skipping merge commit "
+msgstr "Bỏ qua lần chuyển giao hòa trộn "
+
- #: gitk:9002 gitk:9007
++#: gitk:9020 gitk:9025
+msgid "Error getting patch ID for "
+msgstr "Gặp lỗi khi lấy ID miếng vá cho "
+
- #: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046
++#: gitk:9021 gitk:9026
+msgid " - stopping\n"
+msgstr " - dừng\n"
+
- #: gitk:9016
++#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
+msgid "Commit "
+msgstr "Commit "
+
- #: gitk:9024
++#: gitk:9035
+msgid ""
+" is the same patch as\n"
+" "
+msgstr ""
+" là cùng một miếng vá với\n"
+" "
+
- #: gitk:9026
++#: gitk:9043
+msgid ""
+" differs from\n"
+" "
+msgstr ""
+" khác biệt từ\n"
+" "
+
- #: gitk:9038 gitk:9047
++#: gitk:9045
+msgid ""
+"Diff of commits:\n"
+"\n"
+msgstr ""
+"Khác biệt của lần chuyển giao (commit):\n"
+"\n"
+
- #: gitk:9066
++#: gitk:9057 gitk:9066
+#, tcl-format
+msgid " has %s children - stopping\n"
+msgstr " có %s con - dừng\n"
+
- #: gitk:9072
++#: gitk:9085
+#, tcl-format
+msgid "Error writing commit to file: %s"
+msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s"
+
- #: gitk:9118
++#: gitk:9091
+#, tcl-format
+msgid "Error diffing commits: %s"
+msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s"
+
- #: gitk:9119
++#: gitk:9137
+msgid "Top"
+msgstr "Đỉnh"
+
- #: gitk:9124
++#: gitk:9138
+msgid "From"
+msgstr "Từ"
+
- #: gitk:9148
++#: gitk:9143
+msgid "To"
+msgstr "Đến"
+
- #: gitk:9150
++#: gitk:9167
+msgid "Generate patch"
+msgstr "Tạo miếng vá"
+
- #: gitk:9159
++#: gitk:9169
+msgid "From:"
+msgstr "Từ:"
+
- #: gitk:9168
++#: gitk:9178
+msgid "To:"
+msgstr "Đến:"
+
- #: gitk:9170 gitk:9366
++#: gitk:9187
+msgid "Reverse"
+msgstr "Đảo ngược"
+
- #: gitk:9176
++#: gitk:9189 gitk:9385
+msgid "Output file:"
+msgstr "Tập tin kết xuất:"
+
- #: gitk:9214
++#: gitk:9195
+msgid "Generate"
+msgstr "Tạo"
+
- #: gitk:9237 gitk:9354 gitk:9411
++#: gitk:9233
+msgid "Error creating patch:"
+msgstr "Gặp lỗi khi tạo miếng vá:"
+
- #: gitk:9246
++#: gitk:9256 gitk:9373 gitk:9430
+msgid "ID:"
+msgstr "ID:"
+
- #: gitk:9249
++#: gitk:9265
+msgid "Tag name:"
+msgstr "Tên thẻ:"
+
- #: gitk:9251
++#: gitk:9268
+msgid "Tag message is optional"
+msgstr "Ghi chú thẻ chỉ là tùy chọn"
+
- #: gitk:9255 gitk:9420
++#: gitk:9270
+msgid "Tag message:"
+msgstr "Ghi chú cho thẻ:"
+
- #: gitk:9273
++#: gitk:9274 gitk:9439
+msgid "Create"
+msgstr "Tạo"
+
- #: gitk:9277
++#: gitk:9292
+msgid "No tag name specified"
+msgstr "Chưa chỉ ra tên của thẻ"
+
- #: gitk:9287
++#: gitk:9296
+#, tcl-format
+msgid "Tag \"%s\" already exists"
+msgstr "Thẻ “%s” đã có sẵn rồi"
+
- #: gitk:9363
++#: gitk:9306
+msgid "Error creating tag:"
+msgstr "Gặp lỗi khi tạo thẻ:"
+
- #: gitk:9371
++#: gitk:9382
+msgid "Command:"
+msgstr "Lệnh:"
+
- #: gitk:9389
++#: gitk:9390
+msgid "Write"
+msgstr "Ghi"
+
- #: gitk:9416
++#: gitk:9408
+msgid "Error writing commit:"
+msgstr "Gặp lỗi trong quá trình ghi chuyển giao:"
+
- #: gitk:9439
++#: gitk:9435
+msgid "Name:"
+msgstr "Tên:"
+
- #: gitk:9444
++#: gitk:9458
+msgid "Please specify a name for the new branch"
+msgstr "Vui lòng chỉ định tên cho nhánh mới"
+
- #: gitk:9511
++#: gitk:9463
+#, tcl-format
+msgid "Branch '%s' already exists. Overwrite?"
+msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?"
+
- #: gitk:9516
++#: gitk:9530
+#, tcl-format
+msgid "Commit %s is already included in branch %s -- really re-apply it?"
+msgstr ""
+"Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn "
+"áp dụng lại nó không?"
+
- #: gitk:9525
++#: gitk:9535
+msgid "Cherry-picking"
+msgstr "Đang cherry-pick"
+
- #: gitk:9531
++#: gitk:9544
+#, 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 ""
+"Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n"
+"Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại."
+
- #: gitk:9547 gitk:9605
++#: gitk:9550
+msgid ""
+"Cherry-pick failed because of merge conflict.\n"
+"Do you wish to run git citool to resolve it?"
+msgstr ""
+"Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n"
+"Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?"
+
- #: gitk:9574
++#: gitk:9566 gitk:9624
+msgid "No changes committed"
+msgstr "Không có thay đổi nào cần chuyển giao"
+
- #: gitk:9579
++#: gitk:9593
+#, tcl-format
+msgid "Commit %s is not included in branch %s -- really revert it?"
+msgstr ""
+"Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn "
+"“revert” nó không?"
+
- #: gitk:9587
++#: gitk:9598
+msgid "Reverting"
+msgstr "Đang hoàn tác"
+
- #: gitk:9591
++#: gitk:9606
+#, 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 ""
+"Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n"
+"Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại."
+
- #: gitk:9634
++#: gitk:9610
+msgid ""
+"Revert failed because of merge conflict.\n"
+" Do you wish to run git citool to resolve it?"
+msgstr ""
+"Revert gặp lỗi bởi vì xung đột hòa trộn.\n"
+" Bạn có muốn chạy lệnh “git citool” để phân giải nó không?"
+
- #: gitk:9636
++#: gitk:9653
+msgid "Confirm reset"
+msgstr "Xác nhật đặt lại"
+
- #: gitk:9638
++#: gitk:9655
+#, tcl-format
+msgid "Reset branch %s to %s?"
+msgstr "Đặt lại nhánh “%s” thành “%s”?"
+
- #: gitk:9641
++#: gitk:9657
+msgid "Reset type:"
+msgstr "Kiểu đặt lại:"
+
- #: gitk:9644
++#: gitk:9660
+msgid "Soft: Leave working tree and index untouched"
+msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục"
+
- #: gitk:9647
++#: gitk:9663
+msgid "Mixed: Leave working tree untouched, reset index"
+msgstr ""
+"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"
+
- #: gitk:9664
++#: gitk:9666
+msgid ""
+"Hard: Reset working tree and index\n"
+"(discard ALL local changes)"
+msgstr ""
+"Hard: Đặt lại cây làm việc và mục lục\n"
+"(hủy bỏ MỌI thay đổi nội bộ)"
+
- #: gitk:9724
++#: gitk:9683
+msgid "Resetting"
+msgstr "Đang đặt lại"
+
- #: gitk:9777
++#: gitk:9743
+msgid "Checking out"
+msgstr "Đang checkout"
+
- #: gitk:9783
++#: gitk:9796
+msgid "Cannot delete the currently checked-out branch"
+msgstr "Không thể xóa nhánh hiện tại đang được lấy ra"
+
- #: gitk:9814
++#: gitk:9802
+#, tcl-format
+msgid ""
+"The commits on branch %s aren't on any other branch.\n"
+"Really delete branch %s?"
+msgstr ""
+"Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n"
+"Thực sự muốn xóa nhánh %s?"
+
- #: gitk:9829
++#: gitk:9833
+#, tcl-format
+msgid "Tags and heads: %s"
+msgstr "Thẻ và Đầu: %s"
+
- #: gitk:10125
++#: gitk:9850
+msgid "Filter"
+msgstr "Bộ lọc"
+
- #: gitk:11102
++#: gitk:10146
+msgid ""
+"Error reading commit topology information; branch and preceding/following "
+"tag information will be incomplete."
+msgstr ""
+"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ẻ "
+"trước/sau sẽ không hoàn thiện."
+
- #: gitk:11106
++#: gitk:11123
+msgid "Tag"
+msgstr "Thẻ"
+
- #: gitk:11189
++#: gitk:11127
+msgid "Id"
+msgstr "Id"
+
- #: gitk:11206
++#: gitk:11210
+msgid "Gitk font chooser"
+msgstr "Hộp thoại chọn phông Gitk"
+
- #: gitk:11209
++#: gitk:11227
+msgid "B"
+msgstr "B"
+
- #: gitk:11327
++#: gitk:11230
+msgid "I"
+msgstr "I"
+
- #: gitk:11330
++#: gitk:11348
+msgid "Commit list display options"
+msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao"
+
- #: gitk:11334
++#: gitk:11351
+msgid "Maximum graph width (lines)"
+msgstr "Độ rộng biểu đồ tối đa (dòng)"
+
- #: gitk:11337
++#: gitk:11355
+#, no-tcl-format
+msgid "Maximum graph width (% of pane)"
+msgstr "Độ rộng biểu đồ tối đa (% của bảng)"
+
- #: gitk:11340
++#: gitk:11358
+msgid "Show local changes"
+msgstr "Hiển thị các thay đổi nội bộ"
+
- #: gitk:11344
++#: gitk:11361
+msgid "Auto-select SHA1 (length)"
+msgstr "Tự chọn SHA1 (độ dài)"
+
- #: gitk:11348
++#: gitk:11365
+msgid "Hide remote refs"
+msgstr "Ẩn tham chiếu đến máy chủ"
+
- #: gitk:11350
++#: gitk:11369
+msgid "Diff display options"
+msgstr "Các tùy chọn trình bày các khác biệt"
+
- #: gitk:11353
++#: gitk:11371
+msgid "Tab spacing"
+msgstr "Khoảng cách tab"
+
- #: gitk:11356
++#: gitk:11374
+msgid "Display nearby tags/heads"
+msgstr "Hiển thị các thẻ/đầu xung quanh"
+
- #: gitk:11359
++#: gitk:11377
+msgid "Maximum # tags/heads to show"
+msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị"
+
- #: gitk:11362
++#: gitk:11380
+msgid "Limit diffs to listed paths"
+msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê"
+
- #: gitk:11368 gitk:11515
++#: gitk:11383
+msgid "Support per-file encodings"
+msgstr "Hỗ trợ mã hóa mỗi-dòng"
+
- #: gitk:11369
++#: gitk:11389 gitk:11536
+msgid "External diff tool"
+msgstr "Công cụ so sánh từ bên ngoài"
+
- #: gitk:11374
++#: gitk:11390
+msgid "Choose..."
+msgstr "Chọn..."
+
- #: gitk:11377
++#: gitk:11395
+msgid "General options"
+msgstr "Các tùy chọn chung"
+
- #: gitk:11379
++#: gitk:11398
+msgid "Use themed widgets"
+msgstr "Dùng các widget chủ đề"
+
- #: gitk:11381
++#: gitk:11400
+msgid "(change requires restart)"
+msgstr "(để thay đổi cần khởi động lại)"
+
- #: gitk:11392
++#: gitk:11402
+msgid "(currently unavailable)"
+msgstr "(hiện tại không sẵn sàng)"
+
- #: gitk:11395
++#: gitk:11413
+msgid "Colors: press to choose"
+msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu"
+
- #: gitk:11396
++#: gitk:11416
+msgid "Interface"
+msgstr "Giao diện"
+
- #: gitk:11399
++#: gitk:11417
+msgid "interface"
+msgstr "giao diện"
+
- #: gitk:11400 gitk:11430
++#: gitk:11420
+msgid "Background"
+msgstr "Nền"
+
- #: gitk:11403
++#: gitk:11421 gitk:11451
+msgid "background"
+msgstr "nền"
+
- #: gitk:11404
++#: gitk:11424
+msgid "Foreground"
+msgstr "Tiền cảnh"
+
- #: gitk:11407
++#: gitk:11425
+msgid "foreground"
+msgstr "tiền cảnh"
+
- #: gitk:11408
++#: gitk:11428
+msgid "Diff: old lines"
+msgstr "So sánh: dòng cũ"
+
- #: gitk:11412
++#: gitk:11429
+msgid "diff old lines"
+msgstr "diff dòng cũ"
+
- #: gitk:11413
++#: gitk:11433
+msgid "Diff: new lines"
+msgstr "So sánh: dòng mới"
+
- #: gitk:11417
++#: gitk:11434
+msgid "diff new lines"
+msgstr "màu dòng mới"
+
- #: gitk:11419
++#: gitk:11438
+msgid "Diff: hunk header"
+msgstr "So sánh: phần đầu của đoạn"
+
- #: gitk:11423
++#: gitk:11440
+msgid "diff hunk header"
+msgstr "màu của phần đầu của đoạn khi so sánh"
+
- #: gitk:11425
++#: gitk:11444
+msgid "Marked line bg"
+msgstr "Nền dòng đánh dấu"
+
- #: gitk:11429
++#: gitk:11446
+msgid "marked line background"
+msgstr "nền dòng được đánh dấu"
+
- #: gitk:11438
++#: gitk:11450
+msgid "Select bg"
+msgstr "Màu nền"
+
- #: gitk:11440
++#: gitk:11459
+msgid "Fonts: press to choose"
+msgstr "Phông chữ: bấm vào các nút ở dưới để chọn"
+
- #: gitk:11441
++#: gitk:11461
+msgid "Main font"
+msgstr "Phông chữ chính"
+
- #: gitk:11442
++#: gitk:11462
+msgid "Diff display font"
+msgstr "Phông chữ dùng khi so sánh"
+
- #: gitk:11464
++#: gitk:11463
+msgid "User interface font"
+msgstr "Phông chữ giao diện"
+
- #: gitk:11473
++#: gitk:11485
+msgid "Gitk preferences"
+msgstr "Cá nhân hóa các cài đặt cho Gitk"
+
- #: gitk:11474
++#: gitk:11494
+msgid "General"
+msgstr "Chung"
+
- #: gitk:11475
++#: gitk:11495
+msgid "Colors"
+msgstr "Màu sắc"
+
- #: gitk:11525
++#: gitk:11496
+msgid "Fonts"
+msgstr "Phông chữ"
+
- #: gitk:12242
++#: gitk:11546
+#, tcl-format
+msgid "Gitk: choose color for %s"
+msgstr "Gitk: chọn màu cho %s"
+
- #: gitk:12289
++#: gitk:12059
++msgid ""
++"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
++" Gitk requires at least Tcl/Tk 8.4."
++msgstr ""
++
++#: gitk:12269
+msgid "Cannot find a git repository here."
+msgstr "Không thể tìm thấy kho git ở đây."
+
- #: gitk:12301
++#: gitk:12316
+#, tcl-format
+msgid "Ambiguous argument '%s': both revision and filename"
+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"
+
- #: gitk:12405
- msgid "Command line"
- msgstr "Dòng lệnh"
++#: gitk:12328
+msgid "Bad arguments to gitk:"
+msgstr "Đối số không hợp lệ cho gitk:"
+
++#~ msgid "mc"
++#~ msgstr "mc"
+
+#~ msgid "next"
+#~ msgstr "tiếp"
+
+#~ msgid "prev"
+#~ msgstr "trước"
projects / git / commitdiff