diff options
Diffstat (limited to 'gitk-git/po')
| -rw-r--r-- | gitk-git/po/bg.po | 1350 | ||||
| -rw-r--r-- | gitk-git/po/ca.po | 1354 | ||||
| -rw-r--r-- | gitk-git/po/de.po | 887 | ||||
| -rw-r--r-- | gitk-git/po/es.po | 1008 | ||||
| -rw-r--r-- | gitk-git/po/fr.po | 1409 | ||||
| -rw-r--r-- | gitk-git/po/hu.po | 1406 | ||||
| -rw-r--r-- | gitk-git/po/it.po | 1038 | ||||
| -rw-r--r-- | gitk-git/po/ja.po | 1380 | ||||
| -rwxr-xr-x[-rw-r--r--] | gitk-git/po/po2msg.sh | 0 | ||||
| -rw-r--r-- | gitk-git/po/pt_br.po | 1372 | ||||
| -rw-r--r-- | gitk-git/po/ru.po | 995 | ||||
| -rw-r--r-- | gitk-git/po/sv.po | 825 | ||||
| -rw-r--r-- | gitk-git/po/vi.po | 1360 |
13 files changed, 12818 insertions, 1566 deletions
diff --git a/gitk-git/po/bg.po b/gitk-git/po/bg.po new file mode 100644 index 0000000000..1df0716c38 --- /dev/null +++ b/gitk-git/po/bg.po @@ -0,0 +1,1350 @@ +# Bulgarian translation of gitk po-file. +# Copyright (C) 2014 Alexander Shopov <ash@kambanaria.org>. +# This file is distributed under the same license as the git package. +# Alexander Shopov <ash@kambanaria.org>, 2014. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk master\n" +"Report-Msgid-Bugs-To: \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 <ash@kambanaria.org>\n" +"Language-Team: Bulgarian <dict@fsa-bg.org>\n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Списъкът с неслети файлове не може да бъде получен:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Оцветяване на думите" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Отбелязване на думите" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Грешка при разбор на версиите:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Грешка при изпълнение на командата с „--argscmd“." + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове " +"в ограниченията." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Грешка при изпълнение на „git log“:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Прочитане" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Прочитане на подаванията…" + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Не са избрани подавания" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Изходът от „git log“ не може да се анализира:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Липсва информация за подавания" + +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "Добре" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Отказ" + +#: gitk:2069 +msgid "Update" +msgstr "Обновяване" + +#: gitk:2070 +msgid "Reload" +msgstr "Презареждане" + +#: gitk:2071 +msgid "Reread references" +msgstr "Наново прочитане на настройките" + +#: gitk:2072 +msgid "List references" +msgstr "Изброяване на указателите" + +#: gitk:2074 +msgid "Start git gui" +msgstr "Стартиране на „git gui“" + +#: gitk:2076 +msgid "Quit" +msgstr "Спиране на програмата" + +#: gitk:2068 +msgid "File" +msgstr "Файл" + +#: gitk:2080 +msgid "Preferences" +msgstr "Настройки" + +#: gitk:2079 +msgid "Edit" +msgstr "Редактиране" + +#: gitk:2084 +msgid "New view..." +msgstr "Нов изглед…" + +#: gitk:2085 +msgid "Edit view..." +msgstr "Редактиране на изгледа…" + +#: gitk:2086 +msgid "Delete view" +msgstr "Изтриване на изгледа" + +#: gitk:2088 +msgid "All files" +msgstr "Всички файлове" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Изглед" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Относно gitk" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Клавишни комбинации" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Помощ" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1:" + +#: gitk:2229 +msgid "Row" +msgstr "Ред" + +#: gitk:2267 +msgid "Find" +msgstr "Търсене" + +#: gitk:2295 +msgid "commit" +msgstr "подаване" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "съдържащо:" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "засягащо пътищата:" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "добавящо/премахващо низ" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "променящо редове напасващи:" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Точно" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Без регистър" + +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Рег. израз" + +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Всички полета" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Първи ред" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Коментари" + +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 +msgid "Author" +msgstr "Автор" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Подаващ" + +#: gitk:2350 +msgid "Search" +msgstr "Търсене" + +#: gitk:2358 +msgid "Diff" +msgstr "Разлики" + +#: gitk:2360 +msgid "Old version" +msgstr "Стара версия" + +#: gitk:2362 +msgid "New version" +msgstr "Нова версия" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Контекст в редове" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Празните знаци без значение" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Поредови разлики" + +#: gitk:2445 +msgid "Patch" +msgstr "Кръпка" + +#: gitk:2447 +msgid "Tree" +msgstr "Дърво" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Разлики между това и избраното" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Разлики между избраното и това" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Създаване на кръпка" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Създаване на етикет" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Запазване на подаването във файл" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Създаване на нов клон" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Отбиране на това подаване" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Привеждане на върха на клона към текущото подаване" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "Отбелязване на това подаване" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Връщане към отбелязаното подаване" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Откриване и отбелязване на наследниците" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Сравнение с отбелязаното подаване" + +#: gitk:2628 gitk:2639 +msgid "Diff this -> marked commit" +msgstr "Разлики между това и отбелязаното" + +#: gitk:2629 gitk:2640 +msgid "Diff marked commit -> this" +msgstr "Разлики между отбелязаното и това" + +#: gitk:2630 +msgid "Revert this commit" +msgstr "Отмяна на това подаване" + +#: gitk:2646 +msgid "Check out this branch" +msgstr "Изтегляне на този клон" + +#: gitk:2647 +msgid "Remove this branch" +msgstr "Изтриване на този клон" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "Отбелязване и на това" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "Отбелязване само на това" + +#: gitk:2656 +msgid "External diff" +msgstr "Външна програма за разлики" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "Анотиране на родителското подаване" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Показване на произхода на този ред" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Изпълнение на „git gui blame“ върху този ред" + +#: 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:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Затваряне" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Клавишни комбинации" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Клавишни комбинации:" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tСпиране на програмата" + +#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tЗатваряне на прозореца" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Home>\t\tКъм първото подаване" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<End>\t\tКъм последното подаване" + +#: gitk:3049 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, k\tЕдно подаване нагоре" + +#: gitk:3050 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, j\tЕдно подаване надолу" + +#: gitk:3051 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, h\tНазад в историята" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Right>, x, l\tНапред в историята" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tСтраница надолу в списъка с подаванията" + +#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tКъм началото на списъка с подаванията" + +#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tКъм края на списъка с подаванията" + +#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tРед нагоре в списъка с подавания" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tРед надолу в списъка с подавания" + +#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания" + +#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания" + +#: gitk:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "" +"<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tСтраница надолу в изгледа за разлики" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Space>\t\tСтраница надолу в изгледа за разлики" + +#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\t18 реда нагоре в изгледа за разлики" + +#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\t18 реда надолу в изгледа за разлики" + +#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tТърсене" + +#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tКъм следващата поява" + +#: gitk:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\tКъм следващата поява" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tФокус върху полето за търсене" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tКъм предишната поява" + +#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tСледващ файл в изгледа за разлики" + +#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики" + +#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики" + +#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tПо-голям размер на шрифта" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tПо-голям размер на шрифта" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tПо-малък размер на шрифта" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tПо-малък размер на шрифта" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tОбновяване" + +#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Грешка при създаването на временната директория „%s“:" + +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Грешка при получаването на „%s“ от %s:" + +#: gitk:3631 +msgid "command failed:" +msgstr "неуспешно изпълнение на команда:" + +#: gitk:3780 +msgid "No such commit" +msgstr "Такова подаване няма" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "„git gui blame“: неуспешно изпълнение на команда:" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Върхът за сливане не може да бъде прочетен: %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Грешка при прочитане на индекса: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Командата „git blame“ не може да бъде стартирана: %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Търсене" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Грешка при изпълнението на „git blame“: %s" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Този ред идва от подаването %s, което не е в изгледа" + +#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Неуспешно изпълнение на външната програма за разлики:" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Дефиниция на изглед в Gitk" + +#: gitk:4057 +msgid "Remember this view" +msgstr "Запазване на този изглед" + +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Указатели (списък с разделител интервал):" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Клони и етикети:" + +#: gitk:4060 +msgid "All refs" +msgstr "Всички указатели" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Всички (локални) клони" + +#: gitk:4062 +msgid "All tags" +msgstr "Всички етикети" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Всички следящи клони" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Информация за подаване (рег. изр.):" + +#: gitk:4065 +msgid "Author:" +msgstr "Автор:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Подал:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Съобщение при подаване:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Съвпадение по коя да е информация за подаването" + +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Съвпадение по коя да е информация за подаването" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "Промени по файловете:" + +#: gitk:4071 +msgid "Fixed String" +msgstr "Дословен низ" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Регулярен израз" + +#: gitk:4073 +msgid "Search string:" +msgstr "Низ за търсене:" + +#: 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:4075 +msgid "Since:" +msgstr "От:" + +#: gitk:4076 +msgid "Until:" +msgstr "До:" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" +"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло " +"число):" + +#: gitk:4078 +msgid "Number to show:" +msgstr "Брой показани:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Брой прескочени:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Разни:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Подреждане по дата" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Отбелязване на страните по клона" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Само първия родител" + +#: gitk:4084 +msgid "Simple history" +msgstr "Опростена история" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Допълнителни аргументи към „git log“:" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Въведете файловете и директориите за включване, по елемент на ред" + +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "" +"Команда за генерирането на допълнителни подавания, които да бъдат включени:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: редактиране на изглед" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "— критерии за избор на версии" + +#: gitk:4224 +msgid "View Name" +msgstr "Име на изглед" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Прилагане (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Грешка в аргументите за избор на подавания:" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Няма" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Наследник" + +#: gitk:5004 +msgid "Not descendant" +msgstr "Не е наследник" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Предшественик" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "Не е предшественик" + +#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Локални промени добавени към индекса, но неподадени" + +#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Локални промени извън индекса" + +#: gitk:7115 +msgid "and many more" +msgstr "и още много" + +#: gitk:7118 +msgid "many" +msgstr "много" + +#: gitk:7309 +msgid "Tags:" +msgstr "Етикети:" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Родител" + +#: gitk:7337 +msgid "Child" +msgstr "Дете" + +#: gitk:7346 +msgid "Branch" +msgstr "Клон" + +#: gitk:7349 +msgid "Follows" +msgstr "Следва" + +#: gitk:7352 +msgid "Precedes" +msgstr "Предшества" + +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Грешка при получаването на разликите: %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Към ред:" + +#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Съкратената сума по SHA1 %s не е еднозначна" + +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Непозната версия %s" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Непозната сума по SHA1 %s" + +#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Версия %s не е в текущия изглед" + +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Дата" + +#: gitk:8816 +msgid "Children" +msgstr "Деца" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Зануляване на клона „%s“ към текущото подаване" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Несвързан връх: невъзможно зануляване" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Пропускане на подаването на сливането" + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Грешка при получаването на идентификатора на " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " — спиране\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Подаване" + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" е същата кръпка като\n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" се различава от\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Разлика между подаванията:\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " има %s деца — спиране\n" + +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Грешка при запазването на подаването във файл: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Грешка при изчисляването на разликите между подаванията: %s" + +#: gitk:9118 +msgid "Top" +msgstr "Най-горе" + +#: gitk:9119 +msgid "From" +msgstr "От" + +#: gitk:9124 +msgid "To" +msgstr "До" + +#: gitk:9148 +msgid "Generate patch" +msgstr "Генериране на кръпка" + +#: gitk:9150 +msgid "From:" +msgstr "От:" + +#: gitk:9159 +msgid "To:" +msgstr "До:" + +#: gitk:9168 +msgid "Reverse" +msgstr "Обръщане" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Запазване във файла:" + +#: gitk:9176 +msgid "Generate" +msgstr "Генериране" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "Грешка при създаването на кръпка:" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "Идентификатор:" + +#: gitk:9246 +msgid "Tag name:" +msgstr "Име на етикет:" + +#: gitk:9249 +msgid "Tag message is optional" +msgstr "Съобщението за етикет е незадължително" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Съобщение за етикет:" + +#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Създаване" + +#: gitk:9273 +msgid "No tag name specified" +msgstr "Липсва име на етикет" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Етикетът „%s“ вече съществува" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "Грешка при създаването на етикет:" + +#: gitk:9363 +msgid "Command:" +msgstr "Команда:" + +#: gitk:9371 +msgid "Write" +msgstr "Запазване" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "Грешка при запазването на подаването:" + +#: gitk:9416 +msgid "Name:" +msgstr "Име:" + +#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Укажете име за новия клон" + +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?" + +#: gitk:9511 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" + +#: gitk:9516 +msgid "Cherry-picking" +msgstr "Отбиране" + +#: 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: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:9547 gitk:9605 +msgid "No changes committed" +msgstr "Не са подадени промени" + +#: gitk:9574 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" + +#: gitk:9579 +msgid "Reverting" +msgstr "Отмяна" + +#: 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:9591 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Неуспешно отмяна поради конфликти при сливане.\n" +"Искате ли да ги коригирате чрез „git citool“?" + +#: gitk:9634 +msgid "Confirm reset" +msgstr "Потвърждаване на зануляването" + +#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Да се занули ли клонът „%s“ към „%s“?" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Вид зануляване:" + +#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Слабо: работното дърво и индекса остават същите" + +#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Смесено: работното дърво остава същото, индексът се занулява" + +#: gitk:9647 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Силно: зануляване и на работното дърво, и на индекса\n" +"(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" + +#: gitk:9664 +msgid "Resetting" +msgstr "Зануляване" + +#: gitk:9724 +msgid "Checking out" +msgstr "Изтегляне" + +#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Текущо изтегленият клон не може да бъде изтрит" + +#: 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:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Етикети и върхове: %s" + +#: gitk:9829 +msgid "Filter" +msgstr "Филтриране" + +#: gitk:10125 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Грешка при прочитането на топологията на подаванията. Информацията за клона " +"и предшестващите/следващите етикети ще е непълна." + +#: gitk:11102 +msgid "Tag" +msgstr "Етикет" + +#: gitk:11106 +msgid "Id" +msgstr "Идентификатор" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Избор на шрифт за Gitk" + +#: gitk:11206 +msgid "B" +msgstr "Ч" + +#: gitk:11209 +msgid "I" +msgstr "К" + +#: gitk:11327 +msgid "Commit list display options" +msgstr "Настройки на списъка с подавания" + +#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Максимална широчина на графа (в редове)" + +#: gitk:11334 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Максимална широчина на графа (% от панела)" + +#: gitk:11337 +msgid "Show local changes" +msgstr "Показване на локалните промени" + +#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Автоматично избиране на SHA1 (дължина)" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Скриване на отдалечените указатели" + +#: gitk:11348 +msgid "Diff display options" +msgstr "Настройки на показването на разликите" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "Широчина на табулатора" + +#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Извеждане на близките етикети и върхове" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Максимален брой етикети/върхове за показване" + +#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Разлика само в избраните пътища" + +#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Поддръжка на различни кодирания за всеки файл" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Външен инструмент за разлики" + +#: gitk:11369 +msgid "Choose..." +msgstr "Избор…" + +#: gitk:11374 +msgid "General options" +msgstr "Общи настройки" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Използване на тема за графичните обекти" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(промяната изисква рестартиране на Gitk)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(в момента недостъпно)" + +#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Цветове: избира се с натискане" + +#: gitk:11395 +msgid "Interface" +msgstr "Интерфейс" + +#: gitk:11396 +msgid "interface" +msgstr "интерфейс" + +#: gitk:11399 +msgid "Background" +msgstr "Фон" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "фон" + +#: gitk:11403 +msgid "Foreground" +msgstr "Знаци" + +#: gitk:11404 +msgid "foreground" +msgstr "знаци" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "Разлика: стари редове" + +#: gitk:11408 +msgid "diff old lines" +msgstr "разлика, стари редове" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "Разлика: нови редове" + +#: gitk:11413 +msgid "diff new lines" +msgstr "разлика, нови редове" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Разлика: начало на парче" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "разлика, начало на парче" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "Фон на отбелязан ред" + +#: gitk:11425 +msgid "marked line background" +msgstr "фон на отбелязан ред" + +#: gitk:11429 +msgid "Select bg" +msgstr "Избор на фон" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Шрифтове: избира се с натискане" + +#: gitk:11440 +msgid "Main font" +msgstr "Основен шрифт" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Шрифт за разликите" + +#: gitk:11442 +msgid "User interface font" +msgstr "Шрифт на интерфейса" + +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Настройки на Gitk" + +#: gitk:11473 +msgid "General" +msgstr "Общи" + +#: gitk:11474 +msgid "Colors" +msgstr "Цветове" + +#: gitk:11475 +msgid "Fonts" +msgstr "Шрифтове" + +#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: избор на цвят на „%s“" + +#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Тук липсва хранилище на Git." + +#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл" + +#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Неправилни аргументи на gitk:" + +#: gitk:12405 +msgid "Command line" +msgstr "Команден ред" diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po new file mode 100644 index 0000000000..2c1f60683c --- /dev/null +++ b/gitk-git/po/ca.po @@ -0,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 <alexhenrie24@gmail.com>, 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 <alexhenrie24@gmail.com>\n" +"Language-Team: Catalan\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.7.3\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Colora les paraules" + +#: gitk: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 "<Home>\t\tMove to first commit" +msgstr "<Inici>\t\tVés a la primera comissió" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<Fi>\t\tVés a l'última comissió" + +#: gitk:3049 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Amunt>, p, k\tMou-te una comissió amunt" + +#: gitk:3050 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Avall>, n, j\tMou-te una comissió avall" + +#: gitk:3051 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Dreta>, 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 "<PageUp>\tMove up one page in commit list" +msgstr "<RePàg>\tBaixa una pàgina en la llista de comissions" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<AvPàg>\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 "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Maj-Amunt>\tCerca cap enrere (amunt, les comissions més noves)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Maj-Avall>\tCerca cap endavant (avall, les comissions més velles)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Supr>, b\tDesplaça la vista de diferència una pàgina cap amunt" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Retrocés>\tDesplaça la vista de diferència una pàgina cap amunt" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Espai>\t\tDesplaça la vista de diferència una pàgina cap avall" + +#: gitk: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 "<Return>\tMove to next find hit" +msgstr "<Retorn>\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 "<F5>\t\tUpdate" +msgstr "<F5>\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 --git a/gitk-git/po/de.po b/gitk-git/po/de.po index 53ef0d6359..dabd4eefb5 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -8,33 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-12 21:55+0200\n" -"PO-Revision-Date: 2009-05-12 22:18+0200\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 <stimming@tuhh.de>\n" "Language-Team: German\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" -#: gitk:268 +#: 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:323 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" -#: gitk:336 +#: 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:339 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,719 +51,837 @@ msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " "nicht zusammengeführten Dateien in der Dateiauswahl." -#: gitk:361 gitk:508 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fehler beim Ausführen von »git log«:" -#: gitk:379 gitk:524 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lesen" -#: gitk:439 gitk:4061 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Versionen werden gelesen ..." -#: gitk:442 gitk:1560 gitk:4064 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Keine Versionen ausgewählt" -#: gitk:1436 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Ausgabe von »git log« kann nicht erkannt werden:" -#: gitk:1656 +#: gitk:1740 msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:1791 gitk:1815 gitk:3854 gitk:8714 gitk:10250 gitk:10422 +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Ok" -#: gitk:1817 gitk:3856 gitk:8311 gitk:8385 gitk:8495 gitk:8544 gitk:8716 -#: gitk:10251 gitk:10423 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Abbrechen" -#: gitk:1917 +#: gitk:2069 msgid "Update" msgstr "Aktualisieren" -#: gitk:1918 +#: gitk:2070 msgid "Reload" msgstr "Neu laden" -#: gitk:1919 +#: gitk:2071 msgid "Reread references" msgstr "Zweige neu laden" -#: gitk:1920 +#: gitk:2072 msgid "List references" msgstr "Zweige/Markierungen auflisten" -#: gitk:1922 +#: gitk:2074 msgid "Start git gui" msgstr "»git gui« starten" -#: gitk:1924 +#: gitk:2076 msgid "Quit" msgstr "Beenden" -#: gitk:1916 +#: gitk:2068 msgid "File" msgstr "Datei" -#: gitk:1928 +#: gitk:2080 msgid "Preferences" msgstr "Einstellungen" -#: gitk:1927 +#: gitk:2079 msgid "Edit" msgstr "Bearbeiten" -#: gitk:1932 +#: gitk:2084 msgid "New view..." msgstr "Neue Ansicht ..." -#: gitk:1933 +#: gitk:2085 msgid "Edit view..." msgstr "Ansicht bearbeiten ..." -#: gitk:1934 +#: gitk:2086 msgid "Delete view" msgstr "Ansicht entfernen" -#: gitk:1936 +#: gitk:2088 msgid "All files" msgstr "Alle Dateien" -#: gitk:1931 gitk:3666 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Ansicht" -#: gitk:1941 gitk:1951 gitk:2650 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Über gitk" -#: gitk:1942 gitk:1956 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Tastenkürzel" -#: gitk:1940 gitk:1955 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Hilfe" -#: gitk:2016 -msgid "SHA1 ID: " -msgstr "SHA1:" +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2047 +#: gitk:2229 msgid "Row" msgstr "Zeile" -#: gitk:2078 +#: gitk:2267 msgid "Find" msgstr "Suche" -#: gitk:2079 -msgid "next" -msgstr "nächste" - -#: gitk:2080 -msgid "prev" -msgstr "vorige" - -#: gitk:2081 +#: gitk:2295 msgid "commit" msgstr "Version nach" -#: gitk:2084 gitk:2086 gitk:4222 gitk:4245 gitk:4269 gitk:6210 gitk:6282 -#: gitk:6366 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "Beschreibung:" -#: gitk:2087 gitk:3158 gitk:3163 gitk:4297 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "Dateien:" -#: gitk:2088 gitk:4302 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "Änderungen:" -#: gitk:2097 gitk:2099 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exakt" -#: gitk:2099 gitk:4377 gitk:6178 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:2099 gitk:4271 gitk:4375 gitk:6174 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Regexp" -#: gitk:2101 gitk:2102 gitk:4396 gitk:4426 gitk:4433 gitk:6302 gitk:6370 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Alle Felder" -#: gitk:2102 gitk:4394 gitk:4426 gitk:6241 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Überschrift" -#: gitk:2103 gitk:4394 gitk:6241 gitk:6370 gitk:6804 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Beschreibung" -#: gitk:2103 gitk:4394 gitk:4398 gitk:4433 gitk:6241 gitk:6739 gitk:7991 -#: gitk:8006 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autor" -#: gitk:2103 gitk:4394 gitk:6241 gitk:6741 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Eintragender" -#: gitk:2132 +#: gitk:2350 msgid "Search" msgstr "Suchen" -#: gitk:2139 +#: gitk:2358 msgid "Diff" msgstr "Vergleich" -#: gitk:2141 +#: gitk:2360 msgid "Old version" msgstr "Alte Version" -#: gitk:2143 +#: gitk:2362 msgid "New version" msgstr "Neue Version" -#: gitk:2145 +#: gitk:2364 msgid "Lines of context" msgstr "Kontextzeilen" -#: gitk:2155 +#: gitk:2374 msgid "Ignore space change" msgstr "Leerzeichenänderungen ignorieren" -#: gitk:2213 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2215 +#: gitk:2447 msgid "Tree" msgstr "Baum" -#: gitk:2359 gitk:2376 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Vergleich: diese -> gewählte" -#: gitk:2360 gitk:2377 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2361 gitk:2378 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:2362 gitk:8369 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:2363 gitk:8475 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:2364 gitk:8532 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:2365 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:2366 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:2367 +#: gitk:2624 msgid "Mark this commit" msgstr "Lesezeichen setzen" -#: gitk:2368 +#: gitk:2625 msgid "Return to mark" msgstr "Zum Lesezeichen" -#: gitk:2369 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Abkömmling von Lesezeichen und dieser Version finden" -#: gitk:2370 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" -#: gitk:2384 +#: 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:2385 +#: gitk:2647 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:2392 +#: gitk:2654 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:2393 +#: gitk:2655 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:2394 +#: gitk:2656 msgid "External diff" msgstr "Externes Diff-Programm" -#: gitk:2395 +#: gitk:2657 msgid "Blame parent commit" msgstr "Annotieren der Elternversion" -#: gitk:2402 +#: gitk:2664 msgid "Show origin of this line" msgstr "Herkunft dieser Zeile anzeigen" -#: gitk:2403 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" -#: gitk:2652 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 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 © 2005-2008 Paul Mackerras\n" +"Copyright \\u00a9 2005-2010 Paul Mackerras\n" "\n" "Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " "License" -#: gitk:2660 gitk:2722 gitk:8897 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Schließen" -#: gitk:2679 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Gitk-Tastaturbelegung" -#: gitk:2682 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Gitk-Tastaturbelegung:" -#: gitk:2684 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" -#: gitk:2685 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tSuchen" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Pos1>\t\tZur neuesten Version springen" -#: gitk:2686 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tZur ältesten Version springen" -#: gitk:2687 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Hoch>, p, i\tNächste neuere Version" -#: gitk:2688 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Runter>, n, k\tNächste ältere Version" -#: gitk:2689 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Links>, z, j\tEine Version zurückgehen" -#: gitk:2690 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Rechts>, x, l\tEine Version weitergehen" -#: gitk:2691 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<BildHoch>\tEine Seite nach oben blättern" -#: gitk:2692 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<BildRunter>\tEine Seite nach unten blättern" -#: gitk:2693 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" -#: gitk:2694 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" -#: gitk:2695 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" -#: gitk:2696 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" -#: gitk:2697 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" -#: gitk:2698 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" -#: gitk:2699 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)" -#: gitk:2700 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)" -#: gitk:2701 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern" -#: gitk:2702 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern" -#: gitk:2703 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern" -#: gitk:2704 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" -#: gitk:2705 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" -#: gitk:2706 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSuchen" -#: gitk:2707 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tWeitersuchen" -#: gitk:2708 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tWeitersuchen" -#: gitk:2709 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tTastaturfokus ins Suchfeld" -#: gitk:2710 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tRückwärts weitersuchen" -#: gitk:2711 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tVergleich zur nächsten Datei blättern" -#: gitk:2712 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tWeitersuchen im Vergleich" -#: gitk:2713 +#: 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:2714 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" -#: gitk:2715 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tSchrift vergrößern" -#: gitk:2716 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:2717 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tSchrift verkleinern" -#: gitk:2718 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAktualisieren" -#: gitk:3173 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Fehler beim Holen von »%s« von »%s«:" - -#: gitk:3230 gitk:3239 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" -#: gitk:3251 +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + +#: gitk:3631 msgid "command failed:" msgstr "Kommando fehlgeschlagen:" -#: gitk:3397 +#: gitk:3780 msgid "No such commit" msgstr "Version nicht gefunden" -#: gitk:3411 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: Kommando fehlgeschlagen:" -#: gitk:3442 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" -#: gitk:3450 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" -#: gitk:3475 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "»git blame« konnte nicht gestartet werden: %s" -#: gitk:3478 gitk:6209 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Suchen" -#: gitk:3510 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Fehler beim Ausführen von »git blame«: %s" -#: gitk:3538 +#: 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:3552 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Externes Diff-Programm fehlgeschlagen:" -#: gitk:3670 +#: gitk:4053 msgid "Gitk view definition" msgstr "Gitk-Ansichten" -#: gitk:3674 +#: gitk:4057 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:3675 -msgid "Commits to include (arguments to git log):" -msgstr "Versionen anzeigen (Argumente von git log):" +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" -#: gitk:3676 -msgid "Use all refs" -msgstr "Alle Zweige verwenden" +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Zweige/Markierungen:" -#: gitk:3677 -msgid "Strictly sort by date" -msgstr "Streng nach Datum sortieren" +#: gitk:4060 +msgid "All refs" +msgstr "Alle Markierungen und Zweige" -#: gitk:3678 -msgid "Mark branch sides" -msgstr "Zweig-Seiten markieren" +#: gitk:4061 +msgid "All (local) branches" +msgstr "Alle (lokalen) Zweige" + +#: gitk:4062 +msgid "All tags" +msgstr "Alle Markierungen" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Alle Übernahmezweige" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Versionsinformationen (reguläre Ausdrücke):" + +#: gitk:4065 +msgid "Author:" +msgstr "Autor:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Eintragender:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Versionsbeschreibung:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:3679 -msgid "Since date:" -msgstr "Von Datum:" +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:3680 -msgid "Until date:" -msgstr "Bis Datum:" +#: gitk:4070 +msgid "Changes to Files:" +msgstr "Dateien:" + +#: gitk:4071 +msgid "Fixed String" +msgstr "Zeichenkette" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Regulärer Ausdruck" + +#: gitk:4073 +msgid "Search string:" +msgstr "Suchausdruck:" + +#: 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«)" + +#: gitk:4075 +msgid "Since:" +msgstr "Von:" -#: gitk:3681 -msgid "Max count:" -msgstr "Max. Anzahl:" +#: gitk:4076 +msgid "Until:" +msgstr "Bis:" -#: gitk:3682 -msgid "Skip:" +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" + +#: gitk:4078 +msgid "Number to show:" +msgstr "Anzeigen:" + +#: gitk:4079 +msgid "Number to skip:" msgstr "Überspringen:" -#: gitk:3683 +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Sonstiges:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Streng nach Datum sortieren" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Zweig-Seiten markieren" + +#: gitk:4083 msgid "Limit to first parent" msgstr "Auf erste Elternversion beschränken" -#: gitk:3684 +#: gitk:4084 +msgid "Simple history" +msgstr "Einfache Historie" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Zusätzliche Argumente für »git log«:" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" + +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" -#: gitk:3780 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: Ansicht bearbeiten" -#: gitk:3793 -msgid "Name" -msgstr "Name" +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- Auswahl der angezeigten Versionen" -#: gitk:3841 -msgid "Enter files and directories to include, one per line:" -msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" +#: gitk:4224 +msgid "View Name" +msgstr "Ansichtsname" -#: gitk:3855 +#: gitk:4299 msgid "Apply (F5)" msgstr "Anwenden (F5)" -#: gitk:3893 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:3946 gitk:3998 gitk:4446 gitk:4460 gitk:5721 gitk:11114 gitk:11115 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Keine" -#: gitk:4394 gitk:6241 gitk:7993 gitk:8008 -msgid "Date" -msgstr "Datum" - -#: gitk:4394 gitk:6241 -msgid "CDate" -msgstr "Eintragedatum" - -#: gitk:4543 gitk:4548 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Abkömmling" -#: gitk:4544 +#: gitk:5004 msgid "Not descendant" msgstr "Kein Abkömmling" -#: gitk:4551 gitk:4556 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:4552 +#: gitk:5012 msgid "Not ancestor" msgstr "Kein Vorgänger" -#: gitk:4842 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:4878 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:6559 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 msgid "many" msgstr "viele" -#: gitk:6743 +#: gitk:7309 msgid "Tags:" msgstr "Markierungen:" -#: gitk:6760 gitk:6766 gitk:7986 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Eltern" -#: gitk:6771 +#: gitk:7337 msgid "Child" msgstr "Kind" -#: gitk:6780 +#: gitk:7346 msgid "Branch" msgstr "Zweig" -#: gitk:6783 +#: gitk:7349 msgid "Follows" msgstr "Folgt auf" -#: gitk:6786 +#: gitk:7352 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:7279 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:7819 +#: gitk:8631 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:7821 -msgid "SHA1 ID:" -msgstr "SHA1-Hashwert:" - -#: gitk:7840 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:7852 +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Version »%s« ist unbekannt" + +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:7854 +#: gitk:8671 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "Markierung/Zweig »%s« ist unbekannt" +msgid "Revision %s is not in the current view" +msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" -#: gitk:7996 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Datum" + +#: gitk:8816 msgid "Children" msgstr "Kinder" -#: gitk:8053 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:8055 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" -#: gitk:8164 gitk:8170 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Überspringe Zusammenführungs-Version " -#: gitk:8179 gitk:8184 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Fehler beim Holen der Patch-ID für " -#: gitk:8180 gitk:8185 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - Abbruch.\n" -#: gitk:8190 gitk:8193 gitk:8201 gitk:8211 gitk:8220 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Version " -#: gitk:8194 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -762,7 +889,7 @@ msgstr "" " ist das gleiche Patch wie\n" " " -#: gitk:8202 +#: gitk:9024 msgid "" " differs from\n" " " @@ -770,117 +897,139 @@ msgstr "" " ist unterschiedlich von\n" " " -#: gitk:8204 -msgid "- stopping\n" -msgstr "- Abbruch.\n" +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Vergleich der Versionen:\n" +"\n" -#: gitk:8212 gitk:8221 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " hat %s Kinder. Abbruch\n" -#: gitk:8252 +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fehler beim Schreiben der Version in Datei: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fehler beim Vergleichen der Versionen: %s" + +#: gitk:9118 msgid "Top" msgstr "Oben" -#: gitk:8253 +#: gitk:9119 msgid "From" msgstr "Von" -#: gitk:8258 +#: gitk:9124 msgid "To" msgstr "bis" -#: gitk:8282 +#: gitk:9148 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:8284 +#: gitk:9150 msgid "From:" msgstr "Von:" -#: gitk:8293 +#: gitk:9159 msgid "To:" msgstr "bis:" -#: gitk:8302 +#: gitk:9168 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:8304 gitk:8489 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:8310 +#: gitk:9176 msgid "Generate" msgstr "Erzeugen" -#: gitk:8348 +#: gitk:9214 msgid "Error creating patch:" msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:8371 gitk:8477 gitk:8534 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8380 +#: gitk:9246 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:8384 gitk:8543 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "Eine Markierungsbeschreibung ist optional" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Markierungsbeschreibung:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Erstellen" -#: gitk:8401 +#: gitk:9273 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:8405 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:8411 +#: gitk:9287 msgid "Error creating tag:" msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:8486 +#: gitk:9363 msgid "Command:" msgstr "Kommando:" -#: gitk:8494 +#: gitk:9371 msgid "Write" msgstr "Schreiben" -#: gitk:8512 +#: gitk:9389 msgid "Error writing commit:" msgstr "Fehler beim Schreiben der Version:" -#: gitk:8539 +#: gitk:9416 msgid "Name:" msgstr "Name:" -#: gitk:8562 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:8567 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" -#: gitk:8633 +#: 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?" -#: gitk:8638 +#: gitk:9516 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:8647 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -890,7 +1039,7 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:8653 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -899,34 +1048,66 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:8669 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:8695 +#: 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:8697 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:8701 +#: gitk:9638 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:8705 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:8708 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:8711 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -934,21 +1115,21 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:8728 +#: gitk:9664 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:8785 +#: gitk:9724 msgid "Checking out" msgstr "Umstellen" -#: gitk:8838 +#: 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:8844 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -957,16 +1138,16 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:8875 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:8890 +#: gitk:9829 msgid "Filter" msgstr "Filtern" -#: gitk:9185 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -974,182 +1155,228 @@ msgstr "" "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " "Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:10171 +#: gitk:11102 msgid "Tag" msgstr "Markierung" -#: gitk:10171 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10219 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Gitk-Schriften wählen" -#: gitk:10236 +#: gitk:11206 msgid "B" msgstr "F" -#: gitk:10239 +#: gitk:11209 msgid "I" msgstr "K" -#: gitk:10334 -msgid "Gitk preferences" -msgstr "Gitk-Einstellungen" - -#: gitk:10336 +#: gitk:11327 msgid "Commit list display options" msgstr "Anzeige der Versionsliste" -#: gitk:10339 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:10343 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:10347 +#: gitk:11337 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:10350 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "SHA1-Hashwert automatisch auswählen" -#: gitk:10354 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Entfernte Zweige/Markierungen ausblenden" + +#: gitk:11348 msgid "Diff display options" msgstr "Anzeige des Vergleichs" -#: gitk:10356 +#: gitk:11350 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:10359 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Naheliegende Markierungen anzeigen" -#: gitk:10362 +#: 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:10365 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Zeichenkodierung pro Datei ermitteln" -#: gitk:10371 gitk:10436 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Externes Diff-Programm" -#: gitk:10373 +#: gitk:11369 msgid "Choose..." msgstr "Wählen ..." -#: gitk:10378 +#: gitk:11374 +msgid "General options" +msgstr "Allgemeine Optionen" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(Änderungen werden erst nach Neustart wirksam)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(Momentan nicht verfügbar)" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:10381 +#: gitk:11395 +msgid "Interface" +msgstr "Benutzeroberfläche" + +#: gitk:11396 +msgid "interface" +msgstr "Benutzeroberfläche" + +#: gitk:11399 msgid "Background" msgstr "Hintergrund" -#: gitk:10382 gitk:10412 +#: gitk:11400 gitk:11430 msgid "background" msgstr "Hintergrund" -#: gitk:10385 +#: gitk:11403 msgid "Foreground" msgstr "Vordergrund" -#: gitk:10386 +#: gitk:11404 msgid "foreground" msgstr "Vordergrund" -#: gitk:10389 +#: gitk:11407 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:10390 +#: gitk:11408 msgid "diff old lines" msgstr "Vergleich - Alte Zeilen" -#: gitk:10394 +#: gitk:11412 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:10395 +#: gitk:11413 msgid "diff new lines" msgstr "Vergleich - Neue Zeilen" -#: gitk:10399 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:10401 +#: gitk:11419 msgid "diff hunk header" msgstr "Vergleich - Änderungstitel" -#: gitk:10405 +#: gitk:11423 msgid "Marked line bg" msgstr "Hintergrund für markierte Zeile" -#: gitk:10407 +#: gitk:11425 msgid "marked line background" msgstr "Hintergrund für markierte Zeile" -#: gitk:10411 +#: gitk:11429 msgid "Select bg" msgstr "Hintergrundfarbe auswählen" -#: gitk:10415 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:10417 +#: gitk:11440 msgid "Main font" msgstr "Programmschriftart" -#: gitk:10418 +#: gitk:11441 msgid "Diff display font" msgstr "Schriftart für Vergleich" -#: gitk:10419 +#: gitk:11442 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:10446 +#: 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:10893 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Gitk läuft nicht mit dieser Version von Tcl/Tk.\n" -"Gitk benötigt mindestens Tcl/Tk 8.4." - -#: gitk:11020 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Kein Git-Projektarchiv gefunden." -#: gitk:11024 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." - -#: gitk:11071 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:11083 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" -#: gitk:11167 +#: 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 --git a/gitk-git/po/es.po b/gitk-git/po/es.po index 0e19b5eae2..cfc10e13ea 100644 --- a/gitk-git/po/es.po +++ b/gitk-git/po/es.po @@ -8,25 +8,43 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2008-03-25 11:20+0100\n" "Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n" "Language-Team: Spanish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Imposible obtener la lista de archivos pendientes de fusión:" -#: gitk:340 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "" + +#: gitk:324 +#, fuzzy +msgid "Error parsing revisions:" +msgstr "Error al leer las diferencias de fusión:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "" + +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero no hay " "archivos pendientes de fusión." -#: gitk:343 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -34,684 +52,1050 @@ msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero los " "archivos especificados no necesitan fusión." -#: gitk:378 +#: gitk:418 gitk:566 +#, fuzzy +msgid "Error executing git log:" +msgstr "Error al crear la etiqueta:" + +#: gitk:436 gitk:582 msgid "Reading" msgstr "Leyendo" -#: gitk:438 gitk:3462 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Leyendo revisiones..." -#: gitk:441 gitk:1528 gitk:3465 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "No se seleccionaron revisiones" -#: gitk:1399 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Error analizando la salida de git log:" -#: gitk:1605 +#: gitk:1740 msgid "No commit information available" msgstr "Falta información sobre las revisiones" -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Aceptar" -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 -#: gitk:9294 gitk:9467 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Cancelar" -#: gitk:1811 +#: gitk:2069 msgid "Update" msgstr "Actualizar" -#: gitk:1813 +#: gitk:2070 +msgid "Reload" +msgstr "" + +#: gitk:2071 msgid "Reread references" msgstr "Releer referencias" -#: gitk:1814 +#: gitk:2072 msgid "List references" msgstr "Lista de referencias" -#: gitk:1815 +#: gitk:2074 +msgid "Start git gui" +msgstr "" + +#: gitk:2076 msgid "Quit" msgstr "Salir" -#: gitk:1810 +#: gitk:2068 msgid "File" msgstr "Archivo" -#: gitk:1818 +#: gitk:2080 msgid "Preferences" msgstr "Preferencias" -#: gitk:1817 +#: gitk:2079 msgid "Edit" msgstr "Editar" -#: gitk:1821 +#: gitk:2084 msgid "New view..." msgstr "Nueva vista..." -#: gitk:1822 +#: gitk:2085 msgid "Edit view..." msgstr "Modificar vista..." -#: gitk:1823 +#: gitk:2086 msgid "Delete view" msgstr "Eliminar vista" -#: gitk:1825 +#: gitk:2088 msgid "All files" msgstr "Todos los archivos" -#: gitk:1820 gitk:3196 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Vista" -#: gitk:1828 gitk:2487 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Acerca de gitk" -#: gitk:1829 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Combinaciones de teclas" -#: gitk:1827 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Ayuda" -#: gitk:1887 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:1918 +#: gitk:2229 msgid "Row" msgstr "" -#: gitk:1949 +#: gitk:2267 msgid "Find" msgstr "Buscar" -#: gitk:1950 -msgid "next" -msgstr "<<" - -#: gitk:1951 -msgid "prev" -msgstr ">>" - -#: gitk:1952 +#: gitk:2295 msgid "commit" msgstr "revisión" -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "que contiene:" -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "que modifica la ruta:" -#: gitk:1959 gitk:3697 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "que añade/elimina cadena:" -#: gitk:1968 gitk:1970 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exacto" -#: gitk:1970 gitk:3773 gitk:5518 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "NoMayús" -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Regex" -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Todos los campos" -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Título" -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Comentarios" -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 -#: gitk:7300 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autor" -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "" -#: gitk:2003 +#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2010 +#: gitk:2358 msgid "Diff" msgstr "Diferencia" -#: gitk:2012 +#: gitk:2360 msgid "Old version" msgstr "Versión antigua" -#: gitk:2014 +#: gitk:2362 msgid "New version" msgstr "Versión nueva" -#: gitk:2016 +#: gitk:2364 msgid "Lines of context" msgstr "Líneas de contexto" -#: gitk:2026 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignora cambios de espaciado" -#: gitk:2084 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Parche" -#: gitk:2086 +#: gitk:2447 msgid "Tree" msgstr "Árbol" -#: gitk:2213 gitk:2226 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2214 gitk:2227 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2215 gitk:2228 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Crear patch" -#: gitk:2216 gitk:7494 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Crear etiqueta" -#: gitk:2217 gitk:7593 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Escribir revisiones a archivo" -#: gitk:2218 gitk:7647 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Crear nueva rama" -#: gitk:2219 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2220 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Traer la rama HEAD aquí" -#: gitk:2234 +#: gitk:2624 +#, fuzzy +msgid "Mark this commit" +msgstr "Añadir esta revisión a la rama actual (cherry-pick)" + +#: gitk:2625 +msgid "Return to mark" +msgstr "" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diferencia de esta -> seleccionada" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diferencia de seleccionada -> esta" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Añadir esta revisión a la rama actual (cherry-pick)" + +#: gitk:2646 msgid "Check out this branch" msgstr "Cambiar a esta rama" -#: gitk:2235 +#: gitk:2647 msgid "Remove this branch" msgstr "Eliminar esta rama" -#: gitk:2242 +#: gitk:2654 msgid "Highlight this too" msgstr "Seleccionar también" -#: gitk:2243 +#: gitk:2655 msgid "Highlight this only" msgstr "Seleccionar sólo" -#: gitk:2245 +#: gitk:2656 +msgid "External diff" +msgstr "" + +#: gitk:2657 msgid "Blame parent commit" msgstr "" -#: gitk:2488 +#: gitk:2664 +msgid "Show origin of this line" +msgstr "" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "" + +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 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 visualizador de revisiones para git\n" "\n" -"Copyright © 2005-2008 Paul Mackerras\n" +"Copyright \\u00a9 2005-2010 Paul Mackerras\n" "\n" "Uso y redistribución permitidos según los términos de la Licencia Pública " "General de GNU (GNU GPL)" -#: gitk:2496 gitk:2557 gitk:7943 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Cerrar" -#: gitk:2515 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Combinaciones de tecla de Gitk" -#: gitk:2517 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Combinaciones de tecla de Gitk:" -#: gitk:2519 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSalir" -#: gitk:2520 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tBuscar" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tIr a la primera revisión" -#: gitk:2521 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tIr a la última revisión" -#: gitk:2522 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tSubir una revisión" -#: gitk:2523 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tBajar una revisión" -#: gitk:2524 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tRetroceder en la historia" -#: gitk:2525 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tAvanzar en la historia" -#: gitk:2526 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tSubir una página en la lista de revisiones" -#: gitk:2527 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tBajar una página en la lista de revisiones" -#: gitk:2528 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones" -#: gitk:2529 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones" -#: gitk:2530 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones" -#: gitk:2531 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones" -#: gitk:2532 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones" -#: gitk:2533 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones" -#: gitk:2534 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)" -#: gitk:2535 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)" -#: gitk:2536 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:2537 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:2538 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias" -#: gitk:2539 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias" -#: gitk:2540 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias" -#: gitk:2541 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tBuscar" -#: gitk:2542 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tBuscar el siguiente" -#: gitk:2543 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tBuscar el siguiente" -#: gitk:2544 -msgid "/\t\tMove to next find hit, or redo find" -msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "" -#: gitk:2545 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tBuscar el anterior" -#: gitk:2546 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:2547 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias" -#: gitk:2548 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias" -#: gitk:2549 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamaño del texto" -#: gitk:2550 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamaño del texto" -#: gitk:2551 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminuir tamaño del texto" -#: gitk:2552 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDisminuir tamaño del texto" -#: gitk:2553 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tActualizar" -#: gitk:3200 +#: gitk:3546 gitk:3555 +#, fuzzy, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Error en la creación del parche:" + +#: gitk:3568 +#, fuzzy, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Error al leer las diferencias de fusión:" + +#: gitk:3631 +#, fuzzy +msgid "command failed:" +msgstr "Línea de comandos" + +#: gitk:3780 +#, fuzzy +msgid "No such commit" +msgstr "No se han guardado cambios" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "" + +#: gitk:3833 +#, fuzzy, tcl-format +msgid "Error reading index: %s" +msgstr "Error al crear la etiqueta:" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Buscando" + +#: gitk:3893 +#, fuzzy, tcl-format +msgid "Error running git blame: %s" +msgstr "Error al crear la etiqueta:" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" + +#: gitk:3935 +#, fuzzy +msgid "External diff viewer failed:" +msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" + +#: gitk:4053 msgid "Gitk view definition" msgstr "Definición de vistas de Gitk" -#: gitk:3225 -msgid "Name" -msgstr "Nombre" - -#: gitk:3228 +#: gitk:4057 msgid "Remember this view" msgstr "Recordar esta vista" -#: gitk:3232 -msgid "Commits to include (arguments to git log):" +#: gitk:4058 +msgid "References (space separated list):" +msgstr "" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "" + +#: gitk:4060 +#, fuzzy +msgid "All refs" +msgstr "Todos los archivos" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "" + +#: gitk:4062 +msgid "All tags" +msgstr "" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "" + +#: gitk:4065 +#, fuzzy +msgid "Author:" +msgstr "Autor" + +#: gitk:4066 +#, fuzzy +msgid "Committer:" +msgstr "revisión" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "" + +#: gitk:4069 +msgid "Matches none Commit Info criteria" +msgstr "" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "" + +#: gitk:4071 +msgid "Fixed String" +msgstr "" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "" + +#: gitk:4073 +#, fuzzy +msgid "Search string:" +msgstr "Buscando" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" + +#: gitk:4075 +msgid "Since:" +msgstr "" + +#: gitk:4076 +msgid "Until:" +msgstr "" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" + +#: gitk:4078 +msgid "Number to show:" +msgstr "" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "" + +#: gitk:4083 +#, fuzzy +msgid "Limit to first parent" +msgstr "Limitar las diferencias a las rutas seleccionadas" + +#: gitk:4084 +msgid "Simple history" +msgstr "" + +#: gitk:4085 +#, fuzzy +msgid "Additional arguments to git log:" msgstr "Revisiones a incluir (argumentos a git log):" -#: gitk:3239 +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Introducir archivos y directorios a incluir, uno por línea:" + +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Comando que genera más revisiones a incluir:" -#: gitk:3246 -msgid "Enter files and directories to include, one per line:" -msgstr "Introducir archivos y directorios a incluir, uno por línea:" +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "" + +#: gitk:4224 +#, fuzzy +msgid "View Name" +msgstr "Vista" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "" -#: gitk:3293 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Error en los argumentos de selección de las revisiones:" -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Ninguno" -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 -msgid "Date" -msgstr "Fecha" - -#: gitk:3790 gitk:5580 -msgid "CDate" -msgstr "Fecha de creación" - -#: gitk:3939 gitk:3944 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Descendiente" -#: gitk:3940 +#: gitk:5004 msgid "Not descendant" msgstr "No descendiente" -#: gitk:3947 gitk:3952 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Antepasado" -#: gitk:3948 +#: gitk:5012 msgid "Not ancestor" msgstr "No antepasado" -#: gitk:4187 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Cambios locales añadidos al índice pero sin completar revisión" -#: gitk:4220 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Cambios locales sin añadir al índice" -#: gitk:5549 -msgid "Searching" -msgstr "Buscando" +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "" -#: gitk:6049 +#: gitk:7309 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:6066 gitk:6072 gitk:7280 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Padre" -#: gitk:6077 +#: gitk:7337 msgid "Child" msgstr "Hija" -#: gitk:6086 +#: gitk:7346 msgid "Branch" msgstr "Rama" -#: gitk:6089 +#: gitk:7349 msgid "Follows" msgstr "Sigue-a" -#: gitk:6092 +#: gitk:7352 msgid "Precedes" msgstr "Precede-a" -#: gitk:6378 -msgid "Error getting merge diffs:" +#: gitk:7947 +#, fuzzy, tcl-format +msgid "Error getting diffs: %s" msgstr "Error al leer las diferencias de fusión:" -#: gitk:7113 +#: gitk:8631 msgid "Goto:" msgstr "Ir a:" -#: gitk:7115 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7134 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La id SHA1 abreviada %s es ambigua" -#: gitk:7146 +#: gitk:8659 +#, fuzzy, tcl-format +msgid "Revision %s is not known" +msgstr "La id SHA1 %s es desconocida" + +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:7148 +#: gitk:8671 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "La etiqueta/rama %s es deconocida" +msgid "Revision %s is not in the current view" +msgstr "" -#: gitk:7290 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Fecha" + +#: gitk:8816 msgid "Children" msgstr "Hijas" -#: gitk:7347 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Poner la rama %s en esta revisión" -#: gitk:7349 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "" -#: gitk:7381 +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "" + +#: gitk:9001 gitk:9006 +#, fuzzy +msgid "Error getting patch ID for " +msgstr "Error en la creación del parche:" + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr "" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#, fuzzy +msgid "Commit " +msgstr "revisión" + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "" + +#: gitk:9066 +#, fuzzy, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Error al escribir revisión:" + +#: gitk:9072 +#, fuzzy, tcl-format +msgid "Error diffing commits: %s" +msgstr "Error al escribir revisión:" + +#: gitk:9118 msgid "Top" msgstr "Origen" -#: gitk:7382 +#: gitk:9119 msgid "From" msgstr "De" -#: gitk:7387 +#: gitk:9124 msgid "To" msgstr "A" -#: gitk:7410 +#: gitk:9148 msgid "Generate patch" msgstr "Generar parche" -#: gitk:7412 +#: gitk:9150 msgid "From:" msgstr "De:" -#: gitk:7421 +#: gitk:9159 msgid "To:" msgstr "Para:" -#: gitk:7430 +#: gitk:9168 msgid "Reverse" msgstr "Invertir" -#: gitk:7432 gitk:7607 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Escribir a archivo:" -#: gitk:7438 +#: gitk:9176 msgid "Generate" msgstr "Generar" -#: gitk:7474 +#: gitk:9214 msgid "Error creating patch:" msgstr "Error en la creación del parche:" -#: gitk:7496 gitk:7595 gitk:7649 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:7505 +#: gitk:9246 msgid "Tag name:" msgstr "Nombre de etiqueta:" -#: gitk:7509 gitk:7659 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Nombre de etiqueta:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Crear" -#: gitk:7524 +#: gitk:9273 msgid "No tag name specified" msgstr "No se ha especificado etiqueta" -#: gitk:7528 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:7534 +#: gitk:9287 msgid "Error creating tag:" msgstr "Error al crear la etiqueta:" -#: gitk:7604 +#: gitk:9363 msgid "Command:" msgstr "Comando:" -#: gitk:7612 +#: gitk:9371 msgid "Write" msgstr "Escribir" -#: gitk:7628 +#: gitk:9389 msgid "Error writing commit:" msgstr "Error al escribir revisión:" -#: gitk:7654 +#: gitk:9416 msgid "Name:" msgstr "Nombre:" -#: gitk:7674 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Especifique un nombre para la nueva rama" -#: gitk:7703 +#: gitk:9444 +#, fuzzy, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La etiqueta \"%s\" ya existe" + +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:7708 +#: gitk:9516 msgid "Cherry-picking" msgstr "Eligiendo revisiones (cherry-picking)" -#: gitk:7720 +#: 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 "" + +#: gitk:9531 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" + +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "No se han guardado cambios" -#: gitk:7745 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Reponiendo" + +#: 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 "" + +#: gitk:9591 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" + +#: gitk:9634 msgid "Confirm reset" msgstr "Confirmar git reset" -#: gitk:7747 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "¿Reponer la rama %s a %s?" -#: gitk:7751 +#: gitk:9638 msgid "Reset type:" msgstr "Tipo de reposición:" -#: gitk:7755 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Suave: No altera la copia de trabajo ni el índice" -#: gitk:7758 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo" -#: gitk:7761 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -719,19 +1103,19 @@ msgstr "" "Dura: Actualiza el índice y la copia de trabajo\n" "(abandona TODAS las modificaciones locales)" -#: gitk:7777 +#: gitk:9664 msgid "Resetting" msgstr "Reponiendo" -#: gitk:7834 +#: gitk:9724 msgid "Checking out" msgstr "Creando copia de trabajo" -#: gitk:7885 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "No se puede borrar la rama actual" -#: gitk:7891 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -740,16 +1124,16 @@ msgstr "" "Las revisiones de la rama %s no están presentes en otras ramas.\n" "¿Borrar la rama %s?" -#: gitk:7922 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetas y ramas: %s" -#: gitk:7936 +#: gitk:9829 msgid "Filter" msgstr "Filtro" -#: gitk:8230 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -757,155 +1141,255 @@ msgstr "" "Error al leer la topología de revisiones: la información sobre las ramas y " "etiquetas precedentes y siguientes será incompleta." -#: gitk:9216 +#: gitk:11102 msgid "Tag" msgstr "Etiqueta" -#: gitk:9216 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:9262 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Selector de tipografías gitk" -#: gitk:9279 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:9282 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:9375 -msgid "Gitk preferences" -msgstr "Preferencias de gitk" - -#: gitk:9376 +#: gitk:11327 msgid "Commit list display options" msgstr "Opciones de visualización de la lista de revisiones" -#: gitk:9379 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Ancho máximo del gráfico (en líneas)" -#: gitk:9383 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Ancho máximo del gráfico (en % del panel)" -#: gitk:9388 +#: gitk:11337 msgid "Show local changes" msgstr "Mostrar cambios locales" -#: gitk:9393 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Seleccionar automáticamente SHA1 hash" -#: gitk:9398 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "" + +#: gitk:11348 msgid "Diff display options" msgstr "Opciones de visualización de diferencias" -#: gitk:9400 +#: gitk:11350 msgid "Tab spacing" msgstr "Espaciado de tabulador" -#: gitk:9404 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Mostrar etiquetas cercanas" -#: gitk:9409 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:9414 +#: gitk:11362 msgid "Support per-file encodings" msgstr "" -#: gitk:9421 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "" -#: gitk:9423 +#: gitk:11369 msgid "Choose..." msgstr "" -#: gitk:9428 +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "Generar parche" + +#: 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 "Colores: pulse para seleccionar" -#: gitk:9431 +#: gitk:11395 +msgid "Interface" +msgstr "" + +#: gitk:11396 +#, fuzzy +msgid "interface" +msgstr "Tipografía para interfaz de usuario" + +#: gitk:11399 msgid "Background" msgstr "Fondo" -#: gitk:9435 +#: gitk:11400 gitk:11430 +#, fuzzy +msgid "background" +msgstr "Fondo" + +#: gitk:11403 msgid "Foreground" msgstr "Primer plano" -#: gitk:9439 +#: gitk:11404 +#, fuzzy +msgid "foreground" +msgstr "Primer plano" + +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: líneas viejas" -#: gitk:9444 +#: gitk:11408 +#, fuzzy +msgid "diff old lines" +msgstr "Diff: líneas viejas" + +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: líneas nuevas" -#: gitk:9449 +#: gitk:11413 +#, fuzzy +msgid "diff new lines" +msgstr "Diff: líneas nuevas" + +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:9455 +#: gitk:11419 +#, fuzzy +msgid "diff hunk header" +msgstr "Diff: cabecera de fragmento" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "" + +#: gitk:11425 +msgid "marked line background" +msgstr "" + +#: gitk:11429 msgid "Select bg" msgstr "Color de fondo de la selección" -#: gitk:9459 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Tipografías: pulse para elegir" -#: gitk:9461 +#: gitk:11440 msgid "Main font" msgstr "Tipografía principal" -#: gitk:9462 +#: gitk:11441 msgid "Diff display font" msgstr "Tipografía para diferencias" -#: gitk:9463 +#: gitk:11442 msgid "User interface font" msgstr "Tipografía para interfaz de usuario" -#: gitk:9488 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Preferencias de gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Generar" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: elegir color para %s" -#: gitk:9934 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Esta versión de Tcl/Tk es demasiado antigua.\n" -" Gitk requiere Tcl/Tk versión 8.4 o superior." - -#: gitk:10047 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "No hay un repositorio git aquí." -#: gitk:10051 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "No hay directorio git \"%s\"." - -#: gitk:10098 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo" -#: gitk:10110 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Argumentos incorrectos a Gitk:" -#: gitk:10170 +#: gitk:12405 msgid "Command line" msgstr "Línea de comandos" + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "<<" + +#~ msgid "prev" +#~ msgstr ">>" + +#~ msgid "/\t\tMove to next find hit, or redo find" +#~ msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" + +#~ msgid "Name" +#~ msgstr "Nombre" + +#~ msgid "CDate" +#~ msgstr "Fecha de creación" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "La etiqueta/rama %s es deconocida" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "Esta versión de Tcl/Tk es demasiado antigua.\n" +#~ " Gitk requiere Tcl/Tk versión 8.4 o superior." + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "No hay directorio git \"%s\"." diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po new file mode 100644 index 0000000000..747ee190f2 --- /dev/null +++ b/gitk-git/po/fr.po @@ -0,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 <etrillaud@gmail.com> +# +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: 2009-11-19 22:13+0100\n" +"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n" +"Language-Team: git@vger.kernel.org\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: French\n" +"X-Poedit-Country: FRANCE\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk: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:380 +msgid "Error executing --argscmd command:" +msgstr "Erreur à l'exécution de la commande --argscmd :" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont " +"fusionnés." + +# FIXME : améliorer la traduction de 'file limite' +#: gitk:396 +#, fuzzy +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné " +"n'est dans la limite des fichiers." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Erreur à l'exécution de git log :" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lecture en cours" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Lecture des commits..." + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Aucun commit sélectionné" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Impossible de lire la sortie de git log :" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Aucune information disponible sur le commit" + +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "OK" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Annuler" + +#: gitk:2069 +msgid "Update" +msgstr "Mise à jour" + +#: gitk:2070 +msgid "Reload" +msgstr "Recharger" + +#: gitk:2071 +msgid "Reread references" +msgstr "Relire les références" + +#: gitk:2072 +msgid "List references" +msgstr "Lister les références" + +#: gitk:2074 +msgid "Start git gui" +msgstr "Démarrer git gui" + +#: gitk:2076 +msgid "Quit" +msgstr "Quitter" + +#: gitk:2068 +msgid "File" +msgstr "Fichier" + +#: gitk:2080 +msgid "Preferences" +msgstr "Préférences" + +#: gitk:2079 +msgid "Edit" +msgstr "Éditer" + +#: gitk:2084 +msgid "New view..." +msgstr "Nouvelle vue..." + +#: gitk:2085 +msgid "Edit view..." +msgstr "Éditer la vue..." + +#: gitk:2086 +msgid "Delete view" +msgstr "Supprimer la vue" + +#: gitk:2088 +msgid "All files" +msgstr "Tous les fichiers" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Vue" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "À propos de gitk" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Raccourcis clavier" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Aide" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "Id SHA1 :" + +#: gitk:2229 +msgid "Row" +msgstr "Colonne" + +#: gitk:2267 +msgid "Find" +msgstr "Recherche" + +#: gitk:2295 +msgid "commit" +msgstr "commit" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "contient :" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "chemins modifiés :" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "ajoute/supprime la chaîne :" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Exact" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Ignorer la casse" + +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Expression régulière" + +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Tous les champs" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Surligner" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Commentaires" + +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 +msgid "Author" +msgstr "Auteur" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Auteur du commit" + +#: gitk:2350 +msgid "Search" +msgstr "Rechercher" + +#: gitk:2358 +msgid "Diff" +msgstr "Diff" + +#: gitk:2360 +msgid "Old version" +msgstr "Ancienne version" + +#: gitk:2362 +msgid "New version" +msgstr "Nouvelle version" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Lignes de contexte" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignorer les modifications d'espace" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 +msgid "Patch" +msgstr "Patch" + +#: gitk:2447 +msgid "Tree" +msgstr "Arbre" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Diff entre ceci et la sélection" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Diff entre sélection et ceci" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Créer patch" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Créer tag" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Écrire le commit dans un fichier" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Créer une nouvelle branche" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Cueillir (cherry-pick) ce commit" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Réinitialiser la branche HEAD vers cet état" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "Marquer ce commit" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Retourner à la marque" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Chercher le descendant de ceci et le marquer" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Comparer avec le commit marqué" + +#: 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:2647 +msgid "Remove this branch" +msgstr "Supprimer cette branche" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "Surligner également ceci" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "Surligner seulement ceci" + +#: gitk:2656 +msgid "External diff" +msgstr "Diff externe" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "Blâmer le commit parent" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Montrer l'origine de cette ligne" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Exécuter git gui blame sur cette ligne" + +#: gitk:3011 +#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - visualisateur de commit pour git\n" +"\n" +"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"\n" +"Utilisation et redistribution soumises aux termes de la GNU General Public " +"License" + +#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Fermer" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Raccourcis clavier de Gitk" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Raccourcis clavier de Gitk :" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tQuitter" + +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tRechercher" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Début>\t\tAller au premier commit" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<Fin>\t\tAller au dernier commit" + +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Haut>, p, i\t Aller au commit suivant" + +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Bas>, n, k\t Aller au commit précédent" + +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Gauche>, z, j\tReculer dans l'historique" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Droite>, x, l\tAvancer dans l'historique" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tMonter d'une page dans la liste des commits" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tDescendre d'une page dans la liste des commits" + +#: 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:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tAller en bas de la liste des commits" + +#: 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: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: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: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:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "" +"<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "" +"<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tMonter d'une page dans la vue des diff" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff" + +#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tMonter de 18 lignes dans la vue des diff" + +#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" + +#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tRechercher" + +#: 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:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\t\tAller au résultat de recherche suivant" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFocus sur la zone de recherche" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tAller au résultat de recherche précédent" + +#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tAller au prochain fichier dans la vue des diff" + +#: 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: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:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAugmenter la taille de la police" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tAugmenter la taille de la police" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDiminuer la taille de la police" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tDiminuer la taille de la police" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tMise à jour" + +#: 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: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:3780 +msgid "No such commit" +msgstr "Commit inexistant" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame : échec de la commande :" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossible de lire le head de la fusion : %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Erreur à la lecture de l'index : %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossible de démarrer git blame : %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Recherche en cours" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Erreur à l'exécution de git blame : %s" + +#: 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:3935 +msgid "External diff viewer failed:" +msgstr "Échec de l'outil externe de visualisation des diff" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Définition des vues de Gitk" + +#: gitk:4057 +msgid "Remember this view" +msgstr "Se souvenir de cette vue" + +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Références (liste d'éléments séparés par des espaces) :" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Branches & tags :" + +#: gitk:4060 +msgid "All refs" +msgstr "Toutes les références" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Toutes les branches (locales)" + +#: gitk:4062 +msgid "All tags" +msgstr "Tous les tags" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Toutes les branches de suivi à distance" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Info sur les commits (expressions régulières) :" + +#: gitk:4065 +msgid "Author:" +msgstr "Auteur :" + +#: gitk:4066 +msgid "Committer:" +msgstr "Commiteur :" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Message de commit :" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Correspond à tous les critères d'Info sur les commits" + +#: 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:4071 +msgid "Fixed String" +msgstr "Chaîne Figée" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Expression Régulière" + +#: gitk:4073 +msgid "Search string:" +msgstr "Recherche de la chaîne :" + +#: 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:4075 +msgid "Since:" +msgstr "De :" + +#: gitk:4076 +msgid "Until:" +msgstr "Jusqu'au :" + +#: 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:4078 +msgid "Number to show:" +msgstr "Nombre à afficher :" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Nombre à sauter :" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Options diverses :" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Trier par date" + +# FIXME : traduction de "branch sides" +#: gitk:4082 +#, fuzzy +msgid "Mark branch sides" +msgstr "Marquer les extrémités des branches" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Limiter au premier ancêtre" + +#: gitk:4084 +msgid "Simple history" +msgstr "Historique simple" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Arguments supplémentaires de git log :" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" + +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Commande pour générer plus de commits à inclure :" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk : éditer la vue" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- critère pour la sélection des révisions" + +#: gitk:4224 +#, fuzzy +msgid "View Name" +msgstr "Nom de la vue :" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Appliquer (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Erreur dans les arguments de sélection des commits :" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Aucun" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Descendant" + +#: gitk:5004 +msgid "Not descendant" +msgstr "Pas un descendant" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Ancêtre" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "Pas un ancêtre" + +#: 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:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Modifications locales non enregistrées dans l'index et non commitées" + +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "nombreux" + +#: gitk:7309 +msgid "Tags:" +msgstr "Tags :" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Parent" + +#: gitk:7337 +msgid "Child" +msgstr "Enfant" + +#: gitk:7346 +msgid "Branch" +msgstr "Branche" + +#: gitk:7349 +msgid "Follows" +msgstr "Suit" + +#: gitk:7352 +msgid "Precedes" +msgstr "Précède" + +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Erreur lors de la récupération des diff : %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Aller à :" + +#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Id SHA1 court %s est ambigu" + +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Id SHA1 %s est inconnu" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Id SHA1 %s est inconnu" + +#: 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:8813 gitk:8828 +msgid "Date" +msgstr "Date" + +#: gitk:8816 +msgid "Children" +msgstr "Enfants" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Réinitialiser la branche %s vers cet état" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Head détaché : impossible de réinitialiser" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Éviter le commit de la fusion " + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Erreur à l'obtention de l'ID du patch pour " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - arrêt en cours\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Commit " + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +"est le même patch que \n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" diffère de\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "a %s enfants - arrêt en cours\n" + +#: 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:9119 +msgid "From" +msgstr "De" + +#: gitk:9124 +msgid "To" +msgstr "À" + +#: gitk:9148 +msgid "Generate patch" +msgstr "Générer le patch" + +#: gitk:9150 +msgid "From:" +msgstr "De :" + +#: gitk:9159 +msgid "To:" +msgstr "À :" + +#: gitk:9168 +msgid "Reverse" +msgstr "Inverser" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Fichier de sortie :" + +#: gitk:9176 +msgid "Generate" +msgstr "Générer" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "Erreur à la création du patch :" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID :" + +#: gitk:9246 +msgid "Tag name:" +msgstr "Nom du Tag :" + +#: 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:9273 +msgid "No tag name specified" +msgstr "Aucun nom de tag spécifié" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Le tag \"%s\" existe déjà" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "Erreur à la création du tag :" + +#: gitk:9363 +msgid "Command:" +msgstr "Commande :" + +#: gitk:9371 +msgid "Write" +msgstr "Écrire" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "Erreur à l'ecriture du commit :" + +#: gitk:9416 +msgid "Name:" +msgstr "Nom :" + +#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Veuillez spécifier un nom pour la nouvelle branche" + +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La branche '%s' existe déjà. Écraser?" + +#: 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:9516 +msgid "Cherry-picking" +msgstr "Cueillir (Cherry-picking)" + +#: 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: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:9547 gitk:9605 +msgid "No changes committed" +msgstr "Aucun changement commité" + +#: 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:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Réinitialiser la branche %s à %s?" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Type de réinitialisation :" + +#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Douce : Laisse le répertoire de travail et l'index intacts" + +#: 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: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:9664 +msgid "Resetting" +msgstr "Réinitialisation" + +# Fixme: Récupération est-il vraiment une mauvaise traduction? +#: gitk:9724 +#, fuzzy +msgid "Checking out" +msgstr "Récupération" + +#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossible de supprimer la branche en cours" + +#: 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:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Tags et heads : %s" + +#: gitk:9829 +msgid "Filter" +msgstr "Filtrer" + +#: 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:11102 +msgid "Tag" +msgstr "Tag" + +#: gitk:11106 +msgid "Id" +msgstr "Id" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Sélecteur de police de Gitk" + +#: gitk:11206 +msgid "B" +msgstr "B" + +#: gitk:11209 +msgid "I" +msgstr "I" + +#: gitk:11327 +msgid "Commit list display options" +msgstr "Options d'affichage de la liste des commits" + +#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Longueur maximum du graphe (lignes)" + +# FIXME : Traduction standard de "pane"? +#: gitk:11334 +#, fuzzy, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Longueur maximum du graphe (% du panneau)" + +#: gitk:11337 +msgid "Show local changes" +msgstr "Montrer les changements locaux" + +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" +msgstr "Sélection auto. du SHA1" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Cacher les refs distantes" + +#: gitk:11348 +msgid "Diff display options" +msgstr "Options d'affichage des diff" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "Taille des tabulations" + +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" +msgstr "Afficher les tags les plus proches" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Limiter les différences aux chemins listés" + +#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Support pour un encodage des caractères par fichier" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Outil diff externe" + +#: gitk:11369 +msgid "Choose..." +msgstr "Choisir..." + +#: 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:11395 +msgid "Interface" +msgstr "" + +#: gitk:11396 +#, fuzzy +msgid "interface" +msgstr "Police de l'interface utilisateur" + +#: gitk:11399 +msgid "Background" +msgstr "Arrière-plan" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "arrière-plan" + +#: gitk:11403 +msgid "Foreground" +msgstr "Premier plan" + +#: gitk:11404 +msgid "foreground" +msgstr "premier plan" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff : anciennes lignes" + +#: gitk:11408 +msgid "diff old lines" +msgstr "diff anciennes lignes" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff : nouvelles lignes" + +#: gitk:11413 +msgid "diff new lines" +msgstr "diff nouvelles lignes" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff : entête du hunk" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "diff : entête du hunk" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "Arrière-plan de la ligne marquée" + +#: gitk:11425 +msgid "marked line background" +msgstr "Arrière-plan de la ligne marquée" + +#: gitk:11429 +msgid "Select bg" +msgstr "Sélectionner l'arrière-plan" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Polices : cliquer pour choisir" + +#: gitk:11440 +msgid "Main font" +msgstr "Police principale" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Police d'affichage des diff" + +#: gitk:11442 +msgid "User interface font" +msgstr "Police de l'interface utilisateur" + +#: 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:12242 +msgid "Cannot find a git repository here." +msgstr "Impossible de trouver un dépôt git ici." + +#: 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:12301 +msgid "Bad arguments to gitk:" +msgstr "Arguments invalides pour gitk :" + +#: 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 --git a/gitk-git/po/hu.po b/gitk-git/po/hu.po new file mode 100644 index 0000000000..5e3e9468c0 --- /dev/null +++ b/gitk-git/po/hu.po @@ -0,0 +1,1406 @@ +# Translation of gitk to Hungarian. +# Copyright (C) 2007 Paul Mackerras. +# This file is distributed under the same license as the gitk package. +# +# Laszlo Papp <laszlo.papp@arhungary.hu>, 2009. +# +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"PO-Revision-Date: 2009-12-14 14:04+0100\n" +"Last-Translator: Laszlo Papp <djszapi@archlinux.us>\n" +"Language-Team: Hungarian\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Nem sikerült letölteni az unmerged fájl listát:" + +#: 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 "Hiba történt értelmezés közben:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Hiba történt a végrehajtáskor --argscmd parancs:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a " +"fájlon belül limit." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Hiba történt a git log végrehajtása közben:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Olvasás" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Commitok olvasása ..." + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Nincsen commit kiválasztva" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Nem lehet értelmezni a git log kimenetét:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Nincsen elérhető commit információ" + +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "OK" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Visszavonás" + +#: gitk:2069 +msgid "Update" +msgstr "Frissités" + +#: gitk:2070 +msgid "Reload" +msgstr "Újratöltés" + +#: gitk:2071 +msgid "Reread references" +msgstr "Referenciák újraolvasása" + +#: gitk:2072 +msgid "List references" +msgstr "Referenciák listázása" + +#: gitk:2074 +msgid "Start git gui" +msgstr "Git gui indítása" + +#: gitk:2076 +msgid "Quit" +msgstr "Kilépés" + +#: gitk:2068 +msgid "File" +msgstr "Fájl" + +#: gitk:2080 +msgid "Preferences" +msgstr "Beállítások" + +#: gitk:2079 +msgid "Edit" +msgstr "Szerkesztés" + +#: gitk:2084 +msgid "New view..." +msgstr "Új nézet ..." + +#: gitk:2085 +msgid "Edit view..." +msgstr "Nézet szerkesztése ..." + +#: gitk:2086 +msgid "Delete view" +msgstr "Nézet törlése" + +#: gitk:2088 +msgid "All files" +msgstr "Minden fájl" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Nézet" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Gitk névjegy" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Billentyűkombináció" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Segítség" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "Sor" + +#: gitk:2267 +msgid "Find" +msgstr "Keresés" + +#: gitk:2295 +msgid "commit" +msgstr "commit" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "tartalmazás:" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "érintendő útvonalak:" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "string hozzáadása/törlése:" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Pontos" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Kis/nagy betű nem számít" + +#: 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 "Minden mező" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Főcím" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Megjegyzések" + +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 +msgid "Author" +msgstr "Szerző" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Commitoló" + +#: gitk:2350 +msgid "Search" +msgstr "Keresés" + +#: gitk:2358 +msgid "Diff" +msgstr "Diff" + +#: gitk:2360 +msgid "Old version" +msgstr "Régi verzió" + +#: gitk:2362 +msgid "New version" +msgstr "Új verzió" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Tartalmi sorok" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Space váltás mellőzése" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 +msgid "Patch" +msgstr "Patch" + +#: gitk:2447 +msgid "Tree" +msgstr "Tree" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Diff ezeket -> kiválasztott" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Diff kiválasztottakat -> ezt" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Patch készítése" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Tag készítése" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Commit fáljba írása" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Új branch készítése" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Cherry-pick erre a commitra" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "HEAD branch újraindítása ide" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "Ezen commit megjelölése" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Visszatérés a megjelöléshez" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Találd meg ezen utódokat és jelöld meg" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Összehasonlítás a megjelölt commit-tal" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diff ezeket -> kiválasztott" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diff kiválasztottakat -> ezt" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Ezen commit megjelölése" + +#: gitk:2646 +msgid "Check out this branch" +msgstr "Check out ezt a branchot" + +#: gitk:2647 +msgid "Remove this branch" +msgstr "Töröld ezt a branch-ot" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "Emeld ki ezt is" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "Csak ezt emeld ki" + +#: gitk:2656 +msgid "External diff" +msgstr "Külső diff" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "Blame szülő kommitra" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Mutasd meg ennek a sornak az eredetét" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Futtasd a git gui blame-t ezen a soron" + +#: gitk:3011 +#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - commit nézegető a githez\n" +"\n" +"Szerzői jog \\u00a9 2005-2010 Paul Mackerras\n" +"\n" +"Használd és terjeszd a GNU General Public License feltételei mellett" + +#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Bezárás" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Gitk-billentyű hozzárendelés" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Gitk-billentyű hozzaárendelés:" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tKilépés" + +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tKeresés" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Pos1>\t\tElső commithoz" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<Ende>\t\tUtolsó commithoz" + +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Hoch>, p, i\tEgy committal feljebb" + +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Runter>, n, k\tEgy committal lejjebb" + +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Links>, z, j\tVissza a history listába" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Rechts>, x, l\tElőre a history listába" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<BildHoch>\tEgy lappal feljebb a commit listába" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába" + +#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" + +#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Ende>\tGörgetés a commit lista aljához" + +#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" + +#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" + +#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" + +#: gitk:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben" + +#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" + +#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" + +#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tKeresés" + +#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tKövetkező találathoz" + +#: gitk:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Eingabetaste>\tKövetkező találathoz" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tLépj a keresési mezőre" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tElőző találathoz" + +#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tKövetkező fájlra görgetés diff nézetben" + +#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben" + +#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben" + +#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-Plus>\tBetűméret növelése" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-Minus>\tBetűméret csökkentése" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tFrissítés" + +#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" + +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Hiba történt \"%s\" letöltése közben %s-ről:" + +#: gitk:3631 +msgid "command failed:" +msgstr "parancs hiba:" + +#: gitk:3780 +msgid "No such commit" +msgstr "Nincs ilyen commit" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: parancs hiba:" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Nem sikerült a Merge head olvasása: %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Hiba történt az index olvasása közben: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Nem sikerült a git blame indítása: %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Keresés" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Hiba történt a git blame futtatása közben: %s" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" +"A %s commitból származik az a sor, amelyik nem található ebben a nézetben" + +#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Külső diff nézegető hiba:" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Gitk nézet meghatározása" + +#: gitk:4057 +msgid "Remember this view" +msgstr "Maradj ennél a nézetnél" + +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Referenciák (szóközzel tagolt lista" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Branch-ek & tagek:" + +#: gitk:4060 +msgid "All refs" +msgstr "Minden ref" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Minden (helyi) branch" + +#: gitk:4062 +msgid "All tags" +msgstr "Minden tag" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Minden távoli követő branch" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Commit Infó (reguláris kifejezés):" + +#: gitk:4065 +msgid "Author:" +msgstr "Szerző:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Commitoló:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Commit üzenet:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Egyezik minen Commit Infó feltétellel" + +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Egyezik minen Commit Infó feltétellel" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "Fájl változások:" + +#: gitk:4071 +msgid "Fixed String" +msgstr "Fix String" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Reguláris kifejezés" + +#: gitk:4073 +msgid "Search string:" +msgstr "Keresés szöveg:" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:4075 +msgid "Since:" +msgstr "Ettől:" + +#: gitk:4076 +msgid "Until:" +msgstr "Eddig:" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):" + +#: gitk:4078 +msgid "Number to show:" +msgstr "Mutatandó szám:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Kihagyandó szám:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Különféle opciók:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Szigorú rendezás dátum alapján" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Jelölje meg az ágakat" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Korlátozás az első szülőre" + +#: gitk:4084 +msgid "Simple history" +msgstr "Egyszerű history" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "További argumentok a git log-hoz:" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" + +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Parancs több tartalmazó commit generálására:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: szerkesztés nézet" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- kritériumok a revíziók kiválasztásához" + +#: gitk:4224 +msgid "View Name" +msgstr "Nézet neve" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Alkalmaz (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Hiba történt a commit argumentumok kiválasztása közben:" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Keine" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Leszármazott" + +#: gitk:5004 +msgid "Not descendant" +msgstr "Nem leszármazott" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Előd" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "Nem előd" + +#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "" +"Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " +"commitolva" + +#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" + +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "sok" + +#: gitk:7309 +msgid "Tags:" +msgstr "Tagek:" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Eltern" + +#: gitk:7337 +msgid "Child" +msgstr "Gyerek" + +#: gitk:7346 +msgid "Branch" +msgstr "Ág" + +#: gitk:7349 +msgid "Follows" +msgstr "Következők" + +#: gitk:7352 +msgid "Precedes" +msgstr "Megelőzők" + +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Hiba történt a diff-ek letöltése közben: %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Menj:" + +#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Rövid SHA1 id %s félreérthető" + +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "A(z) %s revízió nem ismert" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA1 id %s nem ismert" + +#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "A(z) %s revízió nincs a jelenlegi nézetben" + +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Dátum" + +#: gitk:8816 +msgid "Children" +msgstr "Gyerekek" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Állítsd vissza a %s branch-ot ide" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Elkülönített head: nem lehet visszaállítani" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Merge commit kihagyása " + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Hiba történt a patch ID megszerzése közben a következőnél " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - abbahagyás\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Commit " + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" Ugyanaz a patch mint\n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" különbözik innentől\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"A commitok diffje:\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " %s gyereke van. abbahagyás\n" + +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Hiba történt a commit fájlba írása közben: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Hiba történt a commitok diffelése közben: %s" + +#: gitk:9118 +msgid "Top" +msgstr "Teteje" + +#: gitk:9119 +msgid "From" +msgstr "Innen" + +#: gitk:9124 +msgid "To" +msgstr "Ide" + +#: gitk:9148 +msgid "Generate patch" +msgstr "Patch generálása" + +#: gitk:9150 +msgid "From:" +msgstr "Innen:" + +#: gitk:9159 +msgid "To:" +msgstr "Ide:" + +#: gitk:9168 +msgid "Reverse" +msgstr "Visszafele" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Kimeneti fájl:" + +#: gitk:9176 +msgid "Generate" +msgstr "Generálás" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "Hiba törtét a patch készítése közben:" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + +#: gitk:9246 +msgid "Tag name:" +msgstr "Tag név:" + +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Tag név:" + +#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Létrehozás" + +#: gitk:9273 +msgid "No tag name specified" +msgstr "A tag neve nincsen megadva" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "%s Tag már létezik" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "Hiba történt a tag létrehozása közben:" + +#: gitk:9363 +msgid "Command:" +msgstr "Parancs:" + +#: gitk:9371 +msgid "Write" +msgstr "Írás" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "Hiba történt a commit írása közben:" + +#: gitk:9416 +msgid "Name:" +msgstr "Név:" + +#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Kérem adja meg a nevét az új branchhoz" + +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "%s branch már létezik. Felülírja?" + +#: gitk:9511 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" +"eintragen?" + +#: gitk:9516 +msgid "Cherry-picking" +msgstr "Cherry-picking" + +#: 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 hiba történt lokális váltotások miatt a '%s' fájlban.\n" +"Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " +"újra." + +#: gitk:9531 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick hiba történt merge konfliktus miatt.\n" +"Kívánja futtatni a git citool-t a probléma megoldásához?" + +#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Nincsen változás commitolva" + +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" +"eintragen?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Újraindítás" + +#: 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 "" +"Cherry-pick hiba történt lokális váltotások miatt a '%s' fájlban.\n" +"Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " +"újra." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick hiba történt merge konfliktus miatt.\n" +"Kívánja futtatni a git citool-t a probléma megoldásához?" + +#: gitk:9634 +msgid "Confirm reset" +msgstr "Újraindítás megerősítése" + +#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Újraindítja a %s branchot %s-ig?" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Újraindítás típusa:" + +#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" + +#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" + +#: gitk:9647 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hard: Indítsd újra a working tree-t és az indexet\n" +"(MINDEN lokális változás eldobása)" + +#: gitk:9664 +msgid "Resetting" +msgstr "Újraindítás" + +#: gitk:9724 +msgid "Checking out" +msgstr "Kivesz" + +#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Nem lehet a jelenleg kivett branch-ot törölni" + +#: gitk:9783 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"A %s branchon található commit nem található meg semelyik másik branchon.\n" +"Tényleg törli a %s branchot?" + +#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Tagek és headek: %s" + +#: gitk:9829 +msgid "Filter" +msgstr "Szűrő" + +#: gitk:10125 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Hiba történt a commit topológiai információ olvasása közben; branch ésa " +"megelőző/következő információ nem lesz teljes." + +#: gitk:11102 +msgid "Tag" +msgstr "Tag" + +#: gitk:11106 +msgid "Id" +msgstr "Id" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Gitk-betű kiválasztó" + +#: gitk:11206 +msgid "B" +msgstr "F" + +#: gitk:11209 +msgid "I" +msgstr "K" + +#: gitk:11327 +msgid "Commit list display options" +msgstr "Commit lista kijelzési opciók" + +#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Maximális grafikon szélesség (sorok)" + +#: gitk:11334 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximális grafikon szélesség (táble %-je)" + +#: gitk:11337 +msgid "Show local changes" +msgstr "Mutasd a lokális változtatásokat" + +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" +msgstr "SHA1 Automatikus kiválasztása" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "A távoli refek elrejtése" + +#: gitk:11348 +msgid "Diff display options" +msgstr "Diff kijelző opciók" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "Tab sorköz" + +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" +msgstr "Szomszédos tagek kijelzése" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Korlátozott diffek a kilistázott útvonalakhoz" + +#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Fájlonkénti kódolás támgatása" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Külső diff alkalmazás" + +#: gitk:11369 +msgid "Choose..." +msgstr "Válaszd ..." + +#: gitk:11374 +msgid "General options" +msgstr "Általános opciók" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Témázott vezérlők használata" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(a változás újraindítást igényel)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(jelenleg nem elérhető)" + +#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Színek: nyomja meg a kiválasztáshoz" + +#: gitk:11395 +msgid "Interface" +msgstr "Interfész" + +#: gitk:11396 +msgid "interface" +msgstr "interfész" + +#: gitk:11399 +msgid "Background" +msgstr "Háttér" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "háttér" + +#: gitk:11403 +msgid "Foreground" +msgstr "Előtér" + +#: gitk:11404 +msgid "foreground" +msgstr "előtér" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff: régi sorok" + +#: gitk:11408 +msgid "diff old lines" +msgstr "diff régi sorok" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff: új sorok" + +#: gitk:11413 +msgid "diff new lines" +msgstr "diff - új sorok" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff: nagy headerök" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "diff - nagy headerök" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "Megjelölt sor háttér" + +#: gitk:11425 +msgid "marked line background" +msgstr "megjelölt sor háttér" + +#: gitk:11429 +msgid "Select bg" +msgstr "Válasszon hátteret" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Betű: nyomja meg a kiválasztáshoz" + +#: gitk:11440 +msgid "Main font" +msgstr "Fő betű" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Diff kijelző betű" + +#: gitk:11442 +msgid "User interface font" +msgstr "Felhasználói interfész betű" + +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Gitk beállítások" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Generálás" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: válasszon színt a %s-ra" + +#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Nem találhatü git repository itt." + +#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Félreérthető argumentum '%s': revízió és fájlnév is" + +#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Rossz gitk argumentumok:" + +#: gitk:12405 +msgid "Command line" +msgstr "Parancs sor" + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "következő" + +#~ msgid "prev" +#~ msgstr "előző" + +#~ msgid "CDate" +#~ msgstr "Dátum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Nem található a \"%s\" könyvtár." + +#~ msgid "Use all refs" +#~ msgstr "Használd az összes referenciát" + +#~ msgid "Max count:" +#~ msgstr "Max. szám:" + +#~ msgid "Skip:" +#~ msgstr "Kihagy:" + +#~ msgid "Name" +#~ msgstr "Név" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "Tag/Head %s nem ismert" + +#~ msgid "- stopping\n" +#~ msgstr "- abbahagyás.\n" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" +#~ "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." diff --git a/gitk-git/po/it.po b/gitk-git/po/it.po index e89c95702c..d630bb086d 100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@ -8,25 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" -"PO-Revision-Date: 2008-03-13 17:34+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 <barra_cuda@katamail.com>\n" "Language-Team: Italian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" -#: gitk:340 +#: 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:380 +msgid "Error executing --argscmd command:" +msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" + +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " "sono file in attesa di fusione." -#: gitk:343 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -34,688 +51,1058 @@ msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma i file " "specificati non sono in attesa di fusione." -#: gitk:365 gitk:503 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Errore nell'esecuzione di git log:" -#: gitk:378 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lettura in corso" -#: gitk:438 gitk:3462 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:441 gitk:1528 gitk:3465 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Nessuna revisione selezionata" -#: gitk:1399 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossibile elaborare i dati di git log:" -#: gitk:1605 +#: gitk:1740 msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "OK" -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 -#: gitk:9294 gitk:9467 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Annulla" -#: gitk:1811 +#: gitk:2069 msgid "Update" msgstr "Aggiorna" -#: gitk:1813 +#: gitk:2070 +msgid "Reload" +msgstr "Ricarica" + +#: gitk:2071 msgid "Reread references" msgstr "Rileggi riferimenti" -#: gitk:1814 +#: gitk:2072 msgid "List references" msgstr "Elenca riferimenti" -#: gitk:1815 +#: gitk:2074 +msgid "Start git gui" +msgstr "Avvia git gui" + +#: gitk:2076 msgid "Quit" msgstr "Esci" -#: gitk:1810 +#: gitk:2068 msgid "File" msgstr "File" -#: gitk:1818 +#: gitk:2080 msgid "Preferences" msgstr "Preferenze" -#: gitk:1817 +#: gitk:2079 msgid "Edit" msgstr "Modifica" -#: gitk:1821 +#: gitk:2084 msgid "New view..." msgstr "Nuova vista..." -#: gitk:1822 +#: gitk:2085 msgid "Edit view..." msgstr "Modifica vista..." -#: gitk:1823 +#: gitk:2086 msgid "Delete view" msgstr "Elimina vista" -#: gitk:1825 +#: gitk:2088 msgid "All files" msgstr "Tutti i file" -#: gitk:1820 gitk:3196 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Vista" -#: gitk:1828 gitk:2487 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Informazioni su gitk" -#: gitk:1829 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Scorciatoie da tastiera" -#: gitk:1827 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Aiuto" -#: gitk:1887 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:1918 +#: gitk:2229 msgid "Row" -msgstr "" +msgstr "Riga" -#: gitk:1949 +#: gitk:2267 msgid "Find" msgstr "Trova" -#: gitk:1950 -msgid "next" -msgstr "succ" - -#: gitk:1951 -msgid "prev" -msgstr "prec" - -#: gitk:1952 +#: gitk:2295 msgid "commit" msgstr "revisione" -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "contenente:" -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:1959 gitk:3697 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:1968 gitk:1970 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Esatto" -#: gitk:1970 gitk:3773 gitk:5518 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "" -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "" -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Tutti i campi" -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Titolo" -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Commenti" -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 -#: gitk:7300 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Autore" -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Revisione creata da" -#: gitk:2003 +#: gitk:2350 msgid "Search" msgstr "Cerca" -#: gitk:2010 +#: gitk:2358 msgid "Diff" msgstr "" -#: gitk:2012 +#: gitk:2360 msgid "Old version" msgstr "Vecchia versione" -#: gitk:2014 +#: gitk:2362 msgid "New version" msgstr "Nuova versione" -#: gitk:2016 +#: gitk:2364 msgid "Lines of context" msgstr "Linee di contesto" -#: gitk:2026 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:2084 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Modifiche" -#: gitk:2086 +#: gitk:2447 msgid "Tree" msgstr "Directory" -#: gitk:2213 gitk:2226 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:2214 gitk:2227 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:2215 gitk:2228 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Crea patch" -#: gitk:2216 gitk:7494 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:2217 gitk:7593 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:2218 gitk:7647 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:2219 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:2220 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:2234 +#: gitk:2624 +msgid "Mark this commit" +msgstr "Segna questa revisione" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Torna alla revisione segnata" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Trova il discendente di questa revisione e di quella segnata" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Confronta con la revisione segnata" + +#: 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:2235 +#: gitk:2647 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:2242 +#: gitk:2654 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:2243 +#: gitk:2655 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:2245 +#: gitk:2656 +msgid "External diff" +msgstr "Visualizza differenze in un altro programma" + +#: gitk:2657 msgid "Blame parent commit" -msgstr "" +msgstr "Annota la revisione precedente" -#: gitk:2488 +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Mostra la provenienza di questa riga" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Esegui git gui blame su questa riga" + +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 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 © 2005-2008 Paul Mackerras\n" +"Copyright \\u00a9 2005-2010 Paul Mackerras\n" "\n" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:2496 gitk:2557 gitk:7943 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Chiudi" -#: gitk:2515 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:2517 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:2519 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:2520 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tTrova" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tVai alla prima revisione" -#: gitk:2521 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tVai all'ultima revisione" -#: gitk:2522 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\tVai più in alto di una revisione" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Su>, p, i\tVai più in alto di una revisione" -#: gitk:2523 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\tVai più in basso di una revisione" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Giù>, n, k\tVai più in basso di una revisione" -#: gitk:2524 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\tTorna indietro nella cronologia" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia" -#: gitk:2525 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\tVai avanti nella cronologia" +msgstr "<Destra>, x, l\tVai avanti nella cronologia" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" -#: gitk:2526 +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tVai più in alto di una pagina nella lista delle revisioni" +msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:2527 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tVai più in basso di una pagina nella lista delle revisioni" +msgstr "" +"<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:2528 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:2529 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:2530 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tScorri la lista delle revisioni in alto di una riga" +msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" -#: gitk:2531 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tScorri la lista delle revisioni in basso di una riga" +msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" -#: gitk:2532 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tScorri la lista delle revisioni in alto di una pagina" +msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" -#: gitk:2533 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tScorri la lista delle revisioni in basso di una pagina" +msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" -#: gitk:2534 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "<Shift-Up>\tTrova all'indietro (verso l'alto, revisioni successive)" +msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:2535 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tTrova in avanti (verso il basso, revisioni precedenti)" +msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:2536 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2537 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2538 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\tScorri la vista delle differenze in basso di una pagina" +msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:2539 +#: 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:2540 +#: 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:2541 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:2542 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:2543 +#: gitk:3071 msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tTrova in avanti" +msgstr "<Invio>\tTrova in avanti" -#: gitk:2544 -msgid "/\t\tMove to next find hit, or redo find" -msgstr "/\t\tTrova in avanti, o cerca di nuovo" +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tCursore nel box di ricerca" -#: gitk:2545 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:2546 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:2547 +#: 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:2548 +#: 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:2549 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" -msgstr "<%s-KP+>\tAumenta grandezza carattere" +msgstr "<%s-KP+>\tAumenta dimensione carattere" -#: gitk:2550 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" -msgstr "<%s-plus>\tAumenta grandezza carattere" +msgstr "<%s-più>\tAumenta dimensione carattere" -#: gitk:2551 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" -msgstr "<%s-KP->\tDiminuisci grandezza carattere" +msgstr "<%s-KP->\tDiminuisci dimensione carattere" -#: gitk:2552 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" -msgstr "<%s-minus>\tDiminuisci grandezza carattere" +msgstr "<%s-meno>\tDiminuisci dimensione carattere" -#: gitk:2553 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAggiorna" -#: gitk:3200 +#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Errore durante la creazione della directory temporanea %s:" + +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Errore nella lettura di \"%s\" da %s:" + +#: gitk:3631 +msgid "command failed:" +msgstr "impossibile eseguire il comando:" + +#: gitk:3780 +msgid "No such commit" +msgstr "Revisione inesistente" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: impossibile eseguire il comando:" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossibile leggere merge head: %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Errore nella lettura dell'indice: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossibile eseguire git blame: %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Ricerca in corso" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Errore nell'esecuzione di git blame: %s" + +#: 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:3935 +msgid "External diff viewer failed:" +msgstr "Impossibile eseguire il visualizzatore di differenze:" + +#: gitk:4053 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:3225 -msgid "Name" -msgstr "Nome" - -#: gitk:3228 +#: gitk:4057 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:3232 -msgid "Commits to include (arguments to git log):" -msgstr "Revisioni da includere (argomenti di git log):" +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Riferimenti (lista di elementi separati da spazi)" -#: gitk:3239 -msgid "Command to generate more commits to include:" -msgstr "Comando che genera altre revisioni da visualizzare:" +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Rami ed etichette" + +#: gitk:4060 +msgid "All refs" +msgstr "Tutti i riferimenti" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Tutti i rami (locali)" + +#: gitk:4062 +msgid "All tags" +msgstr "Tutte le etichette" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Tutti i rami remoti" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Informazioni sulla revisione (espressioni regolari):" + +#: gitk:4065 +msgid "Author:" +msgstr "Autore:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Revisione creata da:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Messaggio di revisione:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" + +#: 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:4071 +msgid "Fixed String" +msgstr "Stringa fissa" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Espressione regolare" + +#: gitk:4073 +msgid "Search string:" +msgstr "Cerca stringa:" -#: gitk:3246 +#: 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:4075 +msgid "Since:" +msgstr "Da:" + +#: gitk:4076 +msgid "Until:" +msgstr "A:" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limita e/o salta N revisioni (intero positivo):" + +#: gitk:4078 +msgid "Number to show:" +msgstr "Numero di revisioni da mostrare:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Numero di revisioni da saltare:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Altre opzioni:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Ordina solo per data" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Segna i lati del ramo" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Limita al primo genitore" + +#: gitk:4084 +msgid "Simple history" +msgstr "Cronologia semplificata" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Ulteriori argomenti da passare a git log:" + +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:3293 +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Comando che genera altre revisioni da visualizzare:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: modifica vista" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- criteri per la scelta delle revisioni" + +#: gitk:4224 +msgid "View Name" +msgstr "Nome vista" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Applica (F5)" + +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Nessuno" -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 -msgid "Date" -msgstr "Data" - -#: gitk:3790 gitk:5580 -msgid "CDate" -msgstr "" - -#: gitk:3939 gitk:3944 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Discendente" -#: gitk:3940 +#: gitk:5004 msgid "Not descendant" msgstr "Non discendente" -#: gitk:3947 gitk:3952 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Ascendente" -#: gitk:3948 +#: gitk:5012 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:4187 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:4220 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:5549 -msgid "Searching" -msgstr "Ricerca in corso" +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "molti" -#: gitk:6049 +#: gitk:7309 msgid "Tags:" msgstr "Etichette:" -#: gitk:6066 gitk:6072 gitk:7280 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Genitore" -#: gitk:6077 +#: gitk:7337 msgid "Child" msgstr "Figlio" -#: gitk:6086 +#: gitk:7346 msgid "Branch" msgstr "Ramo" -#: gitk:6089 +#: gitk:7349 msgid "Follows" msgstr "Segue" -#: gitk:6092 +#: gitk:7352 msgid "Precedes" msgstr "Precede" -#: gitk:6378 -msgid "Error getting merge diffs:" -msgstr "Errore nella lettura delle differenze di fusione:" +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Errore nella lettura delle differenze:" -#: gitk:7113 +#: gitk:8631 msgid "Goto:" msgstr "Vai a:" -#: gitk:7115 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7134 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:7146 +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La revisione %s è sconosciuta" + +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:7148 +#: gitk:8671 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "L'etichetta/ramo %s è sconosciuto" +msgid "Revision %s is not in the current view" +msgstr "La revisione %s non è presente nella vista attuale" + +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Data" -#: gitk:7290 +#: gitk:8816 msgid "Children" msgstr "Figli" -#: gitk:7347 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:7349 +#: gitk:8881 msgid "Detached head: can't reset" +msgstr "Nessun ramo attivo: reset impossibile" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Salto la revisione di fusione " + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Errore nella identificazione della patch per " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - fine\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "La revisione " + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " msgstr "" +" ha le stesse differenze di\n" +" " -#: gitk:7381 +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" è diversa da\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Differenze tra le revisioni:\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " ha %s figli - fine\n" + +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Errore nella scrittura della revisione nel file: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Errore nelle differenze tra le revisioni: %s" + +#: gitk:9118 msgid "Top" msgstr "Inizio" -#: gitk:7382 +#: gitk:9119 msgid "From" msgstr "Da" -#: gitk:7387 +#: gitk:9124 msgid "To" msgstr "A" -#: gitk:7410 +#: gitk:9148 msgid "Generate patch" msgstr "Genera patch" -#: gitk:7412 +#: gitk:9150 msgid "From:" msgstr "Da:" -#: gitk:7421 +#: gitk:9159 msgid "To:" msgstr "A:" -#: gitk:7430 +#: gitk:9168 msgid "Reverse" msgstr "Inverti" -#: gitk:7432 gitk:7607 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:7438 +#: gitk:9176 msgid "Generate" msgstr "Genera" -#: gitk:7474 +#: gitk:9214 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:7496 gitk:7595 gitk:7649 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:7505 +#: gitk:9246 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:7509 gitk:7659 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "Il messaggio dell'etichetta è opzionale" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Messaggio dell'etichetta:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Crea" -#: gitk:7524 +#: gitk:9273 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:7528 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già" -#: gitk:7534 +#: gitk:9287 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:7604 +#: gitk:9363 msgid "Command:" msgstr "Comando:" -#: gitk:7612 +#: gitk:9371 msgid "Write" msgstr "Scrivi" -#: gitk:7628 +#: gitk:9389 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:7654 +#: gitk:9416 msgid "Name:" msgstr "Nome:" -#: gitk:7674 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:7703 +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Il ramo '%s' esiste già. Sovrascrivere?" + +#: 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:7708 +#: gitk:9516 msgid "Cherry-picking" msgstr "" -#: gitk:7720 +#: 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: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:9547 gitk:9605 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:7745 +#: 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:7747 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:7751 +#: gitk:9638 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:7755 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:7758 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:7761 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -723,19 +1110,19 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:7777 +#: gitk:9664 msgid "Resetting" msgstr "git reset in corso" -#: gitk:7834 +#: gitk:9724 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:7885 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:7891 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -744,16 +1131,16 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:7922 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:7936 +#: gitk:9829 msgid "Filter" msgstr "Filtro" -#: gitk:8230 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -761,154 +1148,225 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:9216 +#: gitk:11102 msgid "Tag" msgstr "Etichetta" -#: gitk:9216 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:9262 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:9279 +#: gitk:11206 msgid "B" msgstr "B" -#: gitk:9282 +#: gitk:11209 msgid "I" msgstr "I" -#: gitk:9375 -msgid "Gitk preferences" -msgstr "Preferenze gitk" - -#: gitk:9376 +#: gitk:11327 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:9379 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:9383 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:9388 +#: gitk:11337 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:9393 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:9398 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Nascondi i riferimenti remoti" + +#: gitk:11348 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:9400 +#: gitk:11350 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:9404 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Mostra etichette vicine" -#: gitk:9409 +#: 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:9414 +#: gitk:11362 msgid "Support per-file encodings" -msgstr "" +msgstr "Attiva codifica file per file" -#: gitk:9421 +#: gitk:11368 gitk:11515 msgid "External diff tool" -msgstr "" +msgstr "Visualizzatore di differenze" -#: gitk:9423 +#: gitk:11369 msgid "Choose..." -msgstr "" +msgstr "Scegli..." + +#: gitk:11374 +msgid "General options" +msgstr "Opzioni generali" -#: gitk:9428 +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Utilizza interfaccia a tema" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(una modifica richiede il riavvio)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(momentaneamente non disponibile)" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "Colori: premere per scegliere" -#: gitk:9431 +#: gitk:11395 +msgid "Interface" +msgstr "Interfaccia" + +#: gitk:11396 +msgid "interface" +msgstr "interfaccia" + +#: gitk:11399 msgid "Background" msgstr "Sfondo" -#: gitk:9435 +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "sfondo" + +#: gitk:11403 msgid "Foreground" msgstr "Primo piano" -#: gitk:9439 +#: gitk:11404 +msgid "foreground" +msgstr "primo piano" + +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:9444 +#: gitk:11408 +msgid "diff old lines" +msgstr "vecchie linee" + +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:9449 +#: gitk:11413 +msgid "diff new lines" +msgstr "nuove linee" + +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:9455 +#: gitk:11419 +msgid "diff hunk header" +msgstr "intestazione della sezione" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "Sfondo riga selezionata" + +#: gitk:11425 +msgid "marked line background" +msgstr "sfondo riga selezionata" + +#: gitk:11429 msgid "Select bg" -msgstr "Sfondo selezione" +msgstr "Sfondo" -#: gitk:9459 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:9461 +#: gitk:11440 msgid "Main font" msgstr "Carattere principale" -#: gitk:9462 +#: gitk:11441 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:9463 +#: gitk:11442 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:9488 +#: 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:9934 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Questa versione di Tcl/Tk non può avviare gitk.\n" -" Gitk richiede Tcl/Tk versione 8.4 o superiore." - -#: gitk:10047 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Archivio git non trovato." -#: gitk:10051 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Directory git \"%s\" non trovata." - -#: gitk:10098 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:10110 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" -#: gitk:10170 +#: 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 --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po new file mode 100644 index 0000000000..db47a4c2b6 --- /dev/null +++ b/gitk-git/po/ja.po @@ -0,0 +1,1380 @@ +# Japanese translations for gitk package. +# Copyright (C) 2005-2009 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# +# Mizar <mizar.jp@gmail.com>, 2009. +# Junio C Hamano <gitster@pobox.com>, 2009. +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: 2009-11-06 01:45+0900\n" +"Last-Translator: Mizar <mizar.jp@gmail.com>\n" +"Language-Team: Japanese\n" +"Language: \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 "マージされていないファイルのリストを取得できません:" + +#: 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 "リビジョン解析エラー:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "--argscmd コマンド実行エラー:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"ファイル未選択: --merge が指定されましたが、マージされていないファイルはあり" +"ません。" + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"ファイル未選択: --merge が指定されましたが、ファイル制限内にマージされていな" +"いファイルはありません。" + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "git log 実行エラー:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "読み込み中" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "コミット読み込み中..." + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "コミットが選択されていません" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "git log の出力を解析できません:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "有効なコミットの情報がありません" + +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "OK" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "キャンセル" + +#: gitk:2069 +msgid "Update" +msgstr "更新" + +#: gitk:2070 +msgid "Reload" +msgstr "リロード" + +#: gitk:2071 +msgid "Reread references" +msgstr "リファレンスを再読み込み" + +#: gitk:2072 +msgid "List references" +msgstr "リファレンスリストを表示" + +#: gitk:2074 +msgid "Start git gui" +msgstr "git gui の開始" + +#: gitk:2076 +msgid "Quit" +msgstr "終了" + +#: gitk:2068 +msgid "File" +msgstr "ファイル" + +#: gitk:2080 +msgid "Preferences" +msgstr "設定" + +#: gitk:2079 +msgid "Edit" +msgstr "編集" + +#: gitk:2084 +msgid "New view..." +msgstr "新規ビュー..." + +#: gitk:2085 +msgid "Edit view..." +msgstr "ビュー編集..." + +#: gitk:2086 +msgid "Delete view" +msgstr "ビュー削除" + +#: gitk:2088 +msgid "All files" +msgstr "全てのファイル" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "ビュー" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "gitk について" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "キーバインディング" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "ヘルプ" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "行" + +#: gitk:2267 +msgid "Find" +msgstr "検索" + +#: gitk:2295 +msgid "commit" +msgstr "コミット" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "含む:" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "パスの一部:" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "追加/除去する文字列:" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "英字の大小を区別する" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "英字の大小を区別しない" + +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "正規表現" + +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "全ての項目" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "ヘッドライン" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "コメント" + +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 +msgid "Author" +msgstr "作者" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "コミット者" + +#: gitk:2350 +msgid "Search" +msgstr "検索" + +#: gitk:2358 +msgid "Diff" +msgstr "Diff" + +#: gitk:2360 +msgid "Old version" +msgstr "旧バージョン" + +#: gitk:2362 +msgid "New version" +msgstr "新バージョン" + +#: gitk:2364 +msgid "Lines of context" +msgstr "文脈行数" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "空白の違いを無視" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 +msgid "Patch" +msgstr "パッチ" + +#: gitk:2447 +msgid "Tree" +msgstr "ツリー" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "これと選択したコミットのdiffを見る" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "選択したコミットとこれのdiffを見る" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "パッチ作成" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "タグ生成" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "コミットをファイルに書き出す" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "新規ブランチ生成" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "このコミットをチェリーピックする" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "ブランチのHEADをここにリセットする" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "このコミットにマークをつける" + +#: gitk:2625 +msgid "Return to mark" +msgstr "マークを付けた所に戻る" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "これとマークをつけた所との子孫を見つける" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "マークを付けたコミットと比較する" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "これと選択したコミットのdiffを見る" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "選択したコミットとこれのdiffを見る" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "このコミットにマークをつける" + +#: gitk:2646 +msgid "Check out this branch" +msgstr "このブランチをチェックアウトする" + +#: gitk:2647 +msgid "Remove this branch" +msgstr "このブランチを除去する" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "これもハイライトさせる" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "これだけをハイライトさせる" + +#: gitk:2656 +msgid "External diff" +msgstr "外部diffツール" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "親コミットから blame をかける" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "この行の出自を表示する" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "この行に git gui で blame をかける" + +#: gitk:3011 +#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - gitコミットビューア\n" +"\n" +"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"\n" +"使用および再配布は GNU General Public License に従ってください" + +#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "閉じる" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Gitk キーバインディング" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Gitk キーバインディング:" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\t終了" + +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\t検索" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Home>\t\t最初のコミットに移動" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<End>\t\t最後のコミットに移動" + +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, i\t一つ上のコミットに移動" + +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, k\t一つ下のコミットに移動" + +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, j\t履歴の前に戻る" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Right>, x, l\t履歴の次へ進む" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tコミットリストの一つ上のページに移動" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tコミットリストの一つ下のページに移動" + +#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" + +#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tコミットリストの一番下にスクロールする" + +#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" + +#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" + +#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" + +#: gitk:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Shift-Down>\t前方を検索（下方の・古いコミット）" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Delete>, b\tdiff画面を上のページにスクロールする" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tdiff画面を上のページにスクロールする" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Space>\t\tdiff画面を下のページにスクロールする" + +#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tdiff画面を上に18行スクロールする" + +#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tdiff画面を下に18行スクロールする" + +#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\t検索" + +#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\t次を検索して移動" + +#: gitk:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\t次を検索して移動" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\t検索ボックスにフォーカス" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\t前を検索して移動" + +#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\t次のファイルにdiff画面をスクロールする" + +#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tdiff画面の次を検索" + +#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tdiff画面の前を検索" + +#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\t文字サイズを拡大" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\t文字サイズを拡大" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\t文字サイズを縮小" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\t文字サイズを縮小" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\t更新" + +#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "一時ディレクトリ %s 生成時エラー:" + +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "\"%s\" のエラーが %s に発生:" + +#: gitk:3631 +msgid "command failed:" +msgstr "コマンド失敗:" + +#: gitk:3780 +msgid "No such commit" +msgstr "そのようなコミットはありません" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: コマンド失敗:" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "マージする HEAD を読み込めません: %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "インデックス読み込みエラー: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "git blame を始められません: %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "検索中" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "git blame 実行エラー: %s" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "コミット %s に由来するその行は、このビューに表示されていません" + +#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "外部diffビューアが失敗:" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Gitk ビュー定義" + +#: gitk:4057 +msgid "Remember this view" +msgstr "このビューを記憶する" + +#: gitk:4058 +msgid "References (space separated list):" +msgstr "リファレンス（スペース区切りのリスト）:" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "ブランチ＆タグ:" + +#: gitk:4060 +msgid "All refs" +msgstr "全てのリファレンス" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "全ての（ローカルな）ブランチ" + +#: gitk:4062 +msgid "All tags" +msgstr "全てのタグ" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "全てのリモート追跡ブランチ" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "コミット情報（正規表現）:" + +#: gitk:4065 +msgid "Author:" +msgstr "作者:" + +#: gitk:4066 +msgid "Committer:" +msgstr "コミット者:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "コミットメッセージ:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "コミット情報の全ての条件に一致" + +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "コミット情報の全ての条件に一致" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "変更したファイル:" + +#: gitk:4071 +msgid "Fixed String" +msgstr "固定文字列" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "正規表現" + +#: gitk:4073 +msgid "Search string:" +msgstr "検索文字列:" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:4075 +msgid "Since:" +msgstr "期間の始め:" + +#: gitk:4076 +msgid "Until:" +msgstr "期間の終わり:" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "制限・省略するリビジョンの数（正の整数）:" + +#: gitk:4078 +msgid "Number to show:" +msgstr "表示する数:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "省略する数:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "その他のオプション:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "厳密に日付順で並び替え" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "側枝マーク" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "最初の親に制限" + +#: gitk:4084 +msgid "Simple history" +msgstr "簡易な履歴" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "git log への追加の引数:" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" + +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "コミット追加コマンド:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: ビュー編集" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "― リビジョンの選択条件" + +#: gitk:4224 +#, fuzzy +msgid "View Name" +msgstr "ビュー名:" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "適用 (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "コミット選択引数のエラー:" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "無し" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "子孫" + +#: gitk:5004 +msgid "Not descendant" +msgstr "非子孫" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "祖先" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "非祖先" + +#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "ステージされた、コミット前のローカルな変更" + +#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "ステージされていない、コミット前のローカルな変更" + +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "多数" + +#: gitk:7309 +msgid "Tags:" +msgstr "タグ:" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "親" + +#: gitk:7337 +msgid "Child" +msgstr "子" + +#: gitk:7346 +msgid "Branch" +msgstr "ブランチ" + +#: gitk:7349 +msgid "Follows" +msgstr "下位" + +#: gitk:7352 +msgid "Precedes" +msgstr "上位" + +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "diff取得エラー: %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Goto:" + +#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "%s を含む SHA1 ID は複数存在します" + +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "リビジョン %s は不明です" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA1 id %s は不明です" + +#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "リビジョン %s は現在のビューにはありません" + +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "日付" + +#: gitk:8816 +msgid "Children" +msgstr "子" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "%s ブランチをここにリセットする" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "切り離されたHEAD: リセットできません" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "コミットマージをスキップ: " + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "パッチ取得エラー: ID " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - 停止\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "コミット " + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" は下記のパッチと同等\n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" 下記からのdiff\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"コミットのdiff:\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " には %s の子があります - 停止\n" + +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "ファイルへのコミット書き出しエラー: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "コミットのdiff実行エラー: %s" + +#: gitk:9118 +msgid "Top" +msgstr "Top" + +#: gitk:9119 +msgid "From" +msgstr "From" + +#: gitk:9124 +msgid "To" +msgstr "To" + +#: gitk:9148 +msgid "Generate patch" +msgstr "パッチ生成" + +#: gitk:9150 +msgid "From:" +msgstr "From:" + +#: gitk:9159 +msgid "To:" +msgstr "To:" + +#: gitk:9168 +msgid "Reverse" +msgstr "逆" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "出力ファイル:" + +#: gitk:9176 +msgid "Generate" +msgstr "生成" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "パッチ生成エラー:" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + +#: gitk:9246 +msgid "Tag name:" +msgstr "タグ名:" + +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "タグ名:" + +#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "生成" + +#: gitk:9273 +msgid "No tag name specified" +msgstr "タグの名称が指定されていません" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "タグ \"%s\" は既に存在します" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "タグ生成エラー:" + +#: gitk:9363 +msgid "Command:" +msgstr "コマンド:" + +#: gitk:9371 +msgid "Write" +msgstr "書き出し" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "コミット書き出しエラー:" + +#: gitk:9416 +msgid "Name:" +msgstr "名前:" + +#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "新しいブランチの名前を指定してください" + +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "ブランチ '%s' は既に存在します。上書きしますか？" + +#: gitk:9511 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" + +#: gitk:9516 +msgid "Cherry-picking" +msgstr "チェリーピック中" + +#: 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" +"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" +"い。" + +#: 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:9547 gitk:9605 +msgid "No changes committed" +msgstr "何の変更もコミットされていません" + +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "リセット中" + +#: 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 "" +"ファイル '%s' のローカルな変更のためにチェリーピックは失敗しました。\n" +"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" +"い。" + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"マージの衝突によってチェリーピックは失敗しました。\n" +"この解決のために git citool を実行したいですか？" + +#: gitk:9634 +msgid "Confirm reset" +msgstr "確認を取り消す" + +#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "ブランチ %s を %s にリセットしますか？" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Reset タイプ:" + +#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Soft: 作業ツリーもインデックスもそのままにする" + +#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" + +#: gitk:9647 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hard: 作業ツリーやインデックスをリセット\n" +"（「全ての」ローカルな変更を破棄）" + +#: gitk:9664 +msgid "Resetting" +msgstr "リセット中" + +#: gitk:9724 +msgid "Checking out" +msgstr "チェックアウト" + +#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "現在チェックアウトされているブランチを削除することはできません" + +#: 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:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "タグとHEAD: %s" + +#: gitk:9829 +msgid "Filter" +msgstr "フィルター" + +#: gitk:10125 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" +"ようです。" + +#: gitk:11102 +msgid "Tag" +msgstr "タグ" + +#: gitk:11106 +msgid "Id" +msgstr "ID" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Gitk フォント選択" + +#: gitk:11206 +msgid "B" +msgstr "B" + +#: gitk:11209 +msgid "I" +msgstr "I" + +#: gitk:11327 +msgid "Commit list display options" +msgstr "コミットリスト表示オプション" + +#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "最大グラフ幅（線の本数）" + +#: gitk:11334 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "最大グラフ幅（ペインに対する％）" + +#: gitk:11337 +msgid "Show local changes" +msgstr "ローカルな変更を表示" + +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" +msgstr "SHA1 の自動選択" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "リモートリファレンスを隠す" + +#: gitk:11348 +msgid "Diff display options" +msgstr "diff表示オプション" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "タブ空白幅" + +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" +msgstr "近くのタグを表示する" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "diff をリストのパスに制限" + +#: gitk:11362 +msgid "Support per-file encodings" +msgstr "ファイルごとのエンコーディングのサポート" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "外部diffツール" + +#: gitk:11369 +msgid "Choose..." +msgstr "選択..." + +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "パッチ生成" + +#: 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 "色: ボタンを押して選択" + +#: gitk:11395 +msgid "Interface" +msgstr "インターフェイス" + +#: gitk:11396 +msgid "interface" +msgstr "インターフェイス" + +#: gitk:11399 +msgid "Background" +msgstr "背景" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "背景" + +#: gitk:11403 +msgid "Foreground" +msgstr "前景" + +#: gitk:11404 +msgid "foreground" +msgstr "前景" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff: 旧バージョン" + +#: gitk:11408 +msgid "diff old lines" +msgstr "diff 旧バージョン" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff: 新バージョン" + +#: gitk:11413 +msgid "diff new lines" +msgstr "diff 新バージョン" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff: hunkヘッダ" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "diff hunkヘッダ" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "マーク行の背景" + +#: gitk:11425 +msgid "marked line background" +msgstr "マーク行の背景" + +#: gitk:11429 +msgid "Select bg" +msgstr "選択の背景" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "フォント: ボタンを押して選択" + +#: gitk:11440 +msgid "Main font" +msgstr "主フォント" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Diff表示用フォント" + +#: gitk:11442 +msgid "User interface font" +msgstr "UI用フォント" + +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Gitk 設定" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "生成" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: 「%s」 の色を選択" + +#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "ここにはgitリポジトリがありません。" + +#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" + +#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "gitkへの不正な引数:" + +#: gitk:12405 +msgid "Command line" +msgstr "コマンド行" + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "次" + +#~ msgid "prev" +#~ msgstr "前" + +#~ msgid "CDate" +#~ msgstr "作成日" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "gitディレクトリ \"%s\" を見つけられません。" diff --git a/gitk-git/po/po2msg.sh b/gitk-git/po/po2msg.sh index c63248e375..c63248e375 100644..100755 --- a/gitk-git/po/po2msg.sh +++ b/gitk-git/po/po2msg.sh diff --git a/gitk-git/po/pt_br.po b/gitk-git/po/pt_br.po new file mode 100644 index 0000000000..80d24bcad8 --- /dev/null +++ b/gitk-git/po/pt_br.po @@ -0,0 +1,1372 @@ +# Translation of gitk to Brazilian Portuguese. +# Copyright (C) 2007 Paul Mackerras, et al. +# This file is distributed under the same license as the gitk package. +# +# Alexandre Erwin Ittner <alexandre@ittner.com.br>, 2010. +# +#, fuzzy +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: 2010-12-06 23:39-0200\n" +"Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" +"Language-Team: Brazilian Portuguese <>\n" +"Language: pt_BR\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 "Não foi possível obter a lista dos arquivos não mesclados:" + +#: 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 "Erro ao interpretar revisões:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Erro ao executar o comando--argscmd:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" +"mesclados." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" +"mesclados dentro dos limites." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Erro ao executar git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lendo" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Lendo revisões..." + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Nenhuma revisão foi selecionada" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Não foi possível interpretar a saída do \"git log\":" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Não há informações disponíveis sobre a revisão" + +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "Ok" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Cancelar" + +#: gitk:2069 +msgid "Update" +msgstr "Atualizar" + +#: gitk:2070 +msgid "Reload" +msgstr "Recarregar" + +#: gitk:2071 +msgid "Reread references" +msgstr "Ler as referências novamente" + +#: gitk:2072 +msgid "List references" +msgstr "Listar referências" + +#: gitk:2074 +msgid "Start git gui" +msgstr "Iniciar Git GUI" + +#: gitk:2076 +msgid "Quit" +msgstr "Sair" + +#: gitk:2068 +msgid "File" +msgstr "Arquivo" + +#: gitk:2080 +msgid "Preferences" +msgstr "Preferências" + +#: gitk:2079 +msgid "Edit" +msgstr "Editar" + +#: gitk:2084 +msgid "New view..." +msgstr "Nova vista..." + +#: gitk:2085 +msgid "Edit view..." +msgstr "Editar vista..." + +#: gitk:2086 +msgid "Delete view" +msgstr "Apagar vista" + +#: gitk:2088 +msgid "All files" +msgstr "Todos os arquivos" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Exibir" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Sobre o gitk" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Atalhos de teclado" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Ajuda" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "Linha" + +#: gitk:2267 +msgid "Find" +msgstr "Encontrar" + +#: gitk:2295 +msgid "commit" +msgstr "Revisão" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "contendo:" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "envolvendo os caminhos:" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "Adicionando/removendo texto:" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Exatamente" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "Ignorar maiúsculas/minúsculas" + +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "Expressão regular" + +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Todos os campos" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Assunto" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Descrição da revisão" + +#: 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 "Revisor" + +#: gitk:2350 +msgid "Search" +msgstr "Buscar" + +#: gitk:2358 +msgid "Diff" +msgstr "Diferenças" + +#: gitk:2360 +msgid "Old version" +msgstr "Versão antiga" + +#: gitk:2362 +msgid "New version" +msgstr "Versão nova" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Número de linhas de contexto" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignorar mudanças de caixa" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 +msgid "Patch" +msgstr "Diferenças" + +#: gitk:2447 +msgid "Tree" +msgstr "Árvore" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "Comparar esta revisão com a selecionada" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "Comparar a revisão selecionada com esta" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Criar patch" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Criar etiqueta" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Salvar revisão para um arquivo" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Criar novo ramo" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Fazer cherry-pick desta revisão" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Redefinir HEAD para cá" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "Marcar esta revisão" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Voltar à marca" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "Encontrar descendente e marcar" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "Comparar com a revisão marcada" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Comparar esta revisão com a selecionada" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Comparar a revisão selecionada com esta" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Marcar esta revisão" + +#: gitk:2646 +msgid "Check out this branch" +msgstr "Efetuar checkout deste ramo" + +#: gitk:2647 +msgid "Remove this branch" +msgstr "Excluir este ramo" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "Marcar este também" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "Marcar apenas este" + +#: gitk:2656 +msgid "External diff" +msgstr "Diff externo" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "Anotar revisão anterior" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Exibir origem desta linha" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Executar 'git blame' nesta linha" + +#: gitk:3011 +#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - um visualizador de revisões para o git \n" +"\n" +"Copyright ©9 2005-2010 Paul Mackerras\n" +"\n" +"Uso e distribuição segundo os termos da Licença Pública Geral GNU" + +#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Fechar" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Atalhos de teclado" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Atalhos de teclado:" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tSair" + +#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tFechar janela" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Home>\t\tIr para a primeira revisão" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<End>\t\tIr para a última revisão" + +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, i\tIr para uma revisão acima" + +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, k\tIr para uma revisão abaixo" + +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, j\tVoltar no histórico" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Right>, x, l\tAvançar no histórico" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tSubir uma página na lista de revisões" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tDescer uma página na lista de revisões" + +#: gitk:3056 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tRolar para o início da lista de revisões" + +#: gitk:3057 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tRolar para o final da lista de revisões" + +#: gitk:3058 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões" + +#: gitk:3060 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões" + +#: gitk:3061 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões" + +#: gitk:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Delete>, b\tRola alterações uma página acima" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tRolar alterações uma página abaixo" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Space>\t\tRolar alterações uma página abaixo" + +#: gitk:3067 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tRolar alterações 18 linhas acima" + +#: gitk:3068 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tRolar alterações 18 linhas abaixo" + +#: gitk:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tProcurar" + +#: gitk:3070 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tIr para a próxima ocorrência" + +#: gitk:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\tIr para a próxima ocorrência" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tPor foco na caixa de busca" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tIr para a ocorrência anterior" + +#: gitk:3074 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tRolar alterações para o próximo arquivo" + +#: gitk:3075 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações" + +#: gitk:3076 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações" + +#: gitk:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAumentar tamanho da fonte" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tAumentar tamanho da fonte" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tReduzir tamanho da fonte" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tReduzir tamanho da fonte" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tAtualizar" + +#: gitk:3546 gitk:3555 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Erro ao criar o diretório temporário %s:" + +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Erro ao ler \"%s\" de %s:" + +#: gitk:3631 +msgid "command failed:" +msgstr "O comando falhou:" + +#: gitk:3780 +msgid "No such commit" +msgstr "Revisão não encontrada" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "Comando 'git gui blame' falhou:" + +#: gitk:3825 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossível ler merge head: %s" + +#: gitk:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Erro ao ler o índice: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Não foi possível inciar o 'git blame': %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Procurando" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Erro ao executar 'git blame': %s" + +#: gitk:3921 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Esta linha vem da revisão %s, que não está nesta vista" + +#: gitk:3935 +msgid "External diff viewer failed:" +msgstr "Erro do visualizador de alterações externo:" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Definir vista" + +#: gitk:4057 +msgid "Remember this view" +msgstr "Lembrar esta vista" + +#: gitk:4058 +msgid "References (space separated list):" +msgstr "Referências (separar a lista com um espaço):" + +#: gitk:4059 +msgid "Branches & tags:" +msgstr "Ramos & etiquetas:" + +#: gitk:4060 +msgid "All refs" +msgstr "Todas as referências" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Todos os ramos locais" + +#: gitk:4062 +msgid "All tags" +msgstr "Todas as etiquetas" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Todos os ramos de rastreio" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Informações da revisão (expressões regulares):" + +#: gitk:4065 +msgid "Author:" +msgstr "Autor:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Revisor:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Descrição da revisão:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Coincidir todos os critérios de informações da revisão" + +#: gitk:4069 +#, fuzzy +msgid "Matches none Commit Info criteria" +msgstr "Coincidir todos os critérios de informações da revisão" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "Mudanças para os arquivos:" + +#: gitk:4071 +msgid "Fixed String" +msgstr "Texto fixo" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Expressão regular" + +#: gitk:4073 +msgid "Search string:" +msgstr "Texto de busca" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:4075 +msgid "Since:" +msgstr "Desde:" + +#: gitk:4076 +msgid "Until:" +msgstr "Até:" + +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" + +#: gitk:4078 +msgid "Number to show:" +msgstr "Número para mostrar:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Número para ignorar:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Opções diversas:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Ordenar estritamente pela data" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Marcar os dois lados do ramo" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Limitar ao primeiro antecessor" + +#: gitk:4084 +msgid "Simple history" +msgstr "Histórico simplificado" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Argumentos adicionais para o 'git log':" + +#: gitk:4086 +msgid "Enter files and directories to include, one per line:" +msgstr "Arquivos e diretórios para incluir, um por linha" + +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Comando para gerar mais revisões para incluir:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "Gitk: editar vista" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- critérios para selecionar revisões" + +#: gitk:4224 +msgid "View Name" +msgstr "Nome da vista" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Aplicar (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Erro nos argumentos de seleção de revisões:" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Nenhum" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Descendente de" + +#: gitk:5004 +msgid "Not descendant" +msgstr "Não descendente de" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Antecessor de" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "Não antecessor de" + +#: gitk:5306 +msgid "Local changes checked in to index but not committed" +msgstr "Mudanças locais marcadas, porém não salvas" + +#: gitk:5342 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Mudanças locais não marcadas" + +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "muitas" + +#: gitk:7309 +msgid "Tags:" +msgstr "Etiquetas:" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Antecessor" + +#: gitk:7337 +msgid "Child" +msgstr "Descendente" + +#: gitk:7346 +msgid "Branch" +msgstr "Ramo" + +#: gitk:7349 +msgid "Follows" +msgstr "Segue" + +#: gitk:7352 +msgid "Precedes" +msgstr "Precede" + +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Erro ao obter diferenças: %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Ir para:" + +#: gitk:8652 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "O id SHA1 %s é ambíguo" + +#: gitk:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Revisão %s desconhecida" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Id SHA1 %s desconhecido" + +#: gitk:8671 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "A revisão %s não está na vista atual" + +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Data" + +#: gitk:8816 +msgid "Children" +msgstr "Descendentes" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Redefinir ramo %s para este ponto" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Detached head: impossível redefinir" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Saltando revisão de mesclagem" + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Erro ao obter patch ID para" + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr "- parando\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Revisão" + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +"é o mesmo patch que\n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "difere de" + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Diferença de revisões:\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "possui %s descendentes - parando\n" + +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Erro ao salvar revisão para o arquivo: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Erro ao comparar revisões: %s" + +#: gitk:9118 +msgid "Top" +msgstr "Início" + +#: gitk:9119 +msgid "From" +msgstr "De" + +#: gitk:9124 +msgid "To" +msgstr "Para" + +#: gitk:9148 +msgid "Generate patch" +msgstr "Gerar patch" + +#: gitk:9150 +msgid "From:" +msgstr "De:" + +#: gitk:9159 +msgid "To:" +msgstr "Para:" + +#: gitk:9168 +msgid "Reverse" +msgstr "Inverter" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Arquivo de saída:" + +#: gitk:9176 +msgid "Generate" +msgstr "Gerar" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "Erro ao criar patch:" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + +#: gitk:9246 +msgid "Tag name:" +msgstr "Nome da etiqueta:" + +#: gitk:9249 +msgid "Tag message is optional" +msgstr "A descrição da etiqueta é opcional" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Descrição da etiqueta" + +#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Criar" + +#: gitk:9273 +msgid "No tag name specified" +msgstr "Nome da etiqueta não indicado" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Etiqueta \"%s\" já existe" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "Erro ao criar etiqueta:" + +#: gitk:9363 +msgid "Command:" +msgstr "Comando:" + +#: gitk:9371 +msgid "Write" +msgstr "Exportar" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "Erro ao exportar revisão" + +#: gitk:9416 +msgid "Name:" +msgstr "Nome:" + +#: gitk:9439 +msgid "Please specify a name for the new branch" +msgstr "Indique um nome para o novo ramo" + +#: gitk:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "O ramo \"%s\" já existe. Sobrescrever?" + +#: gitk:9511 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" + +#: gitk:9516 +msgid "Cherry-picking" +msgstr "Cherry-picking" + +#: 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 "" +"O cherry-pick falhou porque o arquivo \"%s\" possui mudanças locais.\n" +"Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " +"novamente." + +#: gitk:9531 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"O cherry-pick falhou porque houve um conflito na mesclagem.\n" +"Executar o 'git citool' para resolvê-lo?" + +#: gitk:9547 gitk:9605 +msgid "No changes committed" +msgstr "Nenhuma revisão foi salva" + +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Redefinindo" + +#: 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 "" +"O cherry-pick falhou porque o arquivo \"%s\" possui mudanças locais.\n" +"Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " +"novamente." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"O cherry-pick falhou porque houve um conflito na mesclagem.\n" +"Executar o 'git citool' para resolvê-lo?" + +#: gitk:9634 +msgid "Confirm reset" +msgstr "Confirmar redefinição" + +#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Você realmente deseja redefinir o ramo %s para %s?" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Tipo de redefinição" + +#: gitk:9641 +msgid "Soft: Leave working tree and index untouched" +msgstr "Soft: deixa a árvore de trabalho e o índice intocados" + +#: gitk:9644 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice" + +#: gitk:9647 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hard: Redefine a árvore de trabalho e o índice\n" +"(descarta TODAS as mudanças locais)" + +#: gitk:9664 +msgid "Resetting" +msgstr "Redefinindo" + +#: gitk:9724 +msgid "Checking out" +msgstr "Abrindo" + +#: gitk:9777 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossível excluir o ramo atualmente aberto" + +#: gitk:9783 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n" +"Você realmente deseja excluir ramo \"%s\"?" + +#: gitk:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Referências: %s" + +#: gitk:9829 +msgid "Filter" +msgstr "Filtro" + +#: gitk:10125 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas " +"antecessoras/sucessoras estarão incompletas" + +#: gitk:11102 +msgid "Tag" +msgstr "Etiqueta" + +#: gitk:11106 +msgid "Id" +msgstr "Id" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Selecionar fontes do Gitk" + +#: gitk:11206 +msgid "B" +msgstr "B" + +#: gitk:11209 +msgid "I" +msgstr "I" + +#: gitk:11327 +msgid "Commit list display options" +msgstr "Opções da lista de revisões" + +#: gitk:11330 +msgid "Maximum graph width (lines)" +msgstr "Largura máxima do grafo (linhas)" + +#: gitk:11334 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Largura máxima do grafo (% do painel)" + +#: gitk:11337 +msgid "Show local changes" +msgstr "Exibir mudanças locais" + +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" +msgstr "Selecionar o SHA1 automaticamente" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Ocultar referências remotas" + +#: gitk:11348 +msgid "Diff display options" +msgstr "Opções de exibição das alterações" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "Espaços por tabulação" + +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" +msgstr "Exibir etiquetas próximas" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 +msgid "Limit diffs to listed paths" +msgstr "Limitar diferenças aos caminhos listados" + +#: gitk:11362 +msgid "Support per-file encodings" +msgstr "Usar codificações distintas por arquivo" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Ferramenta 'diff' externa" + +#: gitk:11369 +msgid "Choose..." +msgstr "Selecionar..." + +#: gitk:11374 +msgid "General options" +msgstr "Opções gerais" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Usar temas para as janelas" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(exige reinicialização)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(atualmente indisponível)" + +#: gitk:11392 +msgid "Colors: press to choose" +msgstr "Cores: clique para escolher" + +#: gitk:11395 +msgid "Interface" +msgstr "Interface" + +#: gitk:11396 +msgid "interface" +msgstr "interface" + +#: gitk:11399 +msgid "Background" +msgstr "Segundo plano" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "segundo plano" + +#: gitk:11403 +msgid "Foreground" +msgstr "Primeiro plano" + +#: gitk:11404 +msgid "foreground" +msgstr "primeiro plano" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "Diff: linhas excluídas" + +#: gitk:11408 +msgid "diff old lines" +msgstr "linhas excluídas" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "Diff: linhas adicionadas" + +#: gitk:11413 +msgid "diff new lines" +msgstr "linhas adicionadas" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "Diff: cabeçalho do bloco" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "cabeçalho do bloco" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "2º plano da linha marcada" + +#: gitk:11425 +msgid "marked line background" +msgstr "segundo plano da linha marcada" + +#: gitk:11429 +msgid "Select bg" +msgstr "2º plano da seleção" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Fontes: clique para escolher" + +#: gitk:11440 +msgid "Main font" +msgstr "Fonte principal" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Fonte da lista de mudanças" + +#: gitk:11442 +msgid "User interface font" +msgstr "Fonte da interface" + +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Preferências do Gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Gerar" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: selecionar cor para %s" + +#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Não há nenhum repositório git aqui." + +#: gitk:12289 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "" +"O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de " +"arquivo)" + +#: gitk:12301 +msgid "Bad arguments to gitk:" +msgstr "Argumentos incorretos para o gitk:" + +#: gitk:12405 +msgid "Command line" +msgstr "Linha de comando" + +#~ msgid "next" +#~ msgstr "Próximo" + +#~ msgid "prev" +#~ msgstr "Anterior" + +#~ msgid "CDate" +#~ msgstr "DataR" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Impossível encontrar o diretório git \"%s\"." diff --git a/gitk-git/po/ru.po b/gitk-git/po/ru.po index 704eba8f9d..faba6721c1 100644 --- a/gitk-git/po/ru.po +++ b/gitk-git/po/ru.po @@ -5,816 +5,1030 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-24 16:00+0200\n" +"POT-Creation-Date: 2015-03-15 14:37+1100\n" "PO-Revision-Date: 2009-04-24 16:00+0200\n" "Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n" "Language-Team: Russian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" +msgstr "Невозможно получить список файлов незавершённой операции слияния:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" msgstr "" -"Невозможно получить список файлов незавершённой операции слияния:" -#: gitk:268 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Ошибка в идентификаторе версии:" -#: gitk:323 +#: gitk:380 msgid "Error executing --argscmd command:" -msgstr "Ошибка выполнения команды заданой --argscmd:" +msgstr "Ошибка выполнения команды заданной --argscmd:" -#: gitk:336 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" -"Файлы не выбраны: указан --merge, но не было найдено ни одного файла " -"где эта операция должна быть завершена." +"Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта " +"операция должна быть завершена." -#: gitk:339 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." msgstr "" -"Файлы не выбраны: указан --merge, но в рамках указаного " -"ограничения на имена файлов нет ни одного " -"где эта операция должна быть завершена." +"Файлы не выбраны: указан --merge, но в рамках указанного ограничения на " +"имена файлов нет ни одного где эта операция должна быть завершена." -#: gitk:361 gitk:508 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Ошибка запуска git log:" -#: gitk:379 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Чтение" -#: gitk:439 gitk:4021 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Чтение версий..." -#: gitk:442 gitk:1560 gitk:4024 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Ничего не выбрано" -#: gitk:1436 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Ошибка обработки вывода команды git log:" -#: gitk:1656 +#: gitk:1740 msgid "No commit information available" msgstr "Нет информации о состоянии" -#: gitk:1791 gitk:1815 gitk:3814 gitk:8478 gitk:10014 gitk:10186 +#: gitk:1897 +msgid "mc" +msgstr "" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 msgid "OK" msgstr "Ok" -#: gitk:1817 gitk:3816 gitk:8078 gitk:8152 gitk:8259 gitk:8308 gitk:8480 -#: gitk:10015 gitk:10187 +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 msgid "Cancel" msgstr "Отмена" -#: gitk:1915 +#: gitk:2069 msgid "Update" msgstr "Обновить" -#: gitk:1916 +#: gitk:2070 msgid "Reload" msgstr "Перечитать" -#: gitk:1917 +#: gitk:2071 msgid "Reread references" msgstr "Обновить список ссылок" -#: gitk:1918 +#: gitk:2072 msgid "List references" msgstr "Список ссылок" -#: gitk:1920 +#: gitk:2074 msgid "Start git gui" msgstr "Запустить git gui" -#: gitk:1922 +#: gitk:2076 msgid "Quit" msgstr "Завершить" -#: gitk:1914 +#: gitk:2068 msgid "File" msgstr "Файл" -#: gitk:1925 +#: gitk:2080 msgid "Preferences" msgstr "Настройки" -#: gitk:1924 +#: gitk:2079 msgid "Edit" msgstr "Редактировать" -#: gitk:1928 +#: gitk:2084 msgid "New view..." msgstr "Новое представление..." -#: gitk:1929 +#: gitk:2085 msgid "Edit view..." msgstr "Редактировать представление..." -#: gitk:1930 +#: gitk:2086 msgid "Delete view" msgstr "Удалить представление" -#: gitk:1932 +#: gitk:2088 msgid "All files" msgstr "Все файлы" -#: gitk:1927 gitk:3626 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Представление" -#: gitk:1935 gitk:2609 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "О gitk" -#: gitk:1936 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Назначения клавиатуры" -#: gitk:1934 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Подсказка" -#: gitk:1994 -msgid "SHA1 ID: " -msgstr "SHA1:" +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2025 +#: gitk:2229 msgid "Row" msgstr "Строка" -#: gitk:2056 +#: gitk:2267 msgid "Find" msgstr "Поиск" -#: gitk:2057 -msgid "next" -msgstr "След." - -#: gitk:2058 -msgid "prev" -msgstr "Пред." - -#: gitk:2059 +#: gitk:2295 msgid "commit" msgstr "состояние" -#: gitk:2062 gitk:2064 gitk:4179 gitk:4202 gitk:4226 gitk:6164 gitk:6236 -#: gitk:6320 +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 msgid "containing:" msgstr "содержащее:" -#: gitk:2065 gitk:3117 gitk:3122 gitk:4254 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "касательно файлов:" -#: gitk:2066 gitk:4259 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "добавив/удалив строку:" -#: gitk:2075 gitk:2077 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Точно" -#: gitk:2077 gitk:4334 gitk:6132 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "Игнорировать большие/маленькие" -#: gitk:2077 gitk:4228 gitk:4332 gitk:6128 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Регулярные выражения" -#: gitk:2079 gitk:2080 gitk:4353 gitk:4383 gitk:4390 gitk:6256 gitk:6324 +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 msgid "All fields" msgstr "Во всех полях" -#: gitk:2080 gitk:4351 gitk:4383 gitk:6195 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Заголовок" -#: gitk:2081 gitk:4351 gitk:6195 gitk:6324 gitk:6737 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Комментарии" -#: gitk:2081 gitk:4351 gitk:4355 gitk:4390 gitk:6195 gitk:6672 gitk:7923 -#: gitk:7938 +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 msgid "Author" msgstr "Автор" -#: gitk:2081 gitk:4351 gitk:6195 gitk:6674 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Сохранивший состояние" -#: gitk:2110 +#: gitk:2350 msgid "Search" msgstr "Найти" -#: gitk:2117 +#: gitk:2358 msgid "Diff" msgstr "Сравнить" -#: gitk:2119 +#: gitk:2360 msgid "Old version" msgstr "Старая версия" -#: gitk:2121 +#: gitk:2362 msgid "New version" msgstr "Новая версия" -#: gitk:2123 +#: gitk:2364 msgid "Lines of context" msgstr "Строк контекста" -#: gitk:2133 +#: gitk:2374 msgid "Ignore space change" msgstr "Игнорировать пробелы" -#: gitk:2191 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Патч" -#: gitk:2193 +#: gitk:2447 msgid "Tree" msgstr "Файлы" -#: gitk:2326 gitk:2339 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" -msgstr "Сравнить это состояние с выделеным" +msgstr "Сравнить это состояние с выделенным" -#: gitk:2327 gitk:2340 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" -msgstr "Сравнить выделеное с этим состоянием" +msgstr "Сравнить выделенное с этим состоянием" -#: gitk:2328 gitk:2341 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Создать патч" -#: gitk:2329 gitk:8136 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Создать метку" -#: gitk:2330 gitk:8239 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Сохранить изменения в файл" -#: gitk:2331 gitk:8296 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Создать ветвь" -#: gitk:2332 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Скопировать это состояние" -#: gitk:2333 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Установить HEAD на это состояние" -#: gitk:2347 +#: gitk:2624 +#, fuzzy +msgid "Mark this commit" +msgstr "Скопировать это состояние" + +#: gitk:2625 +msgid "Return to mark" +msgstr "" + +#: gitk:2626 +msgid "Find descendant of this and mark" +msgstr "" + +#: gitk:2627 +msgid "Compare with marked commit" +msgstr "" + +#: gitk:2628 gitk:2639 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Сравнить это состояние с выделенным" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Сравнить выделенное с этим состоянием" + +#: gitk:2630 +#, fuzzy +msgid "Revert this commit" +msgstr "Скопировать это состояние" + +#: gitk:2646 msgid "Check out this branch" msgstr "Перейти на эту ветвь" -#: gitk:2348 +#: gitk:2647 msgid "Remove this branch" msgstr "Удалить эту ветвь" -#: gitk:2355 +#: gitk:2654 msgid "Highlight this too" msgstr "Подсветить этот тоже" -#: gitk:2356 +#: gitk:2655 msgid "Highlight this only" msgstr "Подсветить только этот" -#: gitk:2357 +#: gitk:2656 msgid "External diff" msgstr "Программа сравнения" -#: gitk:2358 +#: gitk:2657 msgid "Blame parent commit" msgstr "Аннотировать родительское состояние" -#: gitk:2365 +#: gitk:2664 msgid "Show origin of this line" msgstr "Показать источник этой строки" -#: gitk:2366 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Запустить git gui blame для этой строки" -#: gitk:2611 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 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 - программа просмотра истории репозиториев Git\n" "\n" -"Copyright (c) 2005-2008 Paul Mackerras\n" +"Copyright \\u00a9 2005-2010 Paul Mackerras\n" "\n" "Использование и распространение согласно условиям GNU General Public License" -#: gitk:2619 gitk:2681 gitk:8661 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Закрыть" -#: gitk:2638 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Назначения клавиатуры в Gitk" -#: gitk:2641 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Назначения клавиатуры в Gitk:" -#: gitk:2643 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tЗавершить" -#: gitk:2644 +#: gitk:3046 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tПоиск" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tПерейти к первому состоянию" -#: gitk:2645 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tПерейти к последнему состоянию" -#: gitk:2646 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3049 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tПерейти к следующему состоянию" -#: gitk:2647 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3050 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tПерейти к предыдущему состоянию" -#: gitk:2648 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3051 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tПоказать ранее посещённое состояние" -#: gitk:2649 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tПоказать следующее посещённое состояние" -#: gitk:2650 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tПерейти на страницу выше в списке состояний" -#: gitk:2651 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tПерейти на страницу ниже в списке состояний" -#: gitk:2652 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tПоказать начало списка состояний" -#: gitk:2653 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tПоказать конец списка состояний" -#: gitk:2654 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tПровернуть список состояний вверх" -#: gitk:2655 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tПровернуть список состояний вниз" -#: gitk:2656 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх" -#: gitk:2657 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз" -#: gitk:2658 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "" -"<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)" +msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)" -#: gitk:2659 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tПоиск (вниз, среди старых состояний)" -#: gitk:2660 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше" -#: gitk:2661 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tПрокрутить список изменений на страницу выше" -#: gitk:2662 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже" -#: gitk:2663 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tПрокрутить список изменений на 18 строк вверх" -#: gitk:2664 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tПрокрутить список изменений на 18 строк вниз" -#: gitk:2665 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tПоиск" -#: gitk:2666 +#: gitk:3070 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tПерейти к следующему найденому состоянию" +msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию" -#: gitk:2667 +#: gitk:3071 msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tПерейти к следующему найденому состоянию" +msgstr "<Return>\tПерейти к следующему найденному состоянию" -#: gitk:2668 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tПерейти к полю поиска" -#: gitk:2669 +#: gitk:3073 msgid "?\t\tMove to previous find hit" -msgstr "?\t\tПерейти к предыдущему найденому состоянию" +msgstr "?\t\tПерейти к предыдущему найденному состоянию" -#: gitk:2670 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tПрокрутить список изменений к следующему файлу" -#: gitk:2671 +#: gitk:3075 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tПродолжить поиск в списке изменений" -#: gitk:2672 +#: gitk:3076 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" -msgstr "<%s-R>\t\tПерейти к предыдущему найденому тексту в списке изменений" +msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений" -#: gitk:2673 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tУвеличить размер шрифта" -#: gitk:2674 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tУвеличить размер шрифта" -#: gitk:2675 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tУменьшить размер шрифта" -#: gitk:2676 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tУменьшить размер шрифта" -#: gitk:2677 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tОбновить" -#: gitk:3132 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Ошибка получения \"%s\" из %s:" - -#: gitk:3189 gitk:3198 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Ошибка создания временного каталога %s:" -#: gitk:3211 +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Ошибка получения \"%s\" из %s:" + +#: gitk:3631 msgid "command failed:" msgstr "ошибка выполнения команды:" -#: gitk:3357 +#: gitk:3780 msgid "No such commit" msgstr "Состояние не найдено" -#: gitk:3371 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: ошибка выполнения команды:" -#: gitk:3402 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Ошибка чтения MERGE_HEAD: %s" -#: gitk:3410 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Ошибка чтения индекса: %s" -#: gitk:3435 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Ошибка запуска git blame: %s" -#: gitk:3438 gitk:6163 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Поиск" -#: gitk:3470 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Ошибка выполнения git blame: %s" -#: gitk:3498 +#: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" -"Эта строка принадлежит состоянию %s, которое не показано в этом " -"представлении" +"Эта строка принадлежит состоянию %s, которое не показано в этом представлении" -#: gitk:3512 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Ошибка выполнения программы сравнения:" -#: gitk:3630 +#: gitk:4053 msgid "Gitk view definition" msgstr "Gitk определение представлений" -#: gitk:3634 +#: gitk:4057 msgid "Remember this view" msgstr "Запомнить представление" -#: gitk:3635 -msgid "Commits to include (arguments to git log):" -msgstr "Включить состояния (аргументы для git-log):" +#: gitk:4058 +msgid "References (space separated list):" +msgstr "" -#: gitk:3636 -msgid "Use all refs" -msgstr "Использовать все ветви" +#: gitk:4059 +msgid "Branches & tags:" +msgstr "" -#: gitk:3637 -msgid "Strictly sort by date" -msgstr "Строгая сортировка по дате" +#: gitk:4060 +#, fuzzy +msgid "All refs" +msgstr "Все файлы" -#: gitk:3638 -msgid "Mark branch sides" -msgstr "Отметить стороны ветвей" +#: gitk:4061 +msgid "All (local) branches" +msgstr "" + +#: gitk:4062 +msgid "All tags" +msgstr "" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "" + +#: gitk:4065 +#, fuzzy +msgid "Author:" +msgstr "Автор" + +#: gitk:4066 +#, fuzzy +msgid "Committer:" +msgstr "Сохранивший состояние" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "" + +#: gitk:4069 +msgid "Matches none Commit Info criteria" +msgstr "" + +#: gitk:4070 +msgid "Changes to Files:" +msgstr "" -#: gitk:3639 -msgid "Since date:" +#: gitk:4071 +msgid "Fixed String" +msgstr "" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "" + +#: gitk:4073 +#, fuzzy +msgid "Search string:" +msgstr "Поиск" + +#: gitk:4074 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" + +#: gitk:4075 +#, fuzzy +msgid "Since:" msgstr "С даты:" -#: gitk:3640 -msgid "Until date:" +#: gitk:4076 +#, fuzzy +msgid "Until:" msgstr "По дату:" -#: gitk:3641 -msgid "Max count:" -msgstr "Макс. количество:" +#: gitk:4077 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" -#: gitk:3642 -msgid "Skip:" -msgstr "Пропустить:" +#: gitk:4078 +msgid "Number to show:" +msgstr "" -#: gitk:3643 +#: gitk:4079 +msgid "Number to skip:" +msgstr "" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Строгая сортировка по дате" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Отметить стороны ветвей" + +#: gitk:4083 msgid "Limit to first parent" msgstr "Ограничить первым предком" -#: gitk:3644 -msgid "Command to generate more commits to include:" -msgstr "Дополнительная команда для списка состояний:" +#: gitk:4084 +msgid "Simple history" +msgstr "" -#: gitk:3753 -msgid "Name" -msgstr "Имя" +#: gitk:4085 +#, fuzzy +msgid "Additional arguments to git log:" +msgstr "Включить состояния (аргументы для git-log):" -#: gitk:3801 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Файлы и каталоги для ограничения истории, по одному на строку:" -#: gitk:3815 +#: gitk:4087 +msgid "Command to generate more commits to include:" +msgstr "Дополнительная команда для списка состояний:" + +#: gitk:4211 +msgid "Gitk: edit view" +msgstr "" + +#: gitk:4219 +#, fuzzy +msgid "-- criteria for selecting revisions" +msgstr "Ошибка в идентификаторе версии:" + +#: gitk:4224 +#, fuzzy +msgid "View Name" +msgstr "Представление" + +#: gitk:4299 msgid "Apply (F5)" msgstr "Применить (F5)" -#: gitk:3853 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Ошибка в параметрах выбора состояний:" -#: gitk:3906 gitk:3958 gitk:4403 gitk:4417 gitk:5675 gitk:10867 gitk:10868 +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 msgid "None" msgstr "Ни одного" -#: gitk:4351 gitk:6195 gitk:7925 gitk:7940 -msgid "Date" -msgstr "Дата" - -#: gitk:4351 gitk:6195 -msgid "CDate" -msgstr "Дата ввода" - -#: gitk:4500 gitk:4505 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Порождённое" -#: gitk:4501 +#: gitk:5004 msgid "Not descendant" msgstr "Не порождённое" -#: gitk:4508 gitk:4513 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Предок" -#: gitk:4509 +#: gitk:5012 msgid "Not ancestor" msgstr "Не предок" -#: gitk:4799 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Изменения зарегистрированные в индексе, но не сохранённые" -#: gitk:4835 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе" -#: gitk:6676 +#: gitk:7115 +msgid "and many more" +msgstr "" + +#: gitk:7118 +msgid "many" +msgstr "" + +#: gitk:7309 msgid "Tags:" msgstr "Таги:" -#: gitk:6693 gitk:6699 gitk:7918 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Предок" -#: gitk:6704 +#: gitk:7337 msgid "Child" msgstr "Потомок" -#: gitk:6713 +#: gitk:7346 msgid "Branch" msgstr "Ветвь" -#: gitk:6716 +#: gitk:7349 msgid "Follows" msgstr "Следует за" -#: gitk:6719 +#: gitk:7352 msgid "Precedes" msgstr "Предшествует" -#: gitk:7212 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Ошибка получения изменений: %s" -#: gitk:7751 +#: gitk:8631 msgid "Goto:" msgstr "Перейти к:" -#: gitk:7753 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7772 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" -#: gitk:7784 +#: gitk:8659 +#, fuzzy, tcl-format +msgid "Revision %s is not known" +msgstr "SHA1 идентификатор %s не найден" + +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 идентификатор %s не найден" -#: gitk:7786 +#: gitk:8671 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "Метка или ветвь %s не найдена" +msgid "Revision %s is not in the current view" +msgstr "" -#: gitk:7928 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Дата" + +#: gitk:8816 msgid "Children" msgstr "Потомки" -#: gitk:7985 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Установить ветвь %s на это состояние" -#: gitk:7987 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Состояние не принадлежит ни одной ветви, переход невозможен" -#: gitk:8019 +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "" + +#: gitk:9001 gitk:9006 +#, fuzzy +msgid "Error getting patch ID for " +msgstr "Ошибка создания патча:" + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr "" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#, fuzzy +msgid "Commit " +msgstr "состояние" + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "" + +#: gitk:9066 +#, fuzzy, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Ошибка сохранения состояния:" + +#: gitk:9072 +#, fuzzy, tcl-format +msgid "Error diffing commits: %s" +msgstr "Ошибка сохранения состояния:" + +#: gitk:9118 msgid "Top" msgstr "Верх" -#: gitk:8020 +#: gitk:9119 msgid "From" msgstr "От" -#: gitk:8025 +#: gitk:9124 msgid "To" msgstr "До" -#: gitk:8049 +#: gitk:9148 msgid "Generate patch" msgstr "Создать патч" -#: gitk:8051 +#: gitk:9150 msgid "From:" msgstr "От:" -#: gitk:8060 +#: gitk:9159 msgid "To:" msgstr "До:" -#: gitk:8069 +#: gitk:9168 msgid "Reverse" msgstr "В обратном порядке" -#: gitk:8071 gitk:8253 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Файл для сохранения:" -#: gitk:8077 +#: gitk:9176 msgid "Generate" msgstr "Создать" -#: gitk:8115 +#: gitk:9214 msgid "Error creating patch:" msgstr "Ошибка создания патча:" -#: gitk:8138 gitk:8241 gitk:8298 +#: gitk:9237 gitk:9354 gitk:9411 msgid "ID:" msgstr "ID:" -#: gitk:8147 +#: gitk:9246 msgid "Tag name:" msgstr "Имя метки:" -#: gitk:8151 gitk:8307 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9251 +#, fuzzy +msgid "Tag message:" +msgstr "Имя метки:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Создать" -#: gitk:8168 +#: gitk:9273 msgid "No tag name specified" msgstr "Не задано имя метки" -#: gitk:8172 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Метка \"%s\" уже существует" -#: gitk:8178 +#: gitk:9287 msgid "Error creating tag:" msgstr "Ошибка создания метки:" -#: gitk:8250 +#: gitk:9363 msgid "Command:" msgstr "Команда:" -#: gitk:8258 +#: gitk:9371 msgid "Write" msgstr "Запись" -#: gitk:8276 +#: gitk:9389 msgid "Error writing commit:" msgstr "Ошибка сохранения состояния:" -#: gitk:8303 +#: gitk:9416 msgid "Name:" msgstr "Имя:" -#: gitk:8326 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Укажите имя для новой ветви" -#: gitk:8331 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Ветвь '%s' уже существует. Переписать?" -#: gitk:8397 +#: gitk:9511 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"Состояние %s уже принадлежит ветви %s. Продолжить операцию?" +msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?" -#: gitk:8402 +#: gitk:9516 msgid "Cherry-picking" msgstr "Копирование изменений" -#: gitk:8411 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -823,61 +1037,88 @@ msgstr "" "Копирование невозможно из-за изменений в файле '%s'.\n" "Сохраните или отмените изменения и повторите операцию." -#: gitk:8417 +#: 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 для завершения этой операции?" +"Копирование изменений невозможно из-за незавершённой операции слияния.\n" +"Запустить git citool для завершения этой операции?" -#: gitk:8433 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Изменения не сохранены" -#: gitk:8459 +#: gitk:9574 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?" + +#: gitk:9579 +#, fuzzy +msgid "Reverting" +msgstr "Установка" + +#: 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 "" +"Копирование невозможно из-за изменений в файле '%s'.\n" +"Сохраните или отмените изменения и повторите операцию." + +#: gitk:9591 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Копирование изменений невозможно из-за незавершённой операции слияния.\n" +"Запустить git citool для завершения этой операции?" + +#: gitk:9634 msgid "Confirm reset" msgstr "Подтвердите операцию перехода" -#: gitk:8461 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Установить ветвь %s на состояние %s?" -#: gitk:8465 +#: gitk:9638 msgid "Reset type:" msgstr "Тип операции перехода:" -#: gitk:8469 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными" -#: gitk:8472 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"Смешаный: оставить рабочий каталог неизменным, установить индекс" +msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс" -#: gitk:8475 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" msgstr "" "Жесткий: переписать индекс и рабочий каталог\n" -"(все изменения в рабочем каталоги будут потеряны)" +"(все изменения в рабочем каталоге будут потеряны)" -#: gitk:8492 +#: gitk:9664 msgid "Resetting" msgstr "Установка" -#: gitk:8549 +#: gitk:9724 msgid "Checking out" msgstr "Переход" -#: gitk:8602 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Активная ветвь не может быть удалена" -#: gitk:8608 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -886,200 +1127,272 @@ msgstr "" "Состояния ветви %s больше не принадлежат никакой другой ветви.\n" "Действительно удалить ветвь %s?" -#: gitk:8639 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Метки и ветви: %s" -#: gitk:8654 +#: gitk:9829 msgid "Filter" msgstr "Фильтровать" -#: gitk:8949 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." msgstr "" -"Ошибка чтения истории проекта; информация о ветвях и состояниях " -"вокруг меток (до/после) может быть неполной." +"Ошибка чтения истории проекта; информация о ветвях и состояниях вокруг меток " +"(до/после) может быть неполной." -#: gitk:9935 +#: gitk:11102 msgid "Tag" msgstr "Метка" -#: gitk:9935 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:9983 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Шрифт Gitk" -#: gitk:10000 +#: gitk:11206 msgid "B" msgstr "Ж" -#: gitk:10003 +#: gitk:11209 msgid "I" msgstr "К" -#: gitk:10098 -msgid "Gitk preferences" -msgstr "Настройки Gitk" - -#: gitk:10100 +#: gitk:11327 msgid "Commit list display options" msgstr "Параметры показа списка состояний" -#: gitk:10103 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Макс. ширина графа (строк)" -#: gitk:10107 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Макс. ширина графа (% ширины панели)" -#: gitk:10111 +#: gitk:11337 msgid "Show local changes" msgstr "Показывать изменения в рабочем каталоге" -#: gitk:10114 -msgid "Auto-select SHA1" +#: gitk:11340 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Выделить SHA1" -#: gitk:10118 +#: gitk:11344 +msgid "Hide remote refs" +msgstr "" + +#: gitk:11348 msgid "Diff display options" msgstr "Параметры показа изменений" -#: gitk:10120 +#: gitk:11350 msgid "Tab spacing" msgstr "Ширина табуляции" -#: gitk:10123 -msgid "Display nearby tags" +#: gitk:11353 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Показывать близкие метки" -#: gitk:10126 +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11359 msgid "Limit diffs to listed paths" -msgstr "Ограничить показ изменений выбраными файлами" +msgstr "Ограничить показ изменений выбранными файлами" -#: gitk:10129 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Поддержка кодировок в отдельных файлах" -#: gitk:10135 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Программа для показа изменений" -#: gitk:10137 +#: gitk:11369 msgid "Choose..." msgstr "Выберите..." -#: gitk:10142 +#: gitk:11374 +#, fuzzy +msgid "General options" +msgstr "Создать патч" + +#: 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 "Цвета: нажмите для выбора" -#: gitk:10145 +#: gitk:11395 +msgid "Interface" +msgstr "" + +#: gitk:11396 +#, fuzzy +msgid "interface" +msgstr "Шрифт интерфейса" + +#: gitk:11399 msgid "Background" msgstr "Фон" -#: gitk:10146 gitk:10176 +#: gitk:11400 gitk:11430 msgid "background" msgstr "фон" -#: gitk:10149 +#: gitk:11403 msgid "Foreground" msgstr "Передний план" -#: gitk:10150 +#: gitk:11404 msgid "foreground" msgstr "передний план" -#: gitk:10153 +#: gitk:11407 msgid "Diff: old lines" msgstr "Изменения: старый текст" -#: gitk:10154 +#: gitk:11408 msgid "diff old lines" msgstr "старый текст изменения" -#: gitk:10158 +#: gitk:11412 msgid "Diff: new lines" msgstr "Изменения: новый текст" -#: gitk:10159 +#: gitk:11413 msgid "diff new lines" msgstr "новый текст изменения" -#: gitk:10163 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Изменения: заголовок блока" -#: gitk:10165 +#: gitk:11419 msgid "diff hunk header" msgstr "заголовок блока изменений" -#: gitk:10169 +#: gitk:11423 msgid "Marked line bg" -msgstr "Фон выбраной строки" +msgstr "Фон выбранной строки" -#: gitk:10171 +#: gitk:11425 msgid "marked line background" -msgstr "фон выбраной строки" +msgstr "фон выбранной строки" -#: gitk:10175 +#: gitk:11429 msgid "Select bg" msgstr "Выберите фон" -#: gitk:10179 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Шрифт: нажмите для выбора" -#: gitk:10181 +#: gitk:11440 msgid "Main font" msgstr "Основной шрифт" -#: gitk:10182 +#: gitk:11441 msgid "Diff display font" msgstr "Шрифт показа изменений" -#: gitk:10183 +#: gitk:11442 msgid "User interface font" msgstr "Шрифт интерфейса" -#: gitk:10210 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Настройки Gitk" + +#: gitk:11473 +#, fuzzy +msgid "General" +msgstr "Создать" + +#: gitk:11474 +msgid "Colors" +msgstr "" + +#: gitk:11475 +msgid "Fonts" +msgstr "" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: выберите цвет для %s" -#: gitk:10656 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"К сожалению gitk не может работать с этой версий Tcl/Tk.\n" -"Требуется как минимум Tcl/Tk 8.4." - -#: gitk:10773 +#: gitk:12242 msgid "Cannot find a git repository here." msgstr "Git-репозитарий не найден в текущем каталоге." -#: gitk:10777 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-репозитарий \"%s\" не найден." - -#: gitk:10824 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла" -#: gitk:10836 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Неправильные аргументы для gitk:" -#: gitk:10896 +#: gitk:12405 msgid "Command line" msgstr "Командная строка" +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1:" + +#~ msgid "next" +#~ msgstr "След." + +#~ msgid "prev" +#~ msgstr "Пред." + +#~ msgid "Use all refs" +#~ msgstr "Использовать все ветви" + +#~ msgid "Max count:" +#~ msgstr "Макс. количество:" + +#~ msgid "Skip:" +#~ msgstr "Пропустить:" + +#~ msgid "Name" +#~ msgstr "Имя" + +#~ msgid "CDate" +#~ msgstr "Дата ввода" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "Метка или ветвь %s не найдена" + +#~ msgid "" +#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" +#~ " Gitk requires at least Tcl/Tk 8.4." +#~ msgstr "" +#~ "К сожалению gitk не может работать с этой версий Tcl/Tk.\n" +#~ "Требуется как минимум Tcl/Tk 8.4." + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Git-репозитарий \"%s\" не найден." diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po index 624eb2281e..0994d87c28 100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@ -1,40 +1,50 @@ # Swedish translation for gitk -# Copyright (C) 2005-2009 Paul Mackerras +# Copyright (C) 2005-2013 Paul Mackerras # This file is distributed under the same license as the gitk package. # -# Peter Krefting <peter@softwolves.pp.se>, 2008-2009. # Mikael Magnusson <mikachu@gmail.com>, 2008. +# Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013. +# msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-13 13:38+0100\n" -"PO-Revision-Date: 2009-08-13 13:40+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 <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Kunde inte hämta lista över ej sammanslagna filer:" -#: gitk:269 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Färga ord" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Märk upp ord" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Fel vid tolkning av revisioner:" -#: gitk:324 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fel vid körning av --argscmd-kommando:" -#: gitk:337 +#: 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:340 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,596 +52,628 @@ msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer inom " "filbegränsningen." -#: gitk:362 gitk:509 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fel vid körning av git log:" -#: gitk:380 gitk:525 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Läser" -#: gitk:440 gitk:4123 +#: gitk:496 gitk:4508 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:443 gitk:1561 gitk:4126 +#: gitk:499 gitk:1637 gitk:4511 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1437 +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Kan inte tolka utdata från git log:" -#: gitk:1657 +#: gitk:1740 msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: 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 "Avbryt" -#: gitk:1919 +#: gitk:2069 msgid "Update" msgstr "Uppdatera" -#: gitk:1920 +#: gitk:2070 msgid "Reload" msgstr "Ladda om" -#: gitk:1921 +#: gitk:2071 msgid "Reread references" msgstr "Läs om referenser" -#: gitk:1922 +#: gitk:2072 msgid "List references" msgstr "Visa referenser" -#: gitk:1924 +#: gitk:2074 msgid "Start git gui" msgstr "Starta git gui" -#: gitk:1926 +#: gitk:2076 msgid "Quit" msgstr "Avsluta" -#: gitk:1918 +#: gitk:2068 msgid "File" msgstr "Arkiv" -#: gitk:1930 +#: gitk:2080 msgid "Preferences" msgstr "Inställningar" -#: gitk:1929 +#: gitk:2079 msgid "Edit" msgstr "Redigera" -#: gitk:1934 +#: gitk:2084 msgid "New view..." msgstr "Ny vy..." -#: gitk:1935 +#: gitk:2085 msgid "Edit view..." msgstr "Ändra vy..." -#: gitk:1936 +#: gitk:2086 msgid "Delete view" msgstr "Ta bort vy" -#: gitk:1938 +#: gitk:2088 msgid "All files" msgstr "Alla filer" -#: gitk:1933 gitk:3670 +#: gitk:2083 gitk:4050 msgid "View" msgstr "Visa" -#: gitk:1943 gitk:1953 gitk:2654 +#: gitk:2093 gitk:2103 gitk:3009 msgid "About gitk" msgstr "Om gitk" -#: gitk:1944 gitk:1958 +#: gitk:2094 gitk:2108 msgid "Key bindings" msgstr "Tangentbordsbindningar" -#: gitk:1942 gitk:1957 +#: gitk:2092 gitk:2107 msgid "Help" msgstr "Hjälp" -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "SHA1-id: " +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1-id:" -#: gitk:2049 +#: gitk:2229 msgid "Row" msgstr "Rad" -#: gitk:2080 +#: gitk:2267 msgid "Find" msgstr "Sök" -#: gitk:2081 -msgid "next" -msgstr "nästa" - -#: gitk:2082 -msgid "prev" -msgstr "föreg" - -#: gitk:2083 +#: gitk:2295 msgid "commit" msgstr "incheckning" -#: 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 "som innehåller:" -#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2090 gitk:4364 +#: gitk:2303 gitk:4759 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2099 gitk:2101 +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "ändrar rader som matchar:" + +#: gitk:2313 gitk:2315 gitk:4748 msgid "Exact" msgstr "Exakt" -#: gitk:2101 gitk:4439 gitk:6240 +#: gitk:2315 gitk:4836 gitk:6704 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 msgid "Regexp" msgstr "Reg.uttr." -#: 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 "Alla fält" -#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 msgid "Headline" msgstr "Rubrik" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 msgid "Comments" msgstr "Kommentarer" -#: 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 "Författare" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 msgid "Committer" msgstr "Incheckare" -#: gitk:2134 +#: gitk:2350 msgid "Search" msgstr "Sök" -#: gitk:2141 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2143 +#: gitk:2360 msgid "Old version" msgstr "Gammal version" -#: gitk:2145 +#: gitk:2362 msgid "New version" msgstr "Ny version" -#: gitk:2147 +#: gitk:2364 msgid "Lines of context" msgstr "Rader sammanhang" -#: gitk:2157 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2215 +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Rad-diff" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2217 +#: gitk:2447 msgid "Tree" msgstr "Träd" -#: gitk:2361 gitk:2378 +#: gitk:2616 gitk:2636 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2362 gitk:2379 +#: gitk:2617 gitk:2637 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2363 gitk:2380 +#: gitk:2618 gitk:2638 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2364 gitk:8441 +#: gitk:2619 gitk:9235 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2365 gitk:8547 +#: gitk:2620 gitk:9352 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2366 gitk:8604 +#: gitk:2621 gitk:9409 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2367 +#: gitk:2622 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2368 +#: gitk:2623 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2369 +#: gitk:2624 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2370 +#: gitk:2625 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2371 +#: gitk:2626 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2372 +#: gitk:2627 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2386 +#: gitk:2628 gitk:2639 +msgid "Diff this -> marked commit" +msgstr "Diff denna -> markerad incheckning" + +#: gitk:2629 gitk:2640 +msgid "Diff marked commit -> this" +msgstr "Diff markerad incheckning -> denna" + +#: gitk:2630 +msgid "Revert this commit" +msgstr "Ångra denna incheckning" + +#: gitk:2646 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2387 +#: gitk:2647 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2394 +#: gitk:2654 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2395 +#: gitk:2655 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2396 +#: gitk:2656 msgid "External diff" msgstr "Extern diff" -#: gitk:2397 +#: gitk:2657 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2404 +#: gitk:2664 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2405 +#: gitk:2665 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:2656 +#: gitk:3011 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2008 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 © 2005-2008 Paul Mackerras\n" +"Copyright ©9 2005-2011 Paul Mackerras\n" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:2664 gitk:2726 gitk:8969 +#: gitk:3019 gitk:3085 gitk:9836 msgid "Close" msgstr "Stäng" -#: gitk:2683 +#: gitk:3040 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:2686 +#: gitk:3043 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:2688 +#: gitk:3045 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:2689 +#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tStäng fönster" + +#: gitk:3047 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tGå till första incheckning" -#: gitk:2690 +#: gitk:3048 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tGå till sista incheckning" -#: gitk:2691 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Upp>, p, i\tGå en incheckning upp" +#: gitk:3049 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Upp>, p, k\tGå en incheckning upp" -#: gitk:2692 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Ned>, n, k\tGå en incheckning ned" +#: gitk:3050 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Ned>, n, j\tGå en incheckning ned" -#: gitk:2693 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Vänster>, z, j\tGå bakåt i historiken" +#: gitk:3051 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Vänster>, z, h\tGå bakåt i historiken" -#: gitk:2694 +#: gitk:3052 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Höger>, x, l\tGå framåt i historiken" -#: gitk:2695 +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tGå upp en sida i incheckningslistan" -#: gitk:2696 +#: gitk:3055 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tGå ned en sida i incheckningslistan" -#: gitk:2697 +#: gitk:3056 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:2698 +#: gitk:3057 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:2699 +#: gitk:3058 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:2700 +#: gitk:3059 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:2701 +#: gitk:3060 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:2702 +#: gitk:3061 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:2703 +#: gitk:3062 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:2704 +#: gitk:3063 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:2705 +#: gitk:3064 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRulla diffvisningen upp en sida" -#: gitk:2706 +#: gitk:3065 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Baksteg>\tRulla diffvisningen upp en sida" -#: gitk:2707 +#: gitk:3066 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" -#: gitk:2708 +#: gitk:3067 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:2709 +#: gitk:3068 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:2710 +#: gitk:3069 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:2711 +#: 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:2712 +#: gitk:3071 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tGå till nästa sökträff" -#: gitk:2713 +#: gitk:3072 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:2714 +#: gitk:3073 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:2715 +#: gitk:3074 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:2716 +#: 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:2717 +#: 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:2718 +#: gitk:3077 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:2719 +#: gitk:3078 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:2720 +#: gitk:3079 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:2721 +#: gitk:3080 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:2722 +#: gitk:3081 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tUppdatera" -#: gitk:3177 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Fel vid hämtning av \"%s\" från %s:" - -#: gitk:3234 gitk:3243 +#: gitk:3546 gitk:3555 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3255 +#: gitk:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fel vid hämtning av \"%s\" från %s:" + +#: gitk:3631 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3401 +#: gitk:3780 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3415 +#: gitk:3794 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3446 +#: gitk:3825 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3454 +#: gitk:3833 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3479 +#: gitk:3858 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3482 gitk:6271 +#: gitk:3861 gitk:6735 msgid "Searching" msgstr "Söker" -#: gitk:3514 +#: gitk:3893 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3542 +#: 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:3556 +#: gitk:3935 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:3674 +#: gitk:4053 msgid "Gitk view definition" msgstr "Definition av Gitk-vy" -#: gitk:3678 +#: gitk:4057 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:3679 +#: gitk:4058 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:3680 +#: gitk:4059 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:3681 +#: gitk:4060 msgid "All refs" msgstr "Alla referenser" -#: gitk:3682 +#: gitk:4061 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:3683 +#: gitk:4062 msgid "All tags" msgstr "Alla taggar" -#: gitk:3684 +#: gitk:4063 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:3685 +#: gitk:4064 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:3686 +#: gitk:4065 msgid "Author:" msgstr "Författare:" -#: gitk:3687 +#: gitk:4066 msgid "Committer:" msgstr "Incheckare:" -#: gitk:3688 +#: gitk:4067 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:3689 +#: gitk:4068 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:3690 +#: 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:3691 +#: gitk:4071 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:3692 +#: gitk:4072 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:3693 +#: gitk:4073 msgid "Search string:" msgstr "Söksträng:" -#: gitk:3694 +#: gitk:4074 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -639,205 +681,201 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3695 +#: gitk:4075 msgid "Since:" msgstr "Från:" -#: gitk:3696 +#: gitk:4076 msgid "Until:" msgstr "Till:" -#: gitk:3697 +#: 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:3698 +#: gitk:4078 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:3699 +#: gitk:4079 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:3700 +#: gitk:4080 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:3701 +#: gitk:4081 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:3702 +#: gitk:4082 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:3703 +#: gitk:4083 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:3704 +#: gitk:4084 msgid "Simple history" msgstr "Enkel historik" -#: gitk:3705 +#: gitk:4085 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:3706 +#: gitk:4086 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:3707 +#: gitk:4087 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:3829 +#: gitk:4211 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:3837 +#: gitk:4219 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:3842 -msgid "View Name:" -msgstr "Namn på vy:" +#: gitk:4224 +msgid "View Name" +msgstr "Namn på vy" -#: gitk:3917 +#: gitk:4299 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:3955 +#: gitk:4337 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: 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 "Inget" -#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 -msgid "Date" -msgstr "Datum" - -#: gitk:4456 gitk:6303 -msgid "CDate" -msgstr "Skapat datum" - -#: gitk:4605 gitk:4610 +#: gitk:5003 gitk:5008 msgid "Descendant" msgstr "Avkomling" -#: gitk:4606 +#: gitk:5004 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:4613 gitk:4618 +#: gitk:5011 gitk:5016 msgid "Ancestor" msgstr "Förfader" -#: gitk:4614 +#: gitk:5012 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:4904 +#: gitk:5306 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:4940 +#: gitk:5342 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:6621 +#: gitk:7115 +msgid "and many more" +msgstr "med många flera" + +#: gitk:7118 msgid "many" msgstr "många" -#: gitk:6805 +#: gitk:7309 msgid "Tags:" msgstr "Taggar:" -#: gitk:6822 gitk:6828 gitk:8058 +#: gitk:7326 gitk:7332 gitk:8806 msgid "Parent" msgstr "Förälder" -#: gitk:6833 +#: gitk:7337 msgid "Child" msgstr "Barn" -#: gitk:6842 +#: gitk:7346 msgid "Branch" msgstr "Gren" -#: gitk:6845 +#: gitk:7349 msgid "Follows" msgstr "Följer" -#: gitk:6848 +#: gitk:7352 msgid "Precedes" msgstr "Föregår" -#: gitk:7346 +#: gitk:7947 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:7886 +#: gitk:8631 msgid "Goto:" msgstr "Gå till:" -#: gitk:7888 -msgid "SHA1 ID:" -msgstr "SHA1-id:" - -#: gitk:7907 +#: gitk:8652 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:7914 +#: gitk:8659 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:7924 +#: gitk:8669 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:7926 +#: gitk:8671 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8068 +#: gitk:8813 gitk:8828 +msgid "Date" +msgstr "Datum" + +#: gitk:8816 msgid "Children" msgstr "Barn" -#: gitk:8125 +#: gitk:8879 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8127 +#: gitk:8881 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:8236 gitk:8242 +#: gitk:8986 gitk:8992 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:8251 gitk:8256 +#: gitk:9001 gitk:9006 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:8252 gitk:8257 +#: gitk:9002 gitk:9007 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 msgid "Commit " msgstr "Incheckning " -#: gitk:8266 +#: gitk:9016 msgid "" " is the same patch as\n" " " @@ -845,7 +883,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:8274 +#: gitk:9024 msgid "" " differs from\n" " " @@ -853,117 +891,139 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:8276 -msgid "- stopping\n" -msgstr "- stannar\n" +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Skillnad mellan incheckningar:\n" +"\n" -#: gitk:8284 gitk:8293 +#: gitk:9038 gitk:9047 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:8324 +#: gitk:9066 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fel vid skrivning av incheckning till fil: %s" + +#: gitk:9072 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fel vid jämförelse av incheckningar: %s" + +#: gitk:9118 msgid "Top" msgstr "Topp" -#: gitk:8325 +#: gitk:9119 msgid "From" msgstr "Från" -#: gitk:8330 +#: gitk:9124 msgid "To" msgstr "Till" -#: gitk:8354 +#: gitk:9148 msgid "Generate patch" msgstr "Generera patch" -#: gitk:8356 +#: gitk:9150 msgid "From:" msgstr "Från:" -#: gitk:8365 +#: gitk:9159 msgid "To:" msgstr "Till:" -#: gitk:8374 +#: gitk:9168 msgid "Reverse" msgstr "Vänd" -#: gitk:8376 gitk:8561 +#: gitk:9170 gitk:9366 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:8382 +#: gitk:9176 msgid "Generate" msgstr "Generera" -#: gitk:8420 +#: gitk:9214 msgid "Error creating patch:" msgstr "Fel vid generering av 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 "Taggnamn:" -#: gitk:8456 gitk:8615 +#: gitk:9249 +msgid "Tag message is optional" +msgstr "Taggmeddelandet är valfritt" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Taggmeddelande:" + +#: gitk:9255 gitk:9420 msgid "Create" msgstr "Skapa" -#: gitk:8473 +#: gitk:9273 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:8477 +#: gitk:9277 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:8483 +#: gitk:9287 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:8558 +#: gitk:9363 msgid "Command:" msgstr "Kommando:" -#: gitk:8566 +#: gitk:9371 msgid "Write" msgstr "Skriv" -#: gitk:8584 +#: gitk:9389 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:8611 +#: gitk:9416 msgid "Name:" msgstr "Namn:" -#: gitk:8634 +#: gitk:9439 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:8639 +#: gitk:9444 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:8705 +#: 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:8710 +#: gitk:9516 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:8719 +#: gitk:9525 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -973,7 +1033,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:8725 +#: gitk:9531 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -981,32 +1041,59 @@ msgstr "" "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:8741 +#: gitk:9547 gitk:9605 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:8767 +#: 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:9579 +msgid "Reverting" +msgstr "Ångrar" + +#: 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: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:9634 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:8769 +#: gitk:9636 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:8773 +#: gitk:9638 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:8777 +#: gitk:9641 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:8780 +#: gitk:9644 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:8783 +#: gitk:9647 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1014,19 +1101,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:8800 +#: gitk:9664 msgid "Resetting" msgstr "Återställer" -#: gitk:8857 +#: gitk:9724 msgid "Checking out" msgstr "Checkar ut" -#: gitk:8910 +#: gitk:9777 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:8916 +#: gitk:9783 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1035,16 +1122,16 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:8947 +#: gitk:9814 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:8962 +#: gitk:9829 msgid "Filter" msgstr "Filter" -#: gitk:9257 +#: gitk:10125 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1052,190 +1139,242 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:10243 +#: gitk:11102 msgid "Tag" msgstr "Tagg" -#: gitk:10243 +#: gitk:11106 msgid "Id" msgstr "Id" -#: gitk:10291 +#: gitk:11189 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:10308 +#: gitk:11206 msgid "B" msgstr "F" -#: gitk:10311 +#: gitk:11209 msgid "I" msgstr "K" -#: gitk:10407 -msgid "Gitk preferences" -msgstr "Inställningar för Gitk" - -#: gitk:10409 +#: gitk:11327 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:10412 +#: gitk:11330 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:10416 -#, tcl-format +#: gitk:11334 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:10420 +#: gitk:11337 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:10423 -msgid "Auto-select SHA1" -msgstr "Välj SHA1 automatiskt" +#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Välj SHA1 (längd) automatiskt" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Dölj fjärr-referenser" -#: gitk:10427 +#: gitk:11348 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:10429 +#: gitk:11350 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:10432 -msgid "Display nearby tags" -msgstr "Visa närliggande taggar" +#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Visa närliggande taggar/huvuden" -#: gitk:10435 -msgid "Hide remote refs" -msgstr "Dölj fjärr-referenser" +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Maximalt antal taggar/huvuden att visa" -#: gitk:10438 +#: gitk:11359 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:10441 +#: gitk:11362 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:10447 gitk:10512 +#: gitk:11368 gitk:11515 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:10449 +#: gitk:11369 msgid "Choose..." msgstr "Välj..." -#: gitk:10454 +#: gitk:11374 +msgid "General options" +msgstr "Allmänna inställningar" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Använd tema på fönsterelement" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(ändringen kräver omstart)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(för närvarande inte tillgängligt)" + +#: gitk:11392 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:10457 +#: gitk:11395 +msgid "Interface" +msgstr "Gränssnitt" + +#: gitk:11396 +msgid "interface" +msgstr "gränssnitt" + +#: gitk:11399 msgid "Background" msgstr "Bakgrund" -#: gitk:10458 gitk:10488 +#: gitk:11400 gitk:11430 msgid "background" msgstr "bakgrund" -#: gitk:10461 +#: gitk:11403 msgid "Foreground" msgstr "Förgrund" -#: gitk:10462 +#: gitk:11404 msgid "foreground" msgstr "förgrund" -#: gitk:10465 +#: gitk:11407 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:10466 +#: gitk:11408 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:10470 +#: gitk:11412 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:10471 +#: gitk:11413 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:10475 +#: gitk:11417 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:10477 +#: gitk:11419 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:10481 +#: gitk:11423 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:10483 +#: gitk:11425 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:10487 +#: gitk:11429 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:10491 +#: gitk:11438 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:10493 +#: gitk:11440 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:10494 +#: gitk:11441 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:10495 +#: gitk:11442 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:10522 +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Inställningar för Gitk" + +#: gitk:11473 +msgid "General" +msgstr "Allmänt" + +#: gitk:11474 +msgid "Colors" +msgstr "Färger" + +#: gitk:11475 +msgid "Fonts" +msgstr "Teckensnitt" + +#: gitk:11525 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:10973 -msgid "" -"Sorry, gitk cannot run with this version of Tcl/Tk.\n" -" Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" -" Gitk kräver åtminstone Tcl/Tk 8.4." - -#: gitk:11101 +#: gitk:12242 msgid "Cannot find a git repository here." -msgstr "Hittar inget gitk-arkiv här." +msgstr "Hittar inget git-arkiv här." -#: gitk:11105 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Hittar inte git-katalogen \"%s\"." - -#: gitk:11152 +#: gitk:12289 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": både revision och filnamn" -#: gitk:11164 +#: gitk:12301 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" -#: gitk:11249 +#: 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" diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po new file mode 100644 index 0000000000..ade9cb70cb --- /dev/null +++ b/gitk-git/po/vi.po @@ -0,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 <vnwildman@gmail.com>, 2013. +# +msgid "" +msgstr "" +"Project-Id-Version: gitk @@GIT_VERSION@@\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 <vnwildman@gmail.com>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Tô màu chữ" + +#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +msgid "Markup words" +msgstr "Đánh dấu chữ" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Gặp lỗi khi phân tích điểm xét duyệt:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn " +"trong giới hạn tập tin." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Gặp lỗi khi thực hiện lệnh git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Đang đọc" + +#: gitk:496 gitk:4508 +msgid "Reading commits..." +msgstr "Đang đọc các lần chuyển giao..." + +#: gitk:499 gitk:1637 gitk:4511 +msgid "No commits selected" +msgstr "Chưa chọn các lần chuyển giao" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Không thể phân tích kết xuất từ lệnh git log:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Không có thông tin về lần chuyển giao nào" + +#: gitk:1897 +msgid "mc" +msgstr "mc" + +#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +msgid "OK" +msgstr "Đồng ý" + +#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 +#: gitk:11221 gitk:11501 +msgid "Cancel" +msgstr "Thôi" + +#: gitk:2069 +msgid "Update" +msgstr "Cập nhật" + +#: gitk:2070 +msgid "Reload" +msgstr "Tải lại" + +#: gitk:2071 +msgid "Reread references" +msgstr "Đọc lại tham chiếu" + +#: gitk:2072 +msgid "List references" +msgstr "Liệt kê các tham chiếu" + +#: gitk:2074 +msgid "Start git gui" +msgstr "Khởi chạy git gui" + +#: gitk:2076 +msgid "Quit" +msgstr "Thoát" + +#: gitk:2068 +msgid "File" +msgstr "Chính" + +#: gitk:2080 +msgid "Preferences" +msgstr "Cá nhân hóa" + +#: gitk:2079 +msgid "Edit" +msgstr "Chỉnh sửa" + +#: gitk:2084 +msgid "New view..." +msgstr "Thêm trình bày mới..." + +#: gitk:2085 +msgid "Edit view..." +msgstr "Sửa cách trình bày..." + +#: gitk:2086 +msgid "Delete view" +msgstr "Xóa cách trình bày" + +#: gitk:2088 +msgid "All files" +msgstr "Mọi tập tin" + +#: gitk:2083 gitk:4050 +msgid "View" +msgstr "Trình bày" + +#: gitk:2093 gitk:2103 gitk:3009 +msgid "About gitk" +msgstr "Giới thiệu về gitk" + +#: gitk:2094 gitk:2108 +msgid "Key bindings" +msgstr "Tổ hợp phím" + +#: gitk:2092 gitk:2107 +msgid "Help" +msgstr "Trợ giúp" + +#: gitk:2185 gitk:8633 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "Hàng" + +#: gitk:2267 +msgid "Find" +msgstr "Tìm" + +#: gitk:2295 +msgid "commit" +msgstr "lần chuyển giao" + +#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 +#: gitk:6893 +msgid "containing:" +msgstr "có chứa:" + +#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +msgid "touching paths:" +msgstr "đang chạm đường dẫn:" + +#: gitk:2303 gitk:4759 +msgid "adding/removing string:" +msgstr "thêm/gỡ bỏ chuỗi:" + +#: gitk:2304 gitk:4761 +msgid "changing lines matching:" +msgstr "những dòng thay đổi khớp mẫu:" + +#: gitk:2313 gitk:2315 gitk:4748 +msgid "Exact" +msgstr "Chính xác" + +#: gitk:2315 gitk:4836 gitk:6704 +msgid "IgnCase" +msgstr "BquaHt" + +#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +msgid "Regexp" +msgstr "BTCQ" + +#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +msgid "All fields" +msgstr "Mọi trường" + +#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +msgid "Headline" +msgstr "Nội dung chính" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +msgid "Comments" +msgstr "Ghi chú" + +#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 +#: gitk:8826 +msgid "Author" +msgstr "Tác giả" + +#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +msgid "Committer" +msgstr "Người chuyển giao" + +#: gitk:2350 +msgid "Search" +msgstr "Tìm kiếm" + +#: gitk:2358 +msgid "Diff" +msgstr "So sánh" + +#: gitk:2360 +msgid "Old version" +msgstr "Phiên bản cũ" + +#: gitk:2362 +msgid "New version" +msgstr "Phiên bản mới" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Các dòng của nội dung" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Không xét đến thay đổi do khoảng trắng" + +#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +msgid "Line diff" +msgstr "Khác biệt theo dòng" + +#: gitk:2445 +msgid "Patch" +msgstr "Vá" + +#: gitk:2447 +msgid "Tree" +msgstr "Cây" + +#: gitk:2616 gitk:2636 +msgid "Diff this -> selected" +msgstr "So sánh cái này -> cái đã chọn" + +#: gitk:2617 gitk:2637 +msgid "Diff selected -> this" +msgstr "So sánh cái đã chọn -> cái này" + +#: gitk:2618 gitk:2638 +msgid "Make patch" +msgstr "Tạo miếng vá" + +#: gitk:2619 gitk:9235 +msgid "Create tag" +msgstr "Tạo thẻ" + +#: gitk:2620 gitk:9352 +msgid "Write commit to file" +msgstr "Ghi lần chuyển giao ra tập tin" + +#: gitk:2621 gitk:9409 +msgid "Create new branch" +msgstr "Tạo nhánh mới" + +#: gitk:2622 +msgid "Cherry-pick this commit" +msgstr "Cherry-pick lần chuyển giao này" + +#: gitk:2623 +msgid "Reset HEAD branch to here" +msgstr "Đặt lại HEAD của nhánh vào đây" + +#: gitk:2624 +msgid "Mark this commit" +msgstr "Đánh dấu lần chuyển giao này" + +#: gitk:2625 +msgid "Return to mark" +msgstr "Quay lại vị trí dấu" + +#: 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:2627 +msgid "Compare with marked commit" +msgstr "So sánh với lần chuyển giao đã đánh dấu" + +#: 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: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:2630 +msgid "Revert this commit" +msgstr "Hoàn lại lần chuyển giao này" + +#: gitk:2646 +msgid "Check out this branch" +msgstr "Checkout nhánh này" + +#: gitk:2647 +msgid "Remove this branch" +msgstr "Gỡ bỏ nhánh này" + +#: gitk:2654 +msgid "Highlight this too" +msgstr "Cũng tô sáng nó" + +#: gitk:2655 +msgid "Highlight this only" +msgstr "Chỉ tô sáng cái này" + +#: gitk:2656 +msgid "External diff" +msgstr "diff từ bên ngoài" + +#: gitk:2657 +msgid "Blame parent commit" +msgstr "Xem công trạng lần chuyển giao cha mẹ" + +#: gitk:2664 +msgid "Show origin of this line" +msgstr "Hiển thị nguyên gốc của dòng này" + +#: gitk:2665 +msgid "Run git gui blame on this line" +msgstr "Chạy lệnh git gui blame cho dòng này" + +#: gitk:3011 +#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - phần mềm xem các lần chuyển giao dành cho git\n" +"\n" +"Bản quyền © 2005-2011 Paul Mackerras\n" +"\n" +"Dùng và phân phối lại phần mềm này theo các điều khoản của Giấy Phép Công GNU" + +#: gitk:3019 gitk:3085 gitk:9836 +msgid "Close" +msgstr "Đóng" + +#: gitk:3040 +msgid "Gitk key bindings" +msgstr "Tổ hợp phím gitk" + +#: gitk:3043 +msgid "Gitk key bindings:" +msgstr "Tổ hợp phím gitk:" + +#: gitk:3045 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tThoát" + +#: gitk:3046 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tĐóng cửa sổ" + +#: gitk:3047 +msgid "<Home>\t\tMove to first commit" +msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên" + +#: gitk:3048 +msgid "<End>\t\tMove to last commit" +msgstr "<End>\t\tChuyển đến lần chuyển giao cuối" + +#: gitk:3049 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, k\tDi chuyển lên một lần chuyển giao" + +#: gitk:3050 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, j\tDi chuyển xuống một lần chuyển giao" + +#: gitk:3051 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sử" + +#: gitk:3052 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sử" + +#: gitk:3053 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3054 +msgid "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tDi chuyển lên một trang trong danh sách lần chuyển giao" + +#: gitk:3055 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tDi chuyển xuống một trang trong danh sách lần chuyển giao" + +#: gitk: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: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: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: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: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: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:3062 +msgid "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Shift-Up>\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)" + +#: gitk:3063 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "" +"<Shift-Down>\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)" + +#: gitk:3064 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Delete>, b\tCuộn phần trình bày diff lên một trang" + +#: gitk:3065 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tCuộn phần trình bày diff lên một trang" + +#: gitk:3066 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Space>\t\tCuộn phần trình bày diff xuống một trang" + +#: gitk: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: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:3069 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tTìm kiếm" + +#: 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:3071 +msgid "<Return>\tMove to next find hit" +msgstr "<Return>\t\tDi chuyển đến chỗ gặp kế tiếp" + +#: gitk:3072 +msgid "/\t\tFocus the search box" +msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm" + +#: gitk:3073 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tDi chuyển đến chỗ gặp kế trước" + +#: 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: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: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:3077 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tTăng cỡ chữ" + +#: gitk:3078 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tTăng cỡ chữ" + +#: gitk:3079 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tGiảm cỡ chữ" + +#: gitk:3080 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tGiảm cỡ chữ" + +#: gitk:3081 +msgid "<F5>\t\tUpdate" +msgstr "<F5>\t\tCập nhật" + +#: 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:3568 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Lỗi chào hỏi \"%s\" từ %s:" + +#: gitk:3631 +msgid "command failed:" +msgstr "lệnh gặp lỗi:" + +#: gitk:3780 +msgid "No such commit" +msgstr "Không có lần chuyển giao như vậy" + +#: gitk:3794 +msgid "git gui blame: command failed:" +msgstr "git gui blame: lệnh gặp lỗi:" + +#: 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:3833 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Gặp lỗi khi đọc chỉ mục: %s" + +#: gitk:3858 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Không thể khởi chạy git blame: %s" + +#: gitk:3861 gitk:6735 +msgid "Searching" +msgstr "Đang tìm kiếm" + +#: gitk:3893 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Gặp lỗi khi chạy git blame: %s" + +#: 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:3935 +msgid "External diff viewer failed:" +msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:" + +#: gitk:4053 +msgid "Gitk view definition" +msgstr "Định nghĩa cách trình bày gitk" + +#: gitk:4057 +msgid "Remember this view" +msgstr "Nhớ cách trình bày này" + +#: 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:4059 +msgid "Branches & tags:" +msgstr "Nhánh & thẻ:" + +#: gitk:4060 +msgid "All refs" +msgstr "Mọi tham chiếu" + +#: gitk:4061 +msgid "All (local) branches" +msgstr "Mọi nhánh (nội bộ)" + +#: gitk:4062 +msgid "All tags" +msgstr "Mọi thẻ" + +#: gitk:4063 +msgid "All remote-tracking branches" +msgstr "Mọi nhánh remote-tracking" + +#: gitk:4064 +msgid "Commit Info (regular expressions):" +msgstr "Thông tin chuyển giao (biểu thức chính quy):" + +#: gitk:4065 +msgid "Author:" +msgstr "Tác giả:" + +#: gitk:4066 +msgid "Committer:" +msgstr "Người chuyển giao:" + +#: gitk:4067 +msgid "Commit Message:" +msgstr "Chú thích của lần chuyển giao:" + +#: gitk:4068 +msgid "Matches all Commit Info criteria" +msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" + +#: 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:4071 +msgid "Fixed String" +msgstr "Chuỗi cố định" + +#: gitk:4072 +msgid "Regular Expression" +msgstr "Biểu thức chính quy" + +#: gitk:4073 +msgid "Search string:" +msgstr "Chuỗi tìm kiếm:" + +#: 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:4075 +msgid "Since:" +msgstr "Kể từ:" + +#: gitk:4076 +msgid "Until:" +msgstr "Đến:" + +#: 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:4078 +msgid "Number to show:" +msgstr "Số lượng hiển thị:" + +#: gitk:4079 +msgid "Number to skip:" +msgstr "Số lượng sẽ bỏ qua:" + +#: gitk:4080 +msgid "Miscellaneous options:" +msgstr "Tuỳ chọn hỗn hợp:" + +#: gitk:4081 +msgid "Strictly sort by date" +msgstr "Sắp xếp chặt chẽ theo ngày" + +#: gitk:4082 +msgid "Mark branch sides" +msgstr "Đánh dấu các cạnh nhánh" + +#: gitk:4083 +msgid "Limit to first parent" +msgstr "Giới hạn thành cha mẹ đầu tiên" + +#: gitk:4084 +msgid "Simple history" +msgstr "Lịch sử dạng đơn giản" + +#: gitk:4085 +msgid "Additional arguments to git log:" +msgstr "Đối số bổ xung cho lệnh git log:" + +#: 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: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:4211 +msgid "Gitk: edit view" +msgstr "Gitk: sửa cách trình bày" + +#: gitk:4219 +msgid "-- criteria for selecting revisions" +msgstr "-- tiêu chuẩn chọn điểm xét duyệt" + +#: gitk:4224 +msgid "View Name" +msgstr "Tên cách trình bày" + +#: gitk:4299 +msgid "Apply (F5)" +msgstr "Áp dụng (F5)" + +#: gitk:4337 +msgid "Error in commit selection arguments:" +msgstr "Lỗi trong các đối số chọn chuyển giao:" + +#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +msgid "None" +msgstr "Không" + +#: gitk:5003 gitk:5008 +msgid "Descendant" +msgstr "Con cháu" + +#: gitk:5004 +msgid "Not descendant" +msgstr "Không có con cháu" + +#: gitk:5011 gitk:5016 +msgid "Ancestor" +msgstr "Tổ tiên chung" + +#: gitk:5012 +msgid "Not ancestor" +msgstr "Không có chung tổ tiên" + +#: 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: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:7115 +msgid "and many more" +msgstr "và nhiều nữa" + +#: gitk:7118 +msgid "many" +msgstr "nhiều" + +#: gitk:7309 +msgid "Tags:" +msgstr "Thẻ:" + +#: gitk:7326 gitk:7332 gitk:8806 +msgid "Parent" +msgstr "Cha" + +#: gitk:7337 +msgid "Child" +msgstr "Con" + +#: gitk:7346 +msgid "Branch" +msgstr "Nhánh" + +#: gitk:7349 +msgid "Follows" +msgstr "Đứng sau" + +#: gitk:7352 +msgid "Precedes" +msgstr "Đứng trước" + +# tcl-format +#: gitk:7947 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Lỗi lấy diff: %s" + +#: gitk:8631 +msgid "Goto:" +msgstr "Nhảy tới:" + +#: 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:8659 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Không hiểu điểm xét duyệt %s" + +#: gitk:8669 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Không hiểu định danh SHA1 %s" + +#: 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:8813 gitk:8828 +msgid "Date" +msgstr "Ngày" + +#: gitk:8816 +msgid "Children" +msgstr "Con cháu" + +#: gitk:8879 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Đặt lại nhánh %s tại đây" + +#: gitk:8881 +msgid "Detached head: can't reset" +msgstr "Head đã bị tách rời: không thể đặt lại" + +#: gitk:8986 gitk:8992 +msgid "Skipping merge commit " +msgstr "Bỏ qua lần chuyển giao hòa trộn " + +#: gitk:9001 gitk:9006 +msgid "Error getting patch ID for " +msgstr "Gặp lỗi khi lấy ID miếng vá cho " + +#: gitk:9002 gitk:9007 +msgid " - stopping\n" +msgstr " - dừng\n" + +#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +msgid "Commit " +msgstr "Commit " + +#: gitk:9016 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" là cùng một miếng vá với\n" +" " + +#: gitk:9024 +msgid "" +" differs from\n" +" " +msgstr "" +" khác biệt từ\n" +" " + +#: gitk:9026 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Khác biệt của lần chuyển giao (commit):\n" +"\n" + +#: gitk:9038 gitk:9047 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " có %s con - dừng\n" + +#: 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: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:9118 +msgid "Top" +msgstr "Đỉnh" + +#: gitk:9119 +msgid "From" +msgstr "Từ" + +#: gitk:9124 +msgid "To" +msgstr "Đến" + +#: gitk:9148 +msgid "Generate patch" +msgstr "Tạo miếng vá" + +#: gitk:9150 +msgid "From:" +msgstr "Từ:" + +#: gitk:9159 +msgid "To:" +msgstr "Đến:" + +#: gitk:9168 +msgid "Reverse" +msgstr "Đảo ngược" + +#: gitk:9170 gitk:9366 +msgid "Output file:" +msgstr "Tập tin kết xuất:" + +#: gitk:9176 +msgid "Generate" +msgstr "Tạo" + +#: gitk:9214 +msgid "Error creating patch:" +msgstr "Gặp lỗi khi tạo miếng vá:" + +#: gitk:9237 gitk:9354 gitk:9411 +msgid "ID:" +msgstr "ID:" + +#: gitk:9246 +msgid "Tag name:" +msgstr "Tên thẻ:" + +#: gitk:9249 +msgid "Tag message is optional" +msgstr "Ghi chú thẻ chỉ là tùy chọn" + +#: gitk:9251 +msgid "Tag message:" +msgstr "Ghi chú cho thẻ:" + +#: gitk:9255 gitk:9420 +msgid "Create" +msgstr "Tạo" + +#: gitk:9273 +msgid "No tag name specified" +msgstr "Chưa chỉ ra tên của thẻ" + +#: gitk:9277 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Thẻ “%s” đã có sẵn rồi" + +#: gitk:9287 +msgid "Error creating tag:" +msgstr "Gặp lỗi khi tạo thẻ:" + +#: gitk:9363 +msgid "Command:" +msgstr "Lệnh:" + +#: gitk:9371 +msgid "Write" +msgstr "Ghi" + +#: gitk:9389 +msgid "Error writing commit:" +msgstr "Gặp lỗi trong quá trình ghi chuyển giao:" + +#: gitk:9416 +msgid "Name:" +msgstr "Tên:" + +#: 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:9444 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?" + +#: 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:9516 +msgid "Cherry-picking" +msgstr "Đang cherry-pick" + +#: 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: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:9547 gitk:9605 +msgid "No changes committed" +msgstr "Không có thay đổi nào cần chuyển giao" + +#: 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:9579 +msgid "Reverting" +msgstr "Đang hoàn tác" + +#: 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: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:9634 +msgid "Confirm reset" +msgstr "Xác nhật đặt lại" + +#: gitk:9636 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Đặt lại nhánh “%s” thành “%s”?" + +#: gitk:9638 +msgid "Reset type:" +msgstr "Kiểu đặt lại:" + +#: 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: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: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:9664 +msgid "Resetting" +msgstr "Đang đặt lại" + +#: gitk:9724 +msgid "Checking out" +msgstr "Đang checkout" + +#: 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: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:9814 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Thẻ và Đầu: %s" + +#: gitk:9829 +msgid "Filter" +msgstr "Bộ lọc" + +#: 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:11102 +msgid "Tag" +msgstr "Thẻ" + +#: gitk:11106 +msgid "Id" +msgstr "Id" + +#: gitk:11189 +msgid "Gitk font chooser" +msgstr "Hộp thoại chọn phông Gitk" + +#: gitk:11206 +msgid "B" +msgstr "B" + +#: gitk:11209 +msgid "I" +msgstr "I" + +#: 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:11330 +msgid "Maximum graph width (lines)" +msgstr "Độ rộng biểu đồ tối đa (dòng)" + +#: gitk:11334 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Độ rộng biểu đồ tối đa (% của bảng)" + +#: gitk:11337 +msgid "Show local changes" +msgstr "Hiển thị các thay đổi nội bộ" + +#: gitk:11340 +msgid "Auto-select SHA1 (length)" +msgstr "Tự chọn SHA1 (độ dài)" + +#: gitk:11344 +msgid "Hide remote refs" +msgstr "Ẩn tham chiếu đến máy chủ" + +#: gitk:11348 +msgid "Diff display options" +msgstr "Các tùy chọn trình bày các khác biệt" + +#: gitk:11350 +msgid "Tab spacing" +msgstr "Khoảng cách tab" + +#: gitk:11353 +msgid "Display nearby tags/heads" +msgstr "Hiển thị các thẻ/đầu xung quanh" + +#: gitk:11356 +msgid "Maximum # tags/heads to show" +msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị" + +#: 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:11362 +msgid "Support per-file encodings" +msgstr "Hỗ trợ mã hóa mỗi-dòng" + +#: gitk:11368 gitk:11515 +msgid "External diff tool" +msgstr "Công cụ so sánh từ bên ngoài" + +#: gitk:11369 +msgid "Choose..." +msgstr "Chọn..." + +#: gitk:11374 +msgid "General options" +msgstr "Các tùy chọn chung" + +#: gitk:11377 +msgid "Use themed widgets" +msgstr "Dùng các widget chủ đề" + +#: gitk:11379 +msgid "(change requires restart)" +msgstr "(để thay đổi cần khởi động lại)" + +#: gitk:11381 +msgid "(currently unavailable)" +msgstr "(hiện tại không sẵn sàng)" + +#: 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:11395 +msgid "Interface" +msgstr "Giao diện" + +#: gitk:11396 +msgid "interface" +msgstr "giao diện" + +#: gitk:11399 +msgid "Background" +msgstr "Nền" + +#: gitk:11400 gitk:11430 +msgid "background" +msgstr "nền" + +#: gitk:11403 +msgid "Foreground" +msgstr "Tiền cảnh" + +#: gitk:11404 +msgid "foreground" +msgstr "tiền cảnh" + +#: gitk:11407 +msgid "Diff: old lines" +msgstr "So sánh: dòng cũ" + +#: gitk:11408 +msgid "diff old lines" +msgstr "diff dòng cũ" + +#: gitk:11412 +msgid "Diff: new lines" +msgstr "So sánh: dòng mới" + +#: gitk:11413 +msgid "diff new lines" +msgstr "màu dòng mới" + +#: gitk:11417 +msgid "Diff: hunk header" +msgstr "So sánh: phần đầu của đoạn" + +#: gitk:11419 +msgid "diff hunk header" +msgstr "màu của phần đầu của đoạn khi so sánh" + +#: gitk:11423 +msgid "Marked line bg" +msgstr "Nền dòng đánh dấu" + +#: gitk:11425 +msgid "marked line background" +msgstr "nền dòng được đánh dấu" + +#: gitk:11429 +msgid "Select bg" +msgstr "Màu nền" + +#: gitk:11438 +msgid "Fonts: press to choose" +msgstr "Phông chữ: bấm vào các nút ở dưới để chọn" + +#: gitk:11440 +msgid "Main font" +msgstr "Phông chữ chính" + +#: gitk:11441 +msgid "Diff display font" +msgstr "Phông chữ dùng khi so sánh" + +#: gitk:11442 +msgid "User interface font" +msgstr "Phông chữ giao diện" + +#: gitk:11464 +msgid "Gitk preferences" +msgstr "Cá nhân hóa các cài đặt cho Gitk" + +#: gitk:11473 +msgid "General" +msgstr "Chung" + +#: gitk:11474 +msgid "Colors" +msgstr "Màu sắc" + +#: gitk:11475 +msgid "Fonts" +msgstr "Phông chữ" + +#: gitk:11525 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: chọn màu cho %s" + +#: gitk:12242 +msgid "Cannot find a git repository here." +msgstr "Không thể tìm thấy kho git ở đây." + +#: 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:12301 +msgid "Bad arguments to gitk:" +msgstr "Đối số không hợp lệ cho gitk:" + +#: gitk:12405 +msgid "Command line" +msgstr "Dòng lệnh" + +#~ msgid "next" +#~ msgstr "tiếp" + +#~ msgid "prev" +#~ msgstr "trước" |