From: Junio C Hamano Date: Tue, 24 Mar 2015 23:10:37 +0000 (-0700) Subject: Merge branch 'master' of git://ozlabs.org/~paulus/gitk X-Git-Tag: v2.4.0-rc0~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92e625d3a3a94b9765baf4d54b1fd86117656d30;p=thirdparty%2Fgit.git Merge branch 'master' of git://ozlabs.org/~paulus/gitk * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Update .po files gitk: l10n: Add Catalan translation gitk: Fix typo in Russian translation gitk: Remove tcl-format flag from a message that shouldn't have it gitk: Pass --invert-grep option down to "git log" gitk: Synchronize config file writes gitk: Report errors in saving config file gitk: Only write changed configuration variables gitk: Enable mouse horizontal scrolling in diff pane gitk: Default wrcomcmd to use --pretty=email --- 92e625d3a3a94b9765baf4d54b1fd86117656d30 diff --cc gitk-git/po/bg.po index f86a161129,0000000000..1df0716c38 mode 100644,000000..100644 --- a/gitk-git/po/bg.po +++ b/gitk-git/po/bg.po @@@ -1,1340 -1,0 +1,1350 @@@ +# Bulgarian translation of gitk po-file. +# Copyright (C) 2014 Alexander Shopov . +# This file is distributed under the same license as the git package. +# Alexander Shopov , 2014. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk master\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2014-08-03 11:17+0300\n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2014-07-28 07:32+0300\n" +"Last-Translator: Alexander Shopov \n" +"Language-Team: Bulgarian \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:2379 ++#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Оцветяване на думите" + - #: gitk:217 gitk:2379 gitk:8155 gitk:8188 ++#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Отбелязване на думите" + - #: gitk:322 ++#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Грешка при разбор на версиите:" + - #: gitk:378 ++#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Грешка при изпълнение на командата с „--argscmd“." + - #: gitk:391 ++#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове." + - #: gitk:394 ++#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове " +"в ограниченията." + - #: gitk:416 gitk:564 ++#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Грешка при изпълнение на „git log“:" + - #: gitk:434 gitk:580 ++#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Прочитане" + - #: gitk:494 gitk:4470 ++#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Прочитане на подаванията…" + - #: gitk:497 gitk:1635 gitk:4473 ++#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Не са избрани подавания" + - #: gitk:1509 ++#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Изходът от „git log“ не може да се анализира:" + - #: gitk:1738 ++#: gitk:1740 +msgid "No commit information available" +msgstr "Липсва информация за подавания" + - #: gitk:1895 ++#: gitk:1897 +msgid "mc" +msgstr "mc" + - #: gitk:1930 gitk:4263 gitk:9604 gitk:11174 gitk:11453 ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "Добре" + - #: gitk:1932 gitk:4265 gitk:9131 gitk:9210 gitk:9326 gitk:9375 gitk:9606 - #: gitk:11175 gitk:11454 ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Отказ" + - #: gitk:2067 ++#: gitk:2069 +msgid "Update" +msgstr "Обновяване" + - #: gitk:2068 ++#: gitk:2070 +msgid "Reload" +msgstr "Презареждане" + - #: gitk:2069 ++#: gitk:2071 +msgid "Reread references" +msgstr "Наново прочитане на настройките" + - #: gitk:2070 ++#: gitk:2072 +msgid "List references" +msgstr "Изброяване на указателите" + - #: gitk:2072 ++#: gitk:2074 +msgid "Start git gui" +msgstr "Стартиране на „git gui“" + - #: gitk:2074 ++#: gitk:2076 +msgid "Quit" +msgstr "Спиране на програмата" + - #: gitk:2066 ++#: gitk:2068 +msgid "File" +msgstr "Файл" + - #: gitk:2078 ++#: gitk:2080 +msgid "Preferences" +msgstr "Настройки" + - #: gitk:2077 ++#: gitk:2079 +msgid "Edit" +msgstr "Редактиране" + - #: gitk:2082 ++#: gitk:2084 +msgid "New view..." +msgstr "Нов изглед…" + - #: gitk:2083 ++#: gitk:2085 +msgid "Edit view..." +msgstr "Редактиране на изгледа…" + - #: gitk:2084 ++#: gitk:2086 +msgid "Delete view" +msgstr "Изтриване на изгледа" + - #: gitk:2086 ++#: gitk:2088 +msgid "All files" +msgstr "Всички файлове" + - #: gitk:2081 gitk:4016 ++#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Изглед" + - #: gitk:2091 gitk:2101 gitk:2976 ++#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Относно gitk" + - #: gitk:2092 gitk:2106 ++#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Клавишни комбинации" + - #: gitk:2090 gitk:2105 ++#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Помощ" + - #: gitk:2183 gitk:8587 ++#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1:" + - #: gitk:2227 ++#: gitk:2229 +msgid "Row" +msgstr "Ред" + - #: gitk:2265 ++#: gitk:2267 +msgid "Find" +msgstr "Търсене" + - #: gitk:2293 ++#: gitk:2295 +msgid "commit" +msgstr "подаване" + - #: gitk:2297 gitk:2299 gitk:4631 gitk:4654 gitk:4678 gitk:6698 gitk:6770 - #: gitk:6855 ++#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 +msgid "containing:" +msgstr "съдържащо:" + - #: gitk:2300 gitk:3488 gitk:3493 gitk:4707 ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "засягащо пътищата:" + - #: gitk:2301 gitk:4721 ++#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "добавящо/премахващо низ" + - #: gitk:2302 gitk:4723 ++#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "променящо редове напасващи:" + - #: gitk:2311 gitk:2313 gitk:4710 ++#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Точно" + - #: gitk:2313 gitk:4798 gitk:6666 ++#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Без регистър" + - #: gitk:2313 gitk:4680 gitk:4796 gitk:6662 ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Рег. израз" + - #: gitk:2315 gitk:2316 gitk:4818 gitk:4848 gitk:4855 gitk:6791 gitk:6859 ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Всички полета" + - #: gitk:2316 gitk:4815 gitk:4848 gitk:6729 ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Първи ред" + - #: gitk:2317 gitk:4815 gitk:6729 gitk:6859 gitk:7332 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Коментари" + - #: gitk:2317 gitk:4815 gitk:4820 gitk:4855 gitk:6729 gitk:7267 gitk:8765 - #: gitk:8780 ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 +msgid "Author" +msgstr "Автор" + - #: gitk:2317 gitk:4815 gitk:6729 gitk:7269 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Подаващ" + - #: gitk:2348 ++#: gitk:2350 +msgid "Search" +msgstr "Търсене" + - #: gitk:2356 ++#: gitk:2358 +msgid "Diff" +msgstr "Разлики" + - #: gitk:2358 ++#: gitk:2360 +msgid "Old version" +msgstr "Стара версия" + - #: gitk:2360 ++#: gitk:2362 +msgid "New version" +msgstr "Нова версия" + - #: gitk:2362 ++#: gitk:2364 +msgid "Lines of context" +msgstr "Контекст в редове" + - #: gitk:2372 ++#: gitk:2374 +msgid "Ignore space change" +msgstr "Празните знаци без значение" + - #: gitk:2376 gitk:2378 gitk:7894 gitk:8141 ++#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Поредови разлики" + - #: gitk:2443 ++#: gitk:2445 +msgid "Patch" +msgstr "Кръпка" + - #: gitk:2445 ++#: gitk:2447 +msgid "Tree" +msgstr "Дърво" + - #: gitk:2604 gitk:2624 ++#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Разлики между това и избраното" + - #: gitk:2605 gitk:2625 ++#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Разлики между избраното и това" + - #: gitk:2606 gitk:2626 ++#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Създаване на кръпка" + - #: gitk:2607 gitk:9189 ++#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Създаване на етикет" + - #: gitk:2608 gitk:9306 ++#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Запазване на подаването във файл" + - #: gitk:2609 gitk:9363 ++#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Създаване на нов клон" + - #: gitk:2610 ++#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Отбиране на това подаване" + - #: gitk:2611 ++#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Привеждане на върха на клона към текущото подаване" + - #: gitk:2612 ++#: gitk:2624 +msgid "Mark this commit" +msgstr "Отбелязване на това подаване" + - #: gitk:2613 ++#: gitk:2625 +msgid "Return to mark" +msgstr "Връщане към отбелязаното подаване" + - #: gitk:2614 ++#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Откриване и отбелязване на наследниците" + - #: gitk:2615 ++#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Сравнение с отбелязаното подаване" + - #: gitk:2616 gitk:2627 ++#: gitk:2628 gitk:2639 +msgid "Diff this -> marked commit" +msgstr "Разлики между това и отбелязаното" + - #: gitk:2617 gitk:2628 ++#: gitk:2629 gitk:2640 +msgid "Diff marked commit -> this" +msgstr "Разлики между отбелязаното и това" + - #: gitk:2618 ++#: gitk:2630 +msgid "Revert this commit" +msgstr "Отмяна на това подаване" + - #: gitk:2634 ++#: gitk:2646 +msgid "Check out this branch" +msgstr "Изтегляне на този клон" + - #: gitk:2635 ++#: gitk:2647 +msgid "Remove this branch" +msgstr "Изтриване на този клон" + - #: gitk:2642 ++#: gitk:2654 +msgid "Highlight this too" +msgstr "Отбелязване и на това" + - #: gitk:2643 ++#: gitk:2655 +msgid "Highlight this only" +msgstr "Отбелязване само на това" + - #: gitk:2644 ++#: gitk:2656 +msgid "External diff" +msgstr "Външна програма за разлики" + - #: gitk:2645 ++#: gitk:2657 +msgid "Blame parent commit" +msgstr "Анотиране на родителското подаване" + - #: gitk:2652 ++#: gitk:2664 +msgid "Show origin of this line" +msgstr "Показване на произхода на този ред" + - #: gitk:2653 ++#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Изпълнение на „git gui blame“ върху този ред" + - #: gitk:2978 ++#: gitk:3011 +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:2986 gitk:3051 gitk:9790 ++#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Затваряне" + - #: gitk:3007 ++#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Клавишни комбинации" + - #: gitk:3010 ++#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Клавишни комбинации:" + - #: gitk:3012 ++#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tСпиране на програмата" + - #: gitk:3013 ++#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tЗатваряне на прозореца" + - #: gitk:3014 ++#: gitk:3047 +msgid "\t\tMove to first commit" +msgstr "\t\tКъм първото подаване" + - #: gitk:3015 ++#: gitk:3048 +msgid "\t\tMove to last commit" +msgstr "\t\tКъм последното подаване" + - #: gitk:3016 ++#: gitk:3049 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tЕдно подаване нагоре" + - #: gitk:3017 ++#: gitk:3050 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tЕдно подаване надолу" + - #: gitk:3018 ++#: gitk:3051 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tНазад в историята" + - #: gitk:3019 ++#: gitk:3052 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tНапред в историята" + - #: gitk:3020 ++#: gitk:3053 ++#, tcl-format ++msgid "<%s-n>\tGo to n-th parent of current commit in history list" ++msgstr "" ++ ++#: gitk:3054 +msgid "\tMove up one page in commit list" +msgstr "\tСтраница нагоре в списъка с подаванията" + - #: gitk:3021 ++#: gitk:3055 +msgid "\tMove down one page in commit list" +msgstr "\tСтраница надолу в списъка с подаванията" + - #: gitk:3022 ++#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tКъм началото на списъка с подаванията" + - #: gitk:3023 ++#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tКъм края на списъка с подаванията" + - #: gitk:3024 ++#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tРед нагоре в списъка с подавания" + - #: gitk:3025 ++#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tРед надолу в списъка с подавания" + - #: gitk:3026 ++#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания" + - #: gitk:3027 ++#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания" + - #: gitk:3028 ++#: gitk:3062 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tТърсене назад (визуално нагоре, исторически — последващи)" + - #: gitk:3029 ++#: gitk:3063 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "" +"\tТърсене напред (визуално надолу, исторически — предхождащи)" + - #: gitk:3030 ++#: gitk:3064 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tСтраница нагоре в изгледа за разлики" + - #: gitk:3031 ++#: gitk:3065 +msgid "\tScroll diff view up one page" +msgstr "\tСтраница надолу в изгледа за разлики" + - #: gitk:3032 ++#: gitk:3066 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tСтраница надолу в изгледа за разлики" + - #: gitk:3033 ++#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\t18 реда нагоре в изгледа за разлики" + - #: gitk:3034 ++#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\t18 реда надолу в изгледа за разлики" + - #: gitk:3035 ++#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tТърсене" + - #: gitk:3036 ++#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tКъм следващата поява" + - #: gitk:3037 ++#: gitk:3071 +msgid "\tMove to next find hit" +msgstr "\tКъм следващата поява" + - #: gitk:3038 ++#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tФокус върху полето за търсене" + - #: gitk:3039 ++#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tКъм предишната поява" + - #: gitk:3040 ++#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tСледващ файл в изгледа за разлики" + - #: gitk:3041 ++#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики" + - #: gitk:3042 ++#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики" + - #: gitk:3043 ++#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tПо-голям размер на шрифта" + - #: gitk:3044 ++#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tПо-голям размер на шрифта" + - #: gitk:3045 ++#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tПо-малък размер на шрифта" + - #: gitk:3046 ++#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tПо-малък размер на шрифта" + - #: gitk:3047 ++#: gitk:3081 +msgid "\t\tUpdate" +msgstr "\t\tОбновяване" + - #: gitk:3512 gitk:3521 ++#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Грешка при създаването на временната директория „%s“:" + - #: gitk:3534 ++#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Грешка при получаването на „%s“ от %s:" + - #: gitk:3597 ++#: gitk:3631 +msgid "command failed:" +msgstr "неуспешно изпълнение на команда:" + - #: gitk:3746 ++#: gitk:3780 +msgid "No such commit" +msgstr "Такова подаване няма" + - #: gitk:3760 ++#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "„git gui blame“: неуспешно изпълнение на команда:" + - #: gitk:3791 ++#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Върхът за сливане не може да бъде прочетен: %s" + - #: gitk:3799 ++#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Грешка при прочитане на индекса: %s" + - #: gitk:3824 ++#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Командата „git blame“ не може да бъде стартирана: %s" + - #: gitk:3827 gitk:6697 ++#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Търсене" + - #: gitk:3859 ++#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Грешка при изпълнението на „git blame“: %s" + - #: gitk:3887 ++#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Този ред идва от подаването %s, което не е в изгледа" + - #: gitk:3901 ++#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Неуспешно изпълнение на външната програма за разлики:" + - #: gitk:4019 ++#: gitk:4053 +msgid "Gitk view definition" +msgstr "Дефиниция на изглед в Gitk" + - #: gitk:4023 ++#: gitk:4057 +msgid "Remember this view" +msgstr "Запазване на този изглед" + - #: gitk:4024 ++#: gitk:4058 +msgid "References (space separated list):" +msgstr "Указатели (списък с разделител интервал):" + - #: gitk:4025 ++#: gitk:4059 +msgid "Branches & tags:" +msgstr "Клони и етикети:" + - #: gitk:4026 ++#: gitk:4060 +msgid "All refs" +msgstr "Всички указатели" + - #: gitk:4027 ++#: gitk:4061 +msgid "All (local) branches" +msgstr "Всички (локални) клони" + - #: gitk:4028 ++#: gitk:4062 +msgid "All tags" +msgstr "Всички етикети" + - #: gitk:4029 ++#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Всички следящи клони" + - #: gitk:4030 ++#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Информация за подаване (рег. изр.):" + - #: gitk:4031 ++#: gitk:4065 +msgid "Author:" +msgstr "Автор:" + - #: gitk:4032 ++#: gitk:4066 +msgid "Committer:" +msgstr "Подал:" + - #: gitk:4033 ++#: gitk:4067 +msgid "Commit Message:" +msgstr "Съобщение при подаване:" + - #: gitk:4034 ++#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Съвпадение по коя да е информация за подаването" + - #: gitk:4035 ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Съвпадение по коя да е информация за подаването" ++ ++#: gitk:4070 +msgid "Changes to Files:" +msgstr "Промени по файловете:" + - #: gitk:4036 ++#: gitk:4071 +msgid "Fixed String" +msgstr "Дословен низ" + - #: gitk:4037 ++#: gitk:4072 +msgid "Regular Expression" +msgstr "Регулярен израз" + - #: gitk:4038 ++#: gitk:4073 +msgid "Search string:" +msgstr "Низ за търсене:" + - #: gitk:4039 ++#: gitk:4074 +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:4040 ++#: gitk:4075 +msgid "Since:" +msgstr "От:" + - #: gitk:4041 ++#: gitk:4076 +msgid "Until:" +msgstr "До:" + - #: gitk:4042 ++#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" +"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло " +"число):" + - #: gitk:4043 ++#: gitk:4078 +msgid "Number to show:" +msgstr "Брой показани:" + - #: gitk:4044 ++#: gitk:4079 +msgid "Number to skip:" +msgstr "Брой прескочени:" + - #: gitk:4045 ++#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Разни:" + - #: gitk:4046 ++#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Подреждане по дата" + - #: gitk:4047 ++#: gitk:4082 +msgid "Mark branch sides" +msgstr "Отбелязване на страните по клона" + - #: gitk:4048 ++#: gitk:4083 +msgid "Limit to first parent" +msgstr "Само първия родител" + - #: gitk:4049 ++#: gitk:4084 +msgid "Simple history" +msgstr "Опростена история" + - #: gitk:4050 ++#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Допълнителни аргументи към „git log“:" + - #: gitk:4051 ++#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Въведете файловете и директориите за включване, по елемент на ред" + - #: gitk:4052 ++#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "" +"Команда за генерирането на допълнителни подавания, които да бъдат включени:" + - #: gitk:4176 ++#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: редактиране на изглед" + - #: gitk:4184 ++#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "— критерии за избор на версии" + - #: gitk:4189 ++#: gitk:4224 +msgid "View Name" +msgstr "Име на изглед" + - #: gitk:4264 ++#: gitk:4299 +msgid "Apply (F5)" +msgstr "Прилагане (F5)" + - #: gitk:4302 ++#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Грешка в аргументите за избор на подавания:" + - #: gitk:4355 gitk:4407 gitk:4868 gitk:4882 gitk:6152 gitk:12281 gitk:12282 ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Няма" + - #: gitk:4965 gitk:4970 ++#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Наследник" + - #: gitk:4966 ++#: gitk:5004 +msgid "Not descendant" +msgstr "Не е наследник" + - #: gitk:4973 gitk:4978 ++#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Предшественик" + - #: gitk:4974 ++#: gitk:5012 +msgid "Not ancestor" +msgstr "Не е предшественик" + - #: gitk:5268 ++#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Локални промени добавени към индекса, но неподадени" + - #: gitk:5304 ++#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Локални промени извън индекса" + - #: gitk:7077 ++#: gitk:7115 +msgid "and many more" +msgstr "и още много" + - #: gitk:7080 ++#: gitk:7118 +msgid "many" +msgstr "много" + - #: gitk:7271 ++#: gitk:7309 +msgid "Tags:" +msgstr "Етикети:" + - #: gitk:7288 gitk:7294 gitk:8760 ++#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Родител" + - #: gitk:7299 ++#: gitk:7337 +msgid "Child" +msgstr "Дете" + - #: gitk:7308 ++#: gitk:7346 +msgid "Branch" +msgstr "Клон" + - #: gitk:7311 ++#: gitk:7349 +msgid "Follows" +msgstr "Следва" + - #: gitk:7314 ++#: gitk:7352 +msgid "Precedes" +msgstr "Предшества" + - #: gitk:7901 ++#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Грешка при получаването на разликите: %s" + - #: gitk:8585 ++#: gitk:8631 +msgid "Goto:" +msgstr "Към ред:" + - #: gitk:8606 ++#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Съкратената сума по SHA1 %s не е еднозначна" + - #: gitk:8613 ++#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Непозната версия %s" + - #: gitk:8623 ++#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Непозната сума по SHA1 %s" + - #: gitk:8625 ++#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Версия %s не е в текущия изглед" + - #: gitk:8767 gitk:8782 ++#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Дата" + - #: gitk:8770 ++#: gitk:8816 +msgid "Children" +msgstr "Деца" + - #: gitk:8833 ++#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Зануляване на клона „%s“ към текущото подаване" + - #: gitk:8835 ++#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Несвързан връх: невъзможно зануляване" + - #: gitk:8940 gitk:8946 ++#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Пропускане на подаването на сливането" + - #: gitk:8955 gitk:8960 ++#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Грешка при получаването на идентификатора на " + - #: gitk:8956 gitk:8961 ++#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " — спиране\n" + - #: gitk:8966 gitk:8969 gitk:8977 gitk:8991 gitk:9000 ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Подаване" + - #: gitk:8970 ++#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" е същата кръпка като\n" +" " + - #: gitk:8978 ++#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" се различава от\n" +" " + - #: gitk:8980 ++#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Разлика между подаванията:\n" +"\n" + - #: gitk:8992 gitk:9001 ++#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " има %s деца — спиране\n" + - #: gitk:9020 ++#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Грешка при запазването на подаването във файл: %s" + - #: gitk:9026 ++#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Грешка при изчисляването на разликите между подаванията: %s" + - #: gitk:9072 ++#: gitk:9118 +msgid "Top" +msgstr "Най-горе" + - #: gitk:9073 ++#: gitk:9119 +msgid "From" +msgstr "От" + - #: gitk:9078 ++#: gitk:9124 +msgid "To" +msgstr "До" + - #: gitk:9102 ++#: gitk:9148 +msgid "Generate patch" +msgstr "Генериране на кръпка" + - #: gitk:9104 ++#: gitk:9150 +msgid "From:" +msgstr "От:" + - #: gitk:9113 ++#: gitk:9159 +msgid "To:" +msgstr "До:" + - #: gitk:9122 ++#: gitk:9168 +msgid "Reverse" +msgstr "Обръщане" + - #: gitk:9124 gitk:9320 ++#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Запазване във файла:" + - #: gitk:9130 ++#: gitk:9176 +msgid "Generate" +msgstr "Генериране" + - #: gitk:9168 ++#: gitk:9214 +msgid "Error creating patch:" +msgstr "Грешка при създаването на кръпка:" + - #: gitk:9191 gitk:9308 gitk:9365 ++#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "Идентификатор:" + - #: gitk:9200 ++#: gitk:9246 +msgid "Tag name:" +msgstr "Име на етикет:" + - #: gitk:9203 ++#: gitk:9249 +msgid "Tag message is optional" +msgstr "Съобщението за етикет е незадължително" + - #: gitk:9205 ++#: gitk:9251 +msgid "Tag message:" +msgstr "Съобщение за етикет:" + - #: gitk:9209 gitk:9374 ++#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Създаване" + - #: gitk:9227 ++#: gitk:9273 +msgid "No tag name specified" +msgstr "Липсва име на етикет" + - #: gitk:9231 ++#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Етикетът „%s“ вече съществува" + - #: gitk:9241 ++#: gitk:9287 +msgid "Error creating tag:" +msgstr "Грешка при създаването на етикет:" + - #: gitk:9317 ++#: gitk:9363 +msgid "Command:" +msgstr "Команда:" + - #: gitk:9325 ++#: gitk:9371 +msgid "Write" +msgstr "Запазване" + - #: gitk:9343 ++#: gitk:9389 +msgid "Error writing commit:" +msgstr "Грешка при запазването на подаването:" + - #: gitk:9370 ++#: gitk:9416 +msgid "Name:" +msgstr "Име:" + - #: gitk:9393 ++#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Укажете име за новия клон" + - #: gitk:9398 ++#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?" + - #: gitk:9465 ++#: gitk:9511 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" + - #: gitk:9470 ++#: gitk:9516 +msgid "Cherry-picking" +msgstr "Отбиране" + - #: gitk:9479 ++#: gitk:9525 +#, 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:9485 ++#: gitk:9531 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Неуспешно отбиране поради конфликти при сливане.\n" +"Искате ли да ги коригирате чрез „git citool“?" + - #: gitk:9501 gitk:9559 ++#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Не са подадени промени" + - #: gitk:9528 ++#: gitk:9574 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" + - #: gitk:9533 ++#: gitk:9579 +msgid "Reverting" +msgstr "Отмяна" + - #: gitk:9541 ++#: gitk:9587 +#, 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:9545 ++#: gitk:9591 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Неуспешно отмяна поради конфликти при сливане.\n" +"Искате ли да ги коригирате чрез „git citool“?" + - #: gitk:9588 ++#: gitk:9634 +msgid "Confirm reset" +msgstr "Потвърждаване на зануляването" + - #: gitk:9590 ++#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Да се занули ли клонът „%s“ към „%s“?" + - #: gitk:9592 ++#: gitk:9638 +msgid "Reset type:" +msgstr "Вид зануляване:" + - #: gitk:9595 ++#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Слабо: работното дърво и индекса остават същите" + - #: gitk:9598 ++#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Смесено: работното дърво остава същото, индексът се занулява" + - #: gitk:9601 ++#: gitk:9647 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Силно: зануляване и на работното дърво, и на индекса\n" +"(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" + - #: gitk:9618 ++#: gitk:9664 +msgid "Resetting" +msgstr "Зануляване" + - #: gitk:9678 ++#: gitk:9724 +msgid "Checking out" +msgstr "Изтегляне" + - #: gitk:9731 ++#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Текущо изтегленият клон не може да бъде изтрит" + - #: gitk:9737 ++#: gitk:9783 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Подаванията на клона „%s“ не са на никой друг клон.\n" +"Наистина ли да се изтрие клонът „%s“?" + - #: gitk:9768 ++#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Етикети и върхове: %s" + - #: gitk:9783 ++#: gitk:9829 +msgid "Filter" +msgstr "Филтриране" + - #: gitk:10079 ++#: gitk:10125 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Грешка при прочитането на топологията на подаванията. Информацията за клона " +"и предшестващите/следващите етикети ще е непълна." + - #: gitk:11056 ++#: gitk:11102 +msgid "Tag" +msgstr "Етикет" + - #: gitk:11060 ++#: gitk:11106 +msgid "Id" +msgstr "Идентификатор" + - #: gitk:11143 ++#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Избор на шрифт за Gitk" + - #: gitk:11160 ++#: gitk:11206 +msgid "B" +msgstr "Ч" + - #: gitk:11163 ++#: gitk:11209 +msgid "I" +msgstr "К" + - #: gitk:11281 ++#: gitk:11327 +msgid "Commit list display options" +msgstr "Настройки на списъка с подавания" + - #: gitk:11284 ++#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Максимална широчина на графа (в редове)" + - #: gitk:11287 - #, tcl-format ++#: gitk:11334 ++#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Максимална широчина на графа (% от панела)" + - #: gitk:11290 ++#: gitk:11337 +msgid "Show local changes" +msgstr "Показване на локалните промени" + - #: gitk:11293 ++#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Автоматично избиране на SHA1 (дължина)" + - #: gitk:11297 ++#: gitk:11344 +msgid "Hide remote refs" +msgstr "Скриване на отдалечените указатели" + - #: gitk:11301 ++#: gitk:11348 +msgid "Diff display options" +msgstr "Настройки на показването на разликите" + - #: gitk:11303 ++#: gitk:11350 +msgid "Tab spacing" +msgstr "Широчина на табулатора" + - #: gitk:11306 ++#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Извеждане на близките етикети и върхове" + - #: gitk:11309 ++#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Максимален брой етикети/върхове за показване" + - #: gitk:11312 ++#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Разлика само в избраните пътища" + - #: gitk:11315 ++#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Поддръжка на различни кодирания за всеки файл" + - #: gitk:11321 gitk:11468 ++#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Външен инструмент за разлики" + - #: gitk:11322 ++#: gitk:11369 +msgid "Choose..." +msgstr "Избор…" + - #: gitk:11327 ++#: gitk:11374 +msgid "General options" +msgstr "Общи настройки" + - #: gitk:11330 ++#: gitk:11377 +msgid "Use themed widgets" +msgstr "Използване на тема за графичните обекти" + - #: gitk:11332 ++#: gitk:11379 +msgid "(change requires restart)" +msgstr "(промяната изисква рестартиране на Gitk)" + - #: gitk:11334 ++#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(в момента недостъпно)" + - #: gitk:11345 ++#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Цветове: избира се с натискане" + - #: gitk:11348 ++#: gitk:11395 +msgid "Interface" +msgstr "Интерфейс" + - #: gitk:11349 ++#: gitk:11396 +msgid "interface" +msgstr "интерфейс" + - #: gitk:11352 ++#: gitk:11399 +msgid "Background" +msgstr "Фон" + - #: gitk:11353 gitk:11383 ++#: gitk:11400 gitk:11430 +msgid "background" +msgstr "фон" + - #: gitk:11356 ++#: gitk:11403 +msgid "Foreground" +msgstr "Знаци" + - #: gitk:11357 ++#: gitk:11404 +msgid "foreground" +msgstr "знаци" + - #: gitk:11360 ++#: gitk:11407 +msgid "Diff: old lines" +msgstr "Разлика: стари редове" + - #: gitk:11361 ++#: gitk:11408 +msgid "diff old lines" +msgstr "разлика, стари редове" + - #: gitk:11365 ++#: gitk:11412 +msgid "Diff: new lines" +msgstr "Разлика: нови редове" + - #: gitk:11366 ++#: gitk:11413 +msgid "diff new lines" +msgstr "разлика, нови редове" + - #: gitk:11370 ++#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Разлика: начало на парче" + - #: gitk:11372 ++#: gitk:11419 +msgid "diff hunk header" +msgstr "разлика, начало на парче" + - #: gitk:11376 ++#: gitk:11423 +msgid "Marked line bg" +msgstr "Фон на отбелязан ред" + - #: gitk:11378 ++#: gitk:11425 +msgid "marked line background" +msgstr "фон на отбелязан ред" + - #: gitk:11382 ++#: gitk:11429 +msgid "Select bg" +msgstr "Избор на фон" + - #: gitk:11391 ++#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Шрифтове: избира се с натискане" + - #: gitk:11393 ++#: gitk:11440 +msgid "Main font" +msgstr "Основен шрифт" + - #: gitk:11394 ++#: gitk:11441 +msgid "Diff display font" +msgstr "Шрифт за разликите" + - #: gitk:11395 ++#: gitk:11442 +msgid "User interface font" +msgstr "Шрифт на интерфейса" + - #: gitk:11417 ++#: gitk:11464 +msgid "Gitk preferences" +msgstr "Настройки на Gitk" + - #: gitk:11426 ++#: gitk:11473 +msgid "General" +msgstr "Общи" + - #: gitk:11427 ++#: gitk:11474 +msgid "Colors" +msgstr "Цветове" + - #: gitk:11428 ++#: gitk:11475 +msgid "Fonts" +msgstr "Шрифтове" + - #: gitk:11478 ++#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: избор на цвят на „%s“" + - #: gitk:12177 ++#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Тук липсва хранилище на Git." + - #: gitk:12224 ++#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл" + - #: gitk:12236 ++#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Неправилни аргументи на gitk:" + - #: gitk:12339 ++#: gitk:12405 +msgid "Command line" +msgstr "Команден ред" diff --cc gitk-git/po/ca.po index 0000000000,0000000000..2c1f60683c new file mode 100644 --- /dev/null +++ b/gitk-git/po/ca.po @@@ -1,0 -1,0 +1,1354 @@@ ++# Translation of gitk ++# Copyright (C) 2005-2014 Paul Mackerras ++# This file is distributed under the same license as the gitk package. ++# Alex Henrie , 2015. ++# ++# ++msgid "" ++msgstr "" ++"Project-Id-Version: gitk\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" ++"PO-Revision-Date: 2015-02-01 22:49-0700\n" ++"Last-Translator: Alex Henrie \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:217 gitk:2381 gitk:8201 gitk:8234 ++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:496 gitk:4508 ++msgid "Reading commits..." ++msgstr "Llegint les revisions..." ++ ++#: gitk:499 gitk:1637 gitk:4511 ++msgid "No commits selected" ++msgstr "Cap comissió seleccionada" ++ ++#: 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:1897 ++msgid "mc" ++msgstr "mc" ++ ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 ++msgid "OK" ++msgstr "D'acord" ++ ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 ++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:2088 ++msgid "All files" ++msgstr "Tots els fitxers" ++ ++#: gitk:2083 gitk:4050 ++msgid "View" ++msgstr "Vista" ++ ++#: gitk:2093 gitk:2103 gitk:3009 ++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:2185 gitk:8633 ++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:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 ++msgid "containing:" ++msgstr "que contingui:" ++ ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 ++msgid "touching paths:" ++msgstr "que toqui els camins:" ++ ++#: gitk:2303 gitk:4759 ++msgid "adding/removing string:" ++msgstr "que afegeixi/elimini la cadena:" ++ ++#: gitk:2304 gitk:4761 ++msgid "changing lines matching:" ++msgstr "que tingui línies canviades coincidents amb:" ++ ++#: gitk:2313 gitk:2315 gitk:4748 ++msgid "Exact" ++msgstr "Exacte" ++ ++#: gitk:2315 gitk:4836 gitk:6704 ++msgid "IgnCase" ++msgstr "Ignora majúscula i minúscula" ++ ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 ++msgid "Regexp" ++msgstr "Regexp" ++ ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 ++msgid "All fields" ++msgstr "Tots els camps" ++ ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 ++msgid "Headline" ++msgstr "Titular" ++ ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 ++msgid "Comments" ++msgstr "Comentaris" ++ ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 ++msgid "Author" ++msgstr "Autor" ++ ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 ++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:2378 gitk:2380 gitk:7940 gitk:8187 ++msgid "Line diff" ++msgstr "Diferència de línies" ++ ++#: gitk:2445 ++msgid "Patch" ++msgstr "Pedaç" ++ ++#: gitk:2447 ++msgid "Tree" ++msgstr "Arbre" ++ ++#: gitk:2616 gitk:2636 ++msgid "Diff this -> selected" ++msgstr "Diferencia aquesta -> la seleccionada" ++ ++#: gitk:2617 gitk:2637 ++msgid "Diff selected -> this" ++msgstr "Diferencia la seleccionada -> aquesta" ++ ++#: gitk:2618 gitk:2638 ++msgid "Make patch" ++msgstr "Fes pedaç" ++ ++#: gitk:2619 gitk:9235 ++msgid "Create tag" ++msgstr "Crea etiqueta" ++ ++#: gitk:2620 gitk:9352 ++msgid "Write commit to file" ++msgstr "Escriu la comissió a un fitxer" ++ ++#: gitk:2621 gitk:9409 ++msgid "Create new branch" ++msgstr "Crea una branca nova" ++ ++#: gitk:2622 ++msgid "Cherry-pick this commit" ++msgstr "Recull aquesta comissió com a cirera" ++ ++#: gitk:2623 ++msgid "Reset HEAD branch to here" ++msgstr "Restableix la branca HEAD aquí" ++ ++#: gitk:2624 ++msgid "Mark this commit" ++msgstr "Marca aquesta comissió" ++ ++#: gitk:2625 ++msgid "Return to mark" ++msgstr "Torna a la marca" ++ ++#: gitk:2626 ++msgid "Find descendant of this and mark" ++msgstr "Troba la descendent d'aquesta i marca-la" ++ ++#: gitk:2627 ++msgid "Compare with marked commit" ++msgstr "Compara amb la comissió marcada" ++ ++#: gitk:2628 gitk:2639 ++msgid "Diff this -> marked commit" ++msgstr "Diferencia aquesta -> la comissió marcada" ++ ++#: gitk:2629 gitk:2640 ++msgid "Diff marked commit -> this" ++msgstr "Diferencia la comissió seleccionada -> aquesta" ++ ++#: gitk:2630 ++msgid "Revert this commit" ++msgstr "Reverteix aquesta comissió" ++ ++#: gitk:2646 ++msgid "Check out this branch" ++msgstr "Agafa aquesta branca" ++ ++#: gitk:2647 ++msgid "Remove this branch" ++msgstr "Elimina aquesta branca" ++ ++#: gitk:2654 ++msgid "Highlight this too" ++msgstr "Ressalta aquest també" ++ ++#: gitk:2655 ++msgid "Highlight this only" ++msgstr "Ressalta només aquest" ++ ++#: gitk:2656 ++msgid "External diff" ++msgstr "Diferència externa" ++ ++#: gitk:2657 ++msgid "Blame parent commit" ++msgstr "Culpabilitat de la comissió mare" ++ ++#: gitk:2664 ++msgid "Show origin of this line" ++msgstr "Mostra l'origen d'aquesta línia" ++ ++#: gitk:2665 ++msgid "Run git gui blame on this line" ++msgstr "Executa git gui blame en aquesta línia" ++ ++#: gitk:3011 ++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:3019 gitk:3085 gitk:9836 ++msgid "Close" ++msgstr "Tanca" ++ ++#: gitk:3040 ++msgid "Gitk key bindings" ++msgstr "Associacions de tecles del Gitk" ++ ++#: gitk:3043 ++msgid "Gitk key bindings:" ++msgstr "Associacions de tecles del Gitk:" ++ ++#: gitk:3045 ++#, tcl-format ++msgid "<%s-Q>\t\tQuit" ++msgstr "<%s-Q>\t\tSurt" ++ ++#: gitk:3046 ++#, tcl-format ++msgid "<%s-W>\t\tClose window" ++msgstr "<%s-W>\t\tTanca la finestra" ++ ++#: gitk:3047 ++msgid "\t\tMove to first commit" ++msgstr "\t\tVés a la primera comissió" ++ ++#: gitk:3048 ++msgid "\t\tMove to last commit" ++msgstr "\t\tVés a l'última comissió" ++ ++#: gitk:3049 ++msgid ", p, k\tMove up one commit" ++msgstr ", p, k\tMou-te una comissió amunt" ++ ++#: gitk:3050 ++msgid ", n, j\tMove down one commit" ++msgstr ", n, j\tMou-te una comissió avall" ++ ++#: gitk:3051 ++msgid ", z, h\tGo back in history list" ++msgstr ", z, h\tRetrocedeix en la llista d'història" ++ ++#: gitk:3052 ++msgid ", x, l\tGo forward in history list" ++msgstr ", x, l\tAvança en la llista d'història" ++ ++#: gitk:3053 ++#, 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:3054 ++msgid "\tMove up one page in commit list" ++msgstr "\tBaixa una pàgina en la llista de comissions" ++ ++#: gitk:3055 ++msgid "\tMove down one page in commit list" ++msgstr "\tBaixa per una pàgina en la llista de comissions" ++ ++#: gitk:3056 ++#, 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:3057 ++#, 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:3058 ++#, 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:3059 ++#, 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:3060 ++#, 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:3061 ++#, 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:3062 ++msgid "\tFind backwards (upwards, later commits)" ++msgstr "\tCerca cap enrere (amunt, les comissions més noves)" ++ ++#: gitk:3063 ++msgid "\tFind forwards (downwards, earlier commits)" ++msgstr "\tCerca cap endavant (avall, les comissions més velles)" ++ ++#: gitk:3064 ++msgid ", b\tScroll diff view up one page" ++msgstr ", b\tDesplaça la vista de diferència una pàgina cap amunt" ++ ++#: gitk:3065 ++msgid "\tScroll diff view up one page" ++msgstr "\tDesplaça la vista de diferència una pàgina cap amunt" ++ ++#: gitk:3066 ++msgid "\t\tScroll diff view down one page" ++msgstr "\t\tDesplaça la vista de diferència una pàgina cap avall" ++ ++#: gitk:3067 ++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:3068 ++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:3069 ++#, tcl-format ++msgid "<%s-F>\t\tFind" ++msgstr "<%s-F>\t\tCerca" ++ ++#: gitk:3070 ++#, 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:3071 ++msgid "\tMove to next find hit" ++msgstr "\tMou-te a la propera coincidència de la cerca" ++ ++#: gitk:3072 ++msgid "/\t\tFocus the search box" ++msgstr "/\t\tPosa el focus a la caixa de cerca" ++ ++#: gitk:3073 ++msgid "?\t\tMove to previous find hit" ++msgstr "?\t\tMou a la coincidència prèvia de la cerca" ++ ++#: gitk:3074 ++msgid "f\t\tScroll diff view to next file" ++msgstr "f\t\tDesplaça la vista de diferència al proper fitxer" ++ ++#: gitk:3075 ++#, 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:3076 ++#, 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:3077 ++#, tcl-format ++msgid "<%s-KP+>\tIncrease font size" ++msgstr "<%s-KP+>\tAugmenta la mida de lletra" ++ ++#: gitk:3078 ++#, tcl-format ++msgid "<%s-plus>\tIncrease font size" ++msgstr "<%s-més>\tAugmenta la mida de lletra" ++ ++#: gitk:3079 ++#, tcl-format ++msgid "<%s-KP->\tDecrease font size" ++msgstr "<%s-KP->\tDisminueix la mida de lletra" ++ ++#: gitk:3080 ++#, tcl-format ++msgid "<%s-minus>\tDecrease font size" ++msgstr "<%s-menys>\tDisminueix la mida de lletra" ++ ++#: gitk:3081 ++msgid "\t\tUpdate" ++msgstr "\t\tActualitza" ++ ++#: gitk:3546 gitk:3555 ++#, tcl-format ++msgid "Error creating temporary directory %s:" ++msgstr "Error en crear el directori temporal %s:" ++ ++#: gitk:3568 ++#, tcl-format ++msgid "Error getting \"%s\" from %s:" ++msgstr "Error en obtenir \"%s\" de %s:" ++ ++#: gitk:3631 ++msgid "command failed:" ++msgstr "l'ordre ha fallat:" ++ ++#: gitk:3780 ++msgid "No such commit" ++msgstr "Cap comissió així" ++ ++#: gitk:3794 ++msgid "git gui blame: command failed:" ++msgstr "git gui blame: l'ordre ha fallat:" ++ ++#: gitk:3825 ++#, tcl-format ++msgid "Couldn't read merge head: %s" ++msgstr "No s'ha pogut llegir el cap de fusió: %s" ++ ++#: gitk:3833 ++#, tcl-format ++msgid "Error reading index: %s" ++msgstr "Error en llegir l'índex: %s" ++ ++#: gitk:3858 ++#, tcl-format ++msgid "Couldn't start git blame: %s" ++msgstr "No s'ha pogut iniciar el git blame: %s" ++ ++#: gitk:3861 gitk:6735 ++msgid "Searching" ++msgstr "Cercant" ++ ++#: gitk:3893 ++#, tcl-format ++msgid "Error running git blame: %s" ++msgstr "Error en executar el git blame: %s" ++ ++#: gitk:3921 ++#, 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:3935 ++msgid "External diff viewer failed:" ++msgstr "El visualitzador de diferència extern ha fallat:" ++ ++#: gitk:4053 ++msgid "Gitk view definition" ++msgstr "Definició de vista del Gitk" ++ ++#: gitk:4057 ++msgid "Remember this view" ++msgstr "Recorda aquesta vista" ++ ++#: gitk:4058 ++msgid "References (space separated list):" ++msgstr "Referències (llista separada per espais)" ++ ++#: gitk:4059 ++msgid "Branches & tags:" ++msgstr "Branques i etiquetes:" ++ ++#: gitk:4060 ++msgid "All refs" ++msgstr "Totes les referències" ++ ++#: gitk:4061 ++msgid "All (local) branches" ++msgstr "Totes les branques (locals)" ++ ++#: gitk:4062 ++msgid "All tags" ++msgstr "Totes les etiquetes" ++ ++#: gitk:4063 ++msgid "All remote-tracking branches" ++msgstr "Totes les branques amb seguiment remot" ++ ++#: gitk:4064 ++msgid "Commit Info (regular expressions):" ++msgstr "Informació de comissió (expressions regulars):" ++ ++#: gitk:4065 ++msgid "Author:" ++msgstr "Autor:" ++ ++#: gitk:4066 ++msgid "Committer:" ++msgstr "Comitent:" ++ ++#: gitk:4067 ++msgid "Commit Message:" ++msgstr "Missatge de comissió:" ++ ++#: gitk:4068 ++msgid "Matches all Commit Info criteria" ++msgstr "Coincideix amb tots els criteris d'informació de comissió" ++ ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Coincideix amb tots els criteris d'informació de comissió" ++ ++#: gitk:4070 ++msgid "Changes to Files:" ++msgstr "Canvis als fitxers:" ++ ++#: gitk:4071 ++msgid "Fixed String" ++msgstr "Cadena fixa" ++ ++#: gitk:4072 ++msgid "Regular Expression" ++msgstr "Expressió regular" ++ ++#: gitk:4073 ++msgid "Search string:" ++msgstr "Cadena de cerca:" ++ ++#: gitk:4074 ++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:4075 ++msgid "Since:" ++msgstr "Des de:" ++ ++#: gitk:4076 ++msgid "Until:" ++msgstr "Fins:" ++ ++#: gitk:4077 ++msgid "Limit and/or skip a number of revisions (positive integer):" ++msgstr "Limita o salta un nombre de revisions (nombre enter positiu)" ++ ++#: gitk:4078 ++msgid "Number to show:" ++msgstr "Nombre a mostrar:" ++ ++#: gitk:4079 ++msgid "Number to skip:" ++msgstr "Nombre a saltar:" ++ ++#: gitk:4080 ++msgid "Miscellaneous options:" ++msgstr "Opcions miscel·lànies:" ++ ++#: gitk:4081 ++msgid "Strictly sort by date" ++msgstr "Ordena estrictament per data" ++ ++#: gitk:4082 ++msgid "Mark branch sides" ++msgstr "Marca els costats de les branques" ++ ++#: gitk:4083 ++msgid "Limit to first parent" ++msgstr "Limita a la primera mare" ++ ++#: gitk:4084 ++msgid "Simple history" ++msgstr "Història senzilla" ++ ++#: gitk:4085 ++msgid "Additional arguments to git log:" ++msgstr "Paràmetres addicionals al git log:" ++ ++#: gitk:4086 ++msgid "Enter files and directories to include, one per line:" ++msgstr "Introduïu els fitxers i directoris a incloure, un per línia:" ++ ++#: gitk:4087 ++msgid "Command to generate more commits to include:" ++msgstr "Ordre per a generar més comissions a incloure:" ++ ++#: gitk:4211 ++msgid "Gitk: edit view" ++msgstr "Gitk: vista d'edició" ++ ++#: gitk:4219 ++msgid "-- criteria for selecting revisions" ++msgstr "-- criteris per a seleccionar les revisions" ++ ++#: gitk:4224 ++msgid "View Name" ++msgstr "Nom de vista" ++ ++#: gitk:4299 ++msgid "Apply (F5)" ++msgstr "Aplica (F5)" ++ ++#: gitk:4337 ++msgid "Error in commit selection arguments:" ++msgstr "Error en els paràmetres de selecció de comissions:" ++ ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 ++msgid "None" ++msgstr "Cap" ++ ++#: gitk:5003 gitk:5008 ++msgid "Descendant" ++msgstr "Descendent" ++ ++#: gitk:5004 ++msgid "Not descendant" ++msgstr "No descendent" ++ ++#: gitk:5011 gitk:5016 ++msgid "Ancestor" ++msgstr "Avantpassat" ++ ++#: gitk:5012 ++msgid "Not ancestor" ++msgstr "No avantpassat" ++ ++#: gitk:5306 ++msgid "Local changes checked in to index but not committed" ++msgstr "Canvis locals registrats en l'índex però no comesos" ++ ++#: gitk:5342 ++msgid "Local uncommitted changes, not checked in to index" ++msgstr "Canvis locals sense cometre, no registrats en l'índex" ++ ++#: gitk:7115 ++msgid "and many more" ++msgstr "i moltes més" ++ ++#: gitk:7118 ++msgid "many" ++msgstr "moltes" ++ ++#: gitk:7309 ++msgid "Tags:" ++msgstr "Etiquetes:" ++ ++#: gitk:7326 gitk:7332 gitk:8806 ++msgid "Parent" ++msgstr "Mare" ++ ++#: gitk:7337 ++msgid "Child" ++msgstr "Filla" ++ ++#: gitk:7346 ++msgid "Branch" ++msgstr "Branca" ++ ++#: gitk:7349 ++msgid "Follows" ++msgstr "Segueix" ++ ++#: gitk:7352 ++msgid "Precedes" ++msgstr "Precedeix" ++ ++#: gitk:7947 ++#, tcl-format ++msgid "Error getting diffs: %s" ++msgstr "Error en obtenir les diferències: %s" ++ ++#: gitk:8631 ++msgid "Goto:" ++msgstr "Vés a:" ++ ++#: gitk:8652 ++#, tcl-format ++msgid "Short SHA1 id %s is ambiguous" ++msgstr "L'id SHA1 curta %s és ambigua" ++ ++#: gitk:8659 ++#, tcl-format ++msgid "Revision %s is not known" ++msgstr "La revisió %s és desconeguda" ++ ++#: gitk:8669 ++#, tcl-format ++msgid "SHA1 id %s is not known" ++msgstr "L'id SHA1 %s és desconeguda" ++ ++#: gitk:8671 ++#, tcl-format ++msgid "Revision %s is not in the current view" ++msgstr "La revisió %s no és en la vista actual" ++ ++#: gitk:8813 gitk:8828 ++msgid "Date" ++msgstr "Data" ++ ++#: gitk:8816 ++msgid "Children" ++msgstr "Filles" ++ ++#: gitk:8879 ++#, tcl-format ++msgid "Reset %s branch to here" ++msgstr "Restableix la branca %s aquí" ++ ++#: gitk:8881 ++msgid "Detached head: can't reset" ++msgstr "Cap separat: no es pot restablir" ++ ++#: gitk:8986 gitk:8992 ++msgid "Skipping merge commit " ++msgstr "Saltant la comissió de fusió " ++ ++#: gitk:9001 gitk:9006 ++msgid "Error getting patch ID for " ++msgstr "Error en obtenir l'ID de pedaç de " ++ ++#: gitk:9002 gitk:9007 ++msgid " - stopping\n" ++msgstr " - aturant\n" ++ ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 ++msgid "Commit " ++msgstr "Comissió " ++ ++#: gitk:9016 ++msgid "" ++" is the same patch as\n" ++" " ++msgstr "" ++" és el mateix pedaç que\n" ++" " ++ ++#: gitk:9024 ++msgid "" ++" differs from\n" ++" " ++msgstr "" ++" difereix de\n" ++" " ++ ++#: gitk:9026 ++msgid "" ++"Diff of commits:\n" ++"\n" ++msgstr "" ++"Diferència entre comissions:\n" ++"\n" ++ ++#: gitk:9038 gitk:9047 ++#, tcl-format ++msgid " has %s children - stopping\n" ++msgstr " té %s filles - aturant\n" ++ ++#: gitk:9066 ++#, tcl-format ++msgid "Error writing commit to file: %s" ++msgstr "Error en escriure la comissió al fitxer: %s" ++ ++#: gitk:9072 ++#, tcl-format ++msgid "Error diffing commits: %s" ++msgstr "Error en diferenciar les comissions: %s" ++ ++#: gitk:9118 ++msgid "Top" ++msgstr "Part superior" ++ ++#: gitk:9119 ++msgid "From" ++msgstr "De" ++ ++#: gitk:9124 ++msgid "To" ++msgstr "A" ++ ++#: gitk:9148 ++msgid "Generate patch" ++msgstr "Genera pedaç" ++ ++#: gitk:9150 ++msgid "From:" ++msgstr "De:" ++ ++#: gitk:9159 ++msgid "To:" ++msgstr "A:" ++ ++#: gitk:9168 ++msgid "Reverse" ++msgstr "Inverteix" ++ ++#: gitk:9170 gitk:9366 ++msgid "Output file:" ++msgstr "Fitxer de sortida:" ++ ++#: gitk:9176 ++msgid "Generate" ++msgstr "Genera" ++ ++#: gitk:9214 ++msgid "Error creating patch:" ++msgstr "Error en crear el pedaç:" ++ ++#: gitk:9237 gitk:9354 gitk:9411 ++msgid "ID:" ++msgstr "ID:" ++ ++#: gitk:9246 ++msgid "Tag name:" ++msgstr "Nom d'etiqueta:" ++ ++#: gitk:9249 ++msgid "Tag message is optional" ++msgstr "El missatge d'etiqueta és opcional" ++ ++#: gitk:9251 ++msgid "Tag message:" ++msgstr "Missatge d'etiqueta:" ++ ++#: gitk:9255 gitk:9420 ++msgid "Create" ++msgstr "Crea" ++ ++#: gitk:9273 ++msgid "No tag name specified" ++msgstr "No s'ha especificat cap nom d'etiqueta" ++ ++#: gitk:9277 ++#, tcl-format ++msgid "Tag \"%s\" already exists" ++msgstr "L'etiqueta \"%s\" ja existeix" ++ ++#: gitk:9287 ++msgid "Error creating tag:" ++msgstr "Error en crear l'etiqueta:" ++ ++#: gitk:9363 ++msgid "Command:" ++msgstr "Ordre:" ++ ++#: gitk:9371 ++msgid "Write" ++msgstr "Escriu" ++ ++#: gitk:9389 ++msgid "Error writing commit:" ++msgstr "Error en escriure la comissió:" ++ ++#: gitk:9416 ++msgid "Name:" ++msgstr "Nom:" ++ ++#: gitk:9439 ++msgid "Please specify a name for the new branch" ++msgstr "Si us plau, especifiqueu un nom per a la branca nova" ++ ++#: gitk:9444 ++#, tcl-format ++msgid "Branch '%s' already exists. Overwrite?" ++msgstr "La branca '%s' ja existeix. Voleu sobreescriure?" ++ ++#: gitk:9511 ++#, 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:9516 ++msgid "Cherry-picking" ++msgstr "Recollint cireres" ++ ++#: gitk:9525 ++#, 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:9531 ++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:9547 gitk:9605 ++msgid "No changes committed" ++msgstr "Cap canvi comès" ++ ++#: gitk:9574 ++#, 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:9579 ++msgid "Reverting" ++msgstr "Revertint" ++ ++#: gitk:9587 ++#, 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:9591 ++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:9634 ++msgid "Confirm reset" ++msgstr "Confirma el restabliment" ++ ++#: gitk:9636 ++#, tcl-format ++msgid "Reset branch %s to %s?" ++msgstr "Voleu restablir la branca %s a %s?" ++ ++#: gitk:9638 ++msgid "Reset type:" ++msgstr "Tipus de restabliment:" ++ ++#: gitk:9641 ++msgid "Soft: Leave working tree and index untouched" ++msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar" ++ ++#: gitk:9644 ++msgid "Mixed: Leave working tree untouched, reset index" ++msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex" ++ ++#: gitk:9647 ++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:9664 ++msgid "Resetting" ++msgstr "Restablint" ++ ++#: gitk:9724 ++msgid "Checking out" ++msgstr "Agafant" ++ ++#: gitk:9777 ++msgid "Cannot delete the currently checked-out branch" ++msgstr "No es pot suprimir la branca actualment agafada" ++ ++#: gitk:9783 ++#, 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:9814 ++#, tcl-format ++msgid "Tags and heads: %s" ++msgstr "Etiquetes i caps: %s" ++ ++#: gitk:9829 ++msgid "Filter" ++msgstr "Filtre" ++ ++#: gitk:10125 ++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:11102 ++msgid "Tag" ++msgstr "Etiqueta" ++ ++#: gitk:11106 ++msgid "Id" ++msgstr "Id" ++ ++#: gitk:11189 ++msgid "Gitk font chooser" ++msgstr "Selector de tipus de lletra del Gitk" ++ ++#: gitk:11206 ++msgid "B" ++msgstr "B" ++ ++#: gitk:11209 ++msgid "I" ++msgstr "I" ++ ++#: gitk:11327 ++msgid "Commit list display options" ++msgstr "Opcions de visualització de la llista de comissions" ++ ++#: gitk:11330 ++msgid "Maximum graph width (lines)" ++msgstr "Amplada màxima del gràfic (línies)" ++ ++#: gitk:11334 ++#, no-tcl-format ++msgid "Maximum graph width (% of pane)" ++msgstr "Amplada màxima del gràfic (% del panell)" ++ ++#: gitk:11337 ++msgid "Show local changes" ++msgstr "Mostra els canvis locals" ++ ++#: gitk:11340 ++msgid "Auto-select SHA1 (length)" ++msgstr "Selecciona automàticament l'SHA1 (longitud)" ++ ++#: gitk:11344 ++msgid "Hide remote refs" ++msgstr "Amaga les referències remotes" ++ ++#: gitk:11348 ++msgid "Diff display options" ++msgstr "Opcions de visualització de diferència" ++ ++#: gitk:11350 ++msgid "Tab spacing" ++msgstr "Espaiat de tabulació" ++ ++#: gitk:11353 ++msgid "Display nearby tags/heads" ++msgstr "Mostra etiquetes/caps propers" ++ ++#: gitk:11356 ++msgid "Maximum # tags/heads to show" ++msgstr "Nombre màxim d'etiquetes/caps a mostrar" ++ ++#: gitk:11359 ++msgid "Limit diffs to listed paths" ++msgstr "Limita les diferències als camins llistats" ++ ++#: gitk:11362 ++msgid "Support per-file encodings" ++msgstr "Admet codificacions específiques per a cada fitxer" ++ ++#: gitk:11368 gitk:11515 ++msgid "External diff tool" ++msgstr "Eina de diferència externa" ++ ++#: gitk:11369 ++msgid "Choose..." ++msgstr "Trieu..." ++ ++#: gitk:11374 ++msgid "General options" ++msgstr "Opcions generals" ++ ++#: gitk:11377 ++msgid "Use themed widgets" ++msgstr "Usa els ginys tematitzats" ++ ++#: gitk:11379 ++msgid "(change requires restart)" ++msgstr "(el canvi requereix reiniciar)" ++ ++#: gitk:11381 ++msgid "(currently unavailable)" ++msgstr "(actualment no disponible)" ++ ++#: gitk:11392 ++msgid "Colors: press to choose" ++msgstr "Colors: pressiona per a triar" ++ ++#: gitk:11395 ++msgid "Interface" ++msgstr "Interfície" ++ ++#: gitk:11396 ++msgid "interface" ++msgstr "interfície" ++ ++#: gitk:11399 ++msgid "Background" ++msgstr "Fons" ++ ++#: gitk:11400 gitk:11430 ++msgid "background" ++msgstr "fons" ++ ++#: gitk:11403 ++msgid "Foreground" ++msgstr "Primer pla" ++ ++#: gitk:11404 ++msgid "foreground" ++msgstr "primer pla" ++ ++#: gitk:11407 ++msgid "Diff: old lines" ++msgstr "Diferència: línies velles" ++ ++#: gitk:11408 ++msgid "diff old lines" ++msgstr "diferencia les línies velles" ++ ++#: gitk:11412 ++msgid "Diff: new lines" ++msgstr "Diferència: línies noves" ++ ++#: gitk:11413 ++msgid "diff new lines" ++msgstr "diferencia les línies noves" ++ ++#: gitk:11417 ++msgid "Diff: hunk header" ++msgstr "Diferència: capçalera de tros" ++ ++#: gitk:11419 ++msgid "diff hunk header" ++msgstr "diferencia la capçalera de tros" ++ ++#: gitk:11423 ++msgid "Marked line bg" ++msgstr "Fons de la línia marcada" ++ ++#: gitk:11425 ++msgid "marked line background" ++msgstr "fons de la línia marcada" ++ ++#: gitk:11429 ++msgid "Select bg" ++msgstr "fons de la selecció" ++ ++#: gitk:11438 ++msgid "Fonts: press to choose" ++msgstr "Tipus de lletra: pressiona per a triar" ++ ++#: gitk:11440 ++msgid "Main font" ++msgstr "Tipus de lletra principal" ++ ++#: gitk:11441 ++msgid "Diff display font" ++msgstr "Tipus de lletra de visualització de diferència" ++ ++#: gitk:11442 ++msgid "User interface font" ++msgstr "Tipus de lletra de la interfície d'usuari" ++ ++#: gitk:11464 ++msgid "Gitk preferences" ++msgstr "Preferències del Gitk" ++ ++#: gitk:11473 ++msgid "General" ++msgstr "General" ++ ++#: gitk:11474 ++msgid "Colors" ++msgstr "Colors" ++ ++#: gitk:11475 ++msgid "Fonts" ++msgstr "Tipus de lletra" ++ ++#: gitk:11525 ++#, tcl-format ++msgid "Gitk: choose color for %s" ++msgstr "Gitk: tria el color per a %s" ++ ++#: gitk:12242 ++msgid "Cannot find a git repository here." ++msgstr "No es pot trobar cap dipòsit de git aquí." ++ ++#: gitk:12289 ++#, tcl-format ++msgid "Ambiguous argument '%s': both revision and filename" ++msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer" ++ ++#: gitk:12301 ++msgid "Bad arguments to gitk:" ++msgstr "Paràmetres dolents al gitk:" ++ ++#: gitk:12405 ++msgid "Command line" ++msgstr "Línia d'ordres" diff --cc gitk-git/po/de.po index bd194a3dff,0000000000..dabd4eefb5 mode 100644,000000..100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@@ -1,1278 -1,0 +1,1382 @@@ +# Translation of gitk to German. +# Copyright (C) 2007 Paul Mackerras. +# This file is distributed under the same license as the gitk package. +# +# Christian Stimming , 2007. +# Frederik Schwarzer , 2008. +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-01-27 20:21+0100\n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2010-01-27 20:27+0100\n" +"Last-Translator: Christian Stimming \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:115 ++#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" + - #: gitk:274 ++#: gitk:212 gitk:2381 ++msgid "Color words" ++msgstr "" ++ ++#: gitk:217 gitk:2381 gitk:8201 gitk:8234 ++msgid "Markup words" ++msgstr "" ++ ++#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Fehler beim Laden der Versionen:" + - #: gitk:329 ++#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" + - #: gitk:342 ++#: 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:345 ++#: 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:367 gitk:514 ++#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Fehler beim Ausführen von »git log«:" + - #: gitk:385 gitk:530 ++#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lesen" + - #: gitk:445 gitk:4261 ++#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Versionen werden gelesen ..." + - #: gitk:448 gitk:1578 gitk:4264 ++#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Keine Versionen ausgewählt" + - #: gitk:1454 ++#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Ausgabe von »git log« kann nicht erkannt werden:" + - #: gitk:1674 ++#: gitk:1740 +msgid "No commit information available" +msgstr "Keine Versionsinformation verfügbar" + - #: gitk:1816 ++#: gitk:1897 +msgid "mc" +msgstr "mc" + - #: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "Ok" + - #: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 - #: gitk:10586 gitk:10805 ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Abbrechen" + - #: gitk:1975 ++#: gitk:2069 +msgid "Update" +msgstr "Aktualisieren" + - #: gitk:1976 ++#: gitk:2070 +msgid "Reload" +msgstr "Neu laden" + - #: gitk:1977 ++#: gitk:2071 +msgid "Reread references" +msgstr "Zweige neu laden" + - #: gitk:1978 ++#: gitk:2072 +msgid "List references" +msgstr "Zweige/Markierungen auflisten" + - #: gitk:1980 ++#: gitk:2074 +msgid "Start git gui" +msgstr "»git gui« starten" + - #: gitk:1982 ++#: gitk:2076 +msgid "Quit" +msgstr "Beenden" + - #: gitk:1974 ++#: gitk:2068 +msgid "File" +msgstr "Datei" + - #: gitk:1986 ++#: gitk:2080 +msgid "Preferences" +msgstr "Einstellungen" + - #: gitk:1985 ++#: gitk:2079 +msgid "Edit" +msgstr "Bearbeiten" + - #: gitk:1990 ++#: gitk:2084 +msgid "New view..." +msgstr "Neue Ansicht ..." + - #: gitk:1991 ++#: gitk:2085 +msgid "Edit view..." +msgstr "Ansicht bearbeiten ..." + - #: gitk:1992 ++#: gitk:2086 +msgid "Delete view" +msgstr "Ansicht entfernen" + - #: gitk:1994 ++#: gitk:2088 +msgid "All files" +msgstr "Alle Dateien" + - #: gitk:1989 gitk:3808 ++#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Ansicht" + - #: gitk:1999 gitk:2009 gitk:2780 ++#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Über gitk" + - #: gitk:2000 gitk:2014 ++#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Tastenkürzel" + - #: gitk:1998 gitk:2013 ++#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Hilfe" + - #: gitk:2091 gitk:8110 ++#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + - #: gitk:2122 ++#: gitk:2229 +msgid "Row" +msgstr "Zeile" + - #: gitk:2160 ++#: gitk:2267 +msgid "Find" +msgstr "Suche" + - #: gitk:2161 - msgid "next" - msgstr "nächste" - - #: gitk:2162 - msgid "prev" - msgstr "vorige" - - #: gitk:2163 ++#: gitk:2295 +msgid "commit" +msgstr "Version nach" + - #: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 - #: gitk:6566 ++#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 +msgid "containing:" +msgstr "Beschreibung:" + - #: gitk:2169 gitk:3290 gitk:3295 gitk:4497 ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "Dateien:" + - #: gitk:2170 gitk:4502 ++#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "Änderungen:" + - #: gitk:2179 gitk:2181 ++#: gitk:2304 gitk:4761 ++msgid "changing lines matching:" ++msgstr "" ++ ++#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Exakt" + - #: gitk:2181 gitk:4577 gitk:6378 ++#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Kein Groß/Klein" + - #: gitk:2181 gitk:4471 gitk:4575 gitk:6374 ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Regexp" + - #: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Alle Felder" + - #: gitk:2184 gitk:4594 gitk:4626 gitk:6441 ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Überschrift" + - #: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Beschreibung" + - #: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 - #: gitk:8300 ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 +msgid "Author" +msgstr "Autor" + - #: gitk:2185 gitk:4594 gitk:6441 gitk:6940 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Eintragender" + - #: gitk:2216 ++#: gitk:2350 +msgid "Search" +msgstr "Suchen" + - #: gitk:2224 ++#: gitk:2358 +msgid "Diff" +msgstr "Vergleich" + - #: gitk:2226 ++#: gitk:2360 +msgid "Old version" +msgstr "Alte Version" + - #: gitk:2228 ++#: gitk:2362 +msgid "New version" +msgstr "Neue Version" + - #: gitk:2230 ++#: gitk:2364 +msgid "Lines of context" +msgstr "Kontextzeilen" + - #: gitk:2240 ++#: gitk:2374 +msgid "Ignore space change" +msgstr "Leerzeichenänderungen ignorieren" + - #: gitk:2299 ++#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 ++msgid "Line diff" ++msgstr "" ++ ++#: gitk:2445 +msgid "Patch" +msgstr "Patch" + - #: gitk:2301 ++#: gitk:2447 +msgid "Tree" +msgstr "Baum" + - #: gitk:2456 gitk:2473 ++#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Vergleich: diese -> gewählte" + - #: gitk:2457 gitk:2474 ++#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Vergleich: gewählte -> diese" + - #: gitk:2458 gitk:2475 ++#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Patch erstellen" + - #: gitk:2459 gitk:8692 ++#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Markierung erstellen" + - #: gitk:2460 gitk:8808 ++#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Version in Datei schreiben" + - #: gitk:2461 gitk:8865 ++#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Neuen Zweig erstellen" + - #: gitk:2462 ++#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Diese Version pflücken" + - #: gitk:2463 ++#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "HEAD-Zweig auf diese Version zurücksetzen" + - #: gitk:2464 ++#: gitk:2624 +msgid "Mark this commit" +msgstr "Lesezeichen setzen" + - #: gitk:2465 ++#: gitk:2625 +msgid "Return to mark" +msgstr "Zum Lesezeichen" + - #: gitk:2466 ++#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Abkömmling von Lesezeichen und dieser Version finden" + - #: gitk:2467 ++#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Mit Lesezeichen vergleichen" + - #: gitk:2481 ++#: gitk:2628 gitk:2639 ++#, fuzzy ++msgid "Diff this -> marked commit" ++msgstr "Vergleich: diese -> gewählte" ++ ++#: gitk:2629 gitk:2640 ++#, fuzzy ++msgid "Diff marked commit -> this" ++msgstr "Vergleich: gewählte -> diese" ++ ++#: gitk:2630 ++#, fuzzy ++msgid "Revert this commit" ++msgstr "Lesezeichen setzen" ++ ++#: gitk:2646 +msgid "Check out this branch" +msgstr "Auf diesen Zweig umstellen" + - #: gitk:2482 ++#: gitk:2647 +msgid "Remove this branch" +msgstr "Zweig löschen" + - #: gitk:2489 ++#: gitk:2654 +msgid "Highlight this too" +msgstr "Diesen auch hervorheben" + - #: gitk:2490 ++#: gitk:2655 +msgid "Highlight this only" +msgstr "Nur diesen hervorheben" + - #: gitk:2491 ++#: gitk:2656 +msgid "External diff" +msgstr "Externes Diff-Programm" + - #: gitk:2492 ++#: gitk:2657 +msgid "Blame parent commit" +msgstr "Annotieren der Elternversion" + - #: gitk:2499 ++#: gitk:2664 +msgid "Show origin of this line" +msgstr "Herkunft dieser Zeile anzeigen" + - #: gitk:2500 ++#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Diese Zeile annotieren (»git gui blame«)" + - #: gitk:2782 ++#: gitk:3011 ++#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright \\u00a9 2005-2010 Paul Mackerras\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" ++"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " ++"License" + - #: gitk:2790 gitk:2854 gitk:9230 ++#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Schließen" + - #: gitk:2811 ++#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Gitk-Tastaturbelegung" + - #: gitk:2814 ++#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Gitk-Tastaturbelegung:" + - #: gitk:2816 ++#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tBeenden" + - #: gitk:2817 ++#: gitk:3046 ++#, fuzzy, tcl-format ++msgid "<%s-W>\t\tClose window" ++msgstr "<%s-F>\t\tSuchen" ++ ++#: gitk:3047 +msgid "\t\tMove to first commit" +msgstr "\t\tZur neuesten Version springen" + - #: gitk:2818 ++#: gitk:3048 +msgid "\t\tMove to last commit" +msgstr "\t\tZur ältesten Version springen" + - #: gitk:2819 - msgid ", p, i\tMove up one commit" ++#: gitk:3049 ++#, fuzzy ++msgid ", p, k\tMove up one commit" +msgstr ", p, i\tNächste neuere Version" + - #: gitk:2820 - msgid ", n, k\tMove down one commit" ++#: gitk:3050 ++#, fuzzy ++msgid ", n, j\tMove down one commit" +msgstr ", n, k\tNächste ältere Version" + - #: gitk:2821 - msgid ", z, j\tGo back in history list" ++#: gitk:3051 ++#, fuzzy ++msgid ", z, h\tGo back in history list" +msgstr ", z, j\tEine Version zurückgehen" + - #: gitk:2822 ++#: gitk:3052 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tEine Version weitergehen" + - #: gitk:2823 ++#: gitk:3053 ++#, tcl-format ++msgid "<%s-n>\tGo to n-th parent of current commit in history list" ++msgstr "" ++ ++#: gitk:3054 +msgid "\tMove up one page in commit list" +msgstr "\tEine Seite nach oben blättern" + - #: gitk:2824 ++#: gitk:3055 +msgid "\tMove down one page in commit list" +msgstr "\tEine Seite nach unten blättern" + - #: gitk:2825 ++#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" + - #: gitk:2826 ++#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" + - #: gitk:2827 ++#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" + - #: gitk:2828 ++#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" + - #: gitk:2829 ++#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" + - #: gitk:2830 ++#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" + - #: gitk:2831 ++#: gitk:3062 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tRückwärts suchen (nach oben; neuere Versionen)" + - #: gitk:2832 ++#: gitk:3063 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr " Suchen (nach unten; ältere Versionen)" + - #: gitk:2833 ++#: gitk:3064 +msgid ", b\tScroll diff view up one page" +msgstr ", b\t\tVergleich eine Seite nach oben blättern" + - #: gitk:2834 ++#: gitk:3065 +msgid "\tScroll diff view up one page" +msgstr "\tVergleich eine Seite nach oben blättern" + - #: gitk:2835 ++#: gitk:3066 +msgid "\t\tScroll diff view down one page" +msgstr "\tVergleich eine Seite nach unten blättern" + - #: gitk:2836 ++#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" + - #: gitk:2837 ++#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" + - #: gitk:2838 ++#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tSuchen" + - #: gitk:2839 ++#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tWeitersuchen" + - #: gitk:2840 ++#: gitk:3071 +msgid "\tMove to next find hit" +msgstr "\tWeitersuchen" + - #: gitk:2841 ++#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tTastaturfokus ins Suchfeld" + - #: gitk:2842 ++#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tRückwärts weitersuchen" + - #: gitk:2843 ++#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tVergleich zur nächsten Datei blättern" + - #: gitk:2844 ++#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tWeitersuchen im Vergleich" + - #: gitk:2845 ++#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" + - #: gitk:2846 ++#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" + - #: gitk:2847 ++#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-Plus>\tSchrift vergrößern" + - #: gitk:2848 ++#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" + - #: gitk:2849 ++#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-Minus>\tSchrift verkleinern" + - #: gitk:2850 ++#: gitk:3081 +msgid "\t\tUpdate" +msgstr "\t\tAktualisieren" + - #: gitk:3305 gitk:3314 ++#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" + - #: gitk:3327 ++#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + - #: gitk:3390 ++#: gitk:3631 +msgid "command failed:" +msgstr "Kommando fehlgeschlagen:" + - #: gitk:3539 ++#: gitk:3780 +msgid "No such commit" +msgstr "Version nicht gefunden" + - #: gitk:3553 ++#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: Kommando fehlgeschlagen:" + - #: gitk:3584 ++#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" + - #: gitk:3592 ++#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" + - #: gitk:3617 ++#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "»git blame« konnte nicht gestartet werden: %s" + - #: gitk:3620 gitk:6409 ++#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Suchen" + - #: gitk:3652 ++#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Fehler beim Ausführen von »git blame«: %s" + - #: gitk:3680 ++#: gitk:3921 +#, 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:3694 ++#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Externes Diff-Programm fehlgeschlagen:" + - #: gitk:3812 ++#: gitk:4053 +msgid "Gitk view definition" +msgstr "Gitk-Ansichten" + - #: gitk:3816 ++#: gitk:4057 +msgid "Remember this view" +msgstr "Diese Ansicht speichern" + - #: gitk:3817 ++#: gitk:4058 +msgid "References (space separated list):" +msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" + - #: gitk:3818 ++#: gitk:4059 +msgid "Branches & tags:" +msgstr "Zweige/Markierungen:" + - #: gitk:3819 ++#: gitk:4060 +msgid "All refs" +msgstr "Alle Markierungen und Zweige" + - #: gitk:3820 ++#: gitk:4061 +msgid "All (local) branches" +msgstr "Alle (lokalen) Zweige" + - #: gitk:3821 ++#: gitk:4062 +msgid "All tags" +msgstr "Alle Markierungen" + - #: gitk:3822 ++#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Alle Übernahmezweige" + - #: gitk:3823 ++#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Versionsinformationen (reguläre Ausdrücke):" + - #: gitk:3824 ++#: gitk:4065 +msgid "Author:" +msgstr "Autor:" + - #: gitk:3825 ++#: gitk:4066 +msgid "Committer:" +msgstr "Eintragender:" + - #: gitk:3826 ++#: gitk:4067 +msgid "Commit Message:" +msgstr "Versionsbeschreibung:" + - #: gitk:3827 ++#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Alle Versionsinformationen-Kriterien erfüllen" + - #: gitk:3828 ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Alle Versionsinformationen-Kriterien erfüllen" ++ ++#: gitk:4070 +msgid "Changes to Files:" +msgstr "Dateien:" + - #: gitk:3829 ++#: gitk:4071 +msgid "Fixed String" +msgstr "Zeichenkette" + - #: gitk:3830 ++#: gitk:4072 +msgid "Regular Expression" +msgstr "Regulärer Ausdruck" + - #: gitk:3831 ++#: gitk:4073 +msgid "Search string:" +msgstr "Suchausdruck:" + - #: gitk:3832 ++#: gitk:4074 +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«)" ++msgstr "" ++"Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" + - #: gitk:3833 ++#: gitk:4075 +msgid "Since:" +msgstr "Von:" + - #: gitk:3834 ++#: gitk:4076 +msgid "Until:" +msgstr "Bis:" + - #: gitk:3835 ++#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" + - #: gitk:3836 ++#: gitk:4078 +msgid "Number to show:" +msgstr "Anzeigen:" + - #: gitk:3837 ++#: gitk:4079 +msgid "Number to skip:" +msgstr "Überspringen:" + - #: gitk:3838 ++#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Sonstiges:" + - #: gitk:3839 ++#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Streng nach Datum sortieren" + - #: gitk:3840 ++#: gitk:4082 +msgid "Mark branch sides" +msgstr "Zweig-Seiten markieren" + - #: gitk:3841 ++#: gitk:4083 +msgid "Limit to first parent" +msgstr "Auf erste Elternversion beschränken" + - #: gitk:3842 ++#: gitk:4084 +msgid "Simple history" +msgstr "Einfache Historie" + - #: gitk:3843 ++#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Zusätzliche Argumente für »git log«:" + - #: gitk:3844 ++#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" + - #: gitk:3845 ++#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" + - #: gitk:3967 ++#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: Ansicht bearbeiten" + - #: gitk:3975 ++#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- Auswahl der angezeigten Versionen" + - #: gitk:3980 ++#: gitk:4224 +msgid "View Name" +msgstr "Ansichtsname" + - #: gitk:4055 ++#: gitk:4299 +msgid "Apply (F5)" +msgstr "Anwenden (F5)" + - #: gitk:4093 ++#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Fehler in den ausgewählten Versionen:" + - #: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Keine" + - #: gitk:4594 gitk:6441 gitk:8287 gitk:8302 - msgid "Date" - msgstr "Datum" - - #: gitk:4594 gitk:6441 - msgid "CDate" - msgstr "Eintragedatum" - - #: gitk:4743 gitk:4748 ++#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Abkömmling" + - #: gitk:4744 ++#: gitk:5004 +msgid "Not descendant" +msgstr "Kein Abkömmling" + - #: gitk:4751 gitk:4756 ++#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Vorgänger" + - #: gitk:4752 ++#: gitk:5012 +msgid "Not ancestor" +msgstr "Kein Vorgänger" + - #: gitk:5042 ++#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" + - #: gitk:5078 ++#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokale Änderungen, nicht bereitgestellt" + - #: gitk:6759 ++#: gitk:7115 ++msgid "and many more" ++msgstr "" ++ ++#: gitk:7118 +msgid "many" +msgstr "viele" + - #: gitk:6942 ++#: gitk:7309 +msgid "Tags:" +msgstr "Markierungen:" + - #: gitk:6959 gitk:6965 gitk:8280 ++#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Eltern" + - #: gitk:6970 ++#: gitk:7337 +msgid "Child" +msgstr "Kind" + - #: gitk:6979 ++#: gitk:7346 +msgid "Branch" +msgstr "Zweig" + - #: gitk:6982 ++#: gitk:7349 +msgid "Follows" +msgstr "Folgt auf" + - #: gitk:6985 ++#: gitk:7352 +msgid "Precedes" +msgstr "Vorgänger von" + - #: gitk:7522 ++#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Fehler beim Laden des Vergleichs: %s" + - #: gitk:8108 ++#: gitk:8631 +msgid "Goto:" +msgstr "Gehe zu:" + - #: gitk:8129 ++#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" + - #: gitk:8136 ++#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Version »%s« ist unbekannt" + - #: gitk:8146 ++#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA1-Hashwert »%s« ist unbekannt" + - #: gitk:8148 ++#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" + - #: gitk:8290 ++#: gitk:8813 gitk:8828 ++msgid "Date" ++msgstr "Datum" ++ ++#: gitk:8816 +msgid "Children" +msgstr "Kinder" + - #: gitk:8348 ++#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Zweig »%s« hierher zurücksetzen" + - #: gitk:8350 ++#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" + - #: gitk:8459 gitk:8465 ++#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Überspringe Zusammenführungs-Version " + - #: gitk:8474 gitk:8479 ++#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Fehler beim Holen der Patch-ID für " + - #: gitk:8475 gitk:8480 ++#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - Abbruch.\n" + - #: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Version " + - #: gitk:8489 ++#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" ist das gleiche Patch wie\n" +" " + - #: gitk:8497 ++#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" ist unterschiedlich von\n" +" " + - #: gitk:8499 ++#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Vergleich der Versionen:\n" +"\n" + - #: gitk:8511 gitk:8520 ++#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " hat %s Kinder. Abbruch\n" + - #: gitk:8539 ++#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fehler beim Schreiben der Version in Datei: %s" + - #: gitk:8545 ++#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fehler beim Vergleichen der Versionen: %s" + - #: gitk:8575 ++#: gitk:9118 +msgid "Top" +msgstr "Oben" + - #: gitk:8576 ++#: gitk:9119 +msgid "From" +msgstr "Von" + - #: gitk:8581 ++#: gitk:9124 +msgid "To" +msgstr "bis" + - #: gitk:8605 ++#: gitk:9148 +msgid "Generate patch" +msgstr "Patch erstellen" + - #: gitk:8607 ++#: gitk:9150 +msgid "From:" +msgstr "Von:" + - #: gitk:8616 ++#: gitk:9159 +msgid "To:" +msgstr "bis:" + - #: gitk:8625 ++#: gitk:9168 +msgid "Reverse" +msgstr "Umgekehrt" + - #: gitk:8627 gitk:8822 ++#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Ausgabedatei:" + - #: gitk:8633 ++#: gitk:9176 +msgid "Generate" +msgstr "Erzeugen" + - #: gitk:8671 ++#: gitk:9214 +msgid "Error creating patch:" +msgstr "Fehler beim Erzeugen des Patches:" + - #: gitk:8694 gitk:8810 gitk:8867 ++#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + - #: gitk:8703 ++#: gitk:9246 +msgid "Tag name:" +msgstr "Markierungsname:" + - #: gitk:8706 ++#: gitk:9249 +msgid "Tag message is optional" +msgstr "Eine Markierungsbeschreibung ist optional" + - #: gitk:8708 ++#: gitk:9251 +msgid "Tag message:" +msgstr "Markierungsbeschreibung:" + - #: gitk:8712 gitk:8876 ++#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Erstellen" + - #: gitk:8730 ++#: gitk:9273 +msgid "No tag name specified" +msgstr "Kein Markierungsname angegeben" + - #: gitk:8734 ++#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Markierung »%s« existiert bereits." + - #: gitk:8744 ++#: gitk:9287 +msgid "Error creating tag:" +msgstr "Fehler beim Erstellen der Markierung:" + - #: gitk:8819 ++#: gitk:9363 +msgid "Command:" +msgstr "Kommando:" + - #: gitk:8827 ++#: gitk:9371 +msgid "Write" +msgstr "Schreiben" + - #: gitk:8845 ++#: gitk:9389 +msgid "Error writing commit:" +msgstr "Fehler beim Schreiben der Version:" + - #: gitk:8872 ++#: gitk:9416 +msgid "Name:" +msgstr "Name:" + - #: gitk:8895 ++#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." + - #: gitk:8900 ++#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" + - #: gitk:8966 ++#: gitk:9511 +#, 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?" ++"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " ++"eintragen?" + - #: gitk:8971 ++#: gitk:9516 +msgid "Cherry-picking" +msgstr "Version pflücken" + - #: gitk:8980 ++#: gitk:9525 +#, 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:8986 ++#: gitk:9531 +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:9002 ++#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Keine Änderungen eingetragen" + - #: gitk:9028 ++#: gitk:9574 ++#, 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:9579 ++#, fuzzy ++msgid "Reverting" ++msgstr "Zurücksetzen" ++ ++#: gitk:9587 ++#, 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:9591 ++#, 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:9634 +msgid "Confirm reset" +msgstr "Zurücksetzen bestätigen" + - #: gitk:9030 ++#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Zweig »%s« auf »%s« zurücksetzen?" + - #: gitk:9032 ++#: gitk:9638 +msgid "Reset type:" +msgstr "Art des Zurücksetzens:" + - #: gitk:9035 ++#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" + - #: gitk:9038 ++#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "" +"Gemischt: Arbeitskopie unverändert,\n" +"Bereitstellung zurückgesetzt" + - #: gitk:9041 ++#: gitk:9647 +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:9058 ++#: gitk:9664 +msgid "Resetting" +msgstr "Zurücksetzen" + - #: gitk:9118 ++#: gitk:9724 +msgid "Checking out" +msgstr "Umstellen" + - #: gitk:9171 ++#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "" +"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " +"gelöscht werden." + - #: gitk:9177 ++#: gitk:9783 +#, 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:9208 ++#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Markierungen und Zweige: %s" + - #: gitk:9223 ++#: gitk:9829 +msgid "Filter" +msgstr "Filtern" + - #: gitk:9518 ++#: gitk:10125 +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:10504 ++#: gitk:11102 +msgid "Tag" +msgstr "Markierung" + - #: gitk:10504 ++#: gitk:11106 +msgid "Id" +msgstr "Id" + - #: gitk:10554 ++#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Gitk-Schriften wählen" + - #: gitk:10571 ++#: gitk:11206 +msgid "B" +msgstr "F" + - #: gitk:10574 ++#: gitk:11209 +msgid "I" +msgstr "K" + - #: gitk:10692 - msgid "Gitk preferences" - msgstr "Gitk-Einstellungen" - - #: gitk:10694 ++#: gitk:11327 +msgid "Commit list display options" +msgstr "Anzeige der Versionsliste" + - #: gitk:10697 ++#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Maximale Graphenbreite (Zeilen)" + - #: gitk:10700 - #, tcl-format ++#: gitk:11334 ++#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximale Graphenbreite (% des Fensters)" + - #: gitk:10703 ++#: gitk:11337 +msgid "Show local changes" +msgstr "Lokale Änderungen anzeigen" + - #: gitk:10706 - msgid "Auto-select SHA1" ++#: gitk:11340 ++#, fuzzy ++msgid "Auto-select SHA1 (length)" +msgstr "SHA1-Hashwert automatisch auswählen" + - #: gitk:10709 ++#: gitk:11344 +msgid "Hide remote refs" +msgstr "Entfernte Zweige/Markierungen ausblenden" + - #: gitk:10713 ++#: gitk:11348 +msgid "Diff display options" +msgstr "Anzeige des Vergleichs" + - #: gitk:10715 ++#: gitk:11350 +msgid "Tab spacing" +msgstr "Tabulatorbreite" + - #: gitk:10718 - msgid "Display nearby tags" ++#: gitk:11353 ++#, fuzzy ++msgid "Display nearby tags/heads" +msgstr "Naheliegende Markierungen anzeigen" + - #: gitk:10721 ++#: gitk:11356 ++msgid "Maximum # tags/heads to show" ++msgstr "" ++ ++#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Vergleich nur für angezeigte Pfade" + - #: gitk:10724 ++#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Zeichenkodierung pro Datei ermitteln" + - #: gitk:10730 gitk:10819 ++#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Externes Diff-Programm" + - #: gitk:10731 ++#: gitk:11369 +msgid "Choose..." +msgstr "Wählen ..." + - #: gitk:10736 ++#: gitk:11374 +msgid "General options" +msgstr "Allgemeine Optionen" + - #: gitk:10739 ++#: gitk:11377 +msgid "Use themed widgets" +msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" + - #: gitk:10741 ++#: gitk:11379 +msgid "(change requires restart)" +msgstr "(Änderungen werden erst nach Neustart wirksam)" + - #: gitk:10743 ++#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(Momentan nicht verfügbar)" + - #: gitk:10747 ++#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Farben: Klicken zum Wählen" + - #: gitk:10750 ++#: gitk:11395 +msgid "Interface" +msgstr "Benutzeroberfläche" + - #: gitk:10751 ++#: gitk:11396 +msgid "interface" +msgstr "Benutzeroberfläche" + - #: gitk:10754 ++#: gitk:11399 +msgid "Background" +msgstr "Hintergrund" + - #: gitk:10755 gitk:10785 ++#: gitk:11400 gitk:11430 +msgid "background" +msgstr "Hintergrund" + - #: gitk:10758 ++#: gitk:11403 +msgid "Foreground" +msgstr "Vordergrund" + - #: gitk:10759 ++#: gitk:11404 +msgid "foreground" +msgstr "Vordergrund" + - #: gitk:10762 ++#: gitk:11407 +msgid "Diff: old lines" +msgstr "Vergleich: Alte Zeilen" + - #: gitk:10763 ++#: gitk:11408 +msgid "diff old lines" +msgstr "Vergleich - Alte Zeilen" + - #: gitk:10767 ++#: gitk:11412 +msgid "Diff: new lines" +msgstr "Vergleich: Neue Zeilen" + - #: gitk:10768 ++#: gitk:11413 +msgid "diff new lines" +msgstr "Vergleich - Neue Zeilen" + - #: gitk:10772 ++#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Vergleich: Änderungstitel" + - #: gitk:10774 ++#: gitk:11419 +msgid "diff hunk header" +msgstr "Vergleich - Änderungstitel" + - #: gitk:10778 ++#: gitk:11423 +msgid "Marked line bg" +msgstr "Hintergrund für markierte Zeile" + - #: gitk:10780 ++#: gitk:11425 +msgid "marked line background" +msgstr "Hintergrund für markierte Zeile" + - #: gitk:10784 ++#: gitk:11429 +msgid "Select bg" +msgstr "Hintergrundfarbe auswählen" + - #: gitk:10788 ++#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Schriftart: Klicken zum Wählen" + - #: gitk:10790 ++#: gitk:11440 +msgid "Main font" +msgstr "Programmschriftart" + - #: gitk:10791 ++#: gitk:11441 +msgid "Diff display font" +msgstr "Schriftart für Vergleich" + - #: gitk:10792 ++#: gitk:11442 +msgid "User interface font" +msgstr "Beschriftungen" + - #: gitk:10829 ++#: gitk:11464 ++msgid "Gitk preferences" ++msgstr "Gitk-Einstellungen" ++ ++#: gitk:11473 ++#, fuzzy ++msgid "General" ++msgstr "Erzeugen" ++ ++#: gitk:11474 ++msgid "Colors" ++msgstr "" ++ ++#: gitk:11475 ++msgid "Fonts" ++msgstr "" ++ ++#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: Farbe wählen für %s" + - #: gitk:11433 ++#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Kein Git-Projektarchiv gefunden." + - #: gitk:11437 - #, tcl-format - msgid "Cannot find the git directory \"%s\"." - msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." - - #: gitk:11484 ++#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." + - #: gitk:11496 ++#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Falsche Kommandozeilen-Parameter für gitk:" + - #: gitk:11587 ++#: gitk:12405 +msgid "Command line" +msgstr "Kommandozeile" ++ ++#~ 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." diff --cc gitk-git/po/fr.po index 5370ddc393,0000000000..747ee190f2 mode 100644,000000..100644 --- a/gitk-git/po/fr.po +++ b/gitk-git/po/fr.po @@@ -1,1254 -1,0 +1,1409 @@@ +# 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 +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2009-10-05 15:16+0200\n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2009-11-19 22:13+0100\n" +"Last-Translator: Emmanuel Trillaud \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:113 ++#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" + - #: gitk:269 ++#: gitk:212 gitk:2381 ++msgid "Color words" ++msgstr "" ++ ++#: gitk:217 gitk:2381 gitk:8201 gitk:8234 ++msgid "Markup words" ++msgstr "" ++ ++#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Erreur lors du parcours des révisions :" + - #: gitk:324 ++#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Erreur à l'exécution de la commande --argscmd :" + - #: gitk:337 ++#: 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:340 ++#: 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:362 gitk:509 ++#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Erreur à l'exécution de git log :" + - #: gitk:380 gitk:525 ++#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lecture en cours" + - #: gitk:440 gitk:4123 ++#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Lecture des commits..." + - #: gitk:443 gitk:1561 gitk:4126 ++#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Aucun commit sélectionné" + - #: gitk:1437 ++#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Impossible de lire la sortie de git log :" + - #: gitk:1657 ++#: gitk:1740 +msgid "No commit information available" +msgstr "Aucune information disponible sur le commit" + - #: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 ++#: gitk:1897 ++msgid "mc" ++msgstr "" ++ ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "OK" + - #: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788 - #: gitk:10323 gitk:10499 ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Annuler" + - #: gitk:1919 ++#: gitk:2069 +msgid "Update" +msgstr "Mise à jour" + - #: gitk:1920 ++#: gitk:2070 +msgid "Reload" +msgstr "Recharger" + - #: gitk:1921 ++#: gitk:2071 +msgid "Reread references" +msgstr "Relire les références" + - #: gitk:1922 ++#: gitk:2072 +msgid "List references" +msgstr "Lister les références" + - #: gitk:1924 ++#: gitk:2074 +msgid "Start git gui" +msgstr "Démarrer git gui" + - #: gitk:1926 ++#: gitk:2076 +msgid "Quit" +msgstr "Quitter" + - #: gitk:1918 ++#: gitk:2068 +msgid "File" +msgstr "Fichier" + - #: gitk:1930 ++#: gitk:2080 +msgid "Preferences" +msgstr "Préférences" + - #: gitk:1929 ++#: gitk:2079 +msgid "Edit" +msgstr "Éditer" + - #: gitk:1934 ++#: gitk:2084 +msgid "New view..." +msgstr "Nouvelle vue..." + - #: gitk:1935 ++#: gitk:2085 +msgid "Edit view..." +msgstr "Éditer la vue..." + - #: gitk:1936 ++#: gitk:2086 +msgid "Delete view" +msgstr "Supprimer la vue" + - #: gitk:1938 ++#: gitk:2088 +msgid "All files" +msgstr "Tous les fichiers" + - #: gitk:1933 gitk:3670 ++#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Vue" + - #: gitk:1943 gitk:1953 gitk:2654 ++#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "À propos de gitk" + - #: gitk:1944 gitk:1958 ++#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Raccourcis clavier" + - #: gitk:1942 gitk:1957 ++#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Aide" + - #: gitk:2018 - msgid "SHA1 ID: " - msgstr "ID SHA1 :" ++#: gitk:2185 gitk:8633 ++msgid "SHA1 ID:" ++msgstr "Id SHA1 :" + - #: gitk:2049 ++#: gitk:2229 +msgid "Row" +msgstr "Colonne" + - #: gitk:2080 ++#: gitk:2267 +msgid "Find" +msgstr "Recherche" + - #: gitk:2081 - msgid "next" - msgstr "suivant" - - #: gitk:2082 - msgid "prev" - msgstr "précédent" - - #: gitk:2083 ++#: gitk:2295 +msgid "commit" +msgstr "commit" + - #: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 - #: gitk:6428 ++#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 +msgid "containing:" +msgstr "contient :" + - #: gitk:2089 gitk:3162 gitk:3167 gitk:4359 ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "chemins modifiés :" + - #: gitk:2090 gitk:4364 ++#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "ajoute/supprime la chaîne :" + - #: gitk:2099 gitk:2101 ++#: gitk:2304 gitk:4761 ++msgid "changing lines matching:" ++msgstr "" ++ ++#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Exact" + - #: gitk:2101 gitk:4439 gitk:6240 ++#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Ignorer la casse" + - #: gitk:2101 gitk:4333 gitk:4437 gitk:6236 ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Expression régulière" + - #: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Tous les champs" + - #: gitk:2104 gitk:4456 gitk:4488 gitk:6303 ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Surligner" + - #: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Commentaires" + - #: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 - #: gitk:8078 ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 +msgid "Author" +msgstr "Auteur" + - #: gitk:2105 gitk:4456 gitk:6303 gitk:6803 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Auteur du commit" + - #: gitk:2134 ++#: gitk:2350 +msgid "Search" +msgstr "Rechercher" + - #: gitk:2141 ++#: gitk:2358 +msgid "Diff" +msgstr "Diff" + - #: gitk:2143 ++#: gitk:2360 +msgid "Old version" +msgstr "Ancienne version" + - #: gitk:2145 ++#: gitk:2362 +msgid "New version" +msgstr "Nouvelle version" + - #: gitk:2147 ++#: gitk:2364 +msgid "Lines of context" +msgstr "Lignes de contexte" + - #: gitk:2157 ++#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignorer les modifications d'espace" + - #: gitk:2215 ++#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 ++msgid "Line diff" ++msgstr "" ++ ++#: gitk:2445 +msgid "Patch" +msgstr "Patch" + - #: gitk:2217 ++#: gitk:2447 +msgid "Tree" +msgstr "Arbre" + - #: gitk:2361 gitk:2378 ++#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Diff entre ceci et la sélection" + - #: gitk:2362 gitk:2379 ++#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Diff entre sélection et ceci" + - #: gitk:2363 gitk:2380 ++#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Créer patch" + - #: gitk:2364 gitk:8441 ++#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Créer tag" + - #: gitk:2365 gitk:8547 ++#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Écrire le commit dans un fichier" + - #: gitk:2366 gitk:8604 ++#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Créer une nouvelle branche" + - #: gitk:2367 ++#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Cueillir (cherry-pick) ce commit" + - #: gitk:2368 ++#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Réinitialiser la branche HEAD vers cet état" + - #: gitk:2369 ++#: gitk:2624 +msgid "Mark this commit" +msgstr "Marquer ce commit" + - #: gitk:2370 ++#: gitk:2625 +msgid "Return to mark" +msgstr "Retourner à la marque" + - #: gitk:2371 ++#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Chercher le descendant de ceci et le marquer" + - #: gitk:2372 ++#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Comparer avec le commit marqué" + - #: gitk:2386 ++#: gitk:2628 gitk:2639 ++#, fuzzy ++msgid "Diff this -> marked commit" ++msgstr "Diff entre ceci et la sélection" ++ ++#: gitk:2629 gitk:2640 ++#, fuzzy ++msgid "Diff marked commit -> this" ++msgstr "Diff entre sélection et ceci" ++ ++#: gitk:2630 ++#, fuzzy ++msgid "Revert this commit" ++msgstr "Marquer ce commit" ++ ++#: gitk:2646 +msgid "Check out this branch" +msgstr "Récupérer cette branche" + - #: gitk:2387 ++#: gitk:2647 +msgid "Remove this branch" +msgstr "Supprimer cette branche" + - #: gitk:2394 ++#: gitk:2654 +msgid "Highlight this too" +msgstr "Surligner également ceci" + - #: gitk:2395 ++#: gitk:2655 +msgid "Highlight this only" +msgstr "Surligner seulement ceci" + - #: gitk:2396 ++#: gitk:2656 +msgid "External diff" +msgstr "Diff externe" + - #: gitk:2397 ++#: gitk:2657 +msgid "Blame parent commit" +msgstr "Blâmer le commit parent" + - #: gitk:2404 ++#: gitk:2664 +msgid "Show origin of this line" +msgstr "Montrer l'origine de cette ligne" + - #: gitk:2405 ++#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Exécuter git gui blame sur cette ligne" + - #: gitk:2656 ++#: gitk:3011 ++#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright \\u00a9 2005-2010 Paul Mackerras\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:2664 gitk:2726 gitk:8969 ++#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Fermer" + - #: gitk:2683 ++#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Raccourcis clavier de Gitk" + - #: gitk:2686 ++#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Raccourcis clavier de Gitk :" + - #: gitk:2688 ++#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tQuitter" + - #: gitk:2689 ++#: gitk:3046 ++#, fuzzy, tcl-format ++msgid "<%s-W>\t\tClose window" ++msgstr "<%s-F>\t\tRechercher" ++ ++#: gitk:3047 +msgid "\t\tMove to first commit" +msgstr "\t\tAller au premier commit" + - #: gitk:2690 ++#: gitk:3048 +msgid "\t\tMove to last commit" +msgstr "\t\tAller au dernier commit" + - #: gitk:2691 - msgid ", p, i\tMove up one commit" ++#: gitk:3049 ++#, fuzzy ++msgid ", p, k\tMove up one commit" +msgstr ", p, i\t Aller au commit suivant" + - #: gitk:2692 - msgid ", n, k\tMove down one commit" ++#: gitk:3050 ++#, fuzzy ++msgid ", n, j\tMove down one commit" +msgstr ", n, k\t Aller au commit précédent" + - #: gitk:2693 - msgid ", z, j\tGo back in history list" ++#: gitk:3051 ++#, fuzzy ++msgid ", z, h\tGo back in history list" +msgstr ", z, j\tReculer dans l'historique" + - #: gitk:2694 ++#: gitk:3052 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tAvancer dans l'historique" + - #: gitk:2695 ++#: gitk:3053 ++#, tcl-format ++msgid "<%s-n>\tGo to n-th parent of current commit in history list" ++msgstr "" ++ ++#: gitk:3054 +msgid "\tMove up one page in commit list" +msgstr "\tMonter d'une page dans la liste des commits" + - #: gitk:2696 ++#: gitk:3055 +msgid "\tMove down one page in commit list" +msgstr "\tDescendre d'une page dans la liste des commits" + - #: gitk:2697 ++#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Début>\tAller en haut de la liste des commits" + - #: gitk:2698 ++#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tAller en bas de la liste des commits" + - #: gitk:2699 ++#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" + - #: gitk:2700 ++#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" + - #: gitk:2701 ++#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" + - #: gitk:2702 ++#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" + - #: gitk:2703 ++#: gitk:3062 +msgid "\tFind backwards (upwards, later commits)" +msgstr "" +"\tRecherche en arrière (vers l'avant, commits les plus anciens)" + - #: gitk:2704 ++#: gitk:3063 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "" +"\tRecherche en avant (vers l'arrière, commit les plus récents)" + - #: gitk:2705 ++#: gitk:3064 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tMonter d'une page dans la vue des diff" + - #: gitk:2706 ++#: gitk:3065 +msgid "\tScroll diff view up one page" +msgstr "\tMonter d'une page dans la vue des diff" + - #: gitk:2707 ++#: gitk:3066 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tDescendre d'une page dans la vue des diff" + - #: gitk:2708 ++#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tMonter de 18 lignes dans la vue des diff" + - #: gitk:2709 ++#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" + - #: gitk:2710 ++#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tRechercher" + - #: gitk:2711 ++#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tAller au résultat de recherche suivant" + - #: gitk:2712 ++#: gitk:3071 +msgid "\tMove to next find hit" +msgstr "\t\tAller au résultat de recherche suivant" + - #: gitk:2713 ++#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFocus sur la zone de recherche" + - #: gitk:2714 ++#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tAller au résultat de recherche précédent" + - #: gitk:2715 ++#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tAller au prochain fichier dans la vue des diff" + - #: gitk:2716 ++#: gitk:3075 +#, 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:2717 ++#: gitk:3076 +#, 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:2718 ++#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAugmenter la taille de la police" + - #: gitk:2719 ++#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tAugmenter la taille de la police" + - #: gitk:2720 ++#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDiminuer la taille de la police" + - #: gitk:2721 ++#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tDiminuer la taille de la police" + - #: gitk:2722 ++#: gitk:3081 +msgid "\t\tUpdate" +msgstr "\t\tMise à jour" + - #: gitk:3177 - #, tcl-format - msgid "Error getting \"%s\" from %s:" - msgstr "Erreur en obtenant \"%s\" de %s:" - - #: gitk:3234 gitk:3243 ++#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Erreur lors de la création du répertoire temporaire %s :" + - #: gitk:3255 ++#: gitk:3568 ++#, tcl-format ++msgid "Error getting \"%s\" from %s:" ++msgstr "Erreur en obtenant \"%s\" de %s:" ++ ++#: gitk:3631 +msgid "command failed:" +msgstr "échec de la commande :" + - #: gitk:3401 ++#: gitk:3780 +msgid "No such commit" +msgstr "Commit inexistant" + - #: gitk:3415 ++#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame : échec de la commande :" + - #: gitk:3446 ++#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossible de lire le head de la fusion : %s" + - #: gitk:3454 ++#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Erreur à la lecture de l'index : %s" + - #: gitk:3479 ++#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossible de démarrer git blame : %s" + - #: gitk:3482 gitk:6271 ++#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Recherche en cours" + - #: gitk:3514 ++#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Erreur à l'exécution de git blame : %s" + - #: gitk:3542 ++#: gitk:3921 +#, 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:3556 ++#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Échec de l'outil externe de visualisation des diff" + - #: gitk:3674 ++#: gitk:4053 +msgid "Gitk view definition" +msgstr "Définition des vues de Gitk" + - #: gitk:3678 ++#: gitk:4057 +msgid "Remember this view" +msgstr "Se souvenir de cette vue" + - #: gitk:3679 ++#: gitk:4058 +msgid "References (space separated list):" +msgstr "Références (liste d'éléments séparés par des espaces) :" + - #: gitk:3680 ++#: gitk:4059 +msgid "Branches & tags:" +msgstr "Branches & tags :" + - #: gitk:3681 ++#: gitk:4060 +msgid "All refs" +msgstr "Toutes les références" + - #: gitk:3682 ++#: gitk:4061 +msgid "All (local) branches" +msgstr "Toutes les branches (locales)" + - #: gitk:3683 ++#: gitk:4062 +msgid "All tags" +msgstr "Tous les tags" + - #: gitk:3684 ++#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Toutes les branches de suivi à distance" + - #: gitk:3685 ++#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Info sur les commits (expressions régulières) :" + - #: gitk:3686 ++#: gitk:4065 +msgid "Author:" +msgstr "Auteur :" + - #: gitk:3687 ++#: gitk:4066 +msgid "Committer:" +msgstr "Commiteur :" + - #: gitk:3688 ++#: gitk:4067 +msgid "Commit Message:" +msgstr "Message de commit :" + - #: gitk:3689 ++#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Correspond à tous les critères d'Info sur les commits" + - #: gitk:3690 ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Correspond à tous les critères d'Info sur les commits" ++ ++#: gitk:4070 +msgid "Changes to Files:" +msgstr "Changements des fichiers :" + - #: gitk:3691 ++#: gitk:4071 +msgid "Fixed String" +msgstr "Chaîne Figée" + - #: gitk:3692 ++#: gitk:4072 +msgid "Regular Expression" +msgstr "Expression Régulière" + - #: gitk:3693 ++#: gitk:4073 +msgid "Search string:" +msgstr "Recherche de la chaîne :" + - #: gitk:3694 ++#: gitk:4074 +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:3695 ++#: gitk:4075 +msgid "Since:" +msgstr "De :" + - #: gitk:3696 ++#: gitk:4076 +msgid "Until:" +msgstr "Jusqu'au :" + - #: gitk:3697 ++#: gitk:4077 +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:3698 ++#: gitk:4078 +msgid "Number to show:" +msgstr "Nombre à afficher :" + - #: gitk:3699 ++#: gitk:4079 +msgid "Number to skip:" +msgstr "Nombre à sauter :" + - #: gitk:3700 ++#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Options diverses :" + - #: gitk:3701 ++#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Trier par date" + +# FIXME : traduction de "branch sides" - #: gitk:3702 ++#: gitk:4082 +#, fuzzy +msgid "Mark branch sides" +msgstr "Marquer les extrémités des branches" + - #: gitk:3703 ++#: gitk:4083 +msgid "Limit to first parent" +msgstr "Limiter au premier ancêtre" + - #: gitk:3704 ++#: gitk:4084 +msgid "Simple history" +msgstr "Historique simple" + - #: gitk:3705 ++#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Arguments supplémentaires de git log :" + - #: gitk:3706 ++#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" + - #: gitk:3707 ++#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Commande pour générer plus de commits à inclure :" + - #: gitk:3829 ++#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk : éditer la vue" + - #: gitk:3837 ++#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- critère pour la sélection des révisions" + - #: gitk:3842 - msgid "View Name:" ++#: gitk:4224 ++#, fuzzy ++msgid "View Name" +msgstr "Nom de la vue :" + - #: gitk:3917 ++#: gitk:4299 +msgid "Apply (F5)" +msgstr "Appliquer (F5)" + - #: gitk:3955 ++#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Erreur dans les arguments de sélection des commits :" + - #: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197 ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Aucun" + - #: gitk:4456 gitk:6303 gitk:8065 gitk:8080 - msgid "Date" - msgstr "Date" - - #: gitk:4456 gitk:6303 - msgid "CDate" - msgstr "CDate" - - #: gitk:4605 gitk:4610 ++#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Descendant" + - #: gitk:4606 ++#: gitk:5004 +msgid "Not descendant" +msgstr "Pas un descendant" + - #: gitk:4613 gitk:4618 ++#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Ancêtre" + - #: gitk:4614 ++#: gitk:5012 +msgid "Not ancestor" +msgstr "Pas un ancêtre" + - #: gitk:4904 ++#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Modifications locales enregistrées dans l'index mais non commitées" + - #: gitk:4940 ++#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Modifications locales non enregistrées dans l'index et non commitées" + - #: gitk:6621 ++#: gitk:7115 ++msgid "and many more" ++msgstr "" ++ ++#: gitk:7118 +msgid "many" +msgstr "nombreux" + - #: gitk:6805 ++#: gitk:7309 +msgid "Tags:" +msgstr "Tags :" + - #: gitk:6822 gitk:6828 gitk:8058 ++#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Parent" + - #: gitk:6833 ++#: gitk:7337 +msgid "Child" +msgstr "Enfant" + - #: gitk:6842 ++#: gitk:7346 +msgid "Branch" +msgstr "Branche" + - #: gitk:6845 ++#: gitk:7349 +msgid "Follows" +msgstr "Suit" + - #: gitk:6848 ++#: gitk:7352 +msgid "Precedes" +msgstr "Précède" + - #: gitk:7346 ++#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Erreur lors de la récupération des diff : %s" + - #: gitk:7886 ++#: gitk:8631 +msgid "Goto:" +msgstr "Aller à :" + - #: gitk:7888 - msgid "SHA1 ID:" - msgstr "Id SHA1 :" - - #: gitk:7907 ++#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Id SHA1 court %s est ambigu" + - #: gitk:7914 ++#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Id SHA1 %s est inconnu" + - #: gitk:7924 ++#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Id SHA1 %s est inconnu" + - #: gitk:7926 ++#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La révision %s n'est pas dans la vue courante" + - #: gitk:8068 ++#: gitk:8813 gitk:8828 ++msgid "Date" ++msgstr "Date" ++ ++#: gitk:8816 +msgid "Children" +msgstr "Enfants" + - #: gitk:8125 ++#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Réinitialiser la branche %s vers cet état" + - #: gitk:8127 ++#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Head détaché : impossible de réinitialiser" + - #: gitk:8236 gitk:8242 ++#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Éviter le commit de la fusion " + - #: gitk:8251 gitk:8256 ++#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Erreur à l'obtention de l'ID du patch pour " + - #: gitk:8252 gitk:8257 ++#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - arrêt en cours\n" + - #: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Commit " + - #: gitk:8266 ++#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +"est le même patch que \n" +" " + - #: gitk:8274 ++#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" diffère de\n" +" " + - #: gitk:8276 - msgid "- stopping\n" - msgstr "- arrêt en cours\n" ++#: gitk:9026 ++msgid "" ++"Diff of commits:\n" ++"\n" ++msgstr "" + - #: gitk:8284 gitk:8293 ++#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "a %s enfants - arrêt en cours\n" + - #: gitk:8324 ++#: gitk:9066 ++#, fuzzy, tcl-format ++msgid "Error writing commit to file: %s" ++msgstr "Erreur à l'ecriture du commit :" ++ ++#: gitk:9072 ++#, fuzzy, tcl-format ++msgid "Error diffing commits: %s" ++msgstr "Erreur à l'ecriture du commit :" ++ ++#: gitk:9118 +msgid "Top" +msgstr "Haut" + - #: gitk:8325 ++#: gitk:9119 +msgid "From" +msgstr "De" + - #: gitk:8330 ++#: gitk:9124 +msgid "To" +msgstr "À" + - #: gitk:8354 ++#: gitk:9148 +msgid "Generate patch" +msgstr "Générer le patch" + - #: gitk:8356 ++#: gitk:9150 +msgid "From:" +msgstr "De :" + - #: gitk:8365 ++#: gitk:9159 +msgid "To:" +msgstr "À :" + - #: gitk:8374 ++#: gitk:9168 +msgid "Reverse" +msgstr "Inverser" + - #: gitk:8376 gitk:8561 ++#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Fichier de sortie :" + - #: gitk:8382 ++#: gitk:9176 +msgid "Generate" +msgstr "Générer" + - #: gitk:8420 ++#: gitk:9214 +msgid "Error creating patch:" +msgstr "Erreur à la création du patch :" + - #: gitk:8443 gitk:8549 gitk:8606 ++#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID :" + - #: gitk:8452 ++#: gitk:9246 +msgid "Tag name:" +msgstr "Nom du Tag :" + - #: gitk:8456 gitk:8615 ++#: gitk:9249 ++msgid "Tag message is optional" ++msgstr "" ++ ++#: gitk:9251 ++#, fuzzy ++msgid "Tag message:" ++msgstr "Nom du Tag :" ++ ++#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Créer" + - #: gitk:8473 ++#: gitk:9273 +msgid "No tag name specified" +msgstr "Aucun nom de tag spécifié" + - #: gitk:8477 ++#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Le tag \"%s\" existe déjà" + - #: gitk:8483 ++#: gitk:9287 +msgid "Error creating tag:" +msgstr "Erreur à la création du tag :" + - #: gitk:8558 ++#: gitk:9363 +msgid "Command:" +msgstr "Commande :" + - #: gitk:8566 ++#: gitk:9371 +msgid "Write" +msgstr "Écrire" + - #: gitk:8584 ++#: gitk:9389 +msgid "Error writing commit:" +msgstr "Erreur à l'ecriture du commit :" + - #: gitk:8611 ++#: gitk:9416 +msgid "Name:" +msgstr "Nom :" + - #: gitk:8634 ++#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Veuillez spécifier un nom pour la nouvelle branche" + - #: gitk:8639 ++#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La branche '%s' existe déjà. Écraser?" + - #: gitk:8705 ++#: gitk:9511 +#, 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:8710 ++#: gitk:9516 +msgid "Cherry-picking" +msgstr "Cueillir (Cherry-picking)" + - #: gitk:8719 ++#: gitk:9525 +#, 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:8725 ++#: gitk:9531 +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:8741 ++#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Aucun changement commité" + - #: gitk:8767 ++#: gitk:9574 ++#, 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:9579 ++#, fuzzy ++msgid "Reverting" ++msgstr "Réinitialisation" ++ ++#: gitk:9587 ++#, 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:9591 ++#, 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:9634 +msgid "Confirm reset" +msgstr "Confirmer la réinitialisation" + - #: gitk:8769 ++#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Réinitialiser la branche %s à %s?" + - #: gitk:8773 ++#: gitk:9638 +msgid "Reset type:" +msgstr "Type de réinitialisation :" + - #: gitk:8777 ++#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Douce : Laisse le répertoire de travail et l'index intacts" + - #: gitk:8780 ++#: gitk:9644 +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:8783 ++#: gitk:9647 +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:8800 ++#: gitk:9664 +msgid "Resetting" +msgstr "Réinitialisation" + +# Fixme: Récupération est-il vraiment une mauvaise traduction? - #: gitk:8857 ++#: gitk:9724 +#, fuzzy +msgid "Checking out" +msgstr "Récupération" + - #: gitk:8910 ++#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossible de supprimer la branche en cours" + - #: gitk:8916 ++#: gitk:9783 +#, 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:8947 ++#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Tags et heads : %s" + - #: gitk:8962 ++#: gitk:9829 +msgid "Filter" +msgstr "Filtrer" + - #: gitk:9257 ++#: gitk:10125 +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:10243 ++#: gitk:11102 +msgid "Tag" +msgstr "Tag" + - #: gitk:10243 ++#: gitk:11106 +msgid "Id" +msgstr "Id" + - #: gitk:10291 ++#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Sélecteur de police de Gitk" + - #: gitk:10308 ++#: gitk:11206 +msgid "B" +msgstr "B" + - #: gitk:10311 ++#: gitk:11209 +msgid "I" +msgstr "I" + - #: gitk:10407 - msgid "Gitk preferences" - msgstr "Préférences de Gitk" - - #: gitk:10409 ++#: gitk:11327 +msgid "Commit list display options" +msgstr "Options d'affichage de la liste des commits" + - #: gitk:10412 ++#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Longueur maximum du graphe (lignes)" + +# FIXME : Traduction standard de "pane"? - #: gitk:10416 - #, fuzzy, tcl-format ++#: gitk:11334 ++#, fuzzy, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Longueur maximum du graphe (% du panneau)" + - #: gitk:10420 ++#: gitk:11337 +msgid "Show local changes" +msgstr "Montrer les changements locaux" + - #: gitk:10423 - msgid "Auto-select SHA1" ++#: gitk:11340 ++#, fuzzy ++msgid "Auto-select SHA1 (length)" +msgstr "Sélection auto. du SHA1" + - #: gitk:10427 ++#: gitk:11344 ++msgid "Hide remote refs" ++msgstr "Cacher les refs distantes" ++ ++#: gitk:11348 +msgid "Diff display options" +msgstr "Options d'affichage des diff" + - #: gitk:10429 ++#: gitk:11350 +msgid "Tab spacing" +msgstr "Taille des tabulations" + - #: gitk:10432 - msgid "Display nearby tags" ++#: gitk:11353 ++#, fuzzy ++msgid "Display nearby tags/heads" +msgstr "Afficher les tags les plus proches" + - #: gitk:10435 - msgid "Hide remote refs" - msgstr "Cacher les refs distantes" ++#: gitk:11356 ++msgid "Maximum # tags/heads to show" ++msgstr "" + - #: gitk:10438 ++#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Limiter les différences aux chemins listés" + - #: gitk:10441 ++#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Support pour un encodage des caractères par fichier" + - #: gitk:10447 gitk:10512 ++#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Outil diff externe" + - #: gitk:10449 ++#: gitk:11369 +msgid "Choose..." +msgstr "Choisir..." + - #: gitk:10454 ++#: gitk:11374 ++#, fuzzy ++msgid "General options" ++msgstr "Générer le patch" ++ ++#: gitk:11377 ++msgid "Use themed widgets" ++msgstr "" ++ ++#: gitk:11379 ++msgid "(change requires restart)" ++msgstr "" ++ ++#: gitk:11381 ++msgid "(currently unavailable)" ++msgstr "" ++ ++#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Couleurs : cliquer pour choisir" + - #: gitk:10457 ++#: gitk:11395 ++msgid "Interface" ++msgstr "" ++ ++#: gitk:11396 ++#, fuzzy ++msgid "interface" ++msgstr "Police de l'interface utilisateur" ++ ++#: gitk:11399 +msgid "Background" +msgstr "Arrière-plan" + - #: gitk:10458 gitk:10488 ++#: gitk:11400 gitk:11430 +msgid "background" +msgstr "arrière-plan" + - #: gitk:10461 ++#: gitk:11403 +msgid "Foreground" +msgstr "Premier plan" + - #: gitk:10462 ++#: gitk:11404 +msgid "foreground" +msgstr "premier plan" + - #: gitk:10465 ++#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff : anciennes lignes" + - #: gitk:10466 ++#: gitk:11408 +msgid "diff old lines" +msgstr "diff anciennes lignes" + - #: gitk:10470 ++#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff : nouvelles lignes" + - #: gitk:10471 ++#: gitk:11413 +msgid "diff new lines" +msgstr "diff nouvelles lignes" + - #: gitk:10475 ++#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff : entête du hunk" + - #: gitk:10477 ++#: gitk:11419 +msgid "diff hunk header" +msgstr "diff : entête du hunk" + - #: gitk:10481 ++#: gitk:11423 +msgid "Marked line bg" +msgstr "Arrière-plan de la ligne marquée" + - #: gitk:10483 ++#: gitk:11425 +msgid "marked line background" +msgstr "Arrière-plan de la ligne marquée" + - #: gitk:10487 ++#: gitk:11429 +msgid "Select bg" +msgstr "Sélectionner l'arrière-plan" + - #: gitk:10491 ++#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Polices : cliquer pour choisir" + - #: gitk:10493 ++#: gitk:11440 +msgid "Main font" +msgstr "Police principale" + - #: gitk:10494 ++#: gitk:11441 +msgid "Diff display font" +msgstr "Police d'affichage des diff" + - #: gitk:10495 ++#: gitk:11442 +msgid "User interface font" +msgstr "Police de l'interface utilisateur" + - #: gitk:10522 ++#: gitk:11464 ++msgid "Gitk preferences" ++msgstr "Préférences de Gitk" ++ ++#: gitk:11473 ++#, fuzzy ++msgid "General" ++msgstr "Générer" ++ ++#: gitk:11474 ++msgid "Colors" ++msgstr "" ++ ++#: gitk:11475 ++msgid "Fonts" ++msgstr "" ++ ++#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk : choisir la couleur de %s" + - #: gitk:10973 - 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:11101 ++#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Impossible de trouver un dépôt git ici." + - #: gitk:11105 - #, tcl-format - msgid "Cannot find the git directory \"%s\"." - msgstr "Impossible de trouver le répertoire git \"%s\"." - - #: gitk:11152 ++#: gitk:12289 +#, 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:11164 ++#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Arguments invalides pour gitk :" + - #: gitk:11249 ++#: gitk:12405 +msgid "Command line" +msgstr "Ligne de commande" ++ ++#~ 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 "" ++#~ "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 "Cannot find the git directory \"%s\"." ++#~ msgstr "Impossible de trouver le répertoire git \"%s\"." diff --cc gitk-git/po/it.po index a730d63a42,0000000000..d630bb086d mode 100644,000000..100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@@ -1,1276 -1,0 +1,1372 @@@ +# Translation of gitk +# Copyright (C) 2005-2008 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# Michele Ballabio , 2008. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-01-28 18:40+0100\n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2010-01-28 18:41+0100\n" +"Last-Translator: Michele Ballabio \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:115 ++#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" + - #: gitk:274 ++#: gitk:212 gitk:2381 ++msgid "Color words" ++msgstr "" ++ ++#: gitk:217 gitk:2381 gitk:8201 gitk:8234 ++msgid "Markup words" ++msgstr "" ++ ++#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Errore nella lettura delle revisioni:" + - #: gitk:329 ++#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" + - #: gitk:342 ++#: 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:345 ++#: 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:367 gitk:514 ++#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Errore nell'esecuzione di git log:" + - #: gitk:385 gitk:530 ++#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lettura in corso" + - #: gitk:445 gitk:4261 ++#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Lettura delle revisioni in corso..." + - #: gitk:448 gitk:1578 gitk:4264 ++#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Nessuna revisione selezionata" + - #: gitk:1454 ++#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Impossibile elaborare i dati di git log:" + - #: gitk:1674 ++#: gitk:1740 +msgid "No commit information available" +msgstr "Nessuna informazione disponibile sulle revisioni" + - #: gitk:1816 ++#: gitk:1897 +msgid "mc" +msgstr "" + - #: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "OK" + - #: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 - #: gitk:10586 gitk:10805 ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Annulla" + - #: gitk:1975 ++#: gitk:2069 +msgid "Update" +msgstr "Aggiorna" + - #: gitk:1976 ++#: gitk:2070 +msgid "Reload" +msgstr "Ricarica" + - #: gitk:1977 ++#: gitk:2071 +msgid "Reread references" +msgstr "Rileggi riferimenti" + - #: gitk:1978 ++#: gitk:2072 +msgid "List references" +msgstr "Elenca riferimenti" + - #: gitk:1980 ++#: gitk:2074 +msgid "Start git gui" +msgstr "Avvia git gui" + - #: gitk:1982 ++#: gitk:2076 +msgid "Quit" +msgstr "Esci" + - #: gitk:1974 ++#: gitk:2068 +msgid "File" +msgstr "File" + - #: gitk:1986 ++#: gitk:2080 +msgid "Preferences" +msgstr "Preferenze" + - #: gitk:1985 ++#: gitk:2079 +msgid "Edit" +msgstr "Modifica" + - #: gitk:1990 ++#: gitk:2084 +msgid "New view..." +msgstr "Nuova vista..." + - #: gitk:1991 ++#: gitk:2085 +msgid "Edit view..." +msgstr "Modifica vista..." + - #: gitk:1992 ++#: gitk:2086 +msgid "Delete view" +msgstr "Elimina vista" + - #: gitk:1994 ++#: gitk:2088 +msgid "All files" +msgstr "Tutti i file" + - #: gitk:1989 gitk:3808 ++#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Vista" + - #: gitk:1999 gitk:2009 gitk:2780 ++#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Informazioni su gitk" + - #: gitk:2000 gitk:2014 ++#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Scorciatoie da tastiera" + - #: gitk:1998 gitk:2013 ++#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Aiuto" + - #: gitk:2091 gitk:8110 ++#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + - #: gitk:2122 ++#: gitk:2229 +msgid "Row" +msgstr "Riga" + - #: gitk:2160 ++#: gitk:2267 +msgid "Find" +msgstr "Trova" + - #: gitk:2161 - msgid "next" - msgstr "succ" - - #: gitk:2162 - msgid "prev" - msgstr "prec" - - #: gitk:2163 ++#: gitk:2295 +msgid "commit" +msgstr "revisione" + - #: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 - #: gitk:6566 ++#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 +msgid "containing:" +msgstr "contenente:" + - #: gitk:2169 gitk:3290 gitk:3295 gitk:4497 ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "che riguarda i percorsi:" + - #: gitk:2170 gitk:4502 ++#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "che aggiunge/rimuove la stringa:" + - #: gitk:2179 gitk:2181 ++#: gitk:2304 gitk:4761 ++msgid "changing lines matching:" ++msgstr "" ++ ++#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Esatto" + - #: gitk:2181 gitk:4577 gitk:6378 ++#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "" + - #: gitk:2181 gitk:4471 gitk:4575 gitk:6374 ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "" + - #: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Tutti i campi" + - #: gitk:2184 gitk:4594 gitk:4626 gitk:6441 ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Titolo" + - #: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Commenti" + - #: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 - #: gitk:8300 ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 +msgid "Author" +msgstr "Autore" + - #: gitk:2185 gitk:4594 gitk:6441 gitk:6940 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Revisione creata da" + - #: gitk:2216 ++#: gitk:2350 +msgid "Search" +msgstr "Cerca" + - #: gitk:2224 ++#: gitk:2358 +msgid "Diff" +msgstr "" + - #: gitk:2226 ++#: gitk:2360 +msgid "Old version" +msgstr "Vecchia versione" + - #: gitk:2228 ++#: gitk:2362 +msgid "New version" +msgstr "Nuova versione" + - #: gitk:2230 ++#: gitk:2364 +msgid "Lines of context" +msgstr "Linee di contesto" + - #: gitk:2240 ++#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignora modifiche agli spazi" + - #: gitk:2299 ++#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 ++msgid "Line diff" ++msgstr "" ++ ++#: gitk:2445 +msgid "Patch" +msgstr "Modifiche" + - #: gitk:2301 ++#: gitk:2447 +msgid "Tree" +msgstr "Directory" + - #: gitk:2456 gitk:2473 ++#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Diff questo -> selezionato" + - #: gitk:2457 gitk:2474 ++#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Diff selezionato -> questo" + - #: gitk:2458 gitk:2475 ++#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Crea patch" + - #: gitk:2459 gitk:8692 ++#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Crea etichetta" + - #: gitk:2460 gitk:8808 ++#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Scrivi revisione in un file" + - #: gitk:2461 gitk:8865 ++#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Crea un nuovo ramo" + - #: gitk:2462 ++#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Porta questa revisione in cima al ramo attuale" + - #: gitk:2463 ++#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Aggiorna il ramo HEAD a questa revisione" + - #: gitk:2464 ++#: gitk:2624 +msgid "Mark this commit" +msgstr "Segna questa revisione" + - #: gitk:2465 ++#: gitk:2625 +msgid "Return to mark" +msgstr "Torna alla revisione segnata" + - #: gitk:2466 ++#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Trova il discendente di questa revisione e di quella segnata" + - #: gitk:2467 ++#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Confronta con la revisione segnata" + - #: gitk:2481 ++#: gitk:2628 gitk:2639 ++#, fuzzy ++msgid "Diff this -> marked commit" ++msgstr "Diff questo -> selezionato" ++ ++#: gitk:2629 gitk:2640 ++#, fuzzy ++msgid "Diff marked commit -> this" ++msgstr "Diff selezionato -> questo" ++ ++#: gitk:2630 ++#, fuzzy ++msgid "Revert this commit" ++msgstr "Segna questa revisione" ++ ++#: gitk:2646 +msgid "Check out this branch" +msgstr "Attiva questo ramo" + - #: gitk:2482 ++#: gitk:2647 +msgid "Remove this branch" +msgstr "Elimina questo ramo" + - #: gitk:2489 ++#: gitk:2654 +msgid "Highlight this too" +msgstr "Evidenzia anche questo" + - #: gitk:2490 ++#: gitk:2655 +msgid "Highlight this only" +msgstr "Evidenzia solo questo" + - #: gitk:2491 ++#: gitk:2656 +msgid "External diff" +msgstr "Visualizza differenze in un altro programma" + - #: gitk:2492 ++#: gitk:2657 +msgid "Blame parent commit" +msgstr "Annota la revisione precedente" + - #: gitk:2499 ++#: gitk:2664 +msgid "Show origin of this line" +msgstr "Mostra la provenienza di questa riga" + - #: gitk:2500 ++#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Esegui git gui blame su questa riga" + - #: gitk:2782 ++#: gitk:3011 ++#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright \\u00a9 2005-2010 Paul Mackerras\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:2790 gitk:2854 gitk:9230 ++#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Chiudi" + - #: gitk:2811 ++#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Scorciatoie da tastiera di Gitk" + - #: gitk:2814 ++#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Scorciatoie da tastiera di Gitk:" + - #: gitk:2816 ++#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tEsci" + - #: gitk:2817 ++#: gitk:3046 ++#, fuzzy, tcl-format ++msgid "<%s-W>\t\tClose window" ++msgstr "<%s-F>\t\tTrova" ++ ++#: gitk:3047 +msgid "\t\tMove to first commit" +msgstr "\t\tVai alla prima revisione" + - #: gitk:2818 ++#: gitk:3048 +msgid "\t\tMove to last commit" +msgstr "\t\tVai all'ultima revisione" + - #: gitk:2819 - msgid ", p, i\tMove up one commit" ++#: gitk:3049 ++#, fuzzy ++msgid ", p, k\tMove up one commit" +msgstr ", p, i\tVai più in alto di una revisione" + - #: gitk:2820 - msgid ", n, k\tMove down one commit" ++#: gitk:3050 ++#, fuzzy ++msgid ", n, j\tMove down one commit" +msgstr ", n, k\tVai più in basso di una revisione" + - #: gitk:2821 - msgid ", z, j\tGo back in history list" ++#: gitk:3051 ++#, fuzzy ++msgid ", z, h\tGo back in history list" +msgstr ", z, j\tTorna indietro nella cronologia" + - #: gitk:2822 ++#: gitk:3052 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tVai avanti nella cronologia" + - #: gitk:2823 ++#: gitk:3053 ++#, tcl-format ++msgid "<%s-n>\tGo to n-th parent of current commit in history list" ++msgstr "" ++ ++#: gitk:3054 +msgid "\tMove up one page in commit list" +msgstr "\tVai più in alto di una pagina nella lista delle revisioni" + - #: gitk:2824 ++#: gitk:3055 +msgid "\tMove down one page in commit list" +msgstr "" +"\tVai più in basso di una pagina nella lista delle revisioni" + - #: gitk:2825 ++#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" + - #: gitk:2826 ++#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" + - #: gitk:2827 ++#: gitk:3058 +#, 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:2828 ++#: gitk:3059 +#, 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:2829 ++#: gitk:3060 +#, 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:2830 ++#: gitk:3061 +#, 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:2831 ++#: gitk:3062 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tTrova all'indietro (verso l'alto, revisioni successive)" + - #: gitk:2832 ++#: gitk:3063 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "\tTrova in avanti (verso il basso, revisioni precedenti)" + - #: gitk:2833 ++#: gitk:3064 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tScorri la vista delle differenze in alto di una pagina" + - #: gitk:2834 ++#: gitk:3065 +msgid "\tScroll diff view up one page" +msgstr "\tScorri la vista delle differenze in alto di una pagina" + - #: gitk:2835 ++#: gitk:3066 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tScorri la vista delle differenze in basso di una pagina" + - #: gitk:2836 ++#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" + - #: gitk:2837 ++#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" + - #: gitk:2838 ++#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tTrova" + - #: gitk:2839 ++#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tTrova in avanti" + - #: gitk:2840 ++#: gitk:3071 +msgid "\tMove to next find hit" +msgstr "\tTrova in avanti" + - #: gitk:2841 ++#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tCursore nel box di ricerca" + - #: gitk:2842 ++#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tTrova all'indietro" + - #: gitk:2843 ++#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tScorri la vista delle differenze al file successivo" + - #: gitk:2844 ++#: gitk:3075 +#, 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:2845 ++#: gitk:3076 +#, 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:2846 ++#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAumenta dimensione carattere" + - #: gitk:2847 ++#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-più>\tAumenta dimensione carattere" + - #: gitk:2848 ++#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDiminuisci dimensione carattere" + - #: gitk:2849 ++#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-meno>\tDiminuisci dimensione carattere" + - #: gitk:2850 ++#: gitk:3081 +msgid "\t\tUpdate" +msgstr "\t\tAggiorna" + - #: gitk:3305 gitk:3314 ++#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Errore durante la creazione della directory temporanea %s:" + - #: gitk:3327 ++#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Errore nella lettura di \"%s\" da %s:" + - #: gitk:3390 ++#: gitk:3631 +msgid "command failed:" +msgstr "impossibile eseguire il comando:" + - #: gitk:3539 ++#: gitk:3780 +msgid "No such commit" +msgstr "Revisione inesistente" + - #: gitk:3553 ++#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: impossibile eseguire il comando:" + - #: gitk:3584 ++#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossibile leggere merge head: %s" + - #: gitk:3592 ++#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Errore nella lettura dell'indice: %s" + - #: gitk:3617 ++#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossibile eseguire git blame: %s" + - #: gitk:3620 gitk:6409 ++#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Ricerca in corso" + - #: gitk:3652 ++#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Errore nell'esecuzione di git blame: %s" + - #: gitk:3680 ++#: gitk:3921 +#, 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:3694 ++#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Impossibile eseguire il visualizzatore di differenze:" + - #: gitk:3812 ++#: gitk:4053 +msgid "Gitk view definition" +msgstr "Scelta vista Gitk" + - #: gitk:3816 ++#: gitk:4057 +msgid "Remember this view" +msgstr "Ricorda questa vista" + - #: gitk:3817 ++#: gitk:4058 +msgid "References (space separated list):" +msgstr "Riferimenti (lista di elementi separati da spazi)" + - #: gitk:3818 ++#: gitk:4059 +msgid "Branches & tags:" +msgstr "Rami ed etichette" + - #: gitk:3819 ++#: gitk:4060 +msgid "All refs" +msgstr "Tutti i riferimenti" + - #: gitk:3820 ++#: gitk:4061 +msgid "All (local) branches" +msgstr "Tutti i rami (locali)" + - #: gitk:3821 ++#: gitk:4062 +msgid "All tags" +msgstr "Tutte le etichette" + - #: gitk:3822 ++#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Tutti i rami remoti" + - #: gitk:3823 ++#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Informazioni sulla revisione (espressioni regolari):" + - #: gitk:3824 ++#: gitk:4065 +msgid "Author:" +msgstr "Autore:" + - #: gitk:3825 ++#: gitk:4066 +msgid "Committer:" +msgstr "Revisione creata da:" + - #: gitk:3826 ++#: gitk:4067 +msgid "Commit Message:" +msgstr "Messaggio di revisione:" + - #: gitk:3827 ++#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" + - #: gitk:3828 ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" ++ ++#: gitk:4070 +msgid "Changes to Files:" +msgstr "Modifiche ai file:" + - #: gitk:3829 ++#: gitk:4071 +msgid "Fixed String" +msgstr "Stringa fissa" + - #: gitk:3830 ++#: gitk:4072 +msgid "Regular Expression" +msgstr "Espressione regolare" + - #: gitk:3831 ++#: gitk:4073 +msgid "Search string:" +msgstr "Cerca stringa:" + - #: gitk:3832 ++#: gitk:4074 +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:3833 ++#: gitk:4075 +msgid "Since:" +msgstr "Da:" + - #: gitk:3834 ++#: gitk:4076 +msgid "Until:" +msgstr "A:" + - #: gitk:3835 ++#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limita e/o salta N revisioni (intero positivo):" + - #: gitk:3836 ++#: gitk:4078 +msgid "Number to show:" +msgstr "Numero di revisioni da mostrare:" + - #: gitk:3837 ++#: gitk:4079 +msgid "Number to skip:" +msgstr "Numero di revisioni da saltare:" + - #: gitk:3838 ++#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Altre opzioni:" + - #: gitk:3839 ++#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Ordina solo per data" + - #: gitk:3840 ++#: gitk:4082 +msgid "Mark branch sides" +msgstr "Segna i lati del ramo" + - #: gitk:3841 ++#: gitk:4083 +msgid "Limit to first parent" +msgstr "Limita al primo genitore" + - #: gitk:3842 ++#: gitk:4084 +msgid "Simple history" +msgstr "Cronologia semplificata" + - #: gitk:3843 ++#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Ulteriori argomenti da passare a git log:" + - #: gitk:3844 ++#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Inserire file e directory da includere, uno per riga:" + - #: gitk:3845 ++#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Comando che genera altre revisioni da visualizzare:" + - #: gitk:3967 ++#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: modifica vista" + - #: gitk:3975 ++#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- criteri per la scelta delle revisioni" + - #: gitk:3980 ++#: gitk:4224 +msgid "View Name" +msgstr "Nome vista" + - #: gitk:4055 ++#: gitk:4299 +msgid "Apply (F5)" +msgstr "Applica (F5)" + - #: gitk:4093 ++#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Errore negli argomenti di selezione delle revisioni:" + - #: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Nessuno" + - #: gitk:4594 gitk:6441 gitk:8287 gitk:8302 - msgid "Date" - msgstr "Data" - - #: gitk:4594 gitk:6441 - msgid "CDate" - msgstr "" - - #: gitk:4743 gitk:4748 ++#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Discendente" + - #: gitk:4744 ++#: gitk:5004 +msgid "Not descendant" +msgstr "Non discendente" + - #: gitk:4751 gitk:4756 ++#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Ascendente" + - #: gitk:4752 ++#: gitk:5012 +msgid "Not ancestor" +msgstr "Non ascendente" + - #: gitk:5042 ++#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" + - #: gitk:5078 ++#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" + - #: gitk:6759 ++#: gitk:7115 ++msgid "and many more" ++msgstr "" ++ ++#: gitk:7118 +msgid "many" +msgstr "molti" + - #: gitk:6942 ++#: gitk:7309 +msgid "Tags:" +msgstr "Etichette:" + - #: gitk:6959 gitk:6965 gitk:8280 ++#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Genitore" + - #: gitk:6970 ++#: gitk:7337 +msgid "Child" +msgstr "Figlio" + - #: gitk:6979 ++#: gitk:7346 +msgid "Branch" +msgstr "Ramo" + - #: gitk:6982 ++#: gitk:7349 +msgid "Follows" +msgstr "Segue" + - #: gitk:6985 ++#: gitk:7352 +msgid "Precedes" +msgstr "Precede" + - #: gitk:7522 ++#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Errore nella lettura delle differenze:" + - #: gitk:8108 ++#: gitk:8631 +msgid "Goto:" +msgstr "Vai a:" + - #: gitk:8129 ++#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "La SHA1 id abbreviata %s è ambigua" + - #: gitk:8136 ++#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La revisione %s è sconosciuta" + - #: gitk:8146 ++#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "La SHA1 id %s è sconosciuta" + - #: gitk:8148 ++#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La revisione %s non è presente nella vista attuale" + - #: gitk:8290 ++#: gitk:8813 gitk:8828 ++msgid "Date" ++msgstr "Data" ++ ++#: gitk:8816 +msgid "Children" +msgstr "Figli" + - #: gitk:8348 ++#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Aggiorna il ramo %s a questa revisione" + - #: gitk:8350 ++#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Nessun ramo attivo: reset impossibile" + - #: gitk:8459 gitk:8465 ++#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Salto la revisione di fusione " + - #: gitk:8474 gitk:8479 ++#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Errore nella identificazione della patch per " + - #: gitk:8475 gitk:8480 ++#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - fine\n" + - #: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "La revisione " + - #: gitk:8489 ++#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" ha le stesse differenze di\n" +" " + - #: gitk:8497 ++#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" è diversa da\n" +" " + - #: gitk:8499 ++#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Differenze tra le revisioni:\n" +"\n" + - #: gitk:8511 gitk:8520 ++#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " ha %s figli - fine\n" + - #: gitk:8539 ++#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Errore nella scrittura della revisione nel file: %s" + - #: gitk:8545 ++#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Errore nelle differenze tra le revisioni: %s" + - #: gitk:8575 ++#: gitk:9118 +msgid "Top" +msgstr "Inizio" + - #: gitk:8576 ++#: gitk:9119 +msgid "From" +msgstr "Da" + - #: gitk:8581 ++#: gitk:9124 +msgid "To" +msgstr "A" + - #: gitk:8605 ++#: gitk:9148 +msgid "Generate patch" +msgstr "Genera patch" + - #: gitk:8607 ++#: gitk:9150 +msgid "From:" +msgstr "Da:" + - #: gitk:8616 ++#: gitk:9159 +msgid "To:" +msgstr "A:" + - #: gitk:8625 ++#: gitk:9168 +msgid "Reverse" +msgstr "Inverti" + - #: gitk:8627 gitk:8822 ++#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Scrivi sul file:" + - #: gitk:8633 ++#: gitk:9176 +msgid "Generate" +msgstr "Genera" + - #: gitk:8671 ++#: gitk:9214 +msgid "Error creating patch:" +msgstr "Errore nella creazione della patch:" + - #: gitk:8694 gitk:8810 gitk:8867 ++#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + - #: gitk:8703 ++#: gitk:9246 +msgid "Tag name:" +msgstr "Nome etichetta:" + - #: gitk:8706 ++#: gitk:9249 +msgid "Tag message is optional" +msgstr "Il messaggio dell'etichetta è opzionale" + - #: gitk:8708 ++#: gitk:9251 +msgid "Tag message:" +msgstr "Messaggio dell'etichetta:" + - #: gitk:8712 gitk:8876 ++#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Crea" + - #: gitk:8730 ++#: gitk:9273 +msgid "No tag name specified" +msgstr "Nessuna etichetta specificata" + - #: gitk:8734 ++#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "L'etichetta \"%s\" esiste già" + - #: gitk:8744 ++#: gitk:9287 +msgid "Error creating tag:" +msgstr "Errore nella creazione dell'etichetta:" + - #: gitk:8819 ++#: gitk:9363 +msgid "Command:" +msgstr "Comando:" + - #: gitk:8827 ++#: gitk:9371 +msgid "Write" +msgstr "Scrivi" + - #: gitk:8845 ++#: gitk:9389 +msgid "Error writing commit:" +msgstr "Errore nella scrittura della revisione:" + - #: gitk:8872 ++#: gitk:9416 +msgid "Name:" +msgstr "Nome:" + - #: gitk:8895 ++#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Specificare un nome per il nuovo ramo" + - #: gitk:8900 ++#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Il ramo '%s' esiste già. Sovrascrivere?" + - #: gitk:8966 ++#: gitk:9511 +#, 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:8971 ++#: gitk:9516 +msgid "Cherry-picking" +msgstr "" + - #: gitk:8980 ++#: gitk:9525 +#, 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:8986 ++#: gitk:9531 +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:9002 ++#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Nessuna modifica archiviata" + - #: gitk:9028 ++#: gitk:9574 ++#, 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:9579 ++#, fuzzy ++msgid "Reverting" ++msgstr "git reset in corso" ++ ++#: gitk:9587 ++#, 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:9591 ++#, 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:9634 +msgid "Confirm reset" +msgstr "Conferma git reset" + - #: gitk:9030 ++#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Aggiornare il ramo %s a %s?" + - #: gitk:9032 ++#: gitk:9638 +msgid "Reset type:" +msgstr "Tipo di aggiornamento:" + - #: gitk:9035 ++#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" + - #: gitk:9038 ++#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" + - #: gitk:9041 ++#: gitk:9647 +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:9058 ++#: gitk:9664 +msgid "Resetting" +msgstr "git reset in corso" + - #: gitk:9118 ++#: gitk:9724 +msgid "Checking out" +msgstr "Attivazione in corso" + - #: gitk:9171 ++#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossibile cancellare il ramo attualmente attivo" + - #: gitk:9177 ++#: gitk:9783 +#, 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:9208 ++#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Etichette e rami: %s" + - #: gitk:9223 ++#: gitk:9829 +msgid "Filter" +msgstr "Filtro" + - #: gitk:9518 ++#: gitk:10125 +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:10504 ++#: gitk:11102 +msgid "Tag" +msgstr "Etichetta" + - #: gitk:10504 ++#: gitk:11106 +msgid "Id" +msgstr "Id" + - #: gitk:10554 ++#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Scelta caratteri gitk" + - #: gitk:10571 ++#: gitk:11206 +msgid "B" +msgstr "B" + - #: gitk:10574 ++#: gitk:11209 +msgid "I" +msgstr "I" + - #: gitk:10692 - msgid "Gitk preferences" - msgstr "Preferenze gitk" - - #: gitk:10694 ++#: gitk:11327 +msgid "Commit list display options" +msgstr "Opzioni visualizzazione dell'elenco revisioni" + - #: gitk:10697 ++#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Larghezza massima del grafico (in linee)" + - #: gitk:10700 - #, tcl-format ++#: gitk:11334 ++#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Larghezza massima del grafico (% del pannello)" + - #: gitk:10703 ++#: gitk:11337 +msgid "Show local changes" +msgstr "Mostra modifiche locali" + - #: gitk:10706 - msgid "Auto-select SHA1" ++#: gitk:11340 ++#, fuzzy ++msgid "Auto-select SHA1 (length)" +msgstr "Seleziona automaticamente SHA1 hash" + - #: gitk:10709 ++#: gitk:11344 +msgid "Hide remote refs" +msgstr "Nascondi i riferimenti remoti" + - #: gitk:10713 ++#: gitk:11348 +msgid "Diff display options" +msgstr "Opzioni di visualizzazione delle differenze" + - #: gitk:10715 ++#: gitk:11350 +msgid "Tab spacing" +msgstr "Spaziatura tabulazioni" + - #: gitk:10718 - msgid "Display nearby tags" ++#: gitk:11353 ++#, fuzzy ++msgid "Display nearby tags/heads" +msgstr "Mostra etichette vicine" + - #: gitk:10721 ++#: gitk:11356 ++msgid "Maximum # tags/heads to show" ++msgstr "" ++ ++#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Limita le differenze ai percorsi elencati" + - #: gitk:10724 ++#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Attiva codifica file per file" + - #: gitk:10730 gitk:10819 ++#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Visualizzatore di differenze" + - #: gitk:10731 ++#: gitk:11369 +msgid "Choose..." +msgstr "Scegli..." + - #: gitk:10736 ++#: gitk:11374 +msgid "General options" +msgstr "Opzioni generali" + - #: gitk:10739 ++#: gitk:11377 +msgid "Use themed widgets" +msgstr "Utilizza interfaccia a tema" + - #: gitk:10741 ++#: gitk:11379 +msgid "(change requires restart)" +msgstr "(una modifica richiede il riavvio)" + - #: gitk:10743 ++#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(momentaneamente non disponibile)" + - #: gitk:10747 ++#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Colori: premere per scegliere" + - #: gitk:10750 ++#: gitk:11395 +msgid "Interface" +msgstr "Interfaccia" + - #: gitk:10751 ++#: gitk:11396 +msgid "interface" +msgstr "interfaccia" + - #: gitk:10754 ++#: gitk:11399 +msgid "Background" +msgstr "Sfondo" + - #: gitk:10755 gitk:10785 ++#: gitk:11400 gitk:11430 +msgid "background" +msgstr "sfondo" + - #: gitk:10758 ++#: gitk:11403 +msgid "Foreground" +msgstr "Primo piano" + - #: gitk:10759 ++#: gitk:11404 +msgid "foreground" +msgstr "primo piano" + - #: gitk:10762 ++#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff: vecchie linee" + - #: gitk:10763 ++#: gitk:11408 +msgid "diff old lines" +msgstr "vecchie linee" + - #: gitk:10767 ++#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff: nuove linee" + - #: gitk:10768 ++#: gitk:11413 +msgid "diff new lines" +msgstr "nuove linee" + - #: gitk:10772 ++#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff: intestazione della sezione" + - #: gitk:10774 ++#: gitk:11419 +msgid "diff hunk header" +msgstr "intestazione della sezione" + - #: gitk:10778 ++#: gitk:11423 +msgid "Marked line bg" +msgstr "Sfondo riga selezionata" + - #: gitk:10780 ++#: gitk:11425 +msgid "marked line background" +msgstr "sfondo riga selezionata" + - #: gitk:10784 ++#: gitk:11429 +msgid "Select bg" +msgstr "Sfondo" + - #: gitk:10788 ++#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Carattere: premere per scegliere" + - #: gitk:10790 ++#: gitk:11440 +msgid "Main font" +msgstr "Carattere principale" + - #: gitk:10791 ++#: gitk:11441 +msgid "Diff display font" +msgstr "Carattere per differenze" + - #: gitk:10792 ++#: gitk:11442 +msgid "User interface font" +msgstr "Carattere per interfaccia utente" + - #: gitk:10829 ++#: gitk:11464 ++msgid "Gitk preferences" ++msgstr "Preferenze gitk" ++ ++#: gitk:11473 ++#, fuzzy ++msgid "General" ++msgstr "Genera" ++ ++#: gitk:11474 ++msgid "Colors" ++msgstr "" ++ ++#: gitk:11475 ++msgid "Fonts" ++msgstr "" ++ ++#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: scegliere un colore per %s" + - #: gitk:11433 ++#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Archivio git non trovato." + - #: gitk:11437 - #, tcl-format - msgid "Cannot find the git directory \"%s\"." - msgstr "Directory git \"%s\" non trovata." - - #: gitk:11484 ++#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" + - #: gitk:11496 ++#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Gitk: argomenti errati:" + - #: gitk:11587 ++#: gitk:12405 +msgid "Command line" +msgstr "Linea di comando" ++ ++#~ msgid "next" ++#~ msgstr "succ" ++ ++#~ msgid "prev" ++#~ msgstr "prec" ++ ++#~ msgid "Cannot find the git directory \"%s\"." ++#~ msgstr "Directory git \"%s\" non trovata." diff --cc gitk-git/po/sv.po index df95e01b90,0000000000..0994d87c28 mode 100644,000000..100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@@ -1,1376 -1,0 +1,1385 @@@ +# Swedish translation for gitk +# Copyright (C) 2005-2013 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# +# Mikael Magnusson , 2008. +# Peter Krefting , 2008, 2009, 2010, 2012, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: sv\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-05-16 08:06+0100\n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2013-05-16 08:12+0100\n" +"Last-Translator: Peter Krefting \n" +"Language-Team: Swedish \n" +"Language: sv\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 "Kunde inte hämta lista över ej sammanslagna filer:" + - #: gitk:210 gitk:2334 ++#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Färga ord" + - #: gitk:215 gitk:2334 gitk:7977 gitk:8010 ++#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Märk upp ord" + - #: gitk:312 ++#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Fel vid tolkning av revisioner:" + - #: gitk:368 ++#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Fel vid körning av --argscmd-kommando:" + - #: gitk:381 ++#: 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:384 ++#: 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:406 gitk:554 ++#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Fel vid körning av git log:" + - #: gitk:424 gitk:570 ++#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Läser" + - #: gitk:484 gitk:4409 ++#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Läser incheckningar..." + - #: gitk:487 gitk:1625 gitk:4412 ++#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Inga incheckningar markerade" + - #: gitk:1499 ++#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Kan inte tolka utdata från git log:" + - #: gitk:1719 ++#: gitk:1740 +msgid "No commit information available" +msgstr "Ingen incheckningsinformation är tillgänglig" + - #: gitk:1876 ++#: gitk:1897 +msgid "mc" +msgstr "mc" + - #: gitk:1911 gitk:4202 gitk:9437 gitk:10979 gitk:11258 ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "OK" + - #: gitk:1913 gitk:4204 gitk:8964 gitk:9043 gitk:9159 gitk:9208 gitk:9439 - #: gitk:10980 gitk:11259 ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Avbryt" + - #: gitk:2048 ++#: gitk:2069 +msgid "Update" +msgstr "Uppdatera" + - #: gitk:2049 ++#: gitk:2070 +msgid "Reload" +msgstr "Ladda om" + - #: gitk:2050 ++#: gitk:2071 +msgid "Reread references" +msgstr "Läs om referenser" + - #: gitk:2051 ++#: gitk:2072 +msgid "List references" +msgstr "Visa referenser" + - #: gitk:2053 ++#: gitk:2074 +msgid "Start git gui" +msgstr "Starta git gui" + - #: gitk:2055 ++#: gitk:2076 +msgid "Quit" +msgstr "Avsluta" + - #: gitk:2047 ++#: gitk:2068 +msgid "File" +msgstr "Arkiv" + - #: gitk:2059 ++#: gitk:2080 +msgid "Preferences" +msgstr "Inställningar" + - #: gitk:2058 ++#: gitk:2079 +msgid "Edit" +msgstr "Redigera" + - #: gitk:2063 ++#: gitk:2084 +msgid "New view..." +msgstr "Ny vy..." + - #: gitk:2064 ++#: gitk:2085 +msgid "Edit view..." +msgstr "Ändra vy..." + - #: gitk:2065 ++#: gitk:2086 +msgid "Delete view" +msgstr "Ta bort vy" + - #: gitk:2067 ++#: gitk:2088 +msgid "All files" +msgstr "Alla filer" + - #: gitk:2062 gitk:3955 ++#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Visa" + - #: gitk:2072 gitk:2082 gitk:2925 ++#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Om gitk" + - #: gitk:2073 gitk:2087 ++#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Tangentbordsbindningar" + - #: gitk:2071 gitk:2086 ++#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Hjälp" + - #: gitk:2164 gitk:8420 ++#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1-id:" + - #: gitk:2208 ++#: gitk:2229 +msgid "Row" +msgstr "Rad" + - #: gitk:2246 ++#: gitk:2267 +msgid "Find" +msgstr "Sök" + - #: gitk:2247 - msgid "next" - msgstr "nästa" - - #: gitk:2248 - msgid "prev" - msgstr "föreg" - - #: gitk:2249 ++#: gitk:2295 +msgid "commit" +msgstr "incheckning" + - #: gitk:2252 gitk:2254 gitk:4570 gitk:4593 gitk:4617 gitk:6592 gitk:6664 - #: gitk:6749 ++#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 +msgid "containing:" +msgstr "som innehåller:" + - #: gitk:2255 gitk:3437 gitk:3442 gitk:4646 ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "som rör sökväg:" + - #: gitk:2256 gitk:4660 ++#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "som lägger/till tar bort sträng:" + - #: gitk:2257 gitk:4662 ++#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "ändrar rader som matchar:" + - #: gitk:2266 gitk:2268 gitk:4649 ++#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Exakt" + - #: gitk:2268 gitk:4737 gitk:6560 ++#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "IgnVersaler" + - #: gitk:2268 gitk:4619 gitk:4735 gitk:6556 ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Reg.uttr." + - #: gitk:2270 gitk:2271 gitk:4757 gitk:4787 gitk:4794 gitk:6685 gitk:6753 ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Alla fält" + - #: gitk:2271 gitk:4754 gitk:4787 gitk:6623 ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Rubrik" + - #: gitk:2272 gitk:4754 gitk:6623 gitk:6753 gitk:7221 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Kommentarer" + - #: gitk:2272 gitk:4754 gitk:4759 gitk:4794 gitk:6623 gitk:7156 gitk:8598 - #: gitk:8613 ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 +msgid "Author" +msgstr "Författare" + - #: gitk:2272 gitk:4754 gitk:6623 gitk:7158 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Incheckare" + - #: gitk:2303 ++#: gitk:2350 +msgid "Search" +msgstr "Sök" + - #: gitk:2311 ++#: gitk:2358 +msgid "Diff" +msgstr "Diff" + - #: gitk:2313 ++#: gitk:2360 +msgid "Old version" +msgstr "Gammal version" + - #: gitk:2315 ++#: gitk:2362 +msgid "New version" +msgstr "Ny version" + - #: gitk:2317 ++#: gitk:2364 +msgid "Lines of context" +msgstr "Rader sammanhang" + - #: gitk:2327 ++#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignorera ändringar i blanksteg" + - #: gitk:2331 gitk:2333 gitk:7735 gitk:7963 ++#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Rad-diff" + - #: gitk:2397 ++#: gitk:2445 +msgid "Patch" +msgstr "Patch" + - #: gitk:2399 ++#: gitk:2447 +msgid "Tree" +msgstr "Träd" + - #: gitk:2557 gitk:2577 ++#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Diff denna -> markerad" + - #: gitk:2558 gitk:2578 ++#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Diff markerad -> denna" + - #: gitk:2559 gitk:2579 ++#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Skapa patch" + - #: gitk:2560 gitk:9022 ++#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Skapa tagg" + - #: gitk:2561 gitk:9139 ++#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Skriv incheckning till fil" + - #: gitk:2562 gitk:9196 ++#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Skapa ny gren" + - #: gitk:2563 ++#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Plocka denna incheckning" + - #: gitk:2564 ++#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Återställ HEAD-grenen hit" + - #: gitk:2565 ++#: gitk:2624 +msgid "Mark this commit" +msgstr "Markera denna incheckning" + - #: gitk:2566 ++#: gitk:2625 +msgid "Return to mark" +msgstr "Återgå till markering" + - #: gitk:2567 ++#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Hitta efterföljare till denna och markera" + - #: gitk:2568 ++#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Jämför med markerad incheckning" + - #: gitk:2569 gitk:2580 ++#: gitk:2628 gitk:2639 +msgid "Diff this -> marked commit" +msgstr "Diff denna -> markerad incheckning" + - #: gitk:2570 gitk:2581 ++#: gitk:2629 gitk:2640 +msgid "Diff marked commit -> this" +msgstr "Diff markerad incheckning -> denna" + - #: gitk:2571 ++#: gitk:2630 +msgid "Revert this commit" +msgstr "Ångra denna incheckning" + - #: gitk:2587 ++#: gitk:2646 +msgid "Check out this branch" +msgstr "Checka ut denna gren" + - #: gitk:2588 ++#: gitk:2647 +msgid "Remove this branch" +msgstr "Ta bort denna gren" + - #: gitk:2595 ++#: gitk:2654 +msgid "Highlight this too" +msgstr "Markera även detta" + - #: gitk:2596 ++#: gitk:2655 +msgid "Highlight this only" +msgstr "Markera bara detta" + - #: gitk:2597 ++#: gitk:2656 +msgid "External diff" +msgstr "Extern diff" + - #: gitk:2598 ++#: gitk:2657 +msgid "Blame parent commit" +msgstr "Klandra föräldraincheckning" + - #: gitk:2605 ++#: gitk:2664 +msgid "Show origin of this line" +msgstr "Visa ursprunget för den här raden" + - #: gitk:2606 ++#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Kör git gui blame på den här raden" + - #: gitk:2927 ++#: gitk:3011 ++#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright ©9 2005-2011 Paul Mackerras\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" +"Copyright ©9 2005-2011 Paul Mackerras\n" +"\n" +"Använd och vidareförmedla enligt villkoren i GNU General Public License" + - #: gitk:2935 gitk:3000 gitk:9623 ++#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Stäng" + - #: gitk:2956 ++#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Tangentbordsbindningar för Gitk" + - #: gitk:2959 ++#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Tangentbordsbindningar för Gitk:" + - #: gitk:2961 ++#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tAvsluta" + - #: gitk:2962 ++#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tStäng fönster" + - #: gitk:2963 ++#: gitk:3047 +msgid "\t\tMove to first commit" +msgstr "\t\tGå till första incheckning" + - #: gitk:2964 ++#: gitk:3048 +msgid "\t\tMove to last commit" +msgstr "\t\tGå till sista incheckning" + - #: gitk:2965 ++#: gitk:3049 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tGå en incheckning upp" + - #: gitk:2966 ++#: gitk:3050 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tGå en incheckning ned" + - #: gitk:2967 ++#: gitk:3051 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tGå bakåt i historiken" + - #: gitk:2968 ++#: gitk:3052 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tGå framåt i historiken" + - #: gitk:2969 ++#: gitk:3053 ++#, tcl-format ++msgid "<%s-n>\tGo to n-th parent of current commit in history list" ++msgstr "" ++ ++#: gitk:3054 +msgid "\tMove up one page in commit list" +msgstr "\tGå upp en sida i incheckningslistan" + - #: gitk:2970 ++#: gitk:3055 +msgid "\tMove down one page in commit list" +msgstr "\tGå ned en sida i incheckningslistan" + - #: gitk:2971 ++#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tRulla till början av incheckningslistan" + - #: gitk:2972 ++#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tRulla till slutet av incheckningslistan" + - #: gitk:2973 ++#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" + - #: gitk:2974 ++#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" + - #: gitk:2975 ++#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" + - #: gitk:2976 ++#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" + - #: gitk:2977 ++#: gitk:3062 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tSök bakåt (uppåt, senare incheckningar)" + - #: gitk:2978 ++#: gitk:3063 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "\tSök framåt (nedåt, tidigare incheckningar)" + - #: gitk:2979 ++#: gitk:3064 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tRulla diffvisningen upp en sida" + - #: gitk:2980 ++#: gitk:3065 +msgid "\tScroll diff view up one page" +msgstr "\tRulla diffvisningen upp en sida" + - #: gitk:2981 ++#: gitk:3066 +msgid "\t\tScroll diff view down one page" +msgstr "\tRulla diffvisningen ned en sida" + - #: gitk:2982 ++#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tRulla diffvisningen upp 18 rader" + - #: gitk:2983 ++#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tRulla diffvisningen ned 18 rader" + - #: gitk:2984 ++#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tSök" + - #: gitk:2985 ++#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tGå till nästa sökträff" + - #: gitk:2986 ++#: gitk:3071 +msgid "\tMove to next find hit" +msgstr "\t\tGå till nästa sökträff" + - #: gitk:2987 ++#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFokusera sökrutan" + - #: gitk:2988 ++#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tGå till föregående sökträff" + - #: gitk:2989 ++#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tRulla diffvisningen till nästa fil" + - #: gitk:2990 ++#: gitk:3075 +#, 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:2991 ++#: gitk:3076 +#, 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:2992 ++#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Num+>\tÖka teckenstorlek" + - #: gitk:2993 ++#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tÖka teckenstorlek" + - #: gitk:2994 ++#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Num->\tMinska teckenstorlek" + - #: gitk:2995 ++#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tMinska teckenstorlek" + - #: gitk:2996 ++#: gitk:3081 +msgid "\t\tUpdate" +msgstr "\t\tUppdatera" + - #: gitk:3451 gitk:3460 ++#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fel vid skapande av temporär katalog %s:" + - #: gitk:3473 ++#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fel vid hämtning av \"%s\" från %s:" + - #: gitk:3536 ++#: gitk:3631 +msgid "command failed:" +msgstr "kommando misslyckades:" + - #: gitk:3685 ++#: gitk:3780 +msgid "No such commit" +msgstr "Incheckning saknas" + - #: gitk:3699 ++#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: kommando misslyckades:" + - #: gitk:3730 ++#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Kunde inte läsa sammanslagningshuvud: %s" + - #: gitk:3738 ++#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Fel vid läsning av index: %s" + - #: gitk:3763 ++#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Kunde inte starta git blame: %s" + - #: gitk:3766 gitk:6591 ++#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Söker" + - #: gitk:3798 ++#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Fel vid körning av git blame: %s" + - #: gitk:3826 ++#: gitk:3921 +#, 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:3840 ++#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Externt diff-verktyg misslyckades:" + - #: gitk:3958 ++#: gitk:4053 +msgid "Gitk view definition" +msgstr "Definition av Gitk-vy" + - #: gitk:3962 ++#: gitk:4057 +msgid "Remember this view" +msgstr "Spara denna vy" + - #: gitk:3963 ++#: gitk:4058 +msgid "References (space separated list):" +msgstr "Referenser (blankstegsavdelad lista):" + - #: gitk:3964 ++#: gitk:4059 +msgid "Branches & tags:" +msgstr "Grenar & taggar:" + - #: gitk:3965 ++#: gitk:4060 +msgid "All refs" +msgstr "Alla referenser" + - #: gitk:3966 ++#: gitk:4061 +msgid "All (local) branches" +msgstr "Alla (lokala) grenar" + - #: gitk:3967 ++#: gitk:4062 +msgid "All tags" +msgstr "Alla taggar" + - #: gitk:3968 ++#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Alla fjärrspårande grenar" + - #: gitk:3969 ++#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Incheckningsinfo (reguljära uttryck):" + - #: gitk:3970 ++#: gitk:4065 +msgid "Author:" +msgstr "Författare:" + - #: gitk:3971 ++#: gitk:4066 +msgid "Committer:" +msgstr "Incheckare:" + - #: gitk:3972 ++#: gitk:4067 +msgid "Commit Message:" +msgstr "Incheckningsmeddelande:" + - #: gitk:3973 ++#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Motsvarar alla kriterier för incheckningsinfo" + - #: gitk:3974 ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Motsvarar alla kriterier för incheckningsinfo" ++ ++#: gitk:4070 +msgid "Changes to Files:" +msgstr "Ändringar av filer:" + - #: gitk:3975 ++#: gitk:4071 +msgid "Fixed String" +msgstr "Fast sträng" + - #: gitk:3976 ++#: gitk:4072 +msgid "Regular Expression" +msgstr "Reguljärt uttryck" + - #: gitk:3977 ++#: gitk:4073 +msgid "Search string:" +msgstr "Söksträng:" + - #: gitk:3978 ++#: gitk:4074 +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:3979 ++#: gitk:4075 +msgid "Since:" +msgstr "Från:" + - #: gitk:3980 ++#: gitk:4076 +msgid "Until:" +msgstr "Till:" + - #: gitk:3981 ++#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" + - #: gitk:3982 ++#: gitk:4078 +msgid "Number to show:" +msgstr "Antal att visa:" + - #: gitk:3983 ++#: gitk:4079 +msgid "Number to skip:" +msgstr "Antal att hoppa över:" + - #: gitk:3984 ++#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Diverse alternativ:" + - #: gitk:3985 ++#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Strikt datumsortering" + - #: gitk:3986 ++#: gitk:4082 +msgid "Mark branch sides" +msgstr "Markera sidogrenar" + - #: gitk:3987 ++#: gitk:4083 +msgid "Limit to first parent" +msgstr "Begränsa till första förälder" + - #: gitk:3988 ++#: gitk:4084 +msgid "Simple history" +msgstr "Enkel historik" + - #: gitk:3989 ++#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Ytterligare argument till git log:" + - #: gitk:3990 ++#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Ange filer och kataloger att ta med, en per rad:" + - #: gitk:3991 ++#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Kommando för att generera fler incheckningar att ta med:" + - #: gitk:4115 ++#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: redigera vy" + - #: gitk:4123 ++#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr " - kriterier för val av revisioner" + - #: gitk:4128 ++#: gitk:4224 +msgid "View Name" +msgstr "Namn på vy" + - #: gitk:4203 ++#: gitk:4299 +msgid "Apply (F5)" +msgstr "Använd (F5)" + - #: gitk:4241 ++#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Fel i argument för val av incheckningar:" + - #: gitk:4294 gitk:4346 gitk:4807 gitk:4821 gitk:6087 gitk:12041 gitk:12042 ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Inget" + - #: gitk:4904 gitk:4909 ++#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Avkomling" + - #: gitk:4905 ++#: gitk:5004 +msgid "Not descendant" +msgstr "Inte avkomling" + - #: gitk:4912 gitk:4917 ++#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Förfader" + - #: gitk:4913 ++#: gitk:5012 +msgid "Not ancestor" +msgstr "Inte förfader" + - #: gitk:5203 ++#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Lokala ändringar sparade i indexet men inte incheckade" + - #: gitk:5239 ++#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokala ändringar, ej sparade i indexet" + - #: gitk:6971 ++#: gitk:7115 +msgid "and many more" +msgstr "med många flera" + - #: gitk:6974 ++#: gitk:7118 +msgid "many" +msgstr "många" + - #: gitk:7160 ++#: gitk:7309 +msgid "Tags:" +msgstr "Taggar:" + - #: gitk:7177 gitk:7183 gitk:8593 ++#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Förälder" + - #: gitk:7188 ++#: gitk:7337 +msgid "Child" +msgstr "Barn" + - #: gitk:7197 ++#: gitk:7346 +msgid "Branch" +msgstr "Gren" + - #: gitk:7200 ++#: gitk:7349 +msgid "Follows" +msgstr "Följer" + - #: gitk:7203 ++#: gitk:7352 +msgid "Precedes" +msgstr "Föregår" + - #: gitk:7742 ++#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Fel vid hämtning av diff: %s" + - #: gitk:8418 ++#: gitk:8631 +msgid "Goto:" +msgstr "Gå till:" + - #: gitk:8439 ++#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Förkortat SHA1-id %s är tvetydigt" + - #: gitk:8446 ++#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Revisionen %s är inte känd" + - #: gitk:8456 ++#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA-id:t %s är inte känt" + - #: gitk:8458 ++#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Revisionen %s finns inte i den nuvarande vyn" + - #: gitk:8600 gitk:8615 ++#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Datum" + - #: gitk:8603 ++#: gitk:8816 +msgid "Children" +msgstr "Barn" + - #: gitk:8666 ++#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Återställ grenen %s hit" + - #: gitk:8668 ++#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Frånkopplad head: kan inte återställa" + - #: gitk:8773 gitk:8779 ++#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Hoppar över sammanslagningsincheckning " + - #: gitk:8788 gitk:8793 ++#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Fel vid hämtning av patch-id för " + - #: gitk:8789 gitk:8794 ++#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - stannar\n" + - #: gitk:8799 gitk:8802 gitk:8810 gitk:8824 gitk:8833 ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Incheckning " + - #: gitk:8803 ++#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" är samma patch som\n" +" " + - #: gitk:8811 ++#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" skiljer sig från\n" +" " + - #: gitk:8813 ++#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Skillnad mellan incheckningar:\n" +"\n" + - #: gitk:8825 gitk:8834 ++#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " har %s barn - stannar\n" + - #: gitk:8853 ++#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fel vid skrivning av incheckning till fil: %s" + - #: gitk:8859 ++#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fel vid jämförelse av incheckningar: %s" + - #: gitk:8905 ++#: gitk:9118 +msgid "Top" +msgstr "Topp" + - #: gitk:8906 ++#: gitk:9119 +msgid "From" +msgstr "Från" + - #: gitk:8911 ++#: gitk:9124 +msgid "To" +msgstr "Till" + - #: gitk:8935 ++#: gitk:9148 +msgid "Generate patch" +msgstr "Generera patch" + - #: gitk:8937 ++#: gitk:9150 +msgid "From:" +msgstr "Från:" + - #: gitk:8946 ++#: gitk:9159 +msgid "To:" +msgstr "Till:" + - #: gitk:8955 ++#: gitk:9168 +msgid "Reverse" +msgstr "Vänd" + - #: gitk:8957 gitk:9153 ++#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Utdatafil:" + - #: gitk:8963 ++#: gitk:9176 +msgid "Generate" +msgstr "Generera" + - #: gitk:9001 ++#: gitk:9214 +msgid "Error creating patch:" +msgstr "Fel vid generering av patch:" + - #: gitk:9024 gitk:9141 gitk:9198 ++#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "Id:" + - #: gitk:9033 ++#: gitk:9246 +msgid "Tag name:" +msgstr "Taggnamn:" + - #: gitk:9036 ++#: gitk:9249 +msgid "Tag message is optional" +msgstr "Taggmeddelandet är valfritt" + - #: gitk:9038 ++#: gitk:9251 +msgid "Tag message:" +msgstr "Taggmeddelande:" + - #: gitk:9042 gitk:9207 ++#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Skapa" + - #: gitk:9060 ++#: gitk:9273 +msgid "No tag name specified" +msgstr "Inget taggnamn angavs" + - #: gitk:9064 ++#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Taggen \"%s\" finns redan" + - #: gitk:9074 ++#: gitk:9287 +msgid "Error creating tag:" +msgstr "Fel vid skapande av tagg:" + - #: gitk:9150 ++#: gitk:9363 +msgid "Command:" +msgstr "Kommando:" + - #: gitk:9158 ++#: gitk:9371 +msgid "Write" +msgstr "Skriv" + - #: gitk:9176 ++#: gitk:9389 +msgid "Error writing commit:" +msgstr "Fel vid skrivning av incheckning:" + - #: gitk:9203 ++#: gitk:9416 +msgid "Name:" +msgstr "Namn:" + - #: gitk:9226 ++#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Ange ett namn för den nya grenen" + - #: gitk:9231 ++#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Grenen \"%s\" finns redan. Skriva över?" + - #: gitk:9298 ++#: gitk:9511 +#, 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:9303 ++#: gitk:9516 +msgid "Cherry-picking" +msgstr "Plockar" + - #: gitk:9312 ++#: gitk:9525 +#, 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:9318 ++#: gitk:9531 +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:9334 gitk:9392 ++#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Inga ändringar incheckade" + - #: gitk:9361 ++#: gitk:9574 +#, 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:9366 ++#: gitk:9579 +msgid "Reverting" +msgstr "Ångrar" + - #: gitk:9374 ++#: gitk:9587 +#, 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:9378 ++#: gitk:9591 +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:9421 ++#: gitk:9634 +msgid "Confirm reset" +msgstr "Bekräfta återställning" + - #: gitk:9423 ++#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Återställa grenen %s till %s?" + - #: gitk:9425 ++#: gitk:9638 +msgid "Reset type:" +msgstr "Typ av återställning:" + - #: gitk:9428 ++#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Mjuk: Rör inte utcheckning och index" + - #: gitk:9431 ++#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Blandad: Rör inte utcheckning, återställ index" + - #: gitk:9434 ++#: gitk:9647 +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:9451 ++#: gitk:9664 +msgid "Resetting" +msgstr "Återställer" + - #: gitk:9511 ++#: gitk:9724 +msgid "Checking out" +msgstr "Checkar ut" + - #: gitk:9564 ++#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Kan inte ta bort den just nu utcheckade grenen" + - #: gitk:9570 ++#: gitk:9783 +#, 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:9601 ++#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Taggar och huvuden: %s" + - #: gitk:9616 ++#: gitk:9829 +msgid "Filter" +msgstr "Filter" + - #: gitk:9912 ++#: gitk:10125 +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:10899 ++#: gitk:11102 +msgid "Tag" +msgstr "Tagg" + - #: gitk:10899 ++#: gitk:11106 +msgid "Id" +msgstr "Id" + - #: gitk:10948 ++#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Teckensnittsväljare för Gitk" + - #: gitk:10965 ++#: gitk:11206 +msgid "B" +msgstr "F" + - #: gitk:10968 ++#: gitk:11209 +msgid "I" +msgstr "K" + - #: gitk:11086 ++#: gitk:11327 +msgid "Commit list display options" +msgstr "Alternativ för incheckningslistvy" + - #: gitk:11089 ++#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Maximal grafbredd (rader)" + - #: gitk:11092 - #, tcl-format ++#: gitk:11334 ++#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximal grafbredd (% av ruta)" + - #: gitk:11095 ++#: gitk:11337 +msgid "Show local changes" +msgstr "Visa lokala ändringar" + - #: gitk:11098 ++#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Välj SHA1 (längd) automatiskt" + - #: gitk:11102 ++#: gitk:11344 +msgid "Hide remote refs" +msgstr "Dölj fjärr-referenser" + - #: gitk:11106 ++#: gitk:11348 +msgid "Diff display options" +msgstr "Alternativ för diffvy" + - #: gitk:11108 ++#: gitk:11350 +msgid "Tab spacing" +msgstr "Blanksteg för tabulatortecken" + - #: gitk:11111 ++#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Visa närliggande taggar/huvuden" + - #: gitk:11114 ++#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Maximalt antal taggar/huvuden att visa" + - #: gitk:11117 ++#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Begränsa diff till listade sökvägar" + - #: gitk:11120 ++#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Stöd för filspecifika teckenkodningar" + - #: gitk:11126 gitk:11273 ++#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Externt diff-verktyg" + - #: gitk:11127 ++#: gitk:11369 +msgid "Choose..." +msgstr "Välj..." + - #: gitk:11132 ++#: gitk:11374 +msgid "General options" +msgstr "Allmänna inställningar" + - #: gitk:11135 ++#: gitk:11377 +msgid "Use themed widgets" +msgstr "Använd tema på fönsterelement" + - #: gitk:11137 ++#: gitk:11379 +msgid "(change requires restart)" +msgstr "(ändringen kräver omstart)" + - #: gitk:11139 ++#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(för närvarande inte tillgängligt)" + - #: gitk:11150 ++#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Färger: tryck för att välja" + - #: gitk:11153 ++#: gitk:11395 +msgid "Interface" +msgstr "Gränssnitt" + - #: gitk:11154 ++#: gitk:11396 +msgid "interface" +msgstr "gränssnitt" + - #: gitk:11157 ++#: gitk:11399 +msgid "Background" +msgstr "Bakgrund" + - #: gitk:11158 gitk:11188 ++#: gitk:11400 gitk:11430 +msgid "background" +msgstr "bakgrund" + - #: gitk:11161 ++#: gitk:11403 +msgid "Foreground" +msgstr "Förgrund" + - #: gitk:11162 ++#: gitk:11404 +msgid "foreground" +msgstr "förgrund" + - #: gitk:11165 ++#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff: gamla rader" + - #: gitk:11166 ++#: gitk:11408 +msgid "diff old lines" +msgstr "diff gamla rader" + - #: gitk:11170 ++#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff: nya rader" + - #: gitk:11171 ++#: gitk:11413 +msgid "diff new lines" +msgstr "diff nya rader" + - #: gitk:11175 ++#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff: delhuvud" + - #: gitk:11177 ++#: gitk:11419 +msgid "diff hunk header" +msgstr "diff delhuvud" + - #: gitk:11181 ++#: gitk:11423 +msgid "Marked line bg" +msgstr "Markerad rad bakgrund" + - #: gitk:11183 ++#: gitk:11425 +msgid "marked line background" +msgstr "markerad rad bakgrund" + - #: gitk:11187 ++#: gitk:11429 +msgid "Select bg" +msgstr "Markerad bakgrund" + - #: gitk:11196 ++#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Teckensnitt: tryck för att välja" + - #: gitk:11198 ++#: gitk:11440 +msgid "Main font" +msgstr "Huvudteckensnitt" + - #: gitk:11199 ++#: gitk:11441 +msgid "Diff display font" +msgstr "Teckensnitt för diffvisning" + - #: gitk:11200 ++#: gitk:11442 +msgid "User interface font" +msgstr "Teckensnitt för användargränssnitt" + - #: gitk:11222 ++#: gitk:11464 +msgid "Gitk preferences" +msgstr "Inställningar för Gitk" + - #: gitk:11231 ++#: gitk:11473 +msgid "General" +msgstr "Allmänt" + - #: gitk:11232 ++#: gitk:11474 +msgid "Colors" +msgstr "Färger" + - #: gitk:11233 ++#: gitk:11475 +msgid "Fonts" +msgstr "Teckensnitt" + - #: gitk:11283 ++#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: välj färg för %s" + - #: gitk:11937 ++#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Hittar inget git-arkiv här." + - #: gitk:11984 ++#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Tvetydigt argument \"%s\": både revision och filnamn" + - #: gitk:11996 ++#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Felaktiga argument till gitk:" + - #: gitk:12099 ++#: gitk:12405 +msgid "Command line" +msgstr "Kommandorad" + ++#~ 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 "" +#~ "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 "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" diff --cc gitk-git/po/vi.po index 4dfe125a69,0000000000..ade9cb70cb mode 100644,000000..100644 --- a/gitk-git/po/vi.po +++ b/gitk-git/po/vi.po @@@ -1,1351 -1,0 +1,1360 @@@ +# 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 , 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: gitk @@GIT_VERSION@@\n" - "Report-Msgid-Bugs-To: Paul Mackerras \n" - "POT-Creation-Date: 2013-12-14 09:24+0700\n" ++"Report-Msgid-Bugs-To: \n" ++"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2013-12-14 14:40+0700\n" +"Last-Translator: Trần Ngọc Quân \n" +"Language-Team: Vietnamese \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:2353 ++#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Tô màu chữ" + - #: gitk:217 gitk:2353 gitk:8103 gitk:8136 ++#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Đánh dấu chữ" + - #: gitk:322 ++#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Gặp lỗi khi phân tích điểm xét duyệt:" + - #: gitk:378 ++#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:" + - #: gitk:391 ++#: 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:394 ++#: 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:416 gitk:564 ++#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Gặp lỗi khi thực hiện lệnh git log:" + - #: gitk:434 gitk:580 ++#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Đang đọc" + - #: gitk:494 gitk:4429 ++#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Đang đọc các lần chuyển giao..." + - #: gitk:497 gitk:1635 gitk:4432 ++#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Chưa chọn các lần chuyển giao" + - #: gitk:1509 ++#: 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:1738 ++#: gitk:1740 +msgid "No commit information available" +msgstr "Không có thông tin về lần chuyển giao nào" + - #: gitk:1895 ++#: gitk:1897 +msgid "mc" +msgstr "mc" + - #: gitk:1930 gitk:4222 gitk:9552 gitk:11122 gitk:11401 ++#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "Đồng ý" + - #: gitk:1932 gitk:4224 gitk:9079 gitk:9158 gitk:9274 gitk:9323 gitk:9554 - #: gitk:11123 gitk:11402 ++#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 ++#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Thôi" + - #: gitk:2067 ++#: gitk:2069 +msgid "Update" +msgstr "Cập nhật" + - #: gitk:2068 ++#: gitk:2070 +msgid "Reload" +msgstr "Tải lại" + - #: gitk:2069 ++#: gitk:2071 +msgid "Reread references" +msgstr "Đọc lại tham chiếu" + - #: gitk:2070 ++#: gitk:2072 +msgid "List references" +msgstr "Liệt kê các tham chiếu" + - #: gitk:2072 ++#: gitk:2074 +msgid "Start git gui" +msgstr "Khởi chạy git gui" + - #: gitk:2074 ++#: gitk:2076 +msgid "Quit" +msgstr "Thoát" + - #: gitk:2066 ++#: gitk:2068 +msgid "File" +msgstr "Chính" + - #: gitk:2078 ++#: gitk:2080 +msgid "Preferences" +msgstr "Cá nhân hóa" + - #: gitk:2077 ++#: gitk:2079 +msgid "Edit" +msgstr "Chỉnh sửa" + - #: gitk:2082 ++#: gitk:2084 +msgid "New view..." +msgstr "Thêm trình bày mới..." + - #: gitk:2083 ++#: gitk:2085 +msgid "Edit view..." +msgstr "Sửa cách trình bày..." + - #: gitk:2084 ++#: gitk:2086 +msgid "Delete view" +msgstr "Xóa cách trình bày" + - #: gitk:2086 ++#: gitk:2088 +msgid "All files" +msgstr "Mọi tập tin" + - #: gitk:2081 gitk:3975 ++#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Trình bày" + - #: gitk:2091 gitk:2101 gitk:2945 ++#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Giới thiệu về gitk" + - #: gitk:2092 gitk:2106 ++#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Tổ hợp phím" + - #: gitk:2090 gitk:2105 ++#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Trợ giúp" + - #: gitk:2183 gitk:8535 ++#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + - #: gitk:2227 ++#: gitk:2229 +msgid "Row" +msgstr "Hàng" + - #: gitk:2265 ++#: gitk:2267 +msgid "Find" +msgstr "Tìm" + - #: gitk:2266 - msgid "next" - msgstr "tiếp" - - #: gitk:2267 - msgid "prev" - msgstr "trước" - - #: gitk:2268 ++#: gitk:2295 +msgid "commit" +msgstr "lần chuyển giao" + - #: gitk:2271 gitk:2273 gitk:4590 gitk:4613 gitk:4637 gitk:6653 gitk:6725 - #: gitk:6810 ++#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 ++#: gitk:6893 +msgid "containing:" +msgstr "có chứa:" + - #: gitk:2274 gitk:3457 gitk:3462 gitk:4666 ++#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "đang chạm đường dẫn:" + - #: gitk:2275 gitk:4680 ++#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "thêm/gỡ bỏ chuỗi:" + - #: gitk:2276 gitk:4682 ++#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "những dòng thay đổi khớp mẫu:" + - #: gitk:2285 gitk:2287 gitk:4669 ++#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Chính xác" + - #: gitk:2287 gitk:4757 gitk:6621 ++#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "BquaHt" + - #: gitk:2287 gitk:4639 gitk:4755 gitk:6617 ++#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "BTCQ" + - #: gitk:2289 gitk:2290 gitk:4777 gitk:4807 gitk:4814 gitk:6746 gitk:6814 ++#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Mọi trường" + - #: gitk:2290 gitk:4774 gitk:4807 gitk:6684 ++#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Nội dung chính" + - #: gitk:2291 gitk:4774 gitk:6684 gitk:6814 gitk:7283 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Ghi chú" + - #: gitk:2291 gitk:4774 gitk:4779 gitk:4814 gitk:6684 gitk:7218 gitk:8713 - #: gitk:8728 ++#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 ++#: gitk:8826 +msgid "Author" +msgstr "Tác giả" + - #: gitk:2291 gitk:4774 gitk:6684 gitk:7220 ++#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Người chuyển giao" + - #: gitk:2322 ++#: gitk:2350 +msgid "Search" +msgstr "Tìm kiếm" + - #: gitk:2330 ++#: gitk:2358 +msgid "Diff" +msgstr "So sánh" + - #: gitk:2332 ++#: gitk:2360 +msgid "Old version" +msgstr "Phiên bản cũ" + - #: gitk:2334 ++#: gitk:2362 +msgid "New version" +msgstr "Phiên bản mới" + - #: gitk:2336 ++#: gitk:2364 +msgid "Lines of context" +msgstr "Các dòng của nội dung" + - #: gitk:2346 ++#: gitk:2374 +msgid "Ignore space change" +msgstr "Không xét đến thay đổi do khoảng trắng" + - #: gitk:2350 gitk:2352 gitk:7842 gitk:8089 ++#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Khác biệt theo dòng" + - #: gitk:2417 ++#: gitk:2445 +msgid "Patch" +msgstr "Vá" + - #: gitk:2419 ++#: gitk:2447 +msgid "Tree" +msgstr "Cây" + - #: gitk:2577 gitk:2597 ++#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "So sánh cái này -> cái đã chọn" + - #: gitk:2578 gitk:2598 ++#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "So sánh cái đã chọn -> cái này" + - #: gitk:2579 gitk:2599 ++#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Tạo miếng vá" + - #: gitk:2580 gitk:9137 ++#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Tạo thẻ" + - #: gitk:2581 gitk:9254 ++#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Ghi lần chuyển giao ra tập tin" + - #: gitk:2582 gitk:9311 ++#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Tạo nhánh mới" + - #: gitk:2583 ++#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Cherry-pick lần chuyển giao này" + - #: gitk:2584 ++#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Đặt lại HEAD của nhánh vào đây" + - #: gitk:2585 ++#: gitk:2624 +msgid "Mark this commit" +msgstr "Đánh dấu lần chuyển giao này" + - #: gitk:2586 ++#: gitk:2625 +msgid "Return to mark" +msgstr "Quay lại vị trí dấu" + - #: gitk:2587 ++#: gitk:2626 +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:2588 ++#: gitk:2627 +msgid "Compare with marked commit" +msgstr "So sánh với lần chuyển giao đã đánh dấu" + - #: gitk:2589 gitk:2600 ++#: gitk:2628 gitk:2639 +msgid "Diff this -> marked commit" +msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu" + - #: gitk:2590 gitk:2601 ++#: gitk:2629 gitk:2640 +msgid "Diff marked commit -> this" +msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này" + - #: gitk:2591 ++#: gitk:2630 +msgid "Revert this commit" +msgstr "Hoàn lại lần chuyển giao này" + - #: gitk:2607 ++#: gitk:2646 +msgid "Check out this branch" +msgstr "Checkout nhánh này" + - #: gitk:2608 ++#: gitk:2647 +msgid "Remove this branch" +msgstr "Gỡ bỏ nhánh này" + - #: gitk:2615 ++#: gitk:2654 +msgid "Highlight this too" +msgstr "Cũng tô sáng nó" + - #: gitk:2616 ++#: gitk:2655 +msgid "Highlight this only" +msgstr "Chỉ tô sáng cái này" + - #: gitk:2617 ++#: gitk:2656 +msgid "External diff" +msgstr "diff từ bên ngoài" + - #: gitk:2618 ++#: gitk:2657 +msgid "Blame parent commit" +msgstr "Xem công trạng lần chuyển giao cha mẹ" + - #: gitk:2625 ++#: gitk:2664 +msgid "Show origin of this line" +msgstr "Hiển thị nguyên gốc của dòng này" + - #: gitk:2626 ++#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Chạy lệnh git gui blame cho dòng này" + - #: gitk:2947 ++#: gitk:3011 ++#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2011 Paul Mackerras\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:2955 gitk:3020 gitk:9738 ++#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Đóng" + - #: gitk:2976 ++#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Tổ hợp phím gitk" + - #: gitk:2979 ++#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Tổ hợp phím gitk:" + - #: gitk:2981 ++#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tThoát" + - #: gitk:2982 ++#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tĐóng cửa sổ" + - #: gitk:2983 ++#: gitk:3047 +msgid "\t\tMove to first commit" +msgstr "\t\tChuyển đến lần chuyển giao đầu tiên" + - #: gitk:2984 ++#: gitk:3048 +msgid "\t\tMove to last commit" +msgstr "\t\tChuyển đến lần chuyển giao cuối" + - #: gitk:2985 ++#: gitk:3049 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tDi chuyển lên một lần chuyển giao" + - #: gitk:2986 ++#: gitk:3050 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tDi chuyển xuống một lần chuyển giao" + - #: gitk:2987 ++#: gitk:3051 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tQuay trở lại danh sách lịch sử" + - #: gitk:2988 ++#: gitk:3052 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tDi chuyển tiếp trong danh sách lịch sử" + - #: gitk:2989 ++#: gitk:3053 ++#, tcl-format ++msgid "<%s-n>\tGo to n-th parent of current commit in history list" ++msgstr "" ++ ++#: gitk:3054 +msgid "\tMove up one page in commit list" +msgstr "\tDi chuyển lên một trang trong danh sách lần chuyển giao" + - #: gitk:2990 ++#: gitk:3055 +msgid "\tMove down one page in commit list" +msgstr "\tDi chuyển xuống một trang trong danh sách lần chuyển giao" + - #: gitk:2991 ++#: gitk:3056 +#, 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:2992 ++#: gitk:3057 +#, 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:2993 ++#: gitk:3058 +#, 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:2994 ++#: gitk:3059 +#, 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:2995 ++#: gitk:3060 +#, 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:2996 ++#: gitk:3061 +#, 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:2997 ++#: gitk:3062 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)" + - #: gitk:2998 ++#: gitk:3063 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "" +"\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)" + - #: gitk:2999 ++#: gitk:3064 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tCuộn phần trình bày diff lên một trang" + - #: gitk:3000 ++#: gitk:3065 +msgid "\tScroll diff view up one page" +msgstr "\tCuộn phần trình bày diff lên một trang" + - #: gitk:3001 ++#: gitk:3066 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tCuộn phần trình bày diff xuống một trang" + - #: gitk:3002 ++#: gitk:3067 +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:3003 ++#: gitk:3068 +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:3004 ++#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tTìm kiếm" + - #: gitk:3005 ++#: gitk:3070 +#, 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:3006 ++#: gitk:3071 +msgid "\tMove to next find hit" +msgstr "\t\tDi chuyển đến chỗ gặp kế tiếp" + - #: gitk:3007 ++#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm" + - #: gitk:3008 ++#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tDi chuyển đến chỗ gặp kế trước" + - #: gitk:3009 ++#: gitk:3074 +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:3010 ++#: gitk:3075 +#, 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:3011 ++#: gitk:3076 +#, 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:3012 ++#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tTăng cỡ chữ" + - #: gitk:3013 ++#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tTăng cỡ chữ" + - #: gitk:3014 ++#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tGiảm cỡ chữ" + - #: gitk:3015 ++#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tGiảm cỡ chữ" + - #: gitk:3016 ++#: gitk:3081 +msgid "\t\tUpdate" +msgstr "\t\tCập nhật" + - #: gitk:3471 gitk:3480 ++#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Gặp lỗi khi tạo thư mục tạm %s:" + - #: gitk:3493 ++#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Lỗi chào hỏi \"%s\" từ %s:" + - #: gitk:3556 ++#: gitk:3631 +msgid "command failed:" +msgstr "lệnh gặp lỗi:" + - #: gitk:3705 ++#: gitk:3780 +msgid "No such commit" +msgstr "Không có lần chuyển giao như vậy" + - #: gitk:3719 ++#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: lệnh gặp lỗi:" + - #: gitk:3750 ++#: gitk:3825 +#, 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:3758 ++#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Gặp lỗi khi đọc chỉ mục: %s" + - #: gitk:3783 ++#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Không thể khởi chạy git blame: %s" + - #: gitk:3786 gitk:6652 ++#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Đang tìm kiếm" + - #: gitk:3818 ++#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Gặp lỗi khi chạy git blame: %s" + - #: gitk:3846 ++#: gitk:3921 +#, 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:3860 ++#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:" + - #: gitk:3978 ++#: gitk:4053 +msgid "Gitk view definition" +msgstr "Định nghĩa cách trình bày gitk" + - #: gitk:3982 ++#: gitk:4057 +msgid "Remember this view" +msgstr "Nhớ cách trình bày này" + - #: gitk:3983 ++#: gitk:4058 +msgid "References (space separated list):" +msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):" + - #: gitk:3984 ++#: gitk:4059 +msgid "Branches & tags:" +msgstr "Nhánh & thẻ:" + - #: gitk:3985 ++#: gitk:4060 +msgid "All refs" +msgstr "Mọi tham chiếu" + - #: gitk:3986 ++#: gitk:4061 +msgid "All (local) branches" +msgstr "Mọi nhánh (nội bộ)" + - #: gitk:3987 ++#: gitk:4062 +msgid "All tags" +msgstr "Mọi thẻ" + - #: gitk:3988 ++#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Mọi nhánh remote-tracking" + - #: gitk:3989 ++#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Thông tin chuyển giao (biểu thức chính quy):" + - #: gitk:3990 ++#: gitk:4065 +msgid "Author:" +msgstr "Tác giả:" + - #: gitk:3991 ++#: gitk:4066 +msgid "Committer:" +msgstr "Người chuyển giao:" + - #: gitk:3992 ++#: gitk:4067 +msgid "Commit Message:" +msgstr "Chú thích của lần chuyển giao:" + - #: gitk:3993 ++#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" + - #: gitk:3994 ++#: gitk:4069 ++#, fuzzy ++msgid "Matches none Commit Info criteria" ++msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" ++ ++#: gitk:4070 +msgid "Changes to Files:" +msgstr "Đổi thành Tập tin:" + - #: gitk:3995 ++#: gitk:4071 +msgid "Fixed String" +msgstr "Chuỗi cố định" + - #: gitk:3996 ++#: gitk:4072 +msgid "Regular Expression" +msgstr "Biểu thức chính quy" + - #: gitk:3997 ++#: gitk:4073 +msgid "Search string:" +msgstr "Chuỗi tìm kiếm:" + - #: gitk:3998 ++#: gitk:4074 +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:3999 ++#: gitk:4075 +msgid "Since:" +msgstr "Kể từ:" + - #: gitk:4000 ++#: gitk:4076 +msgid "Until:" +msgstr "Đến:" + - #: gitk:4001 ++#: gitk:4077 +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:4002 ++#: gitk:4078 +msgid "Number to show:" +msgstr "Số lượng hiển thị:" + - #: gitk:4003 ++#: gitk:4079 +msgid "Number to skip:" +msgstr "Số lượng sẽ bỏ qua:" + - #: gitk:4004 ++#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Tuỳ chọn hỗn hợp:" + - #: gitk:4005 ++#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Sắp xếp chặt chẽ theo ngày" + - #: gitk:4006 ++#: gitk:4082 +msgid "Mark branch sides" +msgstr "Đánh dấu các cạnh nhánh" + - #: gitk:4007 ++#: gitk:4083 +msgid "Limit to first parent" +msgstr "Giới hạn thành cha mẹ đầu tiên" + - #: gitk:4008 ++#: gitk:4084 +msgid "Simple history" +msgstr "Lịch sử dạng đơn giản" + - #: gitk:4009 ++#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Đối số bổ xung cho lệnh git log:" + - #: gitk:4010 ++#: gitk:4086 +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:4011 ++#: gitk:4087 +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:4135 ++#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: sửa cách trình bày" + - #: gitk:4143 ++#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- tiêu chuẩn chọn điểm xét duyệt" + - #: gitk:4148 ++#: gitk:4224 +msgid "View Name" +msgstr "Tên cách trình bày" + - #: gitk:4223 ++#: gitk:4299 +msgid "Apply (F5)" +msgstr "Áp dụng (F5)" + - #: gitk:4261 ++#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Lỗi trong các đối số chọn chuyển giao:" + - #: gitk:4314 gitk:4366 gitk:4827 gitk:4841 gitk:6107 gitk:12184 gitk:12185 ++#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Không" + - #: gitk:4924 gitk:4929 ++#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Con cháu" + - #: gitk:4925 ++#: gitk:5004 +msgid "Not descendant" +msgstr "Không có con cháu" + - #: gitk:4932 gitk:4937 ++#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Tổ tiên chung" + - #: gitk:4933 ++#: gitk:5012 +msgid "Not ancestor" +msgstr "Không có chung tổ tiên" + - #: gitk:5223 ++#: gitk:5306 +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:5259 ++#: gitk:5342 +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:7032 ++#: gitk:7115 +msgid "and many more" +msgstr "và nhiều nữa" + - #: gitk:7035 ++#: gitk:7118 +msgid "many" +msgstr "nhiều" + - #: gitk:7222 ++#: gitk:7309 +msgid "Tags:" +msgstr "Thẻ:" + - #: gitk:7239 gitk:7245 gitk:8708 ++#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Cha" + - #: gitk:7250 ++#: gitk:7337 +msgid "Child" +msgstr "Con" + - #: gitk:7259 ++#: gitk:7346 +msgid "Branch" +msgstr "Nhánh" + - #: gitk:7262 ++#: gitk:7349 +msgid "Follows" +msgstr "Đứng sau" + - #: gitk:7265 ++#: gitk:7352 +msgid "Precedes" +msgstr "Đứng trước" + +# tcl-format - #: gitk:7849 ++#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Lỗi lấy diff: %s" + - #: gitk:8533 ++#: gitk:8631 +msgid "Goto:" +msgstr "Nhảy tới:" + - #: gitk:8554 ++#: gitk:8652 +#, 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:8561 ++#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Không hiểu điểm xét duyệt %s" + - #: gitk:8571 ++#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Không hiểu định danh SHA1 %s" + - #: gitk:8573 ++#: gitk:8671 +#, 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:8715 gitk:8730 ++#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Ngày" + - #: gitk:8718 ++#: gitk:8816 +msgid "Children" +msgstr "Con cháu" + - #: gitk:8781 ++#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Đặt lại nhánh %s tại đây" + - #: gitk:8783 ++#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Head đã bị tách rời: không thể đặt lại" + - #: gitk:8888 gitk:8894 ++#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Bỏ qua lần chuyển giao hòa trộn " + - #: gitk:8903 gitk:8908 ++#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Gặp lỗi khi lấy ID miếng vá cho " + - #: gitk:8904 gitk:8909 ++#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - dừng\n" + - #: gitk:8914 gitk:8917 gitk:8925 gitk:8939 gitk:8948 ++#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Commit " + - #: gitk:8918 ++#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" là cùng một miếng vá với\n" +" " + - #: gitk:8926 ++#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" khác biệt từ\n" +" " + - #: gitk:8928 ++#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Khác biệt của lần chuyển giao (commit):\n" +"\n" + - #: gitk:8940 gitk:8949 ++#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " có %s con - dừng\n" + - #: gitk:8968 ++#: gitk:9066 +#, 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:8974 ++#: gitk:9072 +#, 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:9020 ++#: gitk:9118 +msgid "Top" +msgstr "Đỉnh" + - #: gitk:9021 ++#: gitk:9119 +msgid "From" +msgstr "Từ" + - #: gitk:9026 ++#: gitk:9124 +msgid "To" +msgstr "Đến" + - #: gitk:9050 ++#: gitk:9148 +msgid "Generate patch" +msgstr "Tạo miếng vá" + - #: gitk:9052 ++#: gitk:9150 +msgid "From:" +msgstr "Từ:" + - #: gitk:9061 ++#: gitk:9159 +msgid "To:" +msgstr "Đến:" + - #: gitk:9070 ++#: gitk:9168 +msgid "Reverse" +msgstr "Đảo ngược" + - #: gitk:9072 gitk:9268 ++#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Tập tin kết xuất:" + - #: gitk:9078 ++#: gitk:9176 +msgid "Generate" +msgstr "Tạo" + - #: gitk:9116 ++#: gitk:9214 +msgid "Error creating patch:" +msgstr "Gặp lỗi khi tạo miếng vá:" + - #: gitk:9139 gitk:9256 gitk:9313 ++#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + - #: gitk:9148 ++#: gitk:9246 +msgid "Tag name:" +msgstr "Tên thẻ:" + - #: gitk:9151 ++#: gitk:9249 +msgid "Tag message is optional" +msgstr "Ghi chú thẻ chỉ là tùy chọn" + - #: gitk:9153 ++#: gitk:9251 +msgid "Tag message:" +msgstr "Ghi chú cho thẻ:" + - #: gitk:9157 gitk:9322 ++#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Tạo" + - #: gitk:9175 ++#: gitk:9273 +msgid "No tag name specified" +msgstr "Chưa chỉ ra tên của thẻ" + - #: gitk:9179 ++#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Thẻ “%s” đã có sẵn rồi" + - #: gitk:9189 ++#: gitk:9287 +msgid "Error creating tag:" +msgstr "Gặp lỗi khi tạo thẻ:" + - #: gitk:9265 ++#: gitk:9363 +msgid "Command:" +msgstr "Lệnh:" + - #: gitk:9273 ++#: gitk:9371 +msgid "Write" +msgstr "Ghi" + - #: gitk:9291 ++#: gitk:9389 +msgid "Error writing commit:" +msgstr "Gặp lỗi trong quá trình ghi chuyển giao:" + - #: gitk:9318 ++#: gitk:9416 +msgid "Name:" +msgstr "Tên:" + - #: gitk:9341 ++#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Vui lòng chỉ định tên cho nhánh mới" + - #: gitk:9346 ++#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?" + - #: gitk:9413 ++#: gitk:9511 +#, 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:9418 ++#: gitk:9516 +msgid "Cherry-picking" +msgstr "Đang cherry-pick" + - #: gitk:9427 ++#: gitk:9525 +#, 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:9433 ++#: gitk:9531 +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:9449 gitk:9507 ++#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Không có thay đổi nào cần chuyển giao" + - #: gitk:9476 ++#: gitk:9574 +#, 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:9481 ++#: gitk:9579 +msgid "Reverting" +msgstr "Đang hoàn tác" + - #: gitk:9489 ++#: gitk:9587 +#, 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:9493 ++#: gitk:9591 +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:9536 ++#: gitk:9634 +msgid "Confirm reset" +msgstr "Xác nhật đặt lại" + - #: gitk:9538 ++#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Đặt lại nhánh “%s” thành “%s”?" + - #: gitk:9540 ++#: gitk:9638 +msgid "Reset type:" +msgstr "Kiểu đặt lại:" + - #: gitk:9543 ++#: gitk:9641 +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:9546 ++#: gitk:9644 +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:9549 ++#: gitk:9647 +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:9566 ++#: gitk:9664 +msgid "Resetting" +msgstr "Đang đặt lại" + - #: gitk:9626 ++#: gitk:9724 +msgid "Checking out" +msgstr "Đang checkout" + - #: gitk:9679 ++#: gitk:9777 +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:9685 ++#: gitk:9783 +#, 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:9716 ++#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Thẻ và Đầu: %s" + - #: gitk:9731 ++#: gitk:9829 +msgid "Filter" +msgstr "Bộ lọc" + - #: gitk:10027 ++#: gitk:10125 +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:11004 ++#: gitk:11102 +msgid "Tag" +msgstr "Thẻ" + - #: gitk:11008 ++#: gitk:11106 +msgid "Id" +msgstr "Id" + - #: gitk:11091 ++#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Hộp thoại chọn phông Gitk" + - #: gitk:11108 ++#: gitk:11206 +msgid "B" +msgstr "B" + - #: gitk:11111 ++#: gitk:11209 +msgid "I" +msgstr "I" + - #: gitk:11229 ++#: gitk:11327 +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:11232 ++#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Độ rộng biểu đồ tối đa (dòng)" + - #: gitk:11235 - #, tcl-format ++#: gitk:11334 ++#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Độ rộng biểu đồ tối đa (% của bảng)" + - #: gitk:11238 ++#: gitk:11337 +msgid "Show local changes" +msgstr "Hiển thị các thay đổi nội bộ" + - #: gitk:11241 ++#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Tự chọn SHA1 (độ dài)" + - #: gitk:11245 ++#: gitk:11344 +msgid "Hide remote refs" +msgstr "Ẩn tham chiếu đến máy chủ" + - #: gitk:11249 ++#: gitk:11348 +msgid "Diff display options" +msgstr "Các tùy chọn trình bày các khác biệt" + - #: gitk:11251 ++#: gitk:11350 +msgid "Tab spacing" +msgstr "Khoảng cách tab" + - #: gitk:11254 ++#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Hiển thị các thẻ/đầu xung quanh" + - #: gitk:11257 ++#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị" + - #: gitk:11260 ++#: gitk:11359 +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:11263 ++#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Hỗ trợ mã hóa mỗi-dòng" + - #: gitk:11269 gitk:11416 ++#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Công cụ so sánh từ bên ngoài" + - #: gitk:11270 ++#: gitk:11369 +msgid "Choose..." +msgstr "Chọn..." + - #: gitk:11275 ++#: gitk:11374 +msgid "General options" +msgstr "Các tùy chọn chung" + - #: gitk:11278 ++#: gitk:11377 +msgid "Use themed widgets" +msgstr "Dùng các widget chủ đề" + - #: gitk:11280 ++#: gitk:11379 +msgid "(change requires restart)" +msgstr "(để thay đổi cần khởi động lại)" + - #: gitk:11282 ++#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(hiện tại không sẵn sàng)" + - #: gitk:11293 ++#: gitk:11392 +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:11296 ++#: gitk:11395 +msgid "Interface" +msgstr "Giao diện" + - #: gitk:11297 ++#: gitk:11396 +msgid "interface" +msgstr "giao diện" + - #: gitk:11300 ++#: gitk:11399 +msgid "Background" +msgstr "Nền" + - #: gitk:11301 gitk:11331 ++#: gitk:11400 gitk:11430 +msgid "background" +msgstr "nền" + - #: gitk:11304 ++#: gitk:11403 +msgid "Foreground" +msgstr "Tiền cảnh" + - #: gitk:11305 ++#: gitk:11404 +msgid "foreground" +msgstr "tiền cảnh" + - #: gitk:11308 ++#: gitk:11407 +msgid "Diff: old lines" +msgstr "So sánh: dòng cũ" + - #: gitk:11309 ++#: gitk:11408 +msgid "diff old lines" +msgstr "diff dòng cũ" + - #: gitk:11313 ++#: gitk:11412 +msgid "Diff: new lines" +msgstr "So sánh: dòng mới" + - #: gitk:11314 ++#: gitk:11413 +msgid "diff new lines" +msgstr "màu dòng mới" + - #: gitk:11318 ++#: gitk:11417 +msgid "Diff: hunk header" +msgstr "So sánh: phần đầu của đoạn" + - #: gitk:11320 ++#: gitk:11419 +msgid "diff hunk header" +msgstr "màu của phần đầu của đoạn khi so sánh" + - #: gitk:11324 ++#: gitk:11423 +msgid "Marked line bg" +msgstr "Nền dòng đánh dấu" + - #: gitk:11326 ++#: gitk:11425 +msgid "marked line background" +msgstr "nền dòng được đánh dấu" + - #: gitk:11330 ++#: gitk:11429 +msgid "Select bg" +msgstr "Màu nền" + - #: gitk:11339 ++#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Phông chữ: bấm vào các nút ở dưới để chọn" + - #: gitk:11341 ++#: gitk:11440 +msgid "Main font" +msgstr "Phông chữ chính" + - #: gitk:11342 ++#: gitk:11441 +msgid "Diff display font" +msgstr "Phông chữ dùng khi so sánh" + - #: gitk:11343 ++#: gitk:11442 +msgid "User interface font" +msgstr "Phông chữ giao diện" + - #: gitk:11365 ++#: gitk:11464 +msgid "Gitk preferences" +msgstr "Cá nhân hóa các cài đặt cho Gitk" + - #: gitk:11374 ++#: gitk:11473 +msgid "General" +msgstr "Chung" + - #: gitk:11375 ++#: gitk:11474 +msgid "Colors" +msgstr "Màu sắc" + - #: gitk:11376 ++#: gitk:11475 +msgid "Fonts" +msgstr "Phông chữ" + - #: gitk:11426 ++#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: chọn màu cho %s" + - #: gitk:12080 ++#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Không thể tìm thấy kho git ở đây." + - #: gitk:12127 ++#: gitk:12289 +#, 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:12139 ++#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Đối số không hợp lệ cho gitk:" + - #: gitk:12242 ++#: gitk:12405 +msgid "Command line" +msgstr "Dòng lệnh" ++ ++#~ msgid "next" ++#~ msgstr "tiếp" ++ ++#~ msgid "prev" ++#~ msgstr "trước"