From: Junio C Hamano Date: Wed, 18 Jan 2017 18:27:59 +0000 (-0800) Subject: Merge git://ozlabs.org/~paulus/gitk X-Git-Tag: v2.12.0-rc0~77 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ffac48d093d4b518a0cc0e8bf1b7cb53e0c3d7a2;p=thirdparty%2Fgit.git Merge git://ozlabs.org/~paulus/gitk * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Remove translated message from comments gitk: ru.po: Update Russian translation gitk: Update copyright notice to 2016 gitk: Clear array 'commitinfo' on reload gitk: Remove closed file descriptors from $blobdifffd gitk: Turn off undo manager in the text widget gitk: Fix Japanese translation for "marked commit" gitk: Fix missing commits when using -S or -G gitk: Use explicit RGB green instead of "lime" gitk: Add Portuguese translation gitk: Makefile: create install bin directory gitk: Include commit title in branch dialog gitk: Allow checking out a remote branch gitk: Add a 'rename' option to the branch context menu --- ffac48d093d4b518a0cc0e8bf1b7cb53e0c3d7a2 diff --cc gitk-git/Makefile index 5acdc900ab,0000000000..5bdd52a6eb mode 100644,000000..100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@@ -1,79 -1,0 +1,80 @@@ +# The default target of this Makefile is... +all:: + +prefix ?= $(HOME) +bindir ?= $(prefix)/bin +sharedir ?= $(prefix)/share +gitk_libdir ?= $(sharedir)/gitk/lib +msgsdir ?= $(gitk_libdir)/msgs +msgsdir_SQ = $(subst ','\'',$(msgsdir)) + +TCL_PATH ?= tclsh +TCLTK_PATH ?= wish +INSTALL ?= install +RM ?= rm -f + +DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) +bindir_SQ = $(subst ','\'',$(bindir)) +TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) + +### Detect Tck/Tk interpreter path changes +TRACK_TCLTK = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)') + +GIT-TCLTK-VARS: FORCE + @VARS='$(TRACK_TCLTK)'; \ + if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ + echo 1>&2 " * new Tcl/Tk interpreter location"; \ + echo "$$VARS" >$@; \ + fi + +## po-file creation rules +XGETTEXT ?= xgettext +ifdef NO_MSGFMT + MSGFMT ?= $(TCL_PATH) po/po2msg.sh +else + MSGFMT ?= msgfmt + ifneq ($(shell $(MSGFMT) --tcl -l C -d . /dev/null 2>/dev/null; echo $$?),0) + MSGFMT := $(TCL_PATH) po/po2msg.sh + endif +endif + +PO_TEMPLATE = po/gitk.pot +ALL_POFILES = $(wildcard po/*.po) +ALL_MSGFILES = $(subst .po,.msg,$(ALL_POFILES)) + +ifndef V + QUIET = @ + QUIET_GEN = $(QUIET)echo ' ' GEN $@ && +endif + +all:: gitk-wish $(ALL_MSGFILES) + +install:: all ++ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)' + $(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk + $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)' + $(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true + +uninstall:: + $(foreach p,$(ALL_MSGFILES), $(RM) '$(DESTDIR_SQ)$(msgsdir_SQ)'/$(notdir $p) &&) true + $(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk + +clean:: + $(RM) gitk-wish po/*.msg GIT-TCLTK-VARS + +gitk-wish: gitk GIT-TCLTK-VARS + $(QUIET_GEN)$(RM) $@ $@+ && \ + sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' $@+ && \ + chmod +x $@+ && \ + mv -f $@+ $@ + +$(PO_TEMPLATE): gitk + $(XGETTEXT) -kmc -LTcl -o $@ gitk +update-po:: $(PO_TEMPLATE) + $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) +$(ALL_MSGFILES): %.msg : %.po + @echo Generating catalog $@ + $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) + +.PHONY: all install uninstall clean update-po +.PHONY: FORCE diff --cc gitk-git/po/bg.po index 99aa77aa63,0000000000..407d5550b1 mode 100644,000000..100644 --- a/gitk-git/po/bg.po +++ b/gitk-git/po/bg.po @@@ -1,1381 -1,0 +1,1381 @@@ +# Bulgarian translation of gitk po-file. +# Copyright (C) 2014, 2015 Alexander Shopov . +# This file is distributed under the same license as the git package. +# Alexander Shopov , 2014, 2015. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk master\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-19 11:48+0200\n" +"PO-Revision-Date: 2015-12-19 11:49+0200\n" +"Last-Translator: Alexander Shopov \n" +"Language-Team: Bulgarian \n" +"Language: bg\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Списъкът с неслети файлове не може да бъде получен:" + +#: gitk:212 gitk:2399 +msgid "Color words" +msgstr "Оцветяване на думите" + +#: gitk:217 gitk:2399 gitk:8239 gitk:8272 +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:4544 +msgid "Reading commits..." +msgstr "Прочитане на подаванията…" + +#: gitk:499 gitk:1637 gitk:4547 +msgid "No commits selected" +msgstr "Не са избрани подавания" + +#: gitk:1445 gitk:4064 gitk:12469 +msgid "Command line" +msgstr "Команден ред" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Изходът от „git log“ не може да се анализира:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Липсва информация за подавания" + +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 +msgid "OK" +msgstr "Добре" + +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 +#: gitk:11275 gitk:11555 +msgid "Cancel" +msgstr "Отказ" + +#: gitk:2083 +msgid "&Update" +msgstr "&Обновяване" + +#: gitk:2084 +msgid "&Reload" +msgstr "&Презареждане" + +#: gitk:2085 +msgid "Reread re&ferences" +msgstr "&Наново прочитане на настройките" + +#: gitk:2086 +msgid "&List references" +msgstr "&Изброяване на указателите" + +#: gitk:2088 +msgid "Start git &gui" +msgstr "&Стартиране на „git gui“" + +#: gitk:2090 +msgid "&Quit" +msgstr "&Спиране на програмата" + +#: gitk:2082 +msgid "&File" +msgstr "&Файл" + +#: gitk:2094 +msgid "&Preferences" +msgstr "&Настройки" + +#: gitk:2093 +msgid "&Edit" +msgstr "&Редактиране" + +#: gitk:2098 +msgid "&New view..." +msgstr "&Нов изглед…" + +#: gitk:2099 +msgid "&Edit view..." +msgstr "&Редактиране на изгледа…" + +#: gitk:2100 +msgid "&Delete view" +msgstr "&Изтриване на изгледа" + +#: gitk:2102 +msgid "&All files" +msgstr "&Всички файлове" + +#: gitk:2097 +msgid "&View" +msgstr "&Изглед" + +#: gitk:2107 gitk:2117 +msgid "&About gitk" +msgstr "&Относно gitk" + +#: gitk:2108 gitk:2122 +msgid "&Key bindings" +msgstr "&Клавишни комбинации" + +#: gitk:2106 gitk:2121 +msgid "&Help" +msgstr "Помо&щ" + +#: gitk:2199 gitk:8671 +msgid "SHA1 ID:" +msgstr "SHA1:" + +#: gitk:2243 +msgid "Row" +msgstr "Ред" + +#: gitk:2281 +msgid "Find" +msgstr "Търсене" + +#: gitk:2309 +msgid "commit" +msgstr "подаване" + +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 +#: gitk:6931 +msgid "containing:" +msgstr "съдържащо:" + +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 +msgid "touching paths:" +msgstr "засягащо пътищата:" + +#: gitk:2317 gitk:4796 +msgid "adding/removing string:" +msgstr "добавящо/премахващо низ" + +#: gitk:2318 gitk:4798 +msgid "changing lines matching:" +msgstr "променящо редове напасващи:" + +#: gitk:2327 gitk:2329 gitk:4785 +msgid "Exact" +msgstr "Точно" + +#: gitk:2329 gitk:4873 gitk:6742 +msgid "IgnCase" +msgstr "Без регистър" + +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 +msgid "Regexp" +msgstr "Рег. израз" + +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 +msgid "All fields" +msgstr "Всички полета" + +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 +msgid "Headline" +msgstr "Първи ред" + +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 +msgid "Comments" +msgstr "Коментари" + +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 +#: gitk:8864 +msgid "Author" +msgstr "Автор" + +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 +msgid "Committer" +msgstr "Подаващ" + +#: gitk:2367 +msgid "Search" +msgstr "Търсене" + +#: gitk:2375 +msgid "Diff" +msgstr "Разлики" + +#: gitk:2377 +msgid "Old version" +msgstr "Стара версия" + +#: gitk:2379 +msgid "New version" +msgstr "Нова версия" + +#: gitk:2382 +msgid "Lines of context" +msgstr "Контекст в редове" + +#: gitk:2392 +msgid "Ignore space change" +msgstr "Празните знаци без значение" + +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 +msgid "Line diff" +msgstr "Поредови разлики" + +#: gitk:2463 +msgid "Patch" +msgstr "Кръпка" + +#: gitk:2465 +msgid "Tree" +msgstr "Дърво" + +#: gitk:2635 gitk:2656 +msgid "Diff this -> selected" +msgstr "Разлики между това и избраното" + +#: gitk:2636 gitk:2657 +msgid "Diff selected -> this" +msgstr "Разлики между избраното и това" + +#: gitk:2637 gitk:2658 +msgid "Make patch" +msgstr "Създаване на кръпка" + +#: gitk:2638 gitk:9273 +msgid "Create tag" +msgstr "Създаване на етикет" + +#: gitk:2639 +msgid "Copy commit summary" +msgstr "Копиране на информацията за подаване" + +#: gitk:2640 gitk:9404 +msgid "Write commit to file" +msgstr "Запазване на подаването във файл" + +#: gitk:2641 gitk:9461 +msgid "Create new branch" +msgstr "Създаване на нов клон" + +#: gitk:2642 +msgid "Cherry-pick this commit" +msgstr "Отбиране на това подаване" + +#: gitk:2643 +msgid "Reset HEAD branch to here" +msgstr "Привеждане на върха на клона към текущото подаване" + +#: gitk:2644 +msgid "Mark this commit" +msgstr "Отбелязване на това подаване" + +#: gitk:2645 +msgid "Return to mark" +msgstr "Връщане към отбелязаното подаване" + +#: gitk:2646 +msgid "Find descendant of this and mark" +msgstr "Откриване и отбелязване на наследниците" + +#: gitk:2647 +msgid "Compare with marked commit" +msgstr "Сравнение с отбелязаното подаване" + +#: gitk:2648 gitk:2659 +msgid "Diff this -> marked commit" +msgstr "Разлики между това и отбелязаното" + +#: gitk:2649 gitk:2660 +msgid "Diff marked commit -> this" +msgstr "Разлики между отбелязаното и това" + +#: gitk:2650 +msgid "Revert this commit" +msgstr "Отмяна на това подаване" + +#: gitk:2666 +msgid "Check out this branch" +msgstr "Изтегляне на този клон" + +#: gitk:2667 +msgid "Remove this branch" +msgstr "Изтриване на този клон" + +#: gitk:2668 +msgid "Copy branch name" +msgstr "Копиране на името на клона" + +#: gitk:2675 +msgid "Highlight this too" +msgstr "Отбелязване и на това" + +#: gitk:2676 +msgid "Highlight this only" +msgstr "Отбелязване само на това" + +#: gitk:2677 +msgid "External diff" +msgstr "Външна програма за разлики" + +#: gitk:2678 +msgid "Blame parent commit" +msgstr "Анотиране на родителското подаване" + +#: gitk:2679 +msgid "Copy path" +msgstr "Копиране на пътя" + +#: gitk:2686 +msgid "Show origin of this line" +msgstr "Показване на произхода на този ред" + +#: gitk:2687 +msgid "Run git gui blame on this line" +msgstr "Изпълнение на „git gui blame“ върху този ред" + +#: gitk:3031 +msgid "About gitk" +msgstr "Относно gitk" + +#: gitk:3033 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 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" ++"Авторски права: © 2005-2016 Paul Mackerras\n" +"\n" +"Използвайте и разпространявайте при условията на ОПЛ на ГНУ" + +#: gitk:3041 gitk:3108 gitk:9890 +msgid "Close" +msgstr "Затваряне" + +#: gitk:3062 +msgid "Gitk key bindings" +msgstr "Клавишни комбинации" + +#: gitk:3065 +msgid "Gitk key bindings:" +msgstr "Клавишни комбинации:" + +#: gitk:3067 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tСпиране на програмата" + +#: gitk:3068 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tЗатваряне на прозореца" + +#: gitk:3069 +msgid "\t\tMove to first commit" +msgstr "\t\tКъм първото подаване" + +#: gitk:3070 +msgid "\t\tMove to last commit" +msgstr "\t\tКъм последното подаване" + +#: gitk:3071 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tЕдно подаване нагоре" + +#: gitk:3072 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tЕдно подаване надолу" + +#: gitk:3073 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tНазад в историята" + +#: gitk:3074 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tНапред в историята" + +#: gitk:3075 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята" + +#: gitk:3076 +msgid "\tMove up one page in commit list" +msgstr "\tСтраница нагоре в списъка с подаванията" + +#: gitk:3077 +msgid "\tMove down one page in commit list" +msgstr "\tСтраница надолу в списъка с подаванията" + +#: gitk:3078 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tКъм началото на списъка с подаванията" + +#: gitk:3079 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tКъм края на списъка с подаванията" + +#: gitk:3080 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tРед нагоре в списъка с подавания" + +#: gitk:3081 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tРед надолу в списъка с подавания" + +#: gitk:3082 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания" + +#: gitk:3083 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания" + +#: gitk:3084 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tТърсене назад (визуално нагоре, исторически — последващи)" + +#: gitk:3085 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "" +"\tТърсене напред (визуално надолу, исторически — предхождащи)" + +#: gitk:3086 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tСтраница нагоре в изгледа за разлики" + +#: gitk:3087 +msgid "\tScroll diff view up one page" +msgstr "\tСтраница надолу в изгледа за разлики" + +#: gitk:3088 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tСтраница надолу в изгледа за разлики" + +#: gitk:3089 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\t18 реда нагоре в изгледа за разлики" + +#: gitk:3090 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\t18 реда надолу в изгледа за разлики" + +#: gitk:3091 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tТърсене" + +#: gitk:3092 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tКъм следващата поява" + +#: gitk:3093 +msgid "\tMove to next find hit" +msgstr "\tКъм следващата поява" + +#: gitk:3094 +msgid "g\t\tGo to commit" +msgstr "g\t\tКъм последното подаване" + +#: gitk:3095 +msgid "/\t\tFocus the search box" +msgstr "/\t\tФокус върху полето за търсене" + +#: gitk:3096 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tКъм предишната поява" + +#: gitk:3097 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tСледващ файл в изгледа за разлики" + +#: gitk:3098 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики" + +#: gitk:3099 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики" + +#: gitk:3100 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tПо-голям размер на шрифта" + +#: gitk:3101 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tПо-голям размер на шрифта" + +#: gitk:3102 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tПо-малък размер на шрифта" + +#: gitk:3103 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tПо-малък размер на шрифта" + +#: gitk:3104 +msgid "\t\tUpdate" +msgstr "\t\tОбновяване" + +#: gitk:3569 gitk:3578 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Грешка при създаването на временната директория „%s“:" + +#: gitk:3591 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Грешка при получаването на „%s“ от %s:" + +#: gitk:3654 +msgid "command failed:" +msgstr "неуспешно изпълнение на команда:" + +#: gitk:3803 +msgid "No such commit" +msgstr "Такова подаване няма" + +#: gitk:3817 +msgid "git gui blame: command failed:" +msgstr "„git gui blame“: неуспешно изпълнение на команда:" + +#: gitk:3848 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Върхът за сливане не може да бъде прочетен: %s" + +#: gitk:3856 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Грешка при прочитане на индекса: %s" + +#: gitk:3881 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Командата „git blame“ не може да бъде стартирана: %s" + +#: gitk:3884 gitk:6773 +msgid "Searching" +msgstr "Търсене" + +#: gitk:3916 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Грешка при изпълнението на „git blame“: %s" + +#: gitk:3944 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Този ред идва от подаването %s, което не е в изгледа" + +#: gitk:3958 +msgid "External diff viewer failed:" +msgstr "Неуспешно изпълнение на външната програма за разлики:" + +#: gitk:4062 +msgid "All files" +msgstr "Всички файлове" + +#: gitk:4086 +msgid "View" +msgstr "Изглед" + +#: gitk:4089 +msgid "Gitk view definition" +msgstr "Дефиниция на изглед в Gitk" + +#: gitk:4093 +msgid "Remember this view" +msgstr "Запазване на този изглед" + +#: gitk:4094 +msgid "References (space separated list):" +msgstr "Указатели (списък с разделител интервал):" + +#: gitk:4095 +msgid "Branches & tags:" +msgstr "Клони и етикети:" + +#: gitk:4096 +msgid "All refs" +msgstr "Всички указатели" + +#: gitk:4097 +msgid "All (local) branches" +msgstr "Всички (локални) клони" + +#: gitk:4098 +msgid "All tags" +msgstr "Всички етикети" + +#: gitk:4099 +msgid "All remote-tracking branches" +msgstr "Всички следящи клони" + +#: gitk:4100 +msgid "Commit Info (regular expressions):" +msgstr "Информация за подаване (рег. изр.):" + +#: gitk:4101 +msgid "Author:" +msgstr "Автор:" + +#: gitk:4102 +msgid "Committer:" +msgstr "Подал:" + +#: gitk:4103 +msgid "Commit Message:" +msgstr "Съобщение при подаване:" + +#: gitk:4104 +msgid "Matches all Commit Info criteria" +msgstr "Съвпадение по всички характеристики на подаването" + +#: gitk:4105 +msgid "Matches no Commit Info criteria" +msgstr "Не съвпада по никоя от характеристиките на подаването" + +#: gitk:4106 +msgid "Changes to Files:" +msgstr "Промени по файловете:" + +#: gitk:4107 +msgid "Fixed String" +msgstr "Дословен низ" + +#: gitk:4108 +msgid "Regular Expression" +msgstr "Регулярен израз" + +#: gitk:4109 +msgid "Search string:" +msgstr "Низ за търсене:" + +#: gitk:4110 +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:4111 +msgid "Since:" +msgstr "От:" + +#: gitk:4112 +msgid "Until:" +msgstr "До:" + +#: gitk:4113 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" +"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло " +"число):" + +#: gitk:4114 +msgid "Number to show:" +msgstr "Брой показани:" + +#: gitk:4115 +msgid "Number to skip:" +msgstr "Брой прескочени:" + +#: gitk:4116 +msgid "Miscellaneous options:" +msgstr "Разни:" + +#: gitk:4117 +msgid "Strictly sort by date" +msgstr "Подреждане по дата" + +#: gitk:4118 +msgid "Mark branch sides" +msgstr "Отбелязване на страните по клона" + +#: gitk:4119 +msgid "Limit to first parent" +msgstr "Само първия родител" + +#: gitk:4120 +msgid "Simple history" +msgstr "Опростена история" + +#: gitk:4121 +msgid "Additional arguments to git log:" +msgstr "Допълнителни аргументи към „git log“:" + +#: gitk:4122 +msgid "Enter files and directories to include, one per line:" +msgstr "Въведете файловете и директориите за включване, по елемент на ред" + +#: gitk:4123 +msgid "Command to generate more commits to include:" +msgstr "" +"Команда за генерирането на допълнителни подавания, които да бъдат включени:" + +#: gitk:4247 +msgid "Gitk: edit view" +msgstr "Gitk: редактиране на изглед" + +#: gitk:4255 +msgid "-- criteria for selecting revisions" +msgstr "— критерии за избор на версии" + +#: gitk:4260 +msgid "View Name" +msgstr "Име на изглед" + +#: gitk:4335 +msgid "Apply (F5)" +msgstr "Прилагане (F5)" + +#: gitk:4373 +msgid "Error in commit selection arguments:" +msgstr "Грешка в аргументите за избор на подавания:" + +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 +msgid "None" +msgstr "Няма" + +#: gitk:5040 gitk:5045 +msgid "Descendant" +msgstr "Наследник" + +#: gitk:5041 +msgid "Not descendant" +msgstr "Не е наследник" + +#: gitk:5048 gitk:5053 +msgid "Ancestor" +msgstr "Предшественик" + +#: gitk:5049 +msgid "Not ancestor" +msgstr "Не е предшественик" + +#: gitk:5343 +msgid "Local changes checked in to index but not committed" +msgstr "Локални промени добавени към индекса, но неподадени" + +#: gitk:5379 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Локални промени извън индекса" + +#: gitk:7153 +msgid "and many more" +msgstr "и още много" + +#: gitk:7156 +msgid "many" +msgstr "много" + +#: gitk:7347 +msgid "Tags:" +msgstr "Етикети:" + +#: gitk:7364 gitk:7370 gitk:8844 +msgid "Parent" +msgstr "Родител" + +#: gitk:7375 +msgid "Child" +msgstr "Дете" + +#: gitk:7384 +msgid "Branch" +msgstr "Клон" + +#: gitk:7387 +msgid "Follows" +msgstr "Следва" + +#: gitk:7390 +msgid "Precedes" +msgstr "Предшества" + +#: gitk:7985 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Грешка при получаването на разликите: %s" + +#: gitk:8669 +msgid "Goto:" +msgstr "Към ред:" + +#: gitk:8690 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Съкратената сума по SHA1 %s не е еднозначна" + +#: gitk:8697 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Непозната версия %s" + +#: gitk:8707 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Непозната сума по SHA1 %s" + +#: gitk:8709 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Версия %s не е в текущия изглед" + +#: gitk:8851 gitk:8866 +msgid "Date" +msgstr "Дата" + +#: gitk:8854 +msgid "Children" +msgstr "Деца" + +#: gitk:8917 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Зануляване на клона „%s“ към текущото подаване" + +#: gitk:8919 +msgid "Detached head: can't reset" +msgstr "Несвързан връх: невъзможно зануляване" + +#: gitk:9024 gitk:9030 +msgid "Skipping merge commit " +msgstr "Пропускане на подаването на сливането" + +#: gitk:9039 gitk:9044 +msgid "Error getting patch ID for " +msgstr "Грешка при получаването на идентификатора на " + +#: gitk:9040 gitk:9045 +msgid " - stopping\n" +msgstr " — спиране\n" + +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 +msgid "Commit " +msgstr "Подаване" + +#: gitk:9054 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" е същата кръпка като\n" +" " + +#: gitk:9062 +msgid "" +" differs from\n" +" " +msgstr "" +" се различава от\n" +" " + +#: gitk:9064 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Разлика между подаванията:\n" +"\n" + +#: gitk:9076 gitk:9085 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " има %s деца — спиране\n" + +#: gitk:9104 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Грешка при запазването на подаването във файл: %s" + +#: gitk:9110 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Грешка при изчисляването на разликите между подаванията: %s" + +#: gitk:9156 +msgid "Top" +msgstr "Най-горе" + +#: gitk:9157 +msgid "From" +msgstr "От" + +#: gitk:9162 +msgid "To" +msgstr "До" + +#: gitk:9186 +msgid "Generate patch" +msgstr "Генериране на кръпка" + +#: gitk:9188 +msgid "From:" +msgstr "От:" + +#: gitk:9197 +msgid "To:" +msgstr "До:" + +#: gitk:9206 +msgid "Reverse" +msgstr "Обръщане" + +#: gitk:9208 gitk:9418 +msgid "Output file:" +msgstr "Запазване във файла:" + +#: gitk:9214 +msgid "Generate" +msgstr "Генериране" + +#: gitk:9252 +msgid "Error creating patch:" +msgstr "Грешка при създаването на кръпка:" + +#: gitk:9275 gitk:9406 gitk:9463 +msgid "ID:" +msgstr "Идентификатор:" + +#: gitk:9284 +msgid "Tag name:" +msgstr "Име на етикет:" + +#: gitk:9287 +msgid "Tag message is optional" +msgstr "Съобщението за етикет е незадължително" + +#: gitk:9289 +msgid "Tag message:" +msgstr "Съобщение за етикет:" + +#: gitk:9293 gitk:9472 +msgid "Create" +msgstr "Създаване" + +#: gitk:9311 +msgid "No tag name specified" +msgstr "Липсва име на етикет" + +#: gitk:9315 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Етикетът „%s“ вече съществува" + +#: gitk:9325 +msgid "Error creating tag:" +msgstr "Грешка при създаването на етикет:" + +#: gitk:9415 +msgid "Command:" +msgstr "Команда:" + +#: gitk:9423 +msgid "Write" +msgstr "Запазване" + +#: gitk:9441 +msgid "Error writing commit:" +msgstr "Грешка при запазването на подаването:" + +#: gitk:9468 +msgid "Name:" +msgstr "Име:" + +#: gitk:9491 +msgid "Please specify a name for the new branch" +msgstr "Укажете име за новия клон" + +#: gitk:9496 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?" + +#: gitk:9563 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" + +#: gitk:9568 +msgid "Cherry-picking" +msgstr "Отбиране" + +#: gitk:9577 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Неуспешно отбиране, защото във файла „%s“ има локални промени.\n" +"Подайте, занулете или ги скатайте и пробвайте отново." + +#: gitk:9583 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Неуспешно отбиране поради конфликти при сливане.\n" +"Искате ли да ги коригирате чрез „git citool“?" + +#: gitk:9599 gitk:9657 +msgid "No changes committed" +msgstr "Не са подадени промени" + +#: gitk:9626 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" + +#: gitk:9631 +msgid "Reverting" +msgstr "Отмяна" + +#: gitk:9639 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Неуспешна отмяна, защото във файла „%s“ има локални промени.\n" +"Подайте, занулете или ги скатайте и пробвайте отново.<" + +#: gitk:9643 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Неуспешно отмяна поради конфликти при сливане.\n" +"Искате ли да ги коригирате чрез „git citool“?" + +#: gitk:9686 +msgid "Confirm reset" +msgstr "Потвърждаване на зануляването" + +#: gitk:9688 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Да се занули ли клонът „%s“ към „%s“?" + +#: gitk:9690 +msgid "Reset type:" +msgstr "Вид зануляване:" + +#: gitk:9693 +msgid "Soft: Leave working tree and index untouched" +msgstr "Слабо: работното дърво и индекса остават същите" + +#: gitk:9696 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Смесено: работното дърво остава същото, индексът се занулява" + +#: gitk:9699 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Силно: зануляване и на работното дърво, и на индекса\n" +"(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" + +#: gitk:9716 +msgid "Resetting" +msgstr "Зануляване" + +#: gitk:9776 +msgid "Checking out" +msgstr "Изтегляне" + +#: gitk:9829 +msgid "Cannot delete the currently checked-out branch" +msgstr "Текущо изтегленият клон не може да бъде изтрит" + +#: gitk:9835 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Подаванията на клона „%s“ не са на никой друг клон.\n" +"Наистина ли да се изтрие клонът „%s“?" + +#: gitk:9866 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Етикети и върхове: %s" + +#: gitk:9883 +msgid "Filter" +msgstr "Филтриране" + +#: gitk:10179 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Грешка при прочитането на топологията на подаванията. Информацията за клона " +"и предшестващите/следващите етикети ще е непълна." + +#: gitk:11156 +msgid "Tag" +msgstr "Етикет" + +#: gitk:11160 +msgid "Id" +msgstr "Идентификатор" + +#: gitk:11243 +msgid "Gitk font chooser" +msgstr "Избор на шрифт за Gitk" + +#: gitk:11260 +msgid "B" +msgstr "Ч" + +#: gitk:11263 +msgid "I" +msgstr "К" + +#: gitk:11381 +msgid "Commit list display options" +msgstr "Настройки на списъка с подавания" + +#: gitk:11384 +msgid "Maximum graph width (lines)" +msgstr "Максимална широчина на графа (в редове)" + +#: gitk:11388 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Максимална широчина на графа (% от панела)" + +#: gitk:11391 +msgid "Show local changes" +msgstr "Показване на локалните промени" + +#: gitk:11394 +msgid "Auto-select SHA1 (length)" +msgstr "Автоматично избиране на SHA1 (дължина)" + +#: gitk:11398 +msgid "Hide remote refs" +msgstr "Скриване на отдалечените указатели" + +#: gitk:11402 +msgid "Diff display options" +msgstr "Настройки на показването на разликите" + +#: gitk:11404 +msgid "Tab spacing" +msgstr "Широчина на табулатора" + +#: gitk:11407 +msgid "Display nearby tags/heads" +msgstr "Извеждане на близките етикети и върхове" + +#: gitk:11410 +msgid "Maximum # tags/heads to show" +msgstr "Максимален брой етикети/върхове за показване" + +#: gitk:11413 +msgid "Limit diffs to listed paths" +msgstr "Разлика само в избраните пътища" + +#: gitk:11416 +msgid "Support per-file encodings" +msgstr "Поддръжка на различни кодирания за всеки файл" + +#: gitk:11422 gitk:11569 +msgid "External diff tool" +msgstr "Външен инструмент за разлики" + +#: gitk:11423 +msgid "Choose..." +msgstr "Избор…" + +#: gitk:11428 +msgid "General options" +msgstr "Общи настройки" + +#: gitk:11431 +msgid "Use themed widgets" +msgstr "Използване на тема за графичните обекти" + +#: gitk:11433 +msgid "(change requires restart)" +msgstr "(промяната изисква рестартиране на Gitk)" + +#: gitk:11435 +msgid "(currently unavailable)" +msgstr "(в момента недостъпно)" + +#: gitk:11446 +msgid "Colors: press to choose" +msgstr "Цветове: избира се с натискане" + +#: gitk:11449 +msgid "Interface" +msgstr "Интерфейс" + +#: gitk:11450 +msgid "interface" +msgstr "интерфейс" + +#: gitk:11453 +msgid "Background" +msgstr "Фон" + +#: gitk:11454 gitk:11484 +msgid "background" +msgstr "фон" + +#: gitk:11457 +msgid "Foreground" +msgstr "Знаци" + +#: gitk:11458 +msgid "foreground" +msgstr "знаци" + +#: gitk:11461 +msgid "Diff: old lines" +msgstr "Разлика: стари редове" + +#: gitk:11462 +msgid "diff old lines" +msgstr "разлика, стари редове" + +#: gitk:11466 +msgid "Diff: new lines" +msgstr "Разлика: нови редове" + +#: gitk:11467 +msgid "diff new lines" +msgstr "разлика, нови редове" + +#: gitk:11471 +msgid "Diff: hunk header" +msgstr "Разлика: начало на парче" + +#: gitk:11473 +msgid "diff hunk header" +msgstr "разлика, начало на парче" + +#: gitk:11477 +msgid "Marked line bg" +msgstr "Фон на отбелязан ред" + +#: gitk:11479 +msgid "marked line background" +msgstr "фон на отбелязан ред" + +#: gitk:11483 +msgid "Select bg" +msgstr "Избор на фон" + +#: gitk:11492 +msgid "Fonts: press to choose" +msgstr "Шрифтове: избира се с натискане" + +#: gitk:11494 +msgid "Main font" +msgstr "Основен шрифт" + +#: gitk:11495 +msgid "Diff display font" +msgstr "Шрифт за разликите" + +#: gitk:11496 +msgid "User interface font" +msgstr "Шрифт на интерфейса" + +#: gitk:11518 +msgid "Gitk preferences" +msgstr "Настройки на Gitk" + +#: gitk:11527 +msgid "General" +msgstr "Общи" + +#: gitk:11528 +msgid "Colors" +msgstr "Цветове" + +#: gitk:11529 +msgid "Fonts" +msgstr "Шрифтове" + +#: gitk:11579 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: избор на цвят на „%s“" + +#: gitk:12092 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Тази версия на Tcl/Tk не се поддържа от Gitk.\n" +" Необходима ви е поне Tcl/Tk 8.4." + +#: gitk:12302 +msgid "Cannot find a git repository here." +msgstr "Тук липсва хранилище на Git." + +#: gitk:12349 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл" + +#: gitk:12361 +msgid "Bad arguments to gitk:" +msgstr "Неправилни аргументи на gitk:" diff --cc gitk-git/po/ca.po index 5ad066f7ce,0000000000..87dfc18b44 mode 100644,000000..100644 --- a/gitk-git/po/ca.po +++ b/gitk-git/po/ca.po @@@ -1,1369 -1,0 +1,1369 @@@ +# Translation of gitk - # Copyright (C) 2005-2014 Paul Mackerras ++# Copyright (C) 2005-2016 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# Alex Henrie , 2015. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2015-10-05 22:23-0600\n" +"Last-Translator: Alex Henrie \n" +"Language-Team: Catalan\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.5\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:8220 gitk:8253 +msgid "Markup words" +msgstr "Marca les paraules" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Error en analitzar les revisions:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Error en executar l'ordre --argscmd:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està " +"sense fusionar." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer " +"sense fusionar està dins del límit de fitxers." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Error en executar git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Llegint" + +#: gitk:496 gitk:4525 +msgid "Reading commits..." +msgstr "Llegint les revisions..." + +#: gitk:499 gitk:1637 gitk:4528 +msgid "No commits selected" +msgstr "Cap comissió seleccionada" + +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Línia d'ordres" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "No es pot analitzar la sortida del git log:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Cap informació de comissió disponible" + +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +msgid "OK" +msgstr "D'acord" + +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 +msgid "Cancel" +msgstr "Cancel·la" + +#: gitk:2069 +msgid "&Update" +msgstr "Actualitza" + +#: gitk:2070 +msgid "&Reload" +msgstr "Recarrega" + +#: gitk:2071 +msgid "Reread re&ferences" +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 la vista" + +#: gitk:2088 gitk:4043 +msgid "&All files" +msgstr "Tots els fitxers" + +#: gitk:2083 gitk:4067 +msgid "&View" +msgstr "Vista" + +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" +msgstr "Quant al gitk" + +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "Associacions de tecles" + +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "Ajuda" + +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "ID SHA1:" + +#: gitk:2229 +msgid "Row" +msgstr "Fila" + +#: gitk:2267 +msgid "Find" +msgstr "Cerca" + +#: gitk:2295 +msgid "commit" +msgstr "comissió" + +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 +msgid "containing:" +msgstr "que contingui:" + +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +msgid "touching paths:" +msgstr "que toqui els camins:" + +#: gitk:2303 gitk:4777 +msgid "adding/removing string:" +msgstr "que afegeixi/elimini la cadena:" + +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "que tingui línies canviades coincidents amb:" + +#: gitk:2313 gitk:2315 gitk:4766 +msgid "Exact" +msgstr "Exacte" + +#: gitk:2315 gitk:4854 gitk:6723 +msgid "IgnCase" +msgstr "Ignora majúscula i minúscula" + +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +msgid "Regexp" +msgstr "Regexp" + +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +msgid "All fields" +msgstr "Tots els camps" + +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +msgid "Headline" +msgstr "Titular" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +msgid "Comments" +msgstr "Comentaris" + +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 +msgid "Author" +msgstr "Autor" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +msgid "Committer" +msgstr "Comitent" + +#: gitk:2350 +msgid "Search" +msgstr "Cerca" + +#: gitk:2358 +msgid "Diff" +msgstr "Diferència" + +#: gitk:2360 +msgid "Old version" +msgstr "Versió antiga" + +#: gitk:2362 +msgid "New version" +msgstr "Versió nova" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Línies de context" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignora canvis d'espai" + +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "Diferència de línies" + +#: gitk:2445 +msgid "Patch" +msgstr "Pedaç" + +#: gitk:2447 +msgid "Tree" +msgstr "Arbre" + +#: gitk:2617 gitk:2637 +msgid "Diff this -> selected" +msgstr "Diferencia aquesta -> la seleccionada" + +#: gitk:2618 gitk:2638 +msgid "Diff selected -> this" +msgstr "Diferencia la seleccionada -> aquesta" + +#: gitk:2619 gitk:2639 +msgid "Make patch" +msgstr "Fes pedaç" + +#: gitk:2620 gitk:9254 +msgid "Create tag" +msgstr "Crea etiqueta" + +#: gitk:2621 gitk:9371 +msgid "Write commit to file" +msgstr "Escriu la comissió a un fitxer" + +#: gitk:2622 gitk:9428 +msgid "Create new branch" +msgstr "Crea una branca nova" + +#: gitk:2623 +msgid "Cherry-pick this commit" +msgstr "Recull aquesta comissió com a cirera" + +#: gitk:2624 +msgid "Reset HEAD branch to here" +msgstr "Restableix la branca HEAD aquí" + +#: gitk:2625 +msgid "Mark this commit" +msgstr "Marca aquesta comissió" + +#: gitk:2626 +msgid "Return to mark" +msgstr "Torna a la marca" + +#: gitk:2627 +msgid "Find descendant of this and mark" +msgstr "Troba la descendent d'aquesta i marca-la" + +#: gitk:2628 +msgid "Compare with marked commit" +msgstr "Compara amb la comissió marcada" + +#: gitk:2629 gitk:2640 +msgid "Diff this -> marked commit" +msgstr "Diferencia aquesta -> la comissió marcada" + +#: gitk:2630 gitk:2641 +msgid "Diff marked commit -> this" +msgstr "Diferencia la comissió seleccionada -> aquesta" + +#: gitk:2631 +msgid "Revert this commit" +msgstr "Reverteix aquesta comissió" + +#: gitk:2647 +msgid "Check out this branch" +msgstr "Agafa aquesta branca" + +#: gitk:2648 +msgid "Remove this branch" +msgstr "Elimina aquesta branca" + +#: gitk:2649 +msgid "Copy branch name" +msgstr "Copia el nom de branca" + +#: gitk:2656 +msgid "Highlight this too" +msgstr "Ressalta aquest també" + +#: gitk:2657 +msgid "Highlight this only" +msgstr "Ressalta només aquest" + +#: gitk:2658 +msgid "External diff" +msgstr "Diferència externa" + +#: gitk:2659 +msgid "Blame parent commit" +msgstr "Culpabilitat de la comissió mare" + +#: gitk:2660 +msgid "Copy path" +msgstr "Copia el camí" + +#: gitk:2667 +msgid "Show origin of this line" +msgstr "Mostra l'origen d'aquesta línia" + +#: gitk:2668 +msgid "Run git gui blame on this line" +msgstr "Executa git gui blame en aquesta línia" + +#: gitk:3014 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 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" ++"Copyright © 2005-2016 Paul Mackerras\n" +"\n" +"Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU" + +#: gitk:3022 gitk:3089 gitk:9857 +msgid "Close" +msgstr "Tanca" + +#: gitk:3043 +msgid "Gitk key bindings" +msgstr "Associacions de tecles del Gitk" + +#: gitk:3046 +msgid "Gitk key bindings:" +msgstr "Associacions de tecles del Gitk:" + +#: gitk:3048 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tSurt" + +#: gitk:3049 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tTanca la finestra" + +#: gitk:3050 +msgid "\t\tMove to first commit" +msgstr "\t\tVés a la primera comissió" + +#: gitk:3051 +msgid "\t\tMove to last commit" +msgstr "\t\tVés a l'última comissió" + +#: gitk:3052 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tMou-te cap amunt per una comissió" + +#: gitk:3053 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tMou-te cap avall per una comissió" + +#: gitk:3054 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tRetrocedeix en la llista d'història" + +#: gitk:3055 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tAvança en la llista d'història" + +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" +"<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història" + +#: gitk:3057 +msgid "\tMove up one page in commit list" +msgstr "\tMou-te cap amunt per una pàgina en la llista de comissions" + +#: gitk:3058 +msgid "\tMove down one page in commit list" +msgstr "\tMou-te cap avall per una pàgina en la llista de comissions" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions" + +#: gitk:3060 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions" + +#: gitk:3061 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Amunt>\tDesplaça la llista de comissions cap amunt per una línia" + +#: gitk:3062 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Avall>\tDesplaça la llista de comissions cap avall per una línia" + +#: gitk:3063 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-RePàg>\tDesplaça la llista de comissions cap amunt per una pàgina" + +#: gitk:3064 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-AvPàg>\tDesplaça la llista de comissions cap avall per una pàgina" + +#: gitk:3065 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tCerca cap enrere (cap amunt, les comissions més noves)" + +#: gitk:3066 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "\tCerca cap endavant (cap avall, les comissions més velles)" + +#: gitk:3067 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tDesplaça la vista de diferència cap amunt per una pàgina" + +#: gitk:3068 +msgid "\tScroll diff view up one page" +msgstr "\tDesplaça la vista de diferència cap amunt per una pàgina" + +#: gitk:3069 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tDesplaça la vista de diferència cap avall per una pàgina" + +#: gitk:3070 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tDesplaça la vista de diferència cap amunt per 18 línies" + +#: gitk:3071 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tDesplaça la vista de diferència cap avall per 18 línies" + +#: gitk:3072 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tCerca" + +#: gitk:3073 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca" + +#: gitk:3074 +msgid "\tMove to next find hit" +msgstr "\tMou-te a la propera coincidència de la cerca" + +#: gitk:3075 +msgid "g\t\tGo to commit" +msgstr "g\t\tVés a l'última comissió" + +#: gitk:3076 +msgid "/\t\tFocus the search box" +msgstr "/\t\tPosa el focus a la caixa de cerca" + +#: gitk:3077 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tMou a la coincidència prèvia de la cerca" + +#: gitk:3078 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tDesplaça la vista de diferència al proper fitxer" + +#: gitk:3079 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència" + +#: gitk:3080 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència" + +#: gitk:3081 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAugmenta la mida de lletra" + +#: gitk:3082 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-més>\tAugmenta la mida de lletra" + +#: gitk:3083 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDisminueix la mida de lletra" + +#: gitk:3084 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-menys>\tDisminueix la mida de lletra" + +#: gitk:3085 +msgid "\t\tUpdate" +msgstr "\t\tActualitza" + +#: gitk:3550 gitk:3559 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Error en crear el directori temporal %s:" + +#: gitk:3572 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Error en obtenir \"%s\" de %s:" + +#: gitk:3635 +msgid "command failed:" +msgstr "l'ordre ha fallat:" + +#: gitk:3784 +msgid "No such commit" +msgstr "Cap comissió així" + +#: gitk:3798 +msgid "git gui blame: command failed:" +msgstr "git gui blame: l'ordre ha fallat:" + +#: gitk:3829 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "No s'ha pogut llegir el cap de fusió: %s" + +#: gitk:3837 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Error en llegir l'índex: %s" + +#: gitk:3862 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "No s'ha pogut iniciar el git blame: %s" + +#: gitk:3865 gitk:6754 +msgid "Searching" +msgstr "Cercant" + +#: gitk:3897 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Error en executar el git blame: %s" + +#: gitk:3925 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" +"Aquella línia ve de la comissió %s, la qual no és en aquesta visualització" + +#: gitk:3939 +msgid "External diff viewer failed:" +msgstr "El visualitzador de diferència extern ha fallat:" + +#: gitk:4070 +msgid "Gitk view definition" +msgstr "Definició de vista del Gitk" + +#: gitk:4074 +msgid "Remember this view" +msgstr "Recorda aquesta vista" + +#: gitk:4075 +msgid "References (space separated list):" +msgstr "Referències (llista separada per espais)" + +#: gitk:4076 +msgid "Branches & tags:" +msgstr "Branques i etiquetes:" + +#: gitk:4077 +msgid "All refs" +msgstr "Totes les referències" + +#: gitk:4078 +msgid "All (local) branches" +msgstr "Totes les branques (locals)" + +#: gitk:4079 +msgid "All tags" +msgstr "Totes les etiquetes" + +#: gitk:4080 +msgid "All remote-tracking branches" +msgstr "Totes les branques amb seguiment remot" + +#: gitk:4081 +msgid "Commit Info (regular expressions):" +msgstr "Informació de comissió (expressions regulars):" + +#: gitk:4082 +msgid "Author:" +msgstr "Autor:" + +#: gitk:4083 +msgid "Committer:" +msgstr "Comitent:" + +#: gitk:4084 +msgid "Commit Message:" +msgstr "Missatge de comissió:" + +#: gitk:4085 +msgid "Matches all Commit Info criteria" +msgstr "Coincideix amb tots els criteris d'informació de comissió" + +#: gitk:4086 +msgid "Matches no Commit Info criteria" +msgstr "No coincideix amb cap criteri d'informació de comissió" + +#: gitk:4087 +msgid "Changes to Files:" +msgstr "Canvis als fitxers:" + +#: gitk:4088 +msgid "Fixed String" +msgstr "Cadena fixa" + +#: gitk:4089 +msgid "Regular Expression" +msgstr "Expressió regular" + +#: gitk:4090 +msgid "Search string:" +msgstr "Cadena de cerca:" + +#: gitk:4091 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 " +"15:27:38\"):" + +#: gitk:4092 +msgid "Since:" +msgstr "Des de:" + +#: gitk:4093 +msgid "Until:" +msgstr "Fins:" + +#: gitk:4094 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limita o salta un nombre de revisions (nombre enter positiu)" + +#: gitk:4095 +msgid "Number to show:" +msgstr "Nombre a mostrar:" + +#: gitk:4096 +msgid "Number to skip:" +msgstr "Nombre a saltar:" + +#: gitk:4097 +msgid "Miscellaneous options:" +msgstr "Opcions miscel·lànies:" + +#: gitk:4098 +msgid "Strictly sort by date" +msgstr "Ordena estrictament per data" + +#: gitk:4099 +msgid "Mark branch sides" +msgstr "Marca els costats de les branques" + +#: gitk:4100 +msgid "Limit to first parent" +msgstr "Limita a la primera mare" + +#: gitk:4101 +msgid "Simple history" +msgstr "Història senzilla" + +#: gitk:4102 +msgid "Additional arguments to git log:" +msgstr "Paràmetres addicionals al git log:" + +#: gitk:4103 +msgid "Enter files and directories to include, one per line:" +msgstr "Introduïu els fitxers i directoris a incloure, un per línia:" + +#: gitk:4104 +msgid "Command to generate more commits to include:" +msgstr "Ordre per a generar més comissions a incloure:" + +#: gitk:4228 +msgid "Gitk: edit view" +msgstr "Gitk: vista d'edició" + +#: gitk:4236 +msgid "-- criteria for selecting revisions" +msgstr "-- criteris per a seleccionar les revisions" + +#: gitk:4241 +msgid "View Name" +msgstr "Nom de vista" + +#: gitk:4316 +msgid "Apply (F5)" +msgstr "Aplica (F5)" + +#: gitk:4354 +msgid "Error in commit selection arguments:" +msgstr "Error en els paràmetres de selecció de comissions:" + +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +msgid "None" +msgstr "Cap" + +#: gitk:5021 gitk:5026 +msgid "Descendant" +msgstr "Descendent" + +#: gitk:5022 +msgid "Not descendant" +msgstr "No descendent" + +#: gitk:5029 gitk:5034 +msgid "Ancestor" +msgstr "Avantpassat" + +#: gitk:5030 +msgid "Not ancestor" +msgstr "No avantpassat" + +#: gitk:5324 +msgid "Local changes checked in to index but not committed" +msgstr "Canvis locals registrats en l'índex però no comesos" + +#: gitk:5360 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Canvis locals sense cometre, no registrats en l'índex" + +#: gitk:7134 +msgid "and many more" +msgstr "i moltes més" + +#: gitk:7137 +msgid "many" +msgstr "moltes" + +#: gitk:7328 +msgid "Tags:" +msgstr "Etiquetes:" + +#: gitk:7345 gitk:7351 gitk:8825 +msgid "Parent" +msgstr "Mare" + +#: gitk:7356 +msgid "Child" +msgstr "Filla" + +#: gitk:7365 +msgid "Branch" +msgstr "Branca" + +#: gitk:7368 +msgid "Follows" +msgstr "Segueix" + +#: gitk:7371 +msgid "Precedes" +msgstr "Precedeix" + +#: gitk:7966 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Error en obtenir les diferències: %s" + +#: gitk:8650 +msgid "Goto:" +msgstr "Vés a:" + +#: gitk:8671 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "L'id SHA1 curta %s és ambigua" + +#: gitk:8678 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La revisió %s és desconeguda" + +#: gitk:8688 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "L'id SHA1 %s és desconeguda" + +#: gitk:8690 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La revisió %s no és en la vista actual" + +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Data" + +#: gitk:8835 +msgid "Children" +msgstr "Filles" + +#: gitk:8898 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Restableix la branca %s aquí" + +#: gitk:8900 +msgid "Detached head: can't reset" +msgstr "Cap separat: no es pot restablir" + +#: gitk:9005 gitk:9011 +msgid "Skipping merge commit " +msgstr "Saltant la comissió de fusió " + +#: gitk:9020 gitk:9025 +msgid "Error getting patch ID for " +msgstr "Error en obtenir l'ID de pedaç de " + +#: gitk:9021 gitk:9026 +msgid " - stopping\n" +msgstr " - aturant\n" + +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +msgid "Commit " +msgstr "Comissió " + +#: gitk:9035 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" és el mateix pedaç que\n" +" " + +#: gitk:9043 +msgid "" +" differs from\n" +" " +msgstr "" +" difereix de\n" +" " + +#: gitk:9045 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Diferència entre comissions:\n" +"\n" + +#: gitk:9057 gitk:9066 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " té %s filles - aturant\n" + +#: gitk:9085 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Error en escriure la comissió al fitxer: %s" + +#: gitk:9091 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Error en diferenciar les comissions: %s" + +#: gitk:9137 +msgid "Top" +msgstr "Part superior" + +#: gitk:9138 +msgid "From" +msgstr "De" + +#: gitk:9143 +msgid "To" +msgstr "A" + +#: gitk:9167 +msgid "Generate patch" +msgstr "Genera pedaç" + +#: gitk:9169 +msgid "From:" +msgstr "De:" + +#: gitk:9178 +msgid "To:" +msgstr "A:" + +#: gitk:9187 +msgid "Reverse" +msgstr "Inverteix" + +#: gitk:9189 gitk:9385 +msgid "Output file:" +msgstr "Fitxer de sortida:" + +#: gitk:9195 +msgid "Generate" +msgstr "Genera" + +#: gitk:9233 +msgid "Error creating patch:" +msgstr "Error en crear el pedaç:" + +#: gitk:9256 gitk:9373 gitk:9430 +msgid "ID:" +msgstr "ID:" + +#: gitk:9265 +msgid "Tag name:" +msgstr "Nom d'etiqueta:" + +#: gitk:9268 +msgid "Tag message is optional" +msgstr "El missatge d'etiqueta és opcional" + +#: gitk:9270 +msgid "Tag message:" +msgstr "Missatge d'etiqueta:" + +#: gitk:9274 gitk:9439 +msgid "Create" +msgstr "Crea" + +#: gitk:9292 +msgid "No tag name specified" +msgstr "No s'ha especificat cap nom d'etiqueta" + +#: gitk:9296 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "L'etiqueta \"%s\" ja existeix" + +#: gitk:9306 +msgid "Error creating tag:" +msgstr "Error en crear l'etiqueta:" + +#: gitk:9382 +msgid "Command:" +msgstr "Ordre:" + +#: gitk:9390 +msgid "Write" +msgstr "Escriu" + +#: gitk:9408 +msgid "Error writing commit:" +msgstr "Error en escriure la comissió:" + +#: gitk:9435 +msgid "Name:" +msgstr "Nom:" + +#: gitk:9458 +msgid "Please specify a name for the new branch" +msgstr "Si us plau, especifiqueu un nom per a la branca nova" + +#: gitk:9463 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La branca '%s' ja existeix. Voleu sobreescriure?" + +#: gitk:9530 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a " +"aplicar-la?" + +#: gitk:9535 +msgid "Cherry-picking" +msgstr "Recollint cireres" + +#: gitk:9544 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"El recull de cireres ha fallat a causa de canvis locals al fitxer '%s'.\n" +"Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a " +"intentar." + +#: gitk:9550 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"El recull de cireres ha fallat a causa d'un conflicte de fusió.\n" +"Voleu executar el git citool per a resoldre'l?" + +#: gitk:9566 gitk:9624 +msgid "No changes committed" +msgstr "Cap canvi comès" + +#: gitk:9593 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?" + +#: gitk:9598 +msgid "Reverting" +msgstr "Revertint" + +#: gitk:9606 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"La reversió ha fallat a causa de canvis locals als fitxers següents:%s Si us " +"plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a " +"intentar." + +#: gitk:9610 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"La reversió ha fallat a causa d'un conflicte de fusió.\n" +" Voleu executar el git citool per a resoldre'l?" + +#: gitk:9653 +msgid "Confirm reset" +msgstr "Confirma el restabliment" + +#: gitk:9655 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Voleu restablir la branca %s a %s?" + +#: gitk:9657 +msgid "Reset type:" +msgstr "Tipus de restabliment:" + +#: gitk:9660 +msgid "Soft: Leave working tree and index untouched" +msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar" + +#: gitk:9663 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex" + +#: gitk:9666 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Dur: Restableix l'arbre de treball i l'índex\n" +"(descarta TOTS els canvis locals)" + +#: gitk:9683 +msgid "Resetting" +msgstr "Restablint" + +#: gitk:9743 +msgid "Checking out" +msgstr "Agafant" + +#: gitk:9796 +msgid "Cannot delete the currently checked-out branch" +msgstr "No es pot suprimir la branca actualment agafada" + +#: gitk:9802 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Les comissions en la branca %s no són en cap altra branca.\n" +"Realment voleu suprimir la branca %s?" + +#: gitk:9833 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Etiquetes i caps: %s" + +#: gitk:9850 +msgid "Filter" +msgstr "Filtre" + +#: gitk:10146 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Error en llegir la informació de topologia de comissió; la informació sobre " +"branques i etiquetes precedents/següents serà incompleta." + +#: gitk:11123 +msgid "Tag" +msgstr "Etiqueta" + +#: gitk:11127 +msgid "Id" +msgstr "Id" + +#: gitk:11210 +msgid "Gitk font chooser" +msgstr "Selector de tipus de lletra del Gitk" + +#: gitk:11227 +msgid "B" +msgstr "B" + +#: gitk:11230 +msgid "I" +msgstr "I" + +#: gitk:11348 +msgid "Commit list display options" +msgstr "Opcions de visualització de la llista de comissions" + +#: gitk:11351 +msgid "Maximum graph width (lines)" +msgstr "Amplada màxima del gràfic (línies)" + +#: gitk:11355 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Amplada màxima del gràfic (% del panell)" + +#: gitk:11358 +msgid "Show local changes" +msgstr "Mostra els canvis locals" + +#: gitk:11361 +msgid "Auto-select SHA1 (length)" +msgstr "Selecciona automàticament l'SHA1 (longitud)" + +#: gitk:11365 +msgid "Hide remote refs" +msgstr "Amaga les referències remotes" + +#: gitk:11369 +msgid "Diff display options" +msgstr "Opcions de visualització de diferència" + +#: gitk:11371 +msgid "Tab spacing" +msgstr "Espaiat de tabulació" + +#: gitk:11374 +msgid "Display nearby tags/heads" +msgstr "Mostra etiquetes/caps propers" + +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "Nombre màxim d'etiquetes/caps a mostrar" + +#: gitk:11380 +msgid "Limit diffs to listed paths" +msgstr "Limita les diferències als camins llistats" + +#: gitk:11383 +msgid "Support per-file encodings" +msgstr "Admet codificacions específiques per a cada fitxer" + +#: gitk:11389 gitk:11536 +msgid "External diff tool" +msgstr "Eina de diferència externa" + +#: gitk:11390 +msgid "Choose..." +msgstr "Trieu..." + +#: gitk:11395 +msgid "General options" +msgstr "Opcions generals" + +#: gitk:11398 +msgid "Use themed widgets" +msgstr "Usa els ginys tematitzats" + +#: gitk:11400 +msgid "(change requires restart)" +msgstr "(el canvi requereix reiniciar)" + +#: gitk:11402 +msgid "(currently unavailable)" +msgstr "(actualment no disponible)" + +#: gitk:11413 +msgid "Colors: press to choose" +msgstr "Colors: pressiona per a triar" + +#: gitk:11416 +msgid "Interface" +msgstr "Interfície" + +#: gitk:11417 +msgid "interface" +msgstr "interfície" + +#: gitk:11420 +msgid "Background" +msgstr "Fons" + +#: gitk:11421 gitk:11451 +msgid "background" +msgstr "fons" + +#: gitk:11424 +msgid "Foreground" +msgstr "Primer pla" + +#: gitk:11425 +msgid "foreground" +msgstr "primer pla" + +#: gitk:11428 +msgid "Diff: old lines" +msgstr "Diferència: línies velles" + +#: gitk:11429 +msgid "diff old lines" +msgstr "diferencia les línies velles" + +#: gitk:11433 +msgid "Diff: new lines" +msgstr "Diferència: línies noves" + +#: gitk:11434 +msgid "diff new lines" +msgstr "diferencia les línies noves" + +#: gitk:11438 +msgid "Diff: hunk header" +msgstr "Diferència: capçalera de tros" + +#: gitk:11440 +msgid "diff hunk header" +msgstr "diferencia la capçalera de tros" + +#: gitk:11444 +msgid "Marked line bg" +msgstr "Fons de la línia marcada" + +#: gitk:11446 +msgid "marked line background" +msgstr "fons de la línia marcada" + +#: gitk:11450 +msgid "Select bg" +msgstr "Fons de la selecció" + +#: gitk:11459 +msgid "Fonts: press to choose" +msgstr "Tipus de lletra: pressiona per a triar" + +#: gitk:11461 +msgid "Main font" +msgstr "Tipus de lletra principal" + +#: gitk:11462 +msgid "Diff display font" +msgstr "Tipus de lletra de visualització de diferència" + +#: gitk:11463 +msgid "User interface font" +msgstr "Tipus de lletra de la interfície d'usuari" + +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Preferències del Gitk" + +#: gitk:11494 +msgid "General" +msgstr "General" + +#: gitk:11495 +msgid "Colors" +msgstr "Colors" + +#: gitk:11496 +msgid "Fonts" +msgstr "Tipus de lletra" + +#: gitk:11546 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: tria el color per a %s" + +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Perdó, el gitk no pot executar-se amb aquesta versió de Tcl/Tk.\n" +" El Gitk requereix com a mínim el Tcl/Tk 8.4." + +#: gitk:12269 +msgid "Cannot find a git repository here." +msgstr "No es pot trobar cap dipòsit de git aquí." + +#: gitk:12316 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer" + +#: gitk:12328 +msgid "Bad arguments to gitk:" +msgstr "Paràmetres dolents al gitk:" diff --cc gitk-git/po/de.po index bde749ed8a,0000000000..5db3824828 mode 100644,000000..100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@@ -1,1387 -1,0 +1,1387 @@@ +# Translation of gitk to German. +# Copyright (C) 2007 Paul Mackerras. +# This file is distributed under the same license as the gitk package. +# +# Christian Stimming , 2007. +# Frederik Schwarzer , 2008. +msgid "" +msgstr "" +"Project-Id-Version: git-gui\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2015-10-20 14:20+0200\n" +"Last-Translator: Christian Stimming \n" +"Language-Team: German\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Wörter einfärben" + +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +msgid "Markup words" +msgstr "Wörter kennzeichnen" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Fehler beim Laden der Versionen:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren " +"keine nicht zusammengeführten Dateien." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " +"nicht zusammengeführten Dateien in der Dateiauswahl." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Fehler beim Ausführen von »git log«:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lesen" + +#: gitk:496 gitk:4525 +msgid "Reading commits..." +msgstr "Versionen werden gelesen ..." + +#: gitk:499 gitk:1637 gitk:4528 +msgid "No commits selected" +msgstr "Keine Versionen ausgewählt" + +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Kommandozeile" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Ausgabe von »git log« kann nicht erkannt werden:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Keine Versionsinformation verfügbar" + +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +msgid "OK" +msgstr "Ok" + +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 +msgid "Cancel" +msgstr "Abbrechen" + +#: gitk:2069 +msgid "&Update" +msgstr "&Aktualisieren" + +#: gitk:2070 +msgid "&Reload" +msgstr "&Neu laden" + +#: gitk:2071 +msgid "Reread re&ferences" +msgstr "&Zweige neu laden" + +#: gitk:2072 +msgid "&List references" +msgstr "Zweige/Markierungen auf&listen" + +#: gitk:2074 +msgid "Start git &gui" +msgstr "»git &gui« starten" + +#: gitk:2076 +msgid "&Quit" +msgstr "&Beenden" + +#: gitk:2068 +msgid "&File" +msgstr "&Datei" + +#: gitk:2080 +msgid "&Preferences" +msgstr "&Einstellungen" + +#: gitk:2079 +msgid "&Edit" +msgstr "&Bearbeiten" + +#: gitk:2084 +msgid "&New view..." +msgstr "&Neue Ansicht ..." + +#: gitk:2085 +msgid "&Edit view..." +msgstr "Ansicht &bearbeiten ..." + +#: gitk:2086 +msgid "&Delete view" +msgstr "Ansicht &entfernen" + +#: gitk:2088 gitk:4043 +msgid "&All files" +msgstr "&Alle Dateien" + +#: gitk:2083 gitk:4067 +msgid "&View" +msgstr "&Ansicht" + +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" +msgstr "Über &gitk" + +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "&Tastenkürzel" + +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "&Hilfe" + +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "Zeile" + +#: gitk:2267 +msgid "Find" +msgstr "Suche" + +#: gitk:2295 +msgid "commit" +msgstr "Version nach" + +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 +msgid "containing:" +msgstr "Beschreibung:" + +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +msgid "touching paths:" +msgstr "Dateien:" + +#: gitk:2303 gitk:4777 +msgid "adding/removing string:" +msgstr "Änderungen:" + +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "Geänderte Zeilen entsprechen:" + +#: gitk:2313 gitk:2315 gitk:4766 +msgid "Exact" +msgstr "Exakt" + +#: gitk:2315 gitk:4854 gitk:6723 +msgid "IgnCase" +msgstr "Kein Groß/Klein" + +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +msgid "Regexp" +msgstr "Regexp" + +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +msgid "All fields" +msgstr "Alle Felder" + +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +msgid "Headline" +msgstr "Überschrift" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +msgid "Comments" +msgstr "Beschreibung" + +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 +msgid "Author" +msgstr "Autor" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +msgid "Committer" +msgstr "Eintragender" + +#: gitk:2350 +msgid "Search" +msgstr "Suchen" + +#: gitk:2358 +msgid "Diff" +msgstr "Vergleich" + +#: gitk:2360 +msgid "Old version" +msgstr "Alte Version" + +#: gitk:2362 +msgid "New version" +msgstr "Neue Version" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Kontextzeilen" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Leerzeichenänderungen ignorieren" + +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "Zeilenunterschied" + +#: gitk:2445 +msgid "Patch" +msgstr "Patch" + +#: gitk:2447 +msgid "Tree" +msgstr "Baum" + +#: gitk:2617 gitk:2637 +msgid "Diff this -> selected" +msgstr "Vergleich: diese -> gewählte" + +#: gitk:2618 gitk:2638 +msgid "Diff selected -> this" +msgstr "Vergleich: gewählte -> diese" + +#: gitk:2619 gitk:2639 +msgid "Make patch" +msgstr "Patch erstellen" + +#: gitk:2620 gitk:9254 +msgid "Create tag" +msgstr "Markierung erstellen" + +#: gitk:2621 gitk:9371 +msgid "Write commit to file" +msgstr "Version in Datei schreiben" + +#: gitk:2622 gitk:9428 +msgid "Create new branch" +msgstr "Neuen Zweig erstellen" + +#: gitk:2623 +msgid "Cherry-pick this commit" +msgstr "Diese Version pflücken" + +#: gitk:2624 +msgid "Reset HEAD branch to here" +msgstr "HEAD-Zweig auf diese Version zurücksetzen" + +#: gitk:2625 +msgid "Mark this commit" +msgstr "Lesezeichen setzen" + +#: gitk:2626 +msgid "Return to mark" +msgstr "Zum Lesezeichen" + +#: gitk:2627 +msgid "Find descendant of this and mark" +msgstr "Abkömmling von Lesezeichen und dieser Version finden" + +#: gitk:2628 +msgid "Compare with marked commit" +msgstr "Mit Lesezeichen vergleichen" + +#: gitk:2629 gitk:2640 +msgid "Diff this -> marked commit" +msgstr "Vergleich: diese -> gewählte Version" + +#: gitk:2630 gitk:2641 +msgid "Diff marked commit -> this" +msgstr "Vergleich: gewählte -> diese Version" + +#: gitk:2631 +msgid "Revert this commit" +msgstr "Version umkehren" + +#: gitk:2647 +msgid "Check out this branch" +msgstr "Auf diesen Zweig umstellen" + +#: gitk:2648 +msgid "Remove this branch" +msgstr "Zweig löschen" + +#: gitk:2649 +msgid "Copy branch name" +msgstr "Zweigname kopieren" + +#: gitk:2656 +msgid "Highlight this too" +msgstr "Diesen auch hervorheben" + +#: gitk:2657 +msgid "Highlight this only" +msgstr "Nur diesen hervorheben" + +#: gitk:2658 +msgid "External diff" +msgstr "Externes Diff-Programm" + +#: gitk:2659 +msgid "Blame parent commit" +msgstr "Annotieren der Elternversion" + +#: gitk:2660 +msgid "Copy path" +msgstr "Pfad kopieren" + +#: gitk:2667 +msgid "Show origin of this line" +msgstr "Herkunft dieser Zeile anzeigen" + +#: gitk:2668 +msgid "Run git gui blame on this line" +msgstr "Diese Zeile annotieren (»git gui blame«)" + +#: gitk:3014 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - eine Visualisierung der Git-Historie\n" +"\n" - "Copyright \\u00a9 2005-2014 Paul Mackerras\n" ++"Copyright \\u00a9 2005-2016 Paul Mackerras\n" +"\n" +"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " +"License" + +#: gitk:3022 gitk:3089 gitk:9857 +msgid "Close" +msgstr "Schließen" + +#: gitk:3043 +msgid "Gitk key bindings" +msgstr "Gitk-Tastaturbelegung" + +#: gitk:3046 +msgid "Gitk key bindings:" +msgstr "Gitk-Tastaturbelegung:" + +#: gitk:3048 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tBeenden" + +#: gitk:3049 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tFenster schließen" + +#: gitk:3050 +msgid "\t\tMove to first commit" +msgstr "\t\tZur neuesten Version springen" + +#: gitk:3051 +msgid "\t\tMove to last commit" +msgstr "\t\tZur ältesten Version springen" + +#: gitk:3052 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tNächste neuere Version" + +#: gitk:3053 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tNächste ältere Version" + +#: gitk:3054 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tEine Version zurückgehen" + +#: gitk:3055 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tEine Version weitergehen" + +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n>\tZu n-ter Elternversion in Versionshistorie springen" + +#: gitk:3057 +msgid "\tMove up one page in commit list" +msgstr "\tEine Seite nach oben blättern" + +#: gitk:3058 +msgid "\tMove down one page in commit list" +msgstr "\tEine Seite nach unten blättern" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" + +#: gitk:3060 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" + +#: gitk:3061 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" + +#: gitk:3062 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" + +#: gitk:3063 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" + +#: gitk:3064 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" + +#: gitk:3065 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tRückwärts suchen (nach oben; neuere Versionen)" + +#: gitk:3066 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr " Suchen (nach unten; ältere Versionen)" + +#: gitk:3067 +msgid ", b\tScroll diff view up one page" +msgstr ", b\t\tVergleich eine Seite nach oben blättern" + +#: gitk:3068 +msgid "\tScroll diff view up one page" +msgstr "\tVergleich eine Seite nach oben blättern" + +#: gitk:3069 +msgid "\t\tScroll diff view down one page" +msgstr "\tVergleich eine Seite nach unten blättern" + +#: gitk:3070 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" + +#: gitk:3071 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" + +#: gitk:3072 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tSuchen" + +#: gitk:3073 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tWeitersuchen" + +#: gitk:3074 +msgid "\tMove to next find hit" +msgstr "\tWeitersuchen" + +#: gitk:3075 +msgid "g\t\tGo to commit" +msgstr "g\t\tZu Version springen" + +#: gitk:3076 +msgid "/\t\tFocus the search box" +msgstr "/\t\tTastaturfokus ins Suchfeld" + +#: gitk:3077 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tRückwärts weitersuchen" + +#: gitk:3078 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tVergleich zur nächsten Datei blättern" + +#: gitk:3079 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tWeitersuchen im Vergleich" + +#: gitk:3080 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" + +#: gitk:3081 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" + +#: gitk:3082 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-Plus>\tSchrift vergrößern" + +#: gitk:3083 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" + +#: gitk:3084 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-Minus>\tSchrift verkleinern" + +#: gitk:3085 +msgid "\t\tUpdate" +msgstr "\t\tAktualisieren" + +#: gitk:3550 gitk:3559 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" + +#: gitk:3572 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fehler beim Holen von »%s« von »%s«:" + +#: gitk:3635 +msgid "command failed:" +msgstr "Kommando fehlgeschlagen:" + +#: gitk:3784 +msgid "No such commit" +msgstr "Version nicht gefunden" + +#: gitk:3798 +msgid "git gui blame: command failed:" +msgstr "git gui blame: Kommando fehlgeschlagen:" + +#: gitk:3829 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" + +#: gitk:3837 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" + +#: gitk:3862 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "»git blame« konnte nicht gestartet werden: %s" + +#: gitk:3865 gitk:6754 +msgid "Searching" +msgstr "Suchen" + +#: gitk:3897 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Fehler beim Ausführen von »git blame«: %s" + +#: gitk:3925 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" +"Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird" + +#: gitk:3939 +msgid "External diff viewer failed:" +msgstr "Externes Diff-Programm fehlgeschlagen:" + +#: gitk:4070 +msgid "Gitk view definition" +msgstr "Gitk-Ansichten" + +#: gitk:4074 +msgid "Remember this view" +msgstr "Diese Ansicht speichern" + +#: gitk:4075 +msgid "References (space separated list):" +msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" + +#: gitk:4076 +msgid "Branches & tags:" +msgstr "Zweige/Markierungen:" + +#: gitk:4077 +msgid "All refs" +msgstr "Alle Markierungen und Zweige" + +#: gitk:4078 +msgid "All (local) branches" +msgstr "Alle (lokalen) Zweige" + +#: gitk:4079 +msgid "All tags" +msgstr "Alle Markierungen" + +#: gitk:4080 +msgid "All remote-tracking branches" +msgstr "Alle Übernahmezweige" + +#: gitk:4081 +msgid "Commit Info (regular expressions):" +msgstr "Versionsinformationen (reguläre Ausdrücke):" + +#: gitk:4082 +msgid "Author:" +msgstr "Autor:" + +#: gitk:4083 +msgid "Committer:" +msgstr "Eintragender:" + +#: gitk:4084 +msgid "Commit Message:" +msgstr "Versionsbeschreibung:" + +#: gitk:4085 +msgid "Matches all Commit Info criteria" +msgstr "Alle Versionsinformationen-Kriterien erfüllen" + +#: gitk:4086 +msgid "Matches no Commit Info criteria" +msgstr "keine Versionsinformationen-Kriterien erfüllen" + +#: gitk:4087 +msgid "Changes to Files:" +msgstr "Dateien:" + +#: gitk:4088 +msgid "Fixed String" +msgstr "Zeichenkette" + +#: gitk:4089 +msgid "Regular Expression" +msgstr "Regulärer Ausdruck" + +#: gitk:4090 +msgid "Search string:" +msgstr "Suchausdruck:" + +#: gitk:4091 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" + +#: gitk:4092 +msgid "Since:" +msgstr "Von:" + +#: gitk:4093 +msgid "Until:" +msgstr "Bis:" + +#: gitk:4094 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" + +#: gitk:4095 +msgid "Number to show:" +msgstr "Anzeigen:" + +#: gitk:4096 +msgid "Number to skip:" +msgstr "Überspringen:" + +#: gitk:4097 +msgid "Miscellaneous options:" +msgstr "Sonstiges:" + +#: gitk:4098 +msgid "Strictly sort by date" +msgstr "Streng nach Datum sortieren" + +#: gitk:4099 +msgid "Mark branch sides" +msgstr "Zweig-Seiten markieren" + +#: gitk:4100 +msgid "Limit to first parent" +msgstr "Auf erste Elternversion beschränken" + +#: gitk:4101 +msgid "Simple history" +msgstr "Einfache Historie" + +#: gitk:4102 +msgid "Additional arguments to git log:" +msgstr "Zusätzliche Argumente für »git log«:" + +#: gitk:4103 +msgid "Enter files and directories to include, one per line:" +msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" + +#: gitk:4104 +msgid "Command to generate more commits to include:" +msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" + +#: gitk:4228 +msgid "Gitk: edit view" +msgstr "Gitk: Ansicht bearbeiten" + +#: gitk:4236 +msgid "-- criteria for selecting revisions" +msgstr "-- Auswahl der angezeigten Versionen" + +#: gitk:4241 +msgid "View Name" +msgstr "Ansichtsname" + +#: gitk:4316 +msgid "Apply (F5)" +msgstr "Anwenden (F5)" + +#: gitk:4354 +msgid "Error in commit selection arguments:" +msgstr "Fehler in den ausgewählten Versionen:" + +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +msgid "None" +msgstr "Keine" + +#: gitk:5021 gitk:5026 +msgid "Descendant" +msgstr "Abkömmling" + +#: gitk:5022 +msgid "Not descendant" +msgstr "Kein Abkömmling" + +#: gitk:5029 gitk:5034 +msgid "Ancestor" +msgstr "Vorgänger" + +#: gitk:5030 +msgid "Not ancestor" +msgstr "Kein Vorgänger" + +#: gitk:5324 +msgid "Local changes checked in to index but not committed" +msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" + +#: gitk:5360 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokale Änderungen, nicht bereitgestellt" + +#: gitk:7134 +msgid "and many more" +msgstr "und weitere" + +#: gitk:7137 +msgid "many" +msgstr "viele" + +#: gitk:7328 +msgid "Tags:" +msgstr "Markierungen:" + +#: gitk:7345 gitk:7351 gitk:8825 +msgid "Parent" +msgstr "Eltern" + +#: gitk:7356 +msgid "Child" +msgstr "Kind" + +#: gitk:7365 +msgid "Branch" +msgstr "Zweig" + +#: gitk:7368 +msgid "Follows" +msgstr "Folgt auf" + +#: gitk:7371 +msgid "Precedes" +msgstr "Vorgänger von" + +#: gitk:7966 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Fehler beim Laden des Vergleichs: %s" + +#: gitk:8650 +msgid "Goto:" +msgstr "Gehe zu:" + +#: gitk:8671 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" + +#: gitk:8678 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Version »%s« ist unbekannt" + +#: gitk:8688 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA1-Hashwert »%s« ist unbekannt" + +#: gitk:8690 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" + +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Datum" + +#: gitk:8835 +msgid "Children" +msgstr "Kinder" + +#: gitk:8898 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Zweig »%s« hierher zurücksetzen" + +#: gitk:8900 +msgid "Detached head: can't reset" +msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" + +#: gitk:9005 gitk:9011 +msgid "Skipping merge commit " +msgstr "Überspringe Zusammenführungs-Version " + +#: gitk:9020 gitk:9025 +msgid "Error getting patch ID for " +msgstr "Fehler beim Holen der Patch-ID für " + +#: gitk:9021 gitk:9026 +msgid " - stopping\n" +msgstr " - Abbruch.\n" + +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +msgid "Commit " +msgstr "Version " + +#: gitk:9035 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" ist das gleiche Patch wie\n" +" " + +#: gitk:9043 +msgid "" +" differs from\n" +" " +msgstr "" +" ist unterschiedlich von\n" +" " + +#: gitk:9045 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Vergleich der Versionen:\n" +"\n" + +#: gitk:9057 gitk:9066 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " hat %s Kinder. Abbruch\n" + +#: gitk:9085 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fehler beim Schreiben der Version in Datei: %s" + +#: gitk:9091 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fehler beim Vergleichen der Versionen: %s" + +#: gitk:9137 +msgid "Top" +msgstr "Oben" + +#: gitk:9138 +msgid "From" +msgstr "Von" + +#: gitk:9143 +msgid "To" +msgstr "bis" + +#: gitk:9167 +msgid "Generate patch" +msgstr "Patch erstellen" + +#: gitk:9169 +msgid "From:" +msgstr "Von:" + +#: gitk:9178 +msgid "To:" +msgstr "bis:" + +#: gitk:9187 +msgid "Reverse" +msgstr "Umgekehrt" + +#: gitk:9189 gitk:9385 +msgid "Output file:" +msgstr "Ausgabedatei:" + +#: gitk:9195 +msgid "Generate" +msgstr "Erzeugen" + +#: gitk:9233 +msgid "Error creating patch:" +msgstr "Fehler beim Erzeugen des Patches:" + +#: gitk:9256 gitk:9373 gitk:9430 +msgid "ID:" +msgstr "ID:" + +#: gitk:9265 +msgid "Tag name:" +msgstr "Markierungsname:" + +#: gitk:9268 +msgid "Tag message is optional" +msgstr "Eine Markierungsbeschreibung ist optional" + +#: gitk:9270 +msgid "Tag message:" +msgstr "Markierungsbeschreibung:" + +#: gitk:9274 gitk:9439 +msgid "Create" +msgstr "Erstellen" + +#: gitk:9292 +msgid "No tag name specified" +msgstr "Kein Markierungsname angegeben" + +#: gitk:9296 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Markierung »%s« existiert bereits." + +#: gitk:9306 +msgid "Error creating tag:" +msgstr "Fehler beim Erstellen der Markierung:" + +#: gitk:9382 +msgid "Command:" +msgstr "Kommando:" + +#: gitk:9390 +msgid "Write" +msgstr "Schreiben" + +#: gitk:9408 +msgid "Error writing commit:" +msgstr "Fehler beim Schreiben der Version:" + +#: gitk:9435 +msgid "Name:" +msgstr "Name:" + +#: gitk:9458 +msgid "Please specify a name for the new branch" +msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." + +#: gitk:9463 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" + +#: gitk:9530 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " +"eintragen?" + +#: gitk:9535 +msgid "Cherry-picking" +msgstr "Version pflücken" + +#: gitk:9544 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n" +"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" +"zwischenspeichern (»git stash«) und dann erneut versuchen." + +#: gitk:9550 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n" +"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" +"werden, um diesen Konflikt aufzulösen?" + +#: gitk:9566 gitk:9624 +msgid "No changes committed" +msgstr "Keine Änderungen eingetragen" + +#: gitk:9593 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?" + +#: gitk:9598 +msgid "Reverting" +msgstr "Umkehren" + +#: gitk:9606 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Umkehren fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n" +"vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" +"zwischenspeichern (»git stash«) und dann erneut versuchen." + +#: gitk:9610 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Umkehren fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n" +"ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" +"werden, um diesen Konflikt aufzulösen?" + +#: gitk:9653 +msgid "Confirm reset" +msgstr "Zurücksetzen bestätigen" + +#: gitk:9655 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Zweig »%s« auf »%s« zurücksetzen?" + +#: gitk:9657 +msgid "Reset type:" +msgstr "Art des Zurücksetzens:" + +#: gitk:9660 +msgid "Soft: Leave working tree and index untouched" +msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" + +#: gitk:9663 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "" +"Gemischt: Arbeitskopie unverändert,\n" +"Bereitstellung zurückgesetzt" + +#: gitk:9666 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hart: Arbeitskopie und Bereitstellung\n" +"(Alle lokalen Änderungen werden gelöscht)" + +#: gitk:9683 +msgid "Resetting" +msgstr "Zurücksetzen" + +#: gitk:9743 +msgid "Checking out" +msgstr "Umstellen" + +#: gitk:9796 +msgid "Cannot delete the currently checked-out branch" +msgstr "" +"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " +"gelöscht werden." + +#: gitk:9802 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" +"Zweig »%s« trotzdem löschen?" + +#: gitk:9833 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Markierungen und Zweige: %s" + +#: gitk:9850 +msgid "Filter" +msgstr "Filtern" + +#: gitk:10146 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " +"Vorgänger/Nachfolger werden unvollständig sein." + +#: gitk:11123 +msgid "Tag" +msgstr "Markierung" + +#: gitk:11127 +msgid "Id" +msgstr "Id" + +#: gitk:11210 +msgid "Gitk font chooser" +msgstr "Gitk-Schriften wählen" + +#: gitk:11227 +msgid "B" +msgstr "F" + +#: gitk:11230 +msgid "I" +msgstr "K" + +#: gitk:11348 +msgid "Commit list display options" +msgstr "Anzeige der Versionsliste" + +#: gitk:11351 +msgid "Maximum graph width (lines)" +msgstr "Maximale Graphenbreite (Zeilen)" + +#: gitk:11355 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximale Graphenbreite (% des Fensters)" + +#: gitk:11358 +msgid "Show local changes" +msgstr "Lokale Änderungen anzeigen" + +#: gitk:11361 +msgid "Auto-select SHA1 (length)" +msgstr "SHA1-Hashwert (Länge) automatisch auswählen" + +#: gitk:11365 +msgid "Hide remote refs" +msgstr "Entfernte Zweige/Markierungen ausblenden" + +#: gitk:11369 +msgid "Diff display options" +msgstr "Anzeige des Vergleichs" + +#: gitk:11371 +msgid "Tab spacing" +msgstr "Tabulatorbreite" + +#: gitk:11374 +msgid "Display nearby tags/heads" +msgstr "Naheliegende Markierungen/Zweigspitzen anzeigen" + +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "Maximale Anzahl anzuzeigender Markierungen/Zweigspitzen" + +#: gitk:11380 +msgid "Limit diffs to listed paths" +msgstr "Vergleich nur für angezeigte Pfade" + +#: gitk:11383 +msgid "Support per-file encodings" +msgstr "Zeichenkodierung pro Datei ermitteln" + +#: gitk:11389 gitk:11536 +msgid "External diff tool" +msgstr "Externes Diff-Programm" + +#: gitk:11390 +msgid "Choose..." +msgstr "Wählen ..." + +#: gitk:11395 +msgid "General options" +msgstr "Allgemeine Optionen" + +#: gitk:11398 +msgid "Use themed widgets" +msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" + +#: gitk:11400 +msgid "(change requires restart)" +msgstr "(Änderungen werden erst nach Neustart wirksam)" + +#: gitk:11402 +msgid "(currently unavailable)" +msgstr "(Momentan nicht verfügbar)" + +#: gitk:11413 +msgid "Colors: press to choose" +msgstr "Farben: Klicken zum Wählen" + +#: gitk:11416 +msgid "Interface" +msgstr "Benutzeroberfläche" + +#: gitk:11417 +msgid "interface" +msgstr "Benutzeroberfläche" + +#: gitk:11420 +msgid "Background" +msgstr "Hintergrund" + +#: gitk:11421 gitk:11451 +msgid "background" +msgstr "Hintergrund" + +#: gitk:11424 +msgid "Foreground" +msgstr "Vordergrund" + +#: gitk:11425 +msgid "foreground" +msgstr "Vordergrund" + +#: gitk:11428 +msgid "Diff: old lines" +msgstr "Vergleich: Alte Zeilen" + +#: gitk:11429 +msgid "diff old lines" +msgstr "Vergleich - Alte Zeilen" + +#: gitk:11433 +msgid "Diff: new lines" +msgstr "Vergleich: Neue Zeilen" + +#: gitk:11434 +msgid "diff new lines" +msgstr "Vergleich - Neue Zeilen" + +#: gitk:11438 +msgid "Diff: hunk header" +msgstr "Vergleich: Änderungstitel" + +#: gitk:11440 +msgid "diff hunk header" +msgstr "Vergleich - Änderungstitel" + +#: gitk:11444 +msgid "Marked line bg" +msgstr "Hintergrund für markierte Zeile" + +#: gitk:11446 +msgid "marked line background" +msgstr "Hintergrund für markierte Zeile" + +#: gitk:11450 +msgid "Select bg" +msgstr "Hintergrundfarbe auswählen" + +#: gitk:11459 +msgid "Fonts: press to choose" +msgstr "Schriftart: Klicken zum Wählen" + +#: gitk:11461 +msgid "Main font" +msgstr "Programmschriftart" + +#: gitk:11462 +msgid "Diff display font" +msgstr "Schriftart für Vergleich" + +#: gitk:11463 +msgid "User interface font" +msgstr "Beschriftungen" + +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Gitk-Einstellungen" + +#: gitk:11494 +msgid "General" +msgstr "Allgemein" + +#: gitk:11495 +msgid "Colors" +msgstr "Farben" + +#: gitk:11496 +msgid "Fonts" +msgstr "Schriftarten" + +#: gitk:11546 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: Farbe wählen für %s" + +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Entschuldigung, gitk kann nicht mit dieser Tcl/Tk Version ausgeführt werden.\n" +" Gitk erfordert mindestens Tcl/Tk 8.4." + +#: gitk:12269 +msgid "Cannot find a git repository here." +msgstr "Kein Git-Projektarchiv gefunden." + +#: gitk:12316 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." + +#: gitk:12328 +msgid "Bad arguments to gitk:" +msgstr "Falsche Kommandozeilen-Parameter für gitk:" + +#~ msgid "mc" +#~ msgstr "mc" + +#~ msgid "next" +#~ msgstr "nächste" + +#~ msgid "prev" +#~ msgstr "vorige" + +#~ msgid "CDate" +#~ msgstr "Eintragedatum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." diff --cc gitk-git/po/fr.po index c44f994fa5,0000000000..e4fac932e5 mode 100644,000000..100644 --- a/gitk-git/po/fr.po +++ b/gitk-git/po/fr.po @@@ -1,1400 -1,0 +1,1400 @@@ +# 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 +# Jean-Noël Avila +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2016-01-22 22:04+0100\n" +"PO-Revision-Date: 2016-01-22 23:28+0100\n" +"Last-Translator: Jean-Noël Avila \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:2399 +msgid "Color words" +msgstr "Colorier les mots différents" + +#: gitk:217 gitk:2399 gitk:8239 gitk:8272 +msgid "Markup words" +msgstr "Marquer les mots différents" + +#: 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 +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:4544 +msgid "Reading commits..." +msgstr "Lecture des commits..." + +#: gitk:499 gitk:1637 gitk:4547 +msgid "No commits selected" +msgstr "Aucun commit sélectionné" + +#: gitk:1445 gitk:4064 gitk:12469 +msgid "Command line" +msgstr "Ligne de commande" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Impossible de lire la sortie de git log :" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Aucune information disponible sur le commit" + +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 +msgid "OK" +msgstr "OK" + +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 +#: gitk:11275 gitk:11555 +msgid "Cancel" +msgstr "Annuler" + +#: gitk:2083 +msgid "&Update" +msgstr "Mise à jour" + +#: gitk:2084 +msgid "&Reload" +msgstr "&Recharger" + +#: gitk:2085 +msgid "Reread re&ferences" +msgstr "Relire les ré&férences" + +#: gitk:2086 +msgid "&List references" +msgstr "&Lister les références" + +#: gitk:2088 +msgid "Start git &gui" +msgstr "Démarrer git &gui" + +#: gitk:2090 +msgid "&Quit" +msgstr "&Quitter" + +#: gitk:2082 +msgid "&File" +msgstr "&Fichier" + +#: gitk:2094 +msgid "&Preferences" +msgstr "Préférences" + +#: gitk:2093 +msgid "&Edit" +msgstr "&Éditer" + +#: gitk:2098 +msgid "&New view..." +msgstr "&Nouvelle vue..." + +#: gitk:2099 +msgid "&Edit view..." +msgstr "&Éditer la vue..." + +#: gitk:2100 +msgid "&Delete view" +msgstr "Supprimer la vue" + +#: gitk:2102 +msgid "&All files" +msgstr "Tous les fichiers" + +#: gitk:2097 +msgid "&View" +msgstr "&Vue" + +#: gitk:2107 gitk:2117 +msgid "&About gitk" +msgstr "À propos de gitk" + +#: gitk:2108 gitk:2122 +msgid "&Key bindings" +msgstr "Raccourcis clavier" + +#: gitk:2106 gitk:2121 +msgid "&Help" +msgstr "Aide" + +#: gitk:2199 gitk:8671 +msgid "SHA1 ID:" +msgstr "Id SHA1 :" + +#: gitk:2243 +msgid "Row" +msgstr "Colonne" + +#: gitk:2281 +msgid "Find" +msgstr "Recherche" + +#: gitk:2309 +msgid "commit" +msgstr "commit" + +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 +#: gitk:6931 +msgid "containing:" +msgstr "contient :" + +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 +msgid "touching paths:" +msgstr "chemins modifiés :" + +#: gitk:2317 gitk:4796 +msgid "adding/removing string:" +msgstr "ajoute/supprime la chaîne :" + +#: gitk:2318 gitk:4798 +msgid "changing lines matching:" +msgstr "modifie les lignes vérifiant :" + +#: gitk:2327 gitk:2329 gitk:4785 +msgid "Exact" +msgstr "Exact" + +#: gitk:2329 gitk:4873 gitk:6742 +msgid "IgnCase" +msgstr "Ignorer la casse" + +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 +msgid "Regexp" +msgstr "Expression régulière" + +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 +msgid "All fields" +msgstr "Tous les champs" + +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 +msgid "Headline" +msgstr "Titre" + +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 +msgid "Comments" +msgstr "Commentaires" + +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 +#: gitk:8864 +msgid "Author" +msgstr "Auteur" + +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 +msgid "Committer" +msgstr "Validateur" + +#: gitk:2367 +msgid "Search" +msgstr "Rechercher" + +#: gitk:2375 +msgid "Diff" +msgstr "Diff" + +#: gitk:2377 +msgid "Old version" +msgstr "Ancienne version" + +#: gitk:2379 +msgid "New version" +msgstr "Nouvelle version" + +#: gitk:2382 +msgid "Lines of context" +msgstr "Lignes de contexte" + +#: gitk:2392 +msgid "Ignore space change" +msgstr "Ignorer les modifications d'espace" + +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 +msgid "Line diff" +msgstr "différence par ligne" + +#: gitk:2463 +msgid "Patch" +msgstr "Patch" + +#: gitk:2465 +msgid "Tree" +msgstr "Arbre" + +#: gitk:2635 gitk:2656 +msgid "Diff this -> selected" +msgstr "Diff ceci -> la sélection" + +#: gitk:2636 gitk:2657 +msgid "Diff selected -> this" +msgstr "Diff sélection -> ceci" + +#: gitk:2637 gitk:2658 +msgid "Make patch" +msgstr "Créer patch" + +#: gitk:2638 gitk:9273 +msgid "Create tag" +msgstr "Créer étiquette" + +#: gitk:2639 +msgid "Copy commit summary" +msgstr "Copié le résumé du commit" + +#: gitk:2640 gitk:9404 +msgid "Write commit to file" +msgstr "Écrire le commit dans un fichier" + +#: gitk:2641 gitk:9461 +msgid "Create new branch" +msgstr "Créer une nouvelle branche" + +#: gitk:2642 +msgid "Cherry-pick this commit" +msgstr "Cueillir (cherry-pick) ce commit" + +#: gitk:2643 +msgid "Reset HEAD branch to here" +msgstr "Réinitialiser la branche HEAD vers cet état" + +#: gitk:2644 +msgid "Mark this commit" +msgstr "Marquer ce commit" + +#: gitk:2645 +msgid "Return to mark" +msgstr "Retourner à la marque" + +#: gitk:2646 +msgid "Find descendant of this and mark" +msgstr "Chercher le descendant de ceci et le marquer" + +#: gitk:2647 +msgid "Compare with marked commit" +msgstr "Comparer avec le commit marqué" + +#: gitk:2648 gitk:2659 +msgid "Diff this -> marked commit" +msgstr "Diff ceci -> sélection" + +#: gitk:2649 gitk:2660 +msgid "Diff marked commit -> this" +msgstr "Diff entre sélection -> ceci" + +#: gitk:2650 +msgid "Revert this commit" +msgstr "Défaire ce commit" + +#: gitk:2666 +msgid "Check out this branch" +msgstr "Récupérer cette branche" + +#: gitk:2667 +msgid "Remove this branch" +msgstr "Supprimer cette branche" + +#: gitk:2668 +msgid "Copy branch name" +msgstr "Copier la nom de la branche" + +#: gitk:2675 +msgid "Highlight this too" +msgstr "Surligner également ceci" + +#: gitk:2676 +msgid "Highlight this only" +msgstr "Surligner seulement ceci" + +#: gitk:2677 +msgid "External diff" +msgstr "Diff externe" + +#: gitk:2678 +msgid "Blame parent commit" +msgstr "Blâmer le commit parent" + +#: gitk:2679 +msgid "Copy path" +msgstr "Copier le chemin" + +#: gitk:2686 +msgid "Show origin of this line" +msgstr "Montrer l'origine de cette ligne" + +#: gitk:2687 +msgid "Run git gui blame on this line" +msgstr "Exécuter git gui blame sur cette ligne" + +#: gitk:3031 +msgid "About gitk" +msgstr "À propos de gitk" + +#: gitk:3033 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 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-2014 Paul Mackerras\n" ++"Copyright \\u00a9 2005-2016 Paul Mackerras\n" +"\n" +"Utilisation et redistribution soumises aux termes de la GNU General Public License" + +#: gitk:3041 gitk:3108 gitk:9890 +msgid "Close" +msgstr "Fermer" + +#: gitk:3062 +msgid "Gitk key bindings" +msgstr "Raccourcis clavier de Gitk" + +#: gitk:3065 +msgid "Gitk key bindings:" +msgstr "Raccourcis clavier de Gitk :" + +#: gitk:3067 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tQuitter" + +#: gitk:3068 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tFermer la fenêtre" + +#: gitk:3069 +msgid "\t\tMove to first commit" +msgstr "\t\tAller au premier commit" + +#: gitk:3070 +msgid "\t\tMove to last commit" +msgstr "\t\tAller au dernier commit" + +#: gitk:3071 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\t Aller au commit précédent" + +#: gitk:3072 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\t Aller au commit suivant" + +#: gitk:3073 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tReculer dans l'historique" + +#: gitk:3074 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tAvancer dans l'historique" + +#: gitk:3075 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique" + +#: gitk:3076 +msgid "\tMove up one page in commit list" +msgstr "\tMonter d'une page dans la liste des commits" + +#: gitk:3077 +msgid "\tMove down one page in commit list" +msgstr "\tDescendre d'une page dans la liste des commits" + +#: gitk:3078 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Début>\tAller en haut de la liste des commits" + +#: gitk:3079 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tAller en bas de la liste des commits" + +#: gitk:3080 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" + +#: gitk:3081 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" + +#: gitk:3082 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" + +#: gitk:3083 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" + +#: gitk:3084 +msgid "\tFind backwards (upwards, later commits)" +msgstr "" +"\tRecherche en arrière (vers l'avant, commits les plus anciens)" + +#: gitk:3085 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "" +"\tRecherche en avant (vers l'arrière, commit les plus récents)" + +#: gitk:3086 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tMonter d'une page dans la vue des diff" + +#: gitk:3087 +msgid "\tScroll diff view up one page" +msgstr "\tMonter d'une page dans la vue des diff" + +#: gitk:3088 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tDescendre d'une page dans la vue des diff" + +#: gitk:3089 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tMonter de 18 lignes dans la vue des diff" + +#: gitk:3090 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" + +#: gitk:3091 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tRechercher" + +#: gitk:3092 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tAller au résultat de recherche suivant" + +#: gitk:3093 +msgid "\tMove to next find hit" +msgstr "\t\tAller au résultat de recherche suivant" + +#: gitk:3094 +msgid "g\t\tGo to commit" +msgstr "g\t\tAller au commit" + +#: gitk:3095 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFocus sur la zone de recherche" + +#: gitk:3096 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tAller au résultat de recherche précédent" + +#: gitk:3097 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tAller au prochain fichier dans la vue des diff" + +#: gitk:3098 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff" + +#: gitk:3099 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff" + +#: gitk:3100 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAugmenter la taille de la police" + +#: gitk:3101 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tAugmenter la taille de la police" + +#: gitk:3102 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDiminuer la taille de la police" + +#: gitk:3103 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tDiminuer la taille de la police" + +#: gitk:3104 +msgid "\t\tUpdate" +msgstr "\t\tMise à jour" + +#: gitk:3569 gitk:3578 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Erreur lors de la création du répertoire temporaire %s :" + +#: gitk:3591 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Erreur en obtenant \"%s\" de %s:" + +#: gitk:3654 +msgid "command failed:" +msgstr "échec de la commande :" + +#: gitk:3803 +msgid "No such commit" +msgstr "Commit inexistant" + +#: gitk:3817 +msgid "git gui blame: command failed:" +msgstr "git gui blame : échec de la commande :" + +#: gitk:3848 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossible de lire le head de la fusion : %s" + +#: gitk:3856 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Erreur à la lecture de l'index : %s" + +#: gitk:3881 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossible de démarrer git blame : %s" + +#: gitk:3884 gitk:6773 +msgid "Searching" +msgstr "Recherche en cours" + +#: gitk:3916 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Erreur à l'exécution de git blame : %s" + +#: gitk:3944 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue" + +#: gitk:3958 +msgid "External diff viewer failed:" +msgstr "Échec de l'outil externe de visualisation des diff :" + +#: gitk:4062 +msgid "All files" +msgstr "Tous les fichiers" + +#: gitk:4086 +msgid "View" +msgstr "Vue" + +#: gitk:4089 +msgid "Gitk view definition" +msgstr "Définition des vues de Gitk" + +#: gitk:4093 +msgid "Remember this view" +msgstr "Se souvenir de cette vue" + +#: gitk:4094 +msgid "References (space separated list):" +msgstr "Références (liste d'éléments séparés par des espaces) :" + +#: gitk:4095 +msgid "Branches & tags:" +msgstr "Branches & étiquettes :" + +#: gitk:4096 +msgid "All refs" +msgstr "Toutes les références" + +#: gitk:4097 +msgid "All (local) branches" +msgstr "Toutes les branches (locales)" + +#: gitk:4098 +msgid "All tags" +msgstr "Toutes les étiquettes" + +#: gitk:4099 +msgid "All remote-tracking branches" +msgstr "Toutes les branches de suivi à distance" + +#: gitk:4100 +msgid "Commit Info (regular expressions):" +msgstr "Info sur les commits (expressions régulières) :" + +#: gitk:4101 +msgid "Author:" +msgstr "Auteur :" + +#: gitk:4102 +msgid "Committer:" +msgstr "Validateur :" + +#: gitk:4103 +msgid "Commit Message:" +msgstr "Message de commit :" + +#: gitk:4104 +msgid "Matches all Commit Info criteria" +msgstr "Correspond à tous les critères d'Info sur les commits" + +#: gitk:4105 +msgid "Matches no Commit Info criteria" +msgstr "Ne correspond à aucun des critères d'Info sur les commits" + +#: gitk:4106 +msgid "Changes to Files:" +msgstr "Changements des fichiers :" + +#: gitk:4107 +msgid "Fixed String" +msgstr "Chaîne Figée" + +#: gitk:4108 +msgid "Regular Expression" +msgstr "Expression Régulière" + +#: gitk:4109 +msgid "Search string:" +msgstr "Recherche de la chaîne :" + +#: gitk:4110 +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:4111 +msgid "Since:" +msgstr "Depuis :" + +#: gitk:4112 +msgid "Until:" +msgstr "Jusqu'au :" + +#: gitk:4113 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :" + +#: gitk:4114 +msgid "Number to show:" +msgstr "Nombre à afficher :" + +#: gitk:4115 +msgid "Number to skip:" +msgstr "Nombre à sauter :" + +#: gitk:4116 +msgid "Miscellaneous options:" +msgstr "Options diverses :" + +#: gitk:4117 +msgid "Strictly sort by date" +msgstr "Trier par date" + +#: gitk:4118 +msgid "Mark branch sides" +msgstr "Indiquer les côtés des branches" + +#: gitk:4119 +msgid "Limit to first parent" +msgstr "Limiter au premier ancêtre" + +#: gitk:4120 +msgid "Simple history" +msgstr "Historique simple" + +#: gitk:4121 +msgid "Additional arguments to git log:" +msgstr "Arguments supplémentaires de git log :" + +#: gitk:4122 +msgid "Enter files and directories to include, one per line:" +msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" + +#: gitk:4123 +msgid "Command to generate more commits to include:" +msgstr "Commande pour générer plus de commits à inclure :" + +#: gitk:4247 +msgid "Gitk: edit view" +msgstr "Gitk : éditer la vue" + +#: gitk:4255 +msgid "-- criteria for selecting revisions" +msgstr "-- critère pour la sélection des révisions" + +#: gitk:4260 +msgid "View Name" +msgstr "Nom de la vue" + +#: gitk:4335 +msgid "Apply (F5)" +msgstr "Appliquer (F5)" + +#: gitk:4373 +msgid "Error in commit selection arguments:" +msgstr "Erreur dans les arguments de sélection des commits :" + +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 +msgid "None" +msgstr "Aucun" + +#: gitk:5040 gitk:5045 +msgid "Descendant" +msgstr "Descendant" + +#: gitk:5041 +msgid "Not descendant" +msgstr "Pas un descendant" + +#: gitk:5048 gitk:5053 +msgid "Ancestor" +msgstr "Ancêtre" + +#: gitk:5049 +msgid "Not ancestor" +msgstr "Pas un ancêtre" + +#: gitk:5343 +msgid "Local changes checked in to index but not committed" +msgstr "Modifications locales enregistrées dans l'index mais non validées" + +#: gitk:5379 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Modifications locales non enregistrées dans l'index et non validées" + +#: gitk:7153 +msgid "and many more" +msgstr "et beaucoup plus" + +#: gitk:7156 +msgid "many" +msgstr "nombreux" + +#: gitk:7347 +msgid "Tags:" +msgstr "Étiquettes :" + +#: gitk:7364 gitk:7370 gitk:8844 +msgid "Parent" +msgstr "Parent" + +#: gitk:7375 +msgid "Child" +msgstr "Enfant" + +#: gitk:7384 +msgid "Branch" +msgstr "Branche" + +#: gitk:7387 +msgid "Follows" +msgstr "Suit" + +#: gitk:7390 +msgid "Precedes" +msgstr "Précède" + +#: gitk:7985 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Erreur lors de la récupération des diff : %s" + +#: gitk:8669 +msgid "Goto:" +msgstr "Aller à :" + +#: gitk:8690 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "L'id SHA1 court %s est ambigu" + +#: gitk:8697 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La révision %s est inconnu" + +#: gitk:8707 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "L'id SHA1 %s est inconnu" + +#: gitk:8709 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La révision %s n'est pas dans la vue courante" + +#: gitk:8851 gitk:8866 +msgid "Date" +msgstr "Date" + +#: gitk:8854 +msgid "Children" +msgstr "Enfants" + +#: gitk:8917 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Réinitialiser la branche %s vers cet état" + +#: gitk:8919 +msgid "Detached head: can't reset" +msgstr "Head détaché : impossible de réinitialiser" + +#: gitk:9024 gitk:9030 +msgid "Skipping merge commit " +msgstr "Éviter le commit de la fusion " + +#: gitk:9039 gitk:9044 +msgid "Error getting patch ID for " +msgstr "Erreur à l'obtention de l'ID du patch pour " + +#: gitk:9040 gitk:9045 +msgid " - stopping\n" +msgstr " - arrêt en cours\n" + +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 +msgid "Commit " +msgstr "Commit " + +#: gitk:9054 +msgid "" +" is the same patch as\n" +" " +msgstr "" +"est le même patch que \n" +" " + +#: gitk:9062 +msgid "" +" differs from\n" +" " +msgstr "" +" diffère de\n" +" " + +#: gitk:9064 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "Diff des commits :\n\n" + +#: gitk:9076 gitk:9085 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " a %s enfants - arrêt en cours\n" + +#: gitk:9104 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Erreur à l'écriture du commit dans le fichier : %s" + +#: gitk:9110 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Erreur à la différence des commits : %s" + +#: gitk:9156 +msgid "Top" +msgstr "Haut" + +#: gitk:9157 +msgid "From" +msgstr "De" + +#: gitk:9162 +msgid "To" +msgstr "À" + +#: gitk:9186 +msgid "Generate patch" +msgstr "Générer le patch" + +#: gitk:9188 +msgid "From:" +msgstr "De :" + +#: gitk:9197 +msgid "To:" +msgstr "À :" + +#: gitk:9206 +msgid "Reverse" +msgstr "Inverser" + +#: gitk:9208 gitk:9418 +msgid "Output file:" +msgstr "Fichier de sortie :" + +#: gitk:9214 +msgid "Generate" +msgstr "Générer" + +#: gitk:9252 +msgid "Error creating patch:" +msgstr "Erreur à la création du patch :" + +#: gitk:9275 gitk:9406 gitk:9463 +msgid "ID:" +msgstr "ID :" + +#: gitk:9284 +msgid "Tag name:" +msgstr "Nom de l'étiquette :" + +#: gitk:9287 +msgid "Tag message is optional" +msgstr "Le message d'étiquette est optionnel" + +#: gitk:9289 +msgid "Tag message:" +msgstr "Message d'étiquette :" + +#: gitk:9293 gitk:9472 +msgid "Create" +msgstr "Créer" + +#: gitk:9311 +msgid "No tag name specified" +msgstr "Aucun nom d'étiquette spécifié" + +#: gitk:9315 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "L'étiquette \"%s\" existe déjà" + +#: gitk:9325 +msgid "Error creating tag:" +msgstr "Erreur à la création de l'étiquette :" + +#: gitk:9415 +msgid "Command:" +msgstr "Commande :" + +#: gitk:9423 +msgid "Write" +msgstr "Écrire" + +#: gitk:9441 +msgid "Error writing commit:" +msgstr "Erreur à l'ecriture du commit :" + +#: gitk:9468 +msgid "Name:" +msgstr "Nom :" + +#: gitk:9491 +msgid "Please specify a name for the new branch" +msgstr "Veuillez spécifier un nom pour la nouvelle branche" + +#: gitk:9496 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La branche '%s' existe déjà. Écraser?" + +#: gitk:9563 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " +"tout?" + +#: gitk:9568 +msgid "Cherry-picking" +msgstr "Picorer (Cherry-picking)" + +#: gitk:9577 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Le picorage (cherry-pick) a échouée à cause de modifications locales du fichier '%s'.\n" +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de nouveau." + +#: gitk:9583 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Le picorage (cherry-pick) a échouée à cause d'un conflit lors d'une fusion.\n" +"Souhaitez-vous exécuter git citool pour le résoudre ?" + +#: gitk:9599 gitk:9657 +msgid "No changes committed" +msgstr "Aucune modification validée" + +#: gitk:9626 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?" + +#: gitk:9631 +msgid "Reverting" +msgstr "Commit défait" + +#: gitk:9639 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "Échec en tentant de défaire le commit à cause de modifications locales des fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications et essayer de nouveau." + +#: gitk:9643 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Échec en tentant de défaire à cause d'un conflit de fusion.\n" +"Souhaitez-vous exécuter git citool pour le résoudre ?" + +#: gitk:9686 +msgid "Confirm reset" +msgstr "Confirmer la réinitialisation" + +#: gitk:9688 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Réinitialiser la branche %s à %s?" + +#: gitk:9690 +msgid "Reset type:" +msgstr "Type de réinitialisation :" + +#: gitk:9693 +msgid "Soft: Leave working tree and index untouched" +msgstr "Douce : Laisse le répertoire de travail et l'index intacts" + +#: gitk:9696 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "" +"Hybride : Laisse le répertoire de travail dans son état courant, " +"réinitialise l'index" + +#: gitk:9699 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Dure : Réinitialise le répertoire de travail et l'index\n" +"(abandonne TOUTES les modifications locale)" + +#: gitk:9716 +msgid "Resetting" +msgstr "Réinitialisation" + +# Fixme: Récupération est-il vraiment une mauvaise traduction? +#: gitk:9776 +msgid "Checking out" +msgstr "Extraction" + +#: gitk:9829 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossible de supprimer la branche extraite" + +#: gitk:9835 +#, 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:9866 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Étiquettes et heads : %s" + +#: gitk:9883 +msgid "Filter" +msgstr "Filtrer" + +#: gitk:10179 +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:11156 +msgid "Tag" +msgstr "Étiquette" + +#: gitk:11160 +msgid "Id" +msgstr "Id" + +#: gitk:11243 +msgid "Gitk font chooser" +msgstr "Sélecteur de police de Gitk" + +#: gitk:11260 +msgid "B" +msgstr "B" + +#: gitk:11263 +msgid "I" +msgstr "I" + +#: gitk:11381 +msgid "Commit list display options" +msgstr "Options d'affichage de la liste des commits" + +#: gitk:11384 +msgid "Maximum graph width (lines)" +msgstr "Longueur maximum du graphe (lignes)" + +# FIXME : Traduction standard de "pane"? +#: gitk:11388 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Largeur maximum du graphe (% du panneau)" + +#: gitk:11391 +msgid "Show local changes" +msgstr "Montrer les modifications locales" + +#: gitk:11394 +msgid "Auto-select SHA1 (length)" +msgstr "Sélection auto. du SHA1 (longueur)" + +#: gitk:11398 +msgid "Hide remote refs" +msgstr "Cacher les refs distantes" + +#: gitk:11402 +msgid "Diff display options" +msgstr "Options d'affichage des diff" + +#: gitk:11404 +msgid "Tab spacing" +msgstr "Taille des tabulations" + +#: gitk:11407 +msgid "Display nearby tags/heads" +msgstr "Afficher les tags les plus proches" + +#: gitk:11410 +msgid "Maximum # tags/heads to show" +msgstr "Nombre maximum d'étiquettes/heads à afficher" + +#: gitk:11413 +msgid "Limit diffs to listed paths" +msgstr "Limiter les différences aux chemins listés" + +#: gitk:11416 +msgid "Support per-file encodings" +msgstr "Support pour un encodage des caractères par fichier" + +#: gitk:11422 gitk:11569 +msgid "External diff tool" +msgstr "Outil diff externe" + +#: gitk:11423 +msgid "Choose..." +msgstr "Choisir..." + +#: gitk:11428 +msgid "General options" +msgstr "Options générales" + +#: gitk:11431 +msgid "Use themed widgets" +msgstr "Utiliser des widgets en thème" + +#: gitk:11433 +msgid "(change requires restart)" +msgstr "(la modification nécessite un redémarrage)" + +#: gitk:11435 +msgid "(currently unavailable)" +msgstr "(non disponible actuellement)" + +#: gitk:11446 +msgid "Colors: press to choose" +msgstr "Couleurs : cliquer pour choisir" + +#: gitk:11449 +msgid "Interface" +msgstr "Interface" + +#: gitk:11450 +msgid "interface" +msgstr "interface" + +#: gitk:11453 +msgid "Background" +msgstr "Arrière-plan" + +#: gitk:11454 gitk:11484 +msgid "background" +msgstr "arrière-plan" + +#: gitk:11457 +msgid "Foreground" +msgstr "Premier plan" + +#: gitk:11458 +msgid "foreground" +msgstr "premier plan" + +#: gitk:11461 +msgid "Diff: old lines" +msgstr "Diff : anciennes lignes" + +#: gitk:11462 +msgid "diff old lines" +msgstr "diff anciennes lignes" + +#: gitk:11466 +msgid "Diff: new lines" +msgstr "Diff : nouvelles lignes" + +#: gitk:11467 +msgid "diff new lines" +msgstr "diff nouvelles lignes" + +#: gitk:11471 +msgid "Diff: hunk header" +msgstr "Diff : entête du hunk" + +#: gitk:11473 +msgid "diff hunk header" +msgstr "diff : entête du hunk" + +#: gitk:11477 +msgid "Marked line bg" +msgstr "Fond de la ligne marquée" + +#: gitk:11479 +msgid "marked line background" +msgstr "Fond de la ligne marquée" + +#: gitk:11483 +msgid "Select bg" +msgstr "Sélectionner le fond" + +#: gitk:11492 +msgid "Fonts: press to choose" +msgstr "Polices : cliquer pour choisir" + +#: gitk:11494 +msgid "Main font" +msgstr "Police principale" + +#: gitk:11495 +msgid "Diff display font" +msgstr "Police d'affichage des diff" + +#: gitk:11496 +msgid "User interface font" +msgstr "Police de l'interface utilisateur" + +#: gitk:11518 +msgid "Gitk preferences" +msgstr "Préférences de Gitk" + +#: gitk:11527 +msgid "General" +msgstr "Général" + +#: gitk:11528 +msgid "Colors" +msgstr "Couleurs" + +#: gitk:11529 +msgid "Fonts" +msgstr "Polices" + +#: gitk:11579 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk : choisir la couleur de %s" + +#: gitk:12092 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" +" Gitk requiert Tcl/Tk version 8.4 ou supérieur." + +#: gitk:12302 +msgid "Cannot find a git repository here." +msgstr "Impossible de trouver un dépôt git ici." + +#: gitk:12349 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier" + +#: gitk:12361 +msgid "Bad arguments to gitk:" +msgstr "Arguments invalides pour gitk :" + +#~ msgid "SHA1 ID: " +#~ msgstr "ID SHA1 :" + +#~ msgid "next" +#~ msgstr "suivant" + +#~ msgid "prev" +#~ msgstr "précédent" + +#~ msgid "CDate" +#~ msgstr "CDate" + +#~ msgid "- stopping\n" +#~ msgstr "- arrêt en cours\n" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Impossible de trouver le répertoire git \"%s\"." diff --cc gitk-git/po/it.po index b5f002db7d,0000000000..b58d23eb2b mode 100644,000000..100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@@ -1,1387 -1,0 +1,1387 @@@ +# Translation of gitk +# Copyright (C) 2005-2008 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# Michele Ballabio , 2008. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2010-01-28 18:41+0100\n" +"Last-Translator: Michele Ballabio \n" +"Language-Team: Italian\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +msgid "Markup words" +msgstr "" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Errore nella lettura delle revisioni:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " +"sono file in attesa di fusione." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Nessun file selezionato: è stata specificata l'opzione --merge ma i file " +"specificati non sono in attesa di fusione." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Errore nell'esecuzione di git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Lettura in corso" + +#: gitk:496 gitk:4525 +msgid "Reading commits..." +msgstr "Lettura delle revisioni in corso..." + +#: gitk:499 gitk:1637 gitk:4528 +msgid "No commits selected" +msgstr "Nessuna revisione selezionata" + +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Linea di comando" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Impossibile elaborare i dati di git log:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Nessuna informazione disponibile sulle revisioni" + +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +msgid "OK" +msgstr "OK" + +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 +msgid "Cancel" +msgstr "Annulla" + +#: gitk:2069 +msgid "&Update" +msgstr "Aggiorna" + +#: gitk:2070 +msgid "&Reload" +msgstr "Ricarica" + +#: gitk:2071 +msgid "Reread re&ferences" +msgstr "Rileggi riferimenti" + +#: gitk:2072 +msgid "&List references" +msgstr "Elenca riferimenti" + +#: gitk:2074 +msgid "Start git &gui" +msgstr "Avvia git gui" + +#: gitk:2076 +msgid "&Quit" +msgstr "Esci" + +#: gitk:2068 +msgid "&File" +msgstr "&File" + +#: gitk:2080 +msgid "&Preferences" +msgstr "Preferenze" + +#: gitk:2079 +msgid "&Edit" +msgstr "Modifica" + +#: gitk:2084 +msgid "&New view..." +msgstr "Nuova vista..." + +#: gitk:2085 +msgid "&Edit view..." +msgstr "Modifica vista..." + +#: gitk:2086 +msgid "&Delete view" +msgstr "Elimina vista" + +#: gitk:2088 gitk:4043 +msgid "&All files" +msgstr "Tutti i file" + +#: gitk:2083 gitk:4067 +msgid "&View" +msgstr "Vista" + +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" +msgstr "Informazioni su gitk" + +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "Scorciatoie da tastiera" + +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "Aiuto" + +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "Riga" + +#: gitk:2267 +msgid "Find" +msgstr "Trova" + +#: gitk:2295 +msgid "commit" +msgstr "revisione" + +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 +msgid "containing:" +msgstr "contenente:" + +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +msgid "touching paths:" +msgstr "che riguarda i percorsi:" + +#: gitk:2303 gitk:4777 +msgid "adding/removing string:" +msgstr "che aggiunge/rimuove la stringa:" + +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4766 +msgid "Exact" +msgstr "Esatto" + +#: gitk:2315 gitk:4854 gitk:6723 +msgid "IgnCase" +msgstr "" + +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +msgid "Regexp" +msgstr "" + +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +msgid "All fields" +msgstr "Tutti i campi" + +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +msgid "Headline" +msgstr "Titolo" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +msgid "Comments" +msgstr "Commenti" + +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 +msgid "Author" +msgstr "Autore" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +msgid "Committer" +msgstr "Revisione creata da" + +#: gitk:2350 +msgid "Search" +msgstr "Cerca" + +#: gitk:2358 +msgid "Diff" +msgstr "" + +#: gitk:2360 +msgid "Old version" +msgstr "Vecchia versione" + +#: gitk:2362 +msgid "New version" +msgstr "Nuova versione" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Linee di contesto" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignora modifiche agli spazi" + +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "" + +#: gitk:2445 +msgid "Patch" +msgstr "Modifiche" + +#: gitk:2447 +msgid "Tree" +msgstr "Directory" + +#: gitk:2617 gitk:2637 +msgid "Diff this -> selected" +msgstr "Diff questo -> selezionato" + +#: gitk:2618 gitk:2638 +msgid "Diff selected -> this" +msgstr "Diff selezionato -> questo" + +#: gitk:2619 gitk:2639 +msgid "Make patch" +msgstr "Crea patch" + +#: gitk:2620 gitk:9254 +msgid "Create tag" +msgstr "Crea etichetta" + +#: gitk:2621 gitk:9371 +msgid "Write commit to file" +msgstr "Scrivi revisione in un file" + +#: gitk:2622 gitk:9428 +msgid "Create new branch" +msgstr "Crea un nuovo ramo" + +#: gitk:2623 +msgid "Cherry-pick this commit" +msgstr "Porta questa revisione in cima al ramo attuale" + +#: gitk:2624 +msgid "Reset HEAD branch to here" +msgstr "Aggiorna il ramo HEAD a questa revisione" + +#: gitk:2625 +msgid "Mark this commit" +msgstr "Segna questa revisione" + +#: gitk:2626 +msgid "Return to mark" +msgstr "Torna alla revisione segnata" + +#: gitk:2627 +msgid "Find descendant of this and mark" +msgstr "Trova il discendente di questa revisione e di quella segnata" + +#: gitk:2628 +msgid "Compare with marked commit" +msgstr "Confronta con la revisione segnata" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diff questo -> selezionato" + +#: gitk:2630 gitk:2641 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diff selezionato -> questo" + +#: gitk:2631 +#, fuzzy +msgid "Revert this commit" +msgstr "Segna questa revisione" + +#: gitk:2647 +msgid "Check out this branch" +msgstr "Attiva questo ramo" + +#: gitk:2648 +msgid "Remove this branch" +msgstr "Elimina questo ramo" + +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 +msgid "Highlight this too" +msgstr "Evidenzia anche questo" + +#: gitk:2657 +msgid "Highlight this only" +msgstr "Evidenzia solo questo" + +#: gitk:2658 +msgid "External diff" +msgstr "Visualizza differenze in un altro programma" + +#: gitk:2659 +msgid "Blame parent commit" +msgstr "Annota la revisione precedente" + +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 +msgid "Show origin of this line" +msgstr "Mostra la provenienza di questa riga" + +#: gitk:2668 +msgid "Run git gui blame on this line" +msgstr "Esegui git gui blame su questa riga" + +#: gitk:3014 +#, fuzzy +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - un visualizzatore di revisioni per git\n" +"\n" - "Copyright \\u00a9 2005-2010 Paul Mackerras\n" ++"Copyright \\u00a9 2005-2016 Paul Mackerras\n" +"\n" +"Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " +"License" + +#: gitk:3022 gitk:3089 gitk:9857 +msgid "Close" +msgstr "Chiudi" + +#: gitk:3043 +msgid "Gitk key bindings" +msgstr "Scorciatoie da tastiera di Gitk" + +#: gitk:3046 +msgid "Gitk key bindings:" +msgstr "Scorciatoie da tastiera di Gitk:" + +#: gitk:3048 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tEsci" + +#: gitk:3049 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tTrova" + +#: gitk:3050 +msgid "\t\tMove to first commit" +msgstr "\t\tVai alla prima revisione" + +#: gitk:3051 +msgid "\t\tMove to last commit" +msgstr "\t\tVai all'ultima revisione" + +#: gitk:3052 +#, fuzzy +msgid ", p, k\tMove up one commit" +msgstr ", p, i\tVai più in alto di una revisione" + +#: gitk:3053 +#, fuzzy +msgid ", n, j\tMove down one commit" +msgstr ", n, k\tVai più in basso di una revisione" + +#: gitk:3054 +#, fuzzy +msgid ", z, h\tGo back in history list" +msgstr ", z, j\tTorna indietro nella cronologia" + +#: gitk:3055 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tVai avanti nella cronologia" + +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3057 +msgid "\tMove up one page in commit list" +msgstr "\tVai più in alto di una pagina nella lista delle revisioni" + +#: gitk:3058 +msgid "\tMove down one page in commit list" +msgstr "" +"\tVai più in basso di una pagina nella lista delle revisioni" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" + +#: gitk:3060 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" + +#: gitk:3061 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" + +#: gitk:3062 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" + +#: gitk:3063 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" + +#: gitk:3064 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" + +#: gitk:3065 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tTrova all'indietro (verso l'alto, revisioni successive)" + +#: gitk:3066 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "\tTrova in avanti (verso il basso, revisioni precedenti)" + +#: gitk:3067 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tScorri la vista delle differenze in alto di una pagina" + +#: gitk:3068 +msgid "\tScroll diff view up one page" +msgstr "\tScorri la vista delle differenze in alto di una pagina" + +#: gitk:3069 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tScorri la vista delle differenze in basso di una pagina" + +#: gitk:3070 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" + +#: gitk:3071 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" + +#: gitk:3072 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tTrova" + +#: gitk:3073 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tTrova in avanti" + +#: gitk:3074 +msgid "\tMove to next find hit" +msgstr "\tTrova in avanti" + +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tVai all'ultima revisione" + +#: gitk:3076 +msgid "/\t\tFocus the search box" +msgstr "/\t\tCursore nel box di ricerca" + +#: gitk:3077 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tTrova all'indietro" + +#: gitk:3078 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tScorri la vista delle differenze al file successivo" + +#: gitk:3079 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze" + +#: gitk:3080 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze" + +#: gitk:3081 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tAumenta dimensione carattere" + +#: gitk:3082 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-più>\tAumenta dimensione carattere" + +#: gitk:3083 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tDiminuisci dimensione carattere" + +#: gitk:3084 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-meno>\tDiminuisci dimensione carattere" + +#: gitk:3085 +msgid "\t\tUpdate" +msgstr "\t\tAggiorna" + +#: gitk:3550 gitk:3559 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Errore durante la creazione della directory temporanea %s:" + +#: gitk:3572 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Errore nella lettura di \"%s\" da %s:" + +#: gitk:3635 +msgid "command failed:" +msgstr "impossibile eseguire il comando:" + +#: gitk:3784 +msgid "No such commit" +msgstr "Revisione inesistente" + +#: gitk:3798 +msgid "git gui blame: command failed:" +msgstr "git gui blame: impossibile eseguire il comando:" + +#: gitk:3829 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Impossibile leggere merge head: %s" + +#: gitk:3837 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Errore nella lettura dell'indice: %s" + +#: gitk:3862 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Impossibile eseguire git blame: %s" + +#: gitk:3865 gitk:6754 +msgid "Searching" +msgstr "Ricerca in corso" + +#: gitk:3897 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Errore nell'esecuzione di git blame: %s" + +#: gitk:3925 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista" + +#: gitk:3939 +msgid "External diff viewer failed:" +msgstr "Impossibile eseguire il visualizzatore di differenze:" + +#: gitk:4070 +msgid "Gitk view definition" +msgstr "Scelta vista Gitk" + +#: gitk:4074 +msgid "Remember this view" +msgstr "Ricorda questa vista" + +#: gitk:4075 +msgid "References (space separated list):" +msgstr "Riferimenti (lista di elementi separati da spazi)" + +#: gitk:4076 +msgid "Branches & tags:" +msgstr "Rami ed etichette" + +#: gitk:4077 +msgid "All refs" +msgstr "Tutti i riferimenti" + +#: gitk:4078 +msgid "All (local) branches" +msgstr "Tutti i rami (locali)" + +#: gitk:4079 +msgid "All tags" +msgstr "Tutte le etichette" + +#: gitk:4080 +msgid "All remote-tracking branches" +msgstr "Tutti i rami remoti" + +#: gitk:4081 +msgid "Commit Info (regular expressions):" +msgstr "Informazioni sulla revisione (espressioni regolari):" + +#: gitk:4082 +msgid "Author:" +msgstr "Autore:" + +#: gitk:4083 +msgid "Committer:" +msgstr "Revisione creata da:" + +#: gitk:4084 +msgid "Commit Message:" +msgstr "Messaggio di revisione:" + +#: gitk:4085 +msgid "Matches all Commit Info criteria" +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" + +#: gitk:4086 +#, fuzzy +msgid "Matches no Commit Info criteria" +msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" + +#: gitk:4087 +msgid "Changes to Files:" +msgstr "Modifiche ai file:" + +#: gitk:4088 +msgid "Fixed String" +msgstr "Stringa fissa" + +#: gitk:4089 +msgid "Regular Expression" +msgstr "Espressione regolare" + +#: gitk:4090 +msgid "Search string:" +msgstr "Cerca stringa:" + +#: gitk:4091 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " +"2009 15:27:38\"):" + +#: gitk:4092 +msgid "Since:" +msgstr "Da:" + +#: gitk:4093 +msgid "Until:" +msgstr "A:" + +#: gitk:4094 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Limita e/o salta N revisioni (intero positivo):" + +#: gitk:4095 +msgid "Number to show:" +msgstr "Numero di revisioni da mostrare:" + +#: gitk:4096 +msgid "Number to skip:" +msgstr "Numero di revisioni da saltare:" + +#: gitk:4097 +msgid "Miscellaneous options:" +msgstr "Altre opzioni:" + +#: gitk:4098 +msgid "Strictly sort by date" +msgstr "Ordina solo per data" + +#: gitk:4099 +msgid "Mark branch sides" +msgstr "Segna i lati del ramo" + +#: gitk:4100 +msgid "Limit to first parent" +msgstr "Limita al primo genitore" + +#: gitk:4101 +msgid "Simple history" +msgstr "Cronologia semplificata" + +#: gitk:4102 +msgid "Additional arguments to git log:" +msgstr "Ulteriori argomenti da passare a git log:" + +#: gitk:4103 +msgid "Enter files and directories to include, one per line:" +msgstr "Inserire file e directory da includere, uno per riga:" + +#: gitk:4104 +msgid "Command to generate more commits to include:" +msgstr "Comando che genera altre revisioni da visualizzare:" + +#: gitk:4228 +msgid "Gitk: edit view" +msgstr "Gitk: modifica vista" + +#: gitk:4236 +msgid "-- criteria for selecting revisions" +msgstr "-- criteri per la scelta delle revisioni" + +#: gitk:4241 +msgid "View Name" +msgstr "Nome vista" + +#: gitk:4316 +msgid "Apply (F5)" +msgstr "Applica (F5)" + +#: gitk:4354 +msgid "Error in commit selection arguments:" +msgstr "Errore negli argomenti di selezione delle revisioni:" + +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +msgid "None" +msgstr "Nessuno" + +#: gitk:5021 gitk:5026 +msgid "Descendant" +msgstr "Discendente" + +#: gitk:5022 +msgid "Not descendant" +msgstr "Non discendente" + +#: gitk:5029 gitk:5034 +msgid "Ancestor" +msgstr "Ascendente" + +#: gitk:5030 +msgid "Not ancestor" +msgstr "Non ascendente" + +#: gitk:5324 +msgid "Local changes checked in to index but not committed" +msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" + +#: gitk:5360 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" + +#: gitk:7134 +msgid "and many more" +msgstr "" + +#: gitk:7137 +msgid "many" +msgstr "molti" + +#: gitk:7328 +msgid "Tags:" +msgstr "Etichette:" + +#: gitk:7345 gitk:7351 gitk:8825 +msgid "Parent" +msgstr "Genitore" + +#: gitk:7356 +msgid "Child" +msgstr "Figlio" + +#: gitk:7365 +msgid "Branch" +msgstr "Ramo" + +#: gitk:7368 +msgid "Follows" +msgstr "Segue" + +#: gitk:7371 +msgid "Precedes" +msgstr "Precede" + +#: gitk:7966 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Errore nella lettura delle differenze:" + +#: gitk:8650 +msgid "Goto:" +msgstr "Vai a:" + +#: gitk:8671 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "La SHA1 id abbreviata %s è ambigua" + +#: gitk:8678 +#, tcl-format +msgid "Revision %s is not known" +msgstr "La revisione %s è sconosciuta" + +#: gitk:8688 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "La SHA1 id %s è sconosciuta" + +#: gitk:8690 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "La revisione %s non è presente nella vista attuale" + +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Data" + +#: gitk:8835 +msgid "Children" +msgstr "Figli" + +#: gitk:8898 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Aggiorna il ramo %s a questa revisione" + +#: gitk:8900 +msgid "Detached head: can't reset" +msgstr "Nessun ramo attivo: reset impossibile" + +#: gitk:9005 gitk:9011 +msgid "Skipping merge commit " +msgstr "Salto la revisione di fusione " + +#: gitk:9020 gitk:9025 +msgid "Error getting patch ID for " +msgstr "Errore nella identificazione della patch per " + +#: gitk:9021 gitk:9026 +msgid " - stopping\n" +msgstr " - fine\n" + +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +msgid "Commit " +msgstr "La revisione " + +#: gitk:9035 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" ha le stesse differenze di\n" +" " + +#: gitk:9043 +msgid "" +" differs from\n" +" " +msgstr "" +" è diversa da\n" +" " + +#: gitk:9045 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Differenze tra le revisioni:\n" +"\n" + +#: gitk:9057 gitk:9066 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " ha %s figli - fine\n" + +#: gitk:9085 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Errore nella scrittura della revisione nel file: %s" + +#: gitk:9091 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Errore nelle differenze tra le revisioni: %s" + +#: gitk:9137 +msgid "Top" +msgstr "Inizio" + +#: gitk:9138 +msgid "From" +msgstr "Da" + +#: gitk:9143 +msgid "To" +msgstr "A" + +#: gitk:9167 +msgid "Generate patch" +msgstr "Genera patch" + +#: gitk:9169 +msgid "From:" +msgstr "Da:" + +#: gitk:9178 +msgid "To:" +msgstr "A:" + +#: gitk:9187 +msgid "Reverse" +msgstr "Inverti" + +#: gitk:9189 gitk:9385 +msgid "Output file:" +msgstr "Scrivi sul file:" + +#: gitk:9195 +msgid "Generate" +msgstr "Genera" + +#: gitk:9233 +msgid "Error creating patch:" +msgstr "Errore nella creazione della patch:" + +#: gitk:9256 gitk:9373 gitk:9430 +msgid "ID:" +msgstr "ID:" + +#: gitk:9265 +msgid "Tag name:" +msgstr "Nome etichetta:" + +#: gitk:9268 +msgid "Tag message is optional" +msgstr "Il messaggio dell'etichetta è opzionale" + +#: gitk:9270 +msgid "Tag message:" +msgstr "Messaggio dell'etichetta:" + +#: gitk:9274 gitk:9439 +msgid "Create" +msgstr "Crea" + +#: gitk:9292 +msgid "No tag name specified" +msgstr "Nessuna etichetta specificata" + +#: gitk:9296 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "L'etichetta \"%s\" esiste già" + +#: gitk:9306 +msgid "Error creating tag:" +msgstr "Errore nella creazione dell'etichetta:" + +#: gitk:9382 +msgid "Command:" +msgstr "Comando:" + +#: gitk:9390 +msgid "Write" +msgstr "Scrivi" + +#: gitk:9408 +msgid "Error writing commit:" +msgstr "Errore nella scrittura della revisione:" + +#: gitk:9435 +msgid "Name:" +msgstr "Nome:" + +#: gitk:9458 +msgid "Please specify a name for the new branch" +msgstr "Specificare un nome per il nuovo ramo" + +#: gitk:9463 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Il ramo '%s' esiste già. Sovrascrivere?" + +#: gitk:9530 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" + +#: gitk:9535 +msgid "Cherry-picking" +msgstr "" + +#: gitk:9544 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato " +"nella directory di lavoro.\n" +"Prima di riprovare, bisogna creare una nuova revisione, annullare le " +"modifiche o usare 'git stash'." + +#: gitk:9550 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" +"Vuoi avviare git citool per risolverlo?" + +#: gitk:9566 gitk:9624 +msgid "No changes committed" +msgstr "Nessuna modifica archiviata" + +#: gitk:9593 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" + +#: gitk:9598 +#, fuzzy +msgid "Reverting" +msgstr "git reset in corso" + +#: gitk:9606 +#, fuzzy, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Impossibile eseguire cherry-pick perché il file '%s' è stato modificato " +"nella directory di lavoro.\n" +"Prima di riprovare, bisogna creare una nuova revisione, annullare le " +"modifiche o usare 'git stash'." + +#: gitk:9610 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" +"Vuoi avviare git citool per risolverlo?" + +#: gitk:9653 +msgid "Confirm reset" +msgstr "Conferma git reset" + +#: gitk:9655 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Aggiornare il ramo %s a %s?" + +#: gitk:9657 +msgid "Reset type:" +msgstr "Tipo di aggiornamento:" + +#: gitk:9660 +msgid "Soft: Leave working tree and index untouched" +msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" + +#: gitk:9663 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" + +#: gitk:9666 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hard: Aggiorna la directory di lavoro e l'indice\n" +"(abbandona TUTTE le modifiche locali)" + +#: gitk:9683 +msgid "Resetting" +msgstr "git reset in corso" + +#: gitk:9743 +msgid "Checking out" +msgstr "Attivazione in corso" + +#: gitk:9796 +msgid "Cannot delete the currently checked-out branch" +msgstr "Impossibile cancellare il ramo attualmente attivo" + +#: gitk:9802 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Le revisioni nel ramo %s non sono presenti su altri rami.\n" +"Cancellare il ramo %s?" + +#: gitk:9833 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Etichette e rami: %s" + +#: gitk:9850 +msgid "Filter" +msgstr "Filtro" + +#: gitk:10146 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Errore nella lettura della topologia delle revisioni: le informazioni sul " +"ramo e le etichette precedenti e seguenti saranno incomplete." + +#: gitk:11123 +msgid "Tag" +msgstr "Etichetta" + +#: gitk:11127 +msgid "Id" +msgstr "Id" + +#: gitk:11210 +msgid "Gitk font chooser" +msgstr "Scelta caratteri gitk" + +#: gitk:11227 +msgid "B" +msgstr "B" + +#: gitk:11230 +msgid "I" +msgstr "I" + +#: gitk:11348 +msgid "Commit list display options" +msgstr "Opzioni visualizzazione dell'elenco revisioni" + +#: gitk:11351 +msgid "Maximum graph width (lines)" +msgstr "Larghezza massima del grafico (in linee)" + +#: gitk:11355 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Larghezza massima del grafico (% del pannello)" + +#: gitk:11358 +msgid "Show local changes" +msgstr "Mostra modifiche locali" + +#: gitk:11361 +#, fuzzy +msgid "Auto-select SHA1 (length)" +msgstr "Seleziona automaticamente SHA1 hash" + +#: gitk:11365 +msgid "Hide remote refs" +msgstr "Nascondi i riferimenti remoti" + +#: gitk:11369 +msgid "Diff display options" +msgstr "Opzioni di visualizzazione delle differenze" + +#: gitk:11371 +msgid "Tab spacing" +msgstr "Spaziatura tabulazioni" + +#: gitk:11374 +#, fuzzy +msgid "Display nearby tags/heads" +msgstr "Mostra etichette vicine" + +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11380 +msgid "Limit diffs to listed paths" +msgstr "Limita le differenze ai percorsi elencati" + +#: gitk:11383 +msgid "Support per-file encodings" +msgstr "Attiva codifica file per file" + +#: gitk:11389 gitk:11536 +msgid "External diff tool" +msgstr "Visualizzatore di differenze" + +#: gitk:11390 +msgid "Choose..." +msgstr "Scegli..." + +#: gitk:11395 +msgid "General options" +msgstr "Opzioni generali" + +#: gitk:11398 +msgid "Use themed widgets" +msgstr "Utilizza interfaccia a tema" + +#: gitk:11400 +msgid "(change requires restart)" +msgstr "(una modifica richiede il riavvio)" + +#: gitk:11402 +msgid "(currently unavailable)" +msgstr "(momentaneamente non disponibile)" + +#: gitk:11413 +msgid "Colors: press to choose" +msgstr "Colori: premere per scegliere" + +#: gitk:11416 +msgid "Interface" +msgstr "Interfaccia" + +#: gitk:11417 +msgid "interface" +msgstr "interfaccia" + +#: gitk:11420 +msgid "Background" +msgstr "Sfondo" + +#: gitk:11421 gitk:11451 +msgid "background" +msgstr "sfondo" + +#: gitk:11424 +msgid "Foreground" +msgstr "Primo piano" + +#: gitk:11425 +msgid "foreground" +msgstr "primo piano" + +#: gitk:11428 +msgid "Diff: old lines" +msgstr "Diff: vecchie linee" + +#: gitk:11429 +msgid "diff old lines" +msgstr "vecchie linee" + +#: gitk:11433 +msgid "Diff: new lines" +msgstr "Diff: nuove linee" + +#: gitk:11434 +msgid "diff new lines" +msgstr "nuove linee" + +#: gitk:11438 +msgid "Diff: hunk header" +msgstr "Diff: intestazione della sezione" + +#: gitk:11440 +msgid "diff hunk header" +msgstr "intestazione della sezione" + +#: gitk:11444 +msgid "Marked line bg" +msgstr "Sfondo riga selezionata" + +#: gitk:11446 +msgid "marked line background" +msgstr "sfondo riga selezionata" + +#: gitk:11450 +msgid "Select bg" +msgstr "Sfondo" + +#: gitk:11459 +msgid "Fonts: press to choose" +msgstr "Carattere: premere per scegliere" + +#: gitk:11461 +msgid "Main font" +msgstr "Carattere principale" + +#: gitk:11462 +msgid "Diff display font" +msgstr "Carattere per differenze" + +#: gitk:11463 +msgid "User interface font" +msgstr "Carattere per interfaccia utente" + +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Preferenze gitk" + +#: gitk:11494 +#, fuzzy +msgid "General" +msgstr "Genera" + +#: gitk:11495 +msgid "Colors" +msgstr "" + +#: gitk:11496 +msgid "Fonts" +msgstr "" + +#: gitk:11546 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: scegliere un colore per %s" + +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 +msgid "Cannot find a git repository here." +msgstr "Archivio git non trovato." + +#: gitk:12316 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" + +#: gitk:12328 +msgid "Bad arguments to gitk:" +msgstr "Gitk: argomenti errati:" + +#~ msgid "next" +#~ msgstr "succ" + +#~ msgid "prev" +#~ msgstr "prec" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Directory git \"%s\" non trovata." diff --cc gitk-git/po/pt_pt.po index 0000000000,f680ea86aa..f680ea86aa mode 000000,100644..100644 --- a/gitk-git/po/pt_pt.po +++ b/gitk-git/po/pt_pt.po diff --cc gitk-git/po/ru.po index 17ed026aa7,0000000000..9b08c263ea mode 100644,000000..100644 --- a/gitk-git/po/ru.po +++ b/gitk-git/po/ru.po @@@ -1,1329 -1,0 +1,1371 @@@ +# Translation of gitk to Russian. +# +# Translators: +# 0xAX , 2014 +# Alex Riesen , 2015 - # Dimitriy Ryazantcev , 2015 ++# Dimitriy Ryazantcev , 2015-2016 +# Dmitry Potapov , 2009 +# Skip , 2011 +msgid "" +msgstr "" +"Project-Id-Version: Git Russian Localization Project\n" +"Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2015-05-17 14:32+1000\n" - "PO-Revision-Date: 2015-10-12 10:14+0000\n" ++"POT-Creation-Date: 2016-12-15 00:18+0200\n" ++"PO-Revision-Date: 2016-12-14 22:23+0000\n" +"Last-Translator: Dimitriy Ryazantcev \n" +"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ru\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Невозможно получить список файлов незавершённой операции слияния:" + - #: gitk:212 gitk:2381 ++#: gitk:212 gitk:2403 +msgid "Color words" +msgstr "Цветные слова" + - #: gitk:217 gitk:2381 gitk:8220 gitk:8253 ++#: gitk:217 gitk:2403 gitk:8249 gitk:8282 +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:4525 ++#: gitk:496 gitk:4549 +msgid "Reading commits..." +msgstr "Чтение коммитов..." + - #: gitk:499 gitk:1637 gitk:4528 ++#: gitk:499 gitk:1641 gitk:4552 +msgid "No commits selected" +msgstr "Ничего не выбрано" + - #: gitk:1445 gitk:4045 gitk:12432 ++#: gitk:1449 gitk:4069 gitk:12583 +msgid "Command line" +msgstr "Командная строка" + - #: gitk:1511 ++#: gitk:1515 +msgid "Can't parse git log output:" +msgstr "Ошибка обработки вывода команды git log:" + - #: gitk:1740 ++#: gitk:1744 +msgid "No commit information available" +msgstr "Нет информации о коммите" + - #: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 ++#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668 +msgid "OK" +msgstr "Ok" + - #: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 - #: gitk:11242 gitk:11522 ++#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791 ++#: gitk:11389 gitk:11669 +msgid "Cancel" +msgstr "Отмена" + - #: gitk:2069 ++#: gitk:2087 +msgid "&Update" +msgstr "Обновить" + - #: gitk:2070 ++#: gitk:2088 +msgid "&Reload" +msgstr "Перечитать" + - #: gitk:2071 ++#: gitk:2089 +msgid "Reread re&ferences" +msgstr "Обновить список ссылок" + - #: gitk:2072 ++#: gitk:2090 +msgid "&List references" +msgstr "Список ссылок" + - #: gitk:2074 ++#: gitk:2092 +msgid "Start git &gui" +msgstr "Запустить git gui" + - #: gitk:2076 ++#: gitk:2094 +msgid "&Quit" +msgstr "Завершить" + - #: gitk:2068 ++#: gitk:2086 +msgid "&File" +msgstr "Файл" + - #: gitk:2080 ++#: gitk:2098 +msgid "&Preferences" +msgstr "Настройки" + - #: gitk:2079 ++#: gitk:2097 +msgid "&Edit" +msgstr "Редактировать" + - #: gitk:2084 ++#: gitk:2102 +msgid "&New view..." +msgstr "Новое представление..." + - #: gitk:2085 ++#: gitk:2103 +msgid "&Edit view..." +msgstr "Редактировать представление..." + - #: gitk:2086 ++#: gitk:2104 +msgid "&Delete view" +msgstr "Удалить представление" + - #: gitk:2088 gitk:4043 ++#: gitk:2106 +msgid "&All files" +msgstr "Все файлы" + - #: gitk:2083 gitk:4067 ++#: gitk:2101 +msgid "&View" +msgstr "Представление" + - #: gitk:2093 gitk:2103 gitk:3012 ++#: gitk:2111 gitk:2121 +msgid "&About gitk" +msgstr "О gitk" + - #: gitk:2094 gitk:2108 ++#: gitk:2112 gitk:2126 +msgid "&Key bindings" +msgstr "Назначения клавиатуры" + - #: gitk:2092 gitk:2107 ++#: gitk:2110 gitk:2125 +msgid "&Help" +msgstr "Подсказка" + - #: gitk:2185 gitk:8652 ++#: gitk:2203 gitk:8681 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + - #: gitk:2229 ++#: gitk:2247 +msgid "Row" +msgstr "Строка" + - #: gitk:2267 ++#: gitk:2285 +msgid "Find" +msgstr "Поиск" + - #: gitk:2295 ++#: gitk:2313 +msgid "commit" +msgstr "коммит" + - #: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 - #: gitk:6912 ++#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851 ++#: gitk:6936 +msgid "containing:" +msgstr "содержащее:" + - #: gitk:2302 gitk:3526 gitk:3531 gitk:4763 ++#: gitk:2320 gitk:3550 gitk:3555 gitk:4787 +msgid "touching paths:" +msgstr "касательно файлов:" + - #: gitk:2303 gitk:4777 ++#: gitk:2321 gitk:4801 +msgid "adding/removing string:" +msgstr "добавив/удалив строку:" + - #: gitk:2304 gitk:4779 ++#: gitk:2322 gitk:4803 +msgid "changing lines matching:" +msgstr "изменяя совпадающие строки:" + - #: gitk:2313 gitk:2315 gitk:4766 ++#: gitk:2331 gitk:2333 gitk:4790 +msgid "Exact" +msgstr "Точно" + - #: gitk:2315 gitk:4854 gitk:6723 ++#: gitk:2333 gitk:4878 gitk:6747 +msgid "IgnCase" +msgstr "Игнорировать большие/маленькие" + - #: gitk:2315 gitk:4736 gitk:4852 gitk:6719 ++#: gitk:2333 gitk:4760 gitk:4876 gitk:6743 +msgid "Regexp" +msgstr "Регулярные выражения" + - #: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 ++#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940 +msgid "All fields" +msgstr "Во всех полях" + - #: gitk:2318 gitk:4871 gitk:4904 gitk:6786 ++#: gitk:2336 gitk:4895 gitk:4928 gitk:6810 +msgid "Headline" +msgstr "Заголовок" + - #: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 ++#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413 +msgid "Comments" +msgstr "Комментарии" + - #: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 - #: gitk:8845 ++#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859 ++#: gitk:8874 +msgid "Author" +msgstr "Автор" + - #: gitk:2319 gitk:4871 gitk:6786 gitk:7326 ++#: gitk:2337 gitk:4895 gitk:6810 gitk:7350 +msgid "Committer" +msgstr "Коммитер" + - #: gitk:2350 ++#: gitk:2371 +msgid "Search" +msgstr "Найти" + - #: gitk:2358 ++#: gitk:2379 +msgid "Diff" +msgstr "Сравнить" + - #: gitk:2360 ++#: gitk:2381 +msgid "Old version" +msgstr "Старая версия" + - #: gitk:2362 ++#: gitk:2383 +msgid "New version" +msgstr "Новая версия" + - #: gitk:2364 ++#: gitk:2386 +msgid "Lines of context" +msgstr "Строк контекста" + - #: gitk:2374 ++#: gitk:2396 +msgid "Ignore space change" +msgstr "Игнорировать пробелы" + - #: gitk:2378 gitk:2380 gitk:7959 gitk:8206 ++#: gitk:2400 gitk:2402 gitk:7983 gitk:8235 +msgid "Line diff" +msgstr "Изменения строк" + - #: gitk:2445 ++#: gitk:2467 +msgid "Patch" +msgstr "Патч" + - #: gitk:2447 ++#: gitk:2469 +msgid "Tree" +msgstr "Файлы" + - #: gitk:2617 gitk:2637 ++#: gitk:2639 gitk:2660 +msgid "Diff this -> selected" +msgstr "Сравнить этот коммит с выделенным" + - #: gitk:2618 gitk:2638 ++#: gitk:2640 gitk:2661 +msgid "Diff selected -> this" +msgstr "Сравнить выделенный с этим коммитом" + - #: gitk:2619 gitk:2639 ++#: gitk:2641 gitk:2662 +msgid "Make patch" +msgstr "Создать патч" + - #: gitk:2620 gitk:9254 ++#: gitk:2642 gitk:9283 +msgid "Create tag" +msgstr "Создать метку" + - #: gitk:2621 gitk:9371 ++#: gitk:2643 ++msgid "Copy commit summary" ++msgstr "Копировать информацию о коммите" ++ ++#: gitk:2644 gitk:9414 +msgid "Write commit to file" +msgstr "Сохранить коммит в файл" + - #: gitk:2622 gitk:9428 ++#: gitk:2645 +msgid "Create new branch" +msgstr "Создать ветку" + - #: gitk:2623 ++#: gitk:2646 +msgid "Cherry-pick this commit" - msgstr "Отбор лучшего для этого коммита" ++msgstr "Копировать этот коммит в текущую ветку" + - #: gitk:2624 ++#: gitk:2647 +msgid "Reset HEAD branch to here" +msgstr "Установить HEAD на этот коммит" + - #: gitk:2625 ++#: gitk:2648 +msgid "Mark this commit" +msgstr "Пометить этот коммит" + - #: gitk:2626 ++#: gitk:2649 +msgid "Return to mark" +msgstr "Вернуться на пометку" + - #: gitk:2627 ++#: gitk:2650 +msgid "Find descendant of this and mark" +msgstr "Найти и пометить потомка этого коммита" + - #: gitk:2628 ++#: gitk:2651 +msgid "Compare with marked commit" +msgstr "Сравнить с помеченным коммитом" + - #: gitk:2629 gitk:2640 ++#: gitk:2652 gitk:2663 +msgid "Diff this -> marked commit" +msgstr "Сравнить выделенное с помеченным коммитом" + - #: gitk:2630 gitk:2641 ++#: gitk:2653 gitk:2664 +msgid "Diff marked commit -> this" +msgstr "Сравнить помеченный с этим коммитом" + - #: gitk:2631 ++#: gitk:2654 +msgid "Revert this commit" - msgstr "Возврат этого коммита" ++msgstr "Обратить изменения этого коммита" + - #: gitk:2647 ++#: gitk:2670 +msgid "Check out this branch" +msgstr "Перейти на эту ветку" + - #: gitk:2648 ++#: gitk:2671 ++msgid "Rename this branch" ++msgstr "Переименовать эту ветку" ++ ++#: gitk:2672 +msgid "Remove this branch" +msgstr "Удалить эту ветку" + - #: gitk:2649 ++#: gitk:2673 +msgid "Copy branch name" +msgstr "Копировать имя ветки" + - #: gitk:2656 ++#: gitk:2680 +msgid "Highlight this too" +msgstr "Подсветить этот тоже" + - #: gitk:2657 ++#: gitk:2681 +msgid "Highlight this only" +msgstr "Подсветить только этот" + - #: gitk:2658 ++#: gitk:2682 +msgid "External diff" +msgstr "Программа сравнения" + - #: gitk:2659 ++#: gitk:2683 +msgid "Blame parent commit" +msgstr "Авторы изменений родительского коммита" + - #: gitk:2660 ++#: gitk:2684 +msgid "Copy path" +msgstr "Копировать путь" + - #: gitk:2667 ++#: gitk:2691 +msgid "Show origin of this line" +msgstr "Показать источник этой строки" + - #: gitk:2668 ++#: gitk:2692 +msgid "Run git gui blame on this line" +msgstr "Запустить git gui blame для этой строки" + - #: gitk:3014 ++#: gitk:3036 ++msgid "About gitk" ++msgstr "О gitk" ++ ++#: gitk:3038 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" - msgstr "\nGitk - программа просмотра истории репозиториев git\n\n© 2005-2014 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License" ++msgstr "\nGitk — программа просмотра истории репозиториев git\n\n© 2005-2016 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License" + - #: gitk:3022 gitk:3089 gitk:9857 ++#: gitk:3046 gitk:3113 gitk:10004 +msgid "Close" +msgstr "Закрыть" + - #: gitk:3043 ++#: gitk:3067 +msgid "Gitk key bindings" +msgstr "Назначения клавиатуры в Gitk" + - #: gitk:3046 ++#: gitk:3070 +msgid "Gitk key bindings:" +msgstr "Назначения клавиатуры в Gitk:" + - #: gitk:3048 ++#: gitk:3072 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tЗавершить" + - #: gitk:3049 ++#: gitk:3073 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tЗакрыть окно" + - #: gitk:3050 ++#: gitk:3074 +msgid "\t\tMove to first commit" +msgstr "\t\tПерейти к первому коммиту" + - #: gitk:3051 ++#: gitk:3075 +msgid "\t\tMove to last commit" +msgstr "\t\tПерейти к последнему коммиту" + - #: gitk:3052 ++#: gitk:3076 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tПерейти на один коммит вверх" + - #: gitk:3053 ++#: gitk:3077 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tПерейти на один коммит вниз" + - #: gitk:3054 ++#: gitk:3078 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tПоказать ранее посещённое состояние" + - #: gitk:3055 ++#: gitk:3079 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tПоказать следующий посещённый коммит" + - #: gitk:3056 ++#: gitk:3080 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n>\tПерейти на n родителя от текущего коммита" + - #: gitk:3057 ++#: gitk:3081 +msgid "\tMove up one page in commit list" +msgstr "\tПерейти на страницу выше в списке коммитов" + - #: gitk:3058 ++#: gitk:3082 +msgid "\tMove down one page in commit list" +msgstr "\tПерейти на страницу ниже в списке коммитов" + - #: gitk:3059 ++#: gitk:3083 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tПерейти на начало списка коммитов" + - #: gitk:3060 ++#: gitk:3084 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tПерейти на конец списка коммитов" + - #: gitk:3061 ++#: gitk:3085 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tПровернуть список коммитов вверх" + - #: gitk:3062 ++#: gitk:3086 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tПровернуть список коммитов вниз" + - #: gitk:3063 ++#: gitk:3087 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tПровернуть список коммитов на страницу вверх" + - #: gitk:3064 ++#: gitk:3088 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tПровернуть список коммитов на страницу вниз" + - #: gitk:3065 ++#: gitk:3089 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tПоиск в обратном порядке (вверх, среди новых коммитов)" + - #: gitk:3066 ++#: gitk:3090 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "\tПоиск (вниз, среди старых коммитов)" + - #: gitk:3067 ++#: gitk:3091 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tПрокрутить список изменений на страницу выше" + - #: gitk:3068 ++#: gitk:3092 +msgid "\tScroll diff view up one page" +msgstr "\tПрокрутить список изменений на страницу выше" + - #: gitk:3069 ++#: gitk:3093 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tПрокрутить список изменений на страницу ниже" + - #: gitk:3070 ++#: gitk:3094 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tПрокрутить список изменений на 18 строк вверх" + - #: gitk:3071 ++#: gitk:3095 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tПрокрутить список изменений на 18 строк вниз" + - #: gitk:3072 ++#: gitk:3096 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tПоиск" + - #: gitk:3073 ++#: gitk:3097 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tПерейти к следующему найденному коммиту" + - #: gitk:3074 ++#: gitk:3098 +msgid "\tMove to next find hit" +msgstr "\tПерейти к следующему найденному коммиту" + - #: gitk:3075 ++#: gitk:3099 +msgid "g\t\tGo to commit" +msgstr "g\t\tПерейти на коммит" + - #: gitk:3076 ++#: gitk:3100 +msgid "/\t\tFocus the search box" +msgstr "/\t\tПерейти к полю поиска" + - #: gitk:3077 ++#: gitk:3101 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tПерейти к предыдущему найденному коммиту" + - #: gitk:3078 ++#: gitk:3102 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tПрокрутить список изменений к следующему файлу" + - #: gitk:3079 ++#: gitk:3103 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tПродолжить поиск в списке изменений" + - #: gitk:3080 ++#: gitk:3104 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений" + - #: gitk:3081 ++#: gitk:3105 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tУвеличить размер шрифта" + - #: gitk:3082 ++#: gitk:3106 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tУвеличить размер шрифта" + - #: gitk:3083 ++#: gitk:3107 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tУменьшить размер шрифта" + - #: gitk:3084 ++#: gitk:3108 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tУменьшить размер шрифта" + - #: gitk:3085 ++#: gitk:3109 +msgid "\t\tUpdate" +msgstr "\t\tОбновить" + - #: gitk:3550 gitk:3559 ++#: gitk:3574 gitk:3583 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Ошибка создания временного каталога %s:" + - #: gitk:3572 ++#: gitk:3596 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Ошибка получения «%s» из %s:" + - #: gitk:3635 ++#: gitk:3659 +msgid "command failed:" +msgstr "ошибка выполнения команды:" + - #: gitk:3784 ++#: gitk:3808 +msgid "No such commit" +msgstr "Коммит не найден" + - #: gitk:3798 ++#: gitk:3822 +msgid "git gui blame: command failed:" +msgstr "git gui blame: ошибка выполнения команды:" + - #: gitk:3829 ++#: gitk:3853 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Ошибка чтения MERGE_HEAD: %s" + - #: gitk:3837 ++#: gitk:3861 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Ошибка чтения индекса: %s" + - #: gitk:3862 ++#: gitk:3886 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Ошибка запуска git blame: %s" + - #: gitk:3865 gitk:6754 ++#: gitk:3889 gitk:6778 +msgid "Searching" +msgstr "Поиск" + - #: gitk:3897 ++#: gitk:3921 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Ошибка выполнения git blame: %s" + - #: gitk:3925 ++#: gitk:3949 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Эта строка принадлежит коммиту %s, который не показан в этом представлении" + - #: gitk:3939 ++#: gitk:3963 +msgid "External diff viewer failed:" +msgstr "Ошибка выполнения программы сравнения:" + - #: gitk:4070 ++#: gitk:4067 ++msgid "All files" ++msgstr "Все файлы" ++ ++#: gitk:4091 ++msgid "View" ++msgstr "Представление" ++ ++#: gitk:4094 +msgid "Gitk view definition" +msgstr "Gitk определение представлений" + - #: gitk:4074 ++#: gitk:4098 +msgid "Remember this view" +msgstr "Запомнить представление" + - #: gitk:4075 ++#: gitk:4099 +msgid "References (space separated list):" +msgstr "Ссылки (разделённые пробелом):" + - #: gitk:4076 ++#: gitk:4100 +msgid "Branches & tags:" +msgstr "Ветки и метки" + - #: gitk:4077 ++#: gitk:4101 +msgid "All refs" +msgstr "Все ссылки" + - #: gitk:4078 ++#: gitk:4102 +msgid "All (local) branches" +msgstr "Все (локальные) ветки" + - #: gitk:4079 ++#: gitk:4103 +msgid "All tags" +msgstr "Все метки" + - #: gitk:4080 ++#: gitk:4104 +msgid "All remote-tracking branches" +msgstr "Все внешние отслеживаемые ветки" + - #: gitk:4081 ++#: gitk:4105 +msgid "Commit Info (regular expressions):" +msgstr "Информация о коммите (регулярные выражения):" + - #: gitk:4082 ++#: gitk:4106 +msgid "Author:" +msgstr "Автор:" + - #: gitk:4083 ++#: gitk:4107 +msgid "Committer:" +msgstr "Коммитер:" + - #: gitk:4084 ++#: gitk:4108 +msgid "Commit Message:" +msgstr "Сообщение коммита:" + - #: gitk:4085 ++#: gitk:4109 +msgid "Matches all Commit Info criteria" +msgstr "Совпадает со всеми условиями информации о коммите" + - #: gitk:4086 ++#: gitk:4110 +msgid "Matches no Commit Info criteria" +msgstr "Не совпадает с условиями информации о коммите" + - #: gitk:4087 ++#: gitk:4111 +msgid "Changes to Files:" +msgstr "Изменения файлов:" + - #: gitk:4088 ++#: gitk:4112 +msgid "Fixed String" +msgstr "Обычная строка" + - #: gitk:4089 ++#: gitk:4113 +msgid "Regular Expression" +msgstr "Регулярное выражение:" + - #: gitk:4090 ++#: gitk:4114 +msgid "Search string:" +msgstr "Строка для поиска:" + - #: gitk:4091 ++#: gitk:4115 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "Даты коммита («2 недели назад», «2009-03-17 15:27:38», «17 марта 2009 15:27:38»):" + - #: gitk:4092 ++#: gitk:4116 +msgid "Since:" +msgstr "С даты:" + - #: gitk:4093 ++#: gitk:4117 +msgid "Until:" +msgstr "По дату:" + - #: gitk:4094 ++#: gitk:4118 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Ограничить и/или пропустить количество редакций (положительное число):" + - #: gitk:4095 ++#: gitk:4119 +msgid "Number to show:" +msgstr "Показать количество:" + - #: gitk:4096 ++#: gitk:4120 +msgid "Number to skip:" +msgstr "Пропустить количество:" + - #: gitk:4097 ++#: gitk:4121 +msgid "Miscellaneous options:" +msgstr "Различные опции:" + - #: gitk:4098 ++#: gitk:4122 +msgid "Strictly sort by date" +msgstr "Строгая сортировка по дате" + - #: gitk:4099 ++#: gitk:4123 +msgid "Mark branch sides" +msgstr "Отметить стороны веток" + - #: gitk:4100 ++#: gitk:4124 +msgid "Limit to first parent" +msgstr "Ограничить первым предком" + - #: gitk:4101 ++#: gitk:4125 +msgid "Simple history" +msgstr "Упрощенная история" + - #: gitk:4102 ++#: gitk:4126 +msgid "Additional arguments to git log:" +msgstr "Дополнительные аргументы для git log:" + - #: gitk:4103 ++#: gitk:4127 +msgid "Enter files and directories to include, one per line:" +msgstr "Файлы и каталоги для ограничения истории, по одному на строку:" + - #: gitk:4104 ++#: gitk:4128 +msgid "Command to generate more commits to include:" +msgstr "Дополнительная команда для списка коммитов:" + - #: gitk:4228 ++#: gitk:4252 +msgid "Gitk: edit view" +msgstr "Gitk: изменить представление" + - #: gitk:4236 ++#: gitk:4260 +msgid "-- criteria for selecting revisions" +msgstr "— критерий поиска редакций" + - #: gitk:4241 ++#: gitk:4265 +msgid "View Name" +msgstr "Имя представления" + - #: gitk:4316 ++#: gitk:4340 +msgid "Apply (F5)" +msgstr "Применить (F5)" + - #: gitk:4354 ++#: gitk:4378 +msgid "Error in commit selection arguments:" +msgstr "Ошибка в параметрах выбора коммитов:" + - #: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 ++#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525 +msgid "None" +msgstr "Ни одного" + - #: gitk:5021 gitk:5026 ++#: gitk:5045 gitk:5050 +msgid "Descendant" +msgstr "Порождённое" + - #: gitk:5022 ++#: gitk:5046 +msgid "Not descendant" +msgstr "Не порождённое" + - #: gitk:5029 gitk:5034 ++#: gitk:5053 gitk:5058 +msgid "Ancestor" +msgstr "Предок" + - #: gitk:5030 ++#: gitk:5054 +msgid "Not ancestor" +msgstr "Не предок" + - #: gitk:5324 ++#: gitk:5348 +msgid "Local changes checked in to index but not committed" +msgstr "Проиндексированные изменения" + - #: gitk:5360 ++#: gitk:5384 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Непроиндексированные изменения" + - #: gitk:7134 ++#: gitk:7158 +msgid "and many more" +msgstr "и многое другое" + - #: gitk:7137 ++#: gitk:7161 +msgid "many" +msgstr "много" + - #: gitk:7328 ++#: gitk:7352 +msgid "Tags:" +msgstr "Метки:" + - #: gitk:7345 gitk:7351 gitk:8825 ++#: gitk:7369 gitk:7375 gitk:8854 +msgid "Parent" +msgstr "Предок" + - #: gitk:7356 ++#: gitk:7380 +msgid "Child" +msgstr "Потомок" + - #: gitk:7365 ++#: gitk:7389 +msgid "Branch" +msgstr "Ветка" + - #: gitk:7368 ++#: gitk:7392 +msgid "Follows" +msgstr "Следует за" + - #: gitk:7371 ++#: gitk:7395 +msgid "Precedes" +msgstr "Предшествует" + - #: gitk:7966 ++#: gitk:7990 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Ошибка получения изменений: %s" + - #: gitk:8650 ++#: gitk:8679 +msgid "Goto:" +msgstr "Перейти к:" + - #: gitk:8671 ++#: gitk:8700 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" + - #: gitk:8678 ++#: gitk:8707 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Редакция %s не найдена" + - #: gitk:8688 ++#: gitk:8717 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA1 идентификатор %s не найден" + - #: gitk:8690 ++#: gitk:8719 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Редакция %s не найдена в текущем представлении" + - #: gitk:8832 gitk:8847 ++#: gitk:8861 gitk:8876 +msgid "Date" +msgstr "Дата" + - #: gitk:8835 ++#: gitk:8864 +msgid "Children" +msgstr "Потомки" + - #: gitk:8898 ++#: gitk:8927 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Сбросить ветку %s на этот коммит" + - #: gitk:8900 ++#: gitk:8929 +msgid "Detached head: can't reset" +msgstr "Коммит не принадлежит ни одной ветке, сбросить невозможно" + - #: gitk:9005 gitk:9011 ++#: gitk:9034 gitk:9040 +msgid "Skipping merge commit " +msgstr "Пропускаю коммит-слияние" + - #: gitk:9020 gitk:9025 ++#: gitk:9049 gitk:9054 +msgid "Error getting patch ID for " +msgstr "Не удалось получить идентификатор патча для " + - #: gitk:9021 gitk:9026 ++#: gitk:9050 gitk:9055 +msgid " - stopping\n" +msgstr " — останов\n" + - #: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 ++#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094 +msgid "Commit " +msgstr "Коммит" + - #: gitk:9035 ++#: gitk:9064 +msgid "" +" is the same patch as\n" +" " +msgstr " такой же патч, как и\n " + - #: gitk:9043 ++#: gitk:9072 +msgid "" +" differs from\n" +" " +msgstr " отличается от\n " + - #: gitk:9045 ++#: gitk:9074 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "Различия коммитов:\n\n" + - #: gitk:9057 gitk:9066 ++#: gitk:9086 gitk:9095 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " является %s потомком — останов\n" + - #: gitk:9085 ++#: gitk:9114 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Произошла ошибка при записи коммита в файл: %s" + - #: gitk:9091 ++#: gitk:9120 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Произошла ошибка при выводе различий коммитов: %s" + - #: gitk:9137 ++#: gitk:9166 +msgid "Top" +msgstr "Верх" + - #: gitk:9138 ++#: gitk:9167 +msgid "From" +msgstr "От" + - #: gitk:9143 ++#: gitk:9172 +msgid "To" +msgstr "До" + - #: gitk:9167 ++#: gitk:9196 +msgid "Generate patch" +msgstr "Создать патч" + - #: gitk:9169 ++#: gitk:9198 +msgid "From:" +msgstr "От:" + - #: gitk:9178 ++#: gitk:9207 +msgid "To:" +msgstr "До:" + - #: gitk:9187 ++#: gitk:9216 +msgid "Reverse" +msgstr "В обратном порядке" + - #: gitk:9189 gitk:9385 ++#: gitk:9218 gitk:9428 +msgid "Output file:" +msgstr "Файл для сохранения:" + - #: gitk:9195 ++#: gitk:9224 +msgid "Generate" +msgstr "Создать" + - #: gitk:9233 ++#: gitk:9262 +msgid "Error creating patch:" +msgstr "Ошибка создания патча:" + - #: gitk:9256 gitk:9373 gitk:9430 ++#: gitk:9285 gitk:9416 gitk:9504 +msgid "ID:" +msgstr "ID:" + - #: gitk:9265 ++#: gitk:9294 +msgid "Tag name:" +msgstr "Имя метки:" + - #: gitk:9268 ++#: gitk:9297 +msgid "Tag message is optional" +msgstr "Описание метки указывать не обязательно" + - #: gitk:9270 ++#: gitk:9299 +msgid "Tag message:" +msgstr "Описание метки:" + - #: gitk:9274 gitk:9439 ++#: gitk:9303 gitk:9474 +msgid "Create" +msgstr "Создать" + - #: gitk:9292 ++#: gitk:9321 +msgid "No tag name specified" +msgstr "Не задано имя метки" + - #: gitk:9296 ++#: gitk:9325 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Метка «%s» уже существует" + - #: gitk:9306 ++#: gitk:9335 +msgid "Error creating tag:" +msgstr "Ошибка создания метки:" + - #: gitk:9382 ++#: gitk:9425 +msgid "Command:" +msgstr "Команда:" + - #: gitk:9390 ++#: gitk:9433 +msgid "Write" +msgstr "Запись" + - #: gitk:9408 ++#: gitk:9451 +msgid "Error writing commit:" +msgstr "Произошла ошибка при записи коммита:" + - #: gitk:9435 ++#: gitk:9473 ++msgid "Create branch" ++msgstr "Создать ветку" ++ ++#: gitk:9489 ++#, tcl-format ++msgid "Rename branch %s" ++msgstr "Переименовать ветку %s" ++ ++#: gitk:9490 ++msgid "Rename" ++msgstr "Переименовать" ++ ++#: gitk:9514 +msgid "Name:" +msgstr "Имя:" + - #: gitk:9458 ++#: gitk:9538 +msgid "Please specify a name for the new branch" +msgstr "Укажите имя для новой ветки" + - #: gitk:9463 ++#: gitk:9543 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Ветка «%s» уже существует. Переписать?" + - #: gitk:9530 ++#: gitk:9587 ++msgid "Please specify a new name for the branch" ++msgstr "Укажите имя для новой ветки" ++ ++#: gitk:9650 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "Коммит %s уже включён в ветку %s. Продолжить операцию?" + - #: gitk:9535 ++#: gitk:9655 +msgid "Cherry-picking" - msgstr "Копирование изменений" ++msgstr "Копирование коммита" + - #: gitk:9544 ++#: gitk:9664 +#, 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Закомитьте, сбросьте или спрячьте изменения и повторите операцию." ++msgstr "Копирование коммита невозможно из-за изменений в файле «%s».\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию." + - #: gitk:9550 ++#: gitk:9670 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "Копирование изменений невозможно из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?" + - #: gitk:9566 gitk:9624 ++#: gitk:9686 gitk:9744 +msgid "No changes committed" +msgstr "Изменения не закоммичены" + - #: gitk:9593 ++#: gitk:9713 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Коммит %s не включён в ветку %s. Продолжить операцию?" + - #: gitk:9598 ++#: gitk:9718 +msgid "Reverting" - msgstr "Возврат изменений" ++msgstr "Обращение изменений" + - #: gitk:9606 ++#: gitk:9726 +#, 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Закомитьте, сбросьте или спрячьте изменения и повторите операцию." ++msgstr "Возврат изменений коммита не удался из-за локальных изменений в указанных файлах: %s\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию." + - #: gitk:9610 ++#: gitk:9730 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "Возврат изменений невозможен из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?" + - #: gitk:9653 ++#: gitk:9773 +msgid "Confirm reset" +msgstr "Подтвердите операцию перехода" + - #: gitk:9655 ++#: gitk:9775 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Сбросить ветку %s на коммит %s?" + - #: gitk:9657 ++#: gitk:9777 +msgid "Reset type:" +msgstr "Тип операции перехода:" + - #: gitk:9660 ++#: gitk:9780 +msgid "Soft: Leave working tree and index untouched" +msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными" + - #: gitk:9663 ++#: gitk:9783 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс" + - #: gitk:9666 ++#: gitk:9786 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "Жесткий: переписать индекс и рабочий каталог\n(все изменения в рабочем каталоге будут потеряны)" + - #: gitk:9683 ++#: gitk:9803 +msgid "Resetting" +msgstr "Сброс" + - #: gitk:9743 ++#: gitk:9876 ++#, tcl-format ++msgid "A local branch named %s exists already" ++msgstr "Локальная ветка с именем %s уже существует" ++ ++#: gitk:9884 +msgid "Checking out" +msgstr "Переход" + - #: gitk:9796 ++#: gitk:9943 +msgid "Cannot delete the currently checked-out branch" +msgstr "Активная ветка не может быть удалена" + - #: gitk:9802 ++#: gitk:9949 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "Коммиты из ветки %s не принадлежат больше никакой другой ветке.\nДействительно удалить ветку %s?" + - #: gitk:9833 ++#: gitk:9980 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Метки и ветки: %s" + - #: gitk:9850 ++#: gitk:9997 +msgid "Filter" +msgstr "Фильтровать" + - #: gitk:10146 ++#: gitk:10293 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток (до/после) может быть неполной." + - #: gitk:11123 ++#: gitk:11270 +msgid "Tag" +msgstr "Метка" + - #: gitk:11127 ++#: gitk:11274 +msgid "Id" +msgstr "Id" + - #: gitk:11210 ++#: gitk:11357 +msgid "Gitk font chooser" +msgstr "Шрифт Gitk" + - #: gitk:11227 ++#: gitk:11374 +msgid "B" +msgstr "Ж" + - #: gitk:11230 ++#: gitk:11377 +msgid "I" +msgstr "К" + - #: gitk:11348 ++#: gitk:11495 +msgid "Commit list display options" +msgstr "Параметры показа списка коммитов" + - #: gitk:11351 ++#: gitk:11498 +msgid "Maximum graph width (lines)" +msgstr "Макс. ширина графа (строк)" + - #: gitk:11355 ++#: gitk:11502 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Макс. ширина графа (% ширины панели)" + - #: gitk:11358 ++#: gitk:11505 +msgid "Show local changes" +msgstr "Показывать изменения в рабочем каталоге" + - #: gitk:11361 ++#: gitk:11508 +msgid "Auto-select SHA1 (length)" +msgstr "Автоматически выделить SHA1 (длинна)" + - #: gitk:11365 ++#: gitk:11512 +msgid "Hide remote refs" +msgstr "Скрыть внешние ссылки" + - #: gitk:11369 ++#: gitk:11516 +msgid "Diff display options" +msgstr "Параметры показа изменений" + - #: gitk:11371 ++#: gitk:11518 +msgid "Tab spacing" +msgstr "Ширина табуляции" + - #: gitk:11374 ++#: gitk:11521 +msgid "Display nearby tags/heads" +msgstr "Показывать близкие метки/ветки" + - #: gitk:11377 ++#: gitk:11524 +msgid "Maximum # tags/heads to show" +msgstr "Показывать максимальное количество меток/веток" + - #: gitk:11380 ++#: gitk:11527 +msgid "Limit diffs to listed paths" +msgstr "Ограничить показ изменений выбранными файлами" + - #: gitk:11383 ++#: gitk:11530 +msgid "Support per-file encodings" +msgstr "Поддержка кодировок в отдельных файлах" + - #: gitk:11389 gitk:11536 ++#: gitk:11536 gitk:11683 +msgid "External diff tool" +msgstr "Программа для показа изменений" + - #: gitk:11390 ++#: gitk:11537 +msgid "Choose..." +msgstr "Выберите..." + - #: gitk:11395 ++#: gitk:11542 +msgid "General options" +msgstr "Общие опции" + - #: gitk:11398 ++#: gitk:11545 +msgid "Use themed widgets" +msgstr "Использовать стили виджетов" + - #: gitk:11400 ++#: gitk:11547 +msgid "(change requires restart)" +msgstr "(изменение потребует перезапуск)" + - #: gitk:11402 ++#: gitk:11549 +msgid "(currently unavailable)" +msgstr "(недоступно в данный момент)" + - #: gitk:11413 ++#: gitk:11560 +msgid "Colors: press to choose" +msgstr "Цвета: нажмите для выбора" + - #: gitk:11416 ++#: gitk:11563 +msgid "Interface" +msgstr "Интерфейс" + - #: gitk:11417 ++#: gitk:11564 +msgid "interface" +msgstr "интерфейс" + - #: gitk:11420 ++#: gitk:11567 +msgid "Background" +msgstr "Фон" + - #: gitk:11421 gitk:11451 ++#: gitk:11568 gitk:11598 +msgid "background" +msgstr "фон" + - #: gitk:11424 ++#: gitk:11571 +msgid "Foreground" +msgstr "Передний план" + - #: gitk:11425 ++#: gitk:11572 +msgid "foreground" +msgstr "передний план" + - #: gitk:11428 ++#: gitk:11575 +msgid "Diff: old lines" +msgstr "Изменения: старый текст" + - #: gitk:11429 ++#: gitk:11576 +msgid "diff old lines" +msgstr "старый текст изменения" + - #: gitk:11433 ++#: gitk:11580 +msgid "Diff: new lines" +msgstr "Изменения: новый текст" + - #: gitk:11434 ++#: gitk:11581 +msgid "diff new lines" +msgstr "новый текст изменения" + - #: gitk:11438 ++#: gitk:11585 +msgid "Diff: hunk header" +msgstr "Изменения: заголовок блока" + - #: gitk:11440 ++#: gitk:11587 +msgid "diff hunk header" +msgstr "заголовок блока изменений" + - #: gitk:11444 ++#: gitk:11591 +msgid "Marked line bg" +msgstr "Фон выбранной строки" + - #: gitk:11446 ++#: gitk:11593 +msgid "marked line background" +msgstr "фон выбранной строки" + - #: gitk:11450 ++#: gitk:11597 +msgid "Select bg" +msgstr "Выберите фон" + - #: gitk:11459 ++#: gitk:11606 +msgid "Fonts: press to choose" +msgstr "Шрифт: нажмите для выбора" + - #: gitk:11461 ++#: gitk:11608 +msgid "Main font" +msgstr "Основной шрифт" + - #: gitk:11462 ++#: gitk:11609 +msgid "Diff display font" +msgstr "Шрифт показа изменений" + - #: gitk:11463 ++#: gitk:11610 +msgid "User interface font" +msgstr "Шрифт интерфейса" + - #: gitk:11485 ++#: gitk:11632 +msgid "Gitk preferences" +msgstr "Настройки Gitk" + - #: gitk:11494 ++#: gitk:11641 +msgid "General" +msgstr "Общие" + - #: gitk:11495 ++#: gitk:11642 +msgid "Colors" +msgstr "Цвета" + - #: gitk:11496 ++#: gitk:11643 +msgid "Fonts" +msgstr "Шрифты" + - #: gitk:11546 ++#: gitk:11693 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: выберите цвет для %s" + - #: gitk:12059 ++#: gitk:12206 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "К сожалению gitk не может работать с этой версий Tcl/Tk.\nТребуется как минимум Tcl/Tk 8.4." + - #: gitk:12269 ++#: gitk:12416 +msgid "Cannot find a git repository here." +msgstr "Git-репозитарий не найден в текущем каталоге." + - #: gitk:12316 ++#: gitk:12463 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Неоднозначный аргумент «%s»: существует как редакция и как имя файла" + - #: gitk:12328 ++#: gitk:12475 +msgid "Bad arguments to gitk:" +msgstr "Неправильные аргументы для gitk:" diff --cc gitk-git/po/sv.po index d9d4e87a44,0000000000..2a06fe5bbc mode 100644,000000..100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@@ -1,1428 -1,0 +1,1413 @@@ +# Swedish translation for gitk +# Copyright (C) 2005-2015 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# +# Mikael Magnusson , 2008. +# Peter Krefting , 2008, 2009, 2010, 2012, 2013, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: sv\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-12-09 09:40+0100\n" +"PO-Revision-Date: 2015-12-11 09:46+0100\n" +"Last-Translator: Peter Krefting \n" +"Language-Team: Swedish \n" +"Language: sv\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" + +#: gitk:140 +msgid "Couldn't get list of unmerged files:" +msgstr "Kunde inte hämta lista över ej sammanslagna filer:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Färga ord" + +#: gitk:217 gitk:2381 gitk:8221 gitk:8254 +msgid "Markup words" +msgstr "Märk upp ord" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Fel vid tolkning av revisioner:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Fel vid körning av --argscmd-kommando:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Inga filer valdes: --merge angavs men det finns inga filer som inte har " +"slagits samman." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Inga filer valdes: --merge angavs men det finns inga filer inom " +"filbegränsningen." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Fel vid körning av git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Läser" + +#: gitk:496 gitk:4526 +msgid "Reading commits..." +msgstr "Läser incheckningar..." + +#: gitk:499 gitk:1637 gitk:4529 +msgid "No commits selected" +msgstr "Inga incheckningar markerade" + +#: gitk:1445 gitk:4046 gitk:12447 +msgid "Command line" +msgstr "Kommandorad" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Kan inte tolka utdata från git log:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Ingen incheckningsinformation är tillgänglig" + +#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 +msgid "OK" +msgstr "OK" + +#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 +#: gitk:11257 gitk:11537 +msgid "Cancel" +msgstr "Avbryt" + +#: gitk:2069 +msgid "&Update" +msgstr "&Uppdatera" + +#: gitk:2070 +msgid "&Reload" +msgstr "Läs &om" + +#: gitk:2071 +msgid "Reread re&ferences" +msgstr "Läs om &referenser" + +#: gitk:2072 +msgid "&List references" +msgstr "&Visa referenser" + +#: gitk:2074 +msgid "Start git &gui" +msgstr "Starta git &gui" + +#: gitk:2076 +msgid "&Quit" +msgstr "&Avsluta" + +#: gitk:2068 +msgid "&File" +msgstr "&Arkiv" + +#: gitk:2080 +msgid "&Preferences" +msgstr "&Inställningar" + +#: gitk:2079 +msgid "&Edit" +msgstr "&Redigera" + +#: gitk:2084 +msgid "&New view..." +msgstr "&Ny vy..." + +#: gitk:2085 +msgid "&Edit view..." +msgstr "&Ändra vy..." + +#: gitk:2086 +msgid "&Delete view" +msgstr "&Ta bort vy" + +#: gitk:2088 +msgid "&All files" +msgstr "&Alla filer" + +#: gitk:2083 +msgid "&View" +msgstr "&Visa" + +#: gitk:2093 gitk:2103 +msgid "&About gitk" +msgstr "&Om gitk" + +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "&Tangentbordsbindningar" + +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "&Hjälp" + +#: gitk:2185 gitk:8653 +msgid "SHA1 ID:" +msgstr "SHA1-id:" + +#: gitk:2229 +msgid "Row" +msgstr "Rad" + +#: gitk:2267 +msgid "Find" +msgstr "Sök" + +#: gitk:2295 +msgid "commit" +msgstr "incheckning" + +#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 +#: gitk:6913 +msgid "containing:" +msgstr "som innehåller:" + +#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 +msgid "touching paths:" +msgstr "som rör sökväg:" + +#: gitk:2303 gitk:4778 +msgid "adding/removing string:" +msgstr "som lägger/till tar bort sträng:" + +#: gitk:2304 gitk:4780 +msgid "changing lines matching:" +msgstr "ändrar rader som matchar:" + +#: gitk:2313 gitk:2315 gitk:4767 +msgid "Exact" +msgstr "Exakt" + +#: gitk:2315 gitk:4855 gitk:6724 +msgid "IgnCase" +msgstr "IgnVersaler" + +#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 +msgid "Regexp" +msgstr "Reg.uttr." + +#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 +msgid "All fields" +msgstr "Alla fält" + +#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 +msgid "Headline" +msgstr "Rubrik" + +#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 +msgid "Comments" +msgstr "Kommentarer" + +#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 +#: gitk:8846 +msgid "Author" +msgstr "Författare" + +#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 +msgid "Committer" +msgstr "Incheckare" + +#: gitk:2350 +msgid "Search" +msgstr "Sök" + +#: gitk:2358 +msgid "Diff" +msgstr "Diff" + +#: gitk:2360 +msgid "Old version" +msgstr "Gammal version" + +#: gitk:2362 +msgid "New version" +msgstr "Ny version" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Rader sammanhang" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Ignorera ändringar i blanksteg" + +#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 +msgid "Line diff" +msgstr "Rad-diff" + +#: gitk:2445 +msgid "Patch" +msgstr "Patch" + +#: gitk:2447 +msgid "Tree" +msgstr "Träd" + +#: gitk:2617 gitk:2638 +msgid "Diff this -> selected" +msgstr "Diff denna -> markerad" + +#: gitk:2618 gitk:2639 +msgid "Diff selected -> this" +msgstr "Diff markerad -> denna" + +#: gitk:2619 gitk:2640 +msgid "Make patch" +msgstr "Skapa patch" + +#: gitk:2620 gitk:9255 +msgid "Create tag" +msgstr "Skapa tagg" + +#: gitk:2621 +msgid "Copy commit summary" +msgstr "Kopiera incheckningssammanfattning" + +#: gitk:2622 gitk:9386 +msgid "Write commit to file" +msgstr "Skriv incheckning till fil" + +#: gitk:2623 gitk:9443 +msgid "Create new branch" +msgstr "Skapa ny gren" + +#: gitk:2624 +msgid "Cherry-pick this commit" +msgstr "Plocka denna incheckning" + +#: gitk:2625 +msgid "Reset HEAD branch to here" +msgstr "Återställ HEAD-grenen hit" + +#: gitk:2626 +msgid "Mark this commit" +msgstr "Markera denna incheckning" + +#: gitk:2627 +msgid "Return to mark" +msgstr "Återgå till markering" + +#: gitk:2628 +msgid "Find descendant of this and mark" +msgstr "Hitta efterföljare till denna och markera" + +#: gitk:2629 +msgid "Compare with marked commit" +msgstr "Jämför med markerad incheckning" + +#: gitk:2630 gitk:2641 +msgid "Diff this -> marked commit" +msgstr "Diff denna -> markerad incheckning" + +#: gitk:2631 gitk:2642 +msgid "Diff marked commit -> this" +msgstr "Diff markerad incheckning -> denna" + +#: gitk:2632 +msgid "Revert this commit" +msgstr "Ångra denna incheckning" + +#: gitk:2648 +msgid "Check out this branch" +msgstr "Checka ut denna gren" + +#: gitk:2649 +msgid "Remove this branch" +msgstr "Ta bort denna gren" + +#: gitk:2650 +msgid "Copy branch name" +msgstr "Kopiera namn på gren" + +#: gitk:2657 +msgid "Highlight this too" +msgstr "Markera även detta" + +#: gitk:2658 +msgid "Highlight this only" +msgstr "Markera bara detta" + +#: gitk:2659 +msgid "External diff" +msgstr "Extern diff" + +#: gitk:2660 +msgid "Blame parent commit" +msgstr "Klandra föräldraincheckning" + +#: gitk:2661 +msgid "Copy path" +msgstr "Kopiera sökväg" + +#: gitk:2668 +msgid "Show origin of this line" +msgstr "Visa ursprunget för den här raden" + +#: gitk:2669 +msgid "Run git gui blame on this line" +msgstr "Kör git gui blame på den här raden" + +#: gitk:3013 +msgid "About gitk" +msgstr "Om gitk" + +#: gitk:3015 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 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-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 Paul Mackerras\n" +"\n" +"Använd och vidareförmedla enligt villkoren i GNU General Public License" + +#: gitk:3023 gitk:3090 gitk:9872 +msgid "Close" +msgstr "Stäng" + +#: gitk:3044 +msgid "Gitk key bindings" +msgstr "Tangentbordsbindningar för Gitk" + +#: gitk:3047 +msgid "Gitk key bindings:" +msgstr "Tangentbordsbindningar för Gitk:" + +#: gitk:3049 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tAvsluta" + +#: gitk:3050 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tStäng fönster" + +#: gitk:3051 +msgid "\t\tMove to first commit" +msgstr "\t\tGå till första incheckning" + +#: gitk:3052 +msgid "\t\tMove to last commit" +msgstr "\t\tGå till sista incheckning" + +#: gitk:3053 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tGå en incheckning upp" + +#: gitk:3054 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tGå en incheckning ned" + +#: gitk:3055 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tGå bakåt i historiken" + +#: gitk:3056 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tGå framåt i historiken" + +#: gitk:3057 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan" + +#: gitk:3058 +msgid "\tMove up one page in commit list" +msgstr "\tGå upp en sida i incheckningslistan" + +#: gitk:3059 +msgid "\tMove down one page in commit list" +msgstr "\tGå ned en sida i incheckningslistan" + +#: gitk:3060 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tRulla till början av incheckningslistan" + +#: gitk:3061 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tRulla till slutet av incheckningslistan" + +#: gitk:3062 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" + +#: gitk:3063 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" + +#: gitk:3064 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" + +#: gitk:3065 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" + +#: gitk:3066 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tSök bakåt (uppåt, senare incheckningar)" + +#: gitk:3067 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "\tSök framåt (nedåt, tidigare incheckningar)" + +#: gitk:3068 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tRulla diffvisningen upp en sida" + +#: gitk:3069 +msgid "\tScroll diff view up one page" +msgstr "\tRulla diffvisningen upp en sida" + +#: gitk:3070 +msgid "\t\tScroll diff view down one page" +msgstr "\tRulla diffvisningen ned en sida" + +#: gitk:3071 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tRulla diffvisningen upp 18 rader" + +#: gitk:3072 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tRulla diffvisningen ned 18 rader" + +#: gitk:3073 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tSök" + +#: gitk:3074 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tGå till nästa sökträff" + +#: gitk:3075 +msgid "\tMove to next find hit" +msgstr "\t\tGå till nästa sökträff" + +#: gitk:3076 +msgid "g\t\tGo to commit" +msgstr "g\t\tGå till incheckning" + +#: gitk:3077 +msgid "/\t\tFocus the search box" +msgstr "/\t\tFokusera sökrutan" + +#: gitk:3078 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tGå till föregående sökträff" + +#: gitk:3079 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tRulla diffvisningen till nästa fil" + +#: gitk:3080 +#, 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:3081 +#, 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:3082 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-Num+>\tÖka teckenstorlek" + +#: gitk:3083 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tÖka teckenstorlek" + +#: gitk:3084 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-Num->\tMinska teckenstorlek" + +#: gitk:3085 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tMinska teckenstorlek" + +#: gitk:3086 +msgid "\t\tUpdate" +msgstr "\t\tUppdatera" + +#: gitk:3551 gitk:3560 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Fel vid skapande av temporär katalog %s:" + +#: gitk:3573 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Fel vid hämtning av \"%s\" från %s:" + +#: gitk:3636 +msgid "command failed:" +msgstr "kommando misslyckades:" + +#: gitk:3785 +msgid "No such commit" +msgstr "Incheckning saknas" + +#: gitk:3799 +msgid "git gui blame: command failed:" +msgstr "git gui blame: kommando misslyckades:" + +#: gitk:3830 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Kunde inte läsa sammanslagningshuvud: %s" + +#: gitk:3838 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Fel vid läsning av index: %s" + +#: gitk:3863 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Kunde inte starta git blame: %s" + +#: gitk:3866 gitk:6755 +msgid "Searching" +msgstr "Söker" + +#: gitk:3898 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Fel vid körning av git blame: %s" + +#: gitk:3926 +#, 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:3940 +msgid "External diff viewer failed:" +msgstr "Externt diff-verktyg misslyckades:" + +#: gitk:4044 +msgid "All files" +msgstr "Alla filer" + +#: gitk:4068 +msgid "View" +msgstr "Visa" + +#: gitk:4071 +msgid "Gitk view definition" +msgstr "Definition av Gitk-vy" + +#: gitk:4075 +msgid "Remember this view" +msgstr "Spara denna vy" + +#: gitk:4076 +msgid "References (space separated list):" +msgstr "Referenser (blankstegsavdelad lista):" + +#: gitk:4077 +msgid "Branches & tags:" +msgstr "Grenar & taggar:" + +#: gitk:4078 +msgid "All refs" +msgstr "Alla referenser" + +#: gitk:4079 +msgid "All (local) branches" +msgstr "Alla (lokala) grenar" + +#: gitk:4080 +msgid "All tags" +msgstr "Alla taggar" + +#: gitk:4081 +msgid "All remote-tracking branches" +msgstr "Alla fjärrspårande grenar" + +#: gitk:4082 +msgid "Commit Info (regular expressions):" +msgstr "Incheckningsinfo (reguljära uttryck):" + +#: gitk:4083 +msgid "Author:" +msgstr "Författare:" + +#: gitk:4084 +msgid "Committer:" +msgstr "Incheckare:" + +#: gitk:4085 +msgid "Commit Message:" +msgstr "Incheckningsmeddelande:" + +#: gitk:4086 +msgid "Matches all Commit Info criteria" +msgstr "Motsvarar alla kriterier för incheckningsinfo" + +#: gitk:4087 +msgid "Matches no Commit Info criteria" +msgstr "Motsvarar inga kriterier för incheckningsinfo" + +#: gitk:4088 +msgid "Changes to Files:" +msgstr "Ändringar av filer:" + +#: gitk:4089 +msgid "Fixed String" +msgstr "Fast sträng" + +#: gitk:4090 +msgid "Regular Expression" +msgstr "Reguljärt uttryck" + +#: gitk:4091 +msgid "Search string:" +msgstr "Söksträng:" + +#: gitk:4092 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:4093 +msgid "Since:" +msgstr "Från:" + +#: gitk:4094 +msgid "Until:" +msgstr "Till:" + +#: gitk:4095 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" + +#: gitk:4096 +msgid "Number to show:" +msgstr "Antal att visa:" + +#: gitk:4097 +msgid "Number to skip:" +msgstr "Antal att hoppa över:" + +#: gitk:4098 +msgid "Miscellaneous options:" +msgstr "Diverse alternativ:" + +#: gitk:4099 +msgid "Strictly sort by date" +msgstr "Strikt datumsortering" + +#: gitk:4100 +msgid "Mark branch sides" +msgstr "Markera sidogrenar" + +#: gitk:4101 +msgid "Limit to first parent" +msgstr "Begränsa till första förälder" + +#: gitk:4102 +msgid "Simple history" +msgstr "Enkel historik" + +#: gitk:4103 +msgid "Additional arguments to git log:" +msgstr "Ytterligare argument till git log:" + +#: gitk:4104 +msgid "Enter files and directories to include, one per line:" +msgstr "Ange filer och kataloger att ta med, en per rad:" + +#: gitk:4105 +msgid "Command to generate more commits to include:" +msgstr "Kommando för att generera fler incheckningar att ta med:" + +#: gitk:4229 +msgid "Gitk: edit view" +msgstr "Gitk: redigera vy" + +#: gitk:4237 +msgid "-- criteria for selecting revisions" +msgstr " - kriterier för val av revisioner" + +#: gitk:4242 +msgid "View Name" +msgstr "Namn på vy" + +#: gitk:4317 +msgid "Apply (F5)" +msgstr "Använd (F5)" + +#: gitk:4355 +msgid "Error in commit selection arguments:" +msgstr "Fel i argument för val av incheckningar:" + +#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 +msgid "None" +msgstr "Inget" + +#: gitk:5022 gitk:5027 +msgid "Descendant" +msgstr "Avkomling" + +#: gitk:5023 +msgid "Not descendant" +msgstr "Inte avkomling" + +#: gitk:5030 gitk:5035 +msgid "Ancestor" +msgstr "Förfader" + +#: gitk:5031 +msgid "Not ancestor" +msgstr "Inte förfader" + +#: gitk:5325 +msgid "Local changes checked in to index but not committed" +msgstr "Lokala ändringar sparade i indexet men inte incheckade" + +#: gitk:5361 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Lokala ändringar, ej sparade i indexet" + +#: gitk:7135 +msgid "and many more" +msgstr "med många flera" + +#: gitk:7138 +msgid "many" +msgstr "många" + +#: gitk:7329 +msgid "Tags:" +msgstr "Taggar:" + +#: gitk:7346 gitk:7352 gitk:8826 +msgid "Parent" +msgstr "Förälder" + +#: gitk:7357 +msgid "Child" +msgstr "Barn" + +#: gitk:7366 +msgid "Branch" +msgstr "Gren" + +#: gitk:7369 +msgid "Follows" +msgstr "Följer" + +#: gitk:7372 +msgid "Precedes" +msgstr "Föregår" + +#: gitk:7967 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Fel vid hämtning av diff: %s" + +#: gitk:8651 +msgid "Goto:" +msgstr "Gå till:" + +#: gitk:8672 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Förkortat SHA1-id %s är tvetydigt" + +#: gitk:8679 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Revisionen %s är inte känd" + +#: gitk:8689 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "SHA-id:t %s är inte känt" + +#: gitk:8691 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Revisionen %s finns inte i den nuvarande vyn" + +#: gitk:8833 gitk:8848 +msgid "Date" +msgstr "Datum" + +#: gitk:8836 +msgid "Children" +msgstr "Barn" + +#: gitk:8899 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Återställ grenen %s hit" + +#: gitk:8901 +msgid "Detached head: can't reset" +msgstr "Frånkopplad head: kan inte återställa" + +#: gitk:9006 gitk:9012 +msgid "Skipping merge commit " +msgstr "Hoppar över sammanslagningsincheckning " + +#: gitk:9021 gitk:9026 +msgid "Error getting patch ID for " +msgstr "Fel vid hämtning av patch-id för " + +#: gitk:9022 gitk:9027 +msgid " - stopping\n" +msgstr " - stannar\n" + +#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 +msgid "Commit " +msgstr "Incheckning " + +#: gitk:9036 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" är samma patch som\n" +" " + +#: gitk:9044 +msgid "" +" differs from\n" +" " +msgstr "" +" skiljer sig från\n" +" " + +#: gitk:9046 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Skillnad mellan incheckningar:\n" +"\n" + +#: gitk:9058 gitk:9067 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " har %s barn - stannar\n" + +#: gitk:9086 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Fel vid skrivning av incheckning till fil: %s" + +#: gitk:9092 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Fel vid jämförelse av incheckningar: %s" + +#: gitk:9138 +msgid "Top" +msgstr "Topp" + +#: gitk:9139 +msgid "From" +msgstr "Från" + +#: gitk:9144 +msgid "To" +msgstr "Till" + +#: gitk:9168 +msgid "Generate patch" +msgstr "Generera patch" + +#: gitk:9170 +msgid "From:" +msgstr "Från:" + +#: gitk:9179 +msgid "To:" +msgstr "Till:" + +#: gitk:9188 +msgid "Reverse" +msgstr "Vänd" + +#: gitk:9190 gitk:9400 +msgid "Output file:" +msgstr "Utdatafil:" + +#: gitk:9196 +msgid "Generate" +msgstr "Generera" + +#: gitk:9234 +msgid "Error creating patch:" +msgstr "Fel vid generering av patch:" + +#: gitk:9257 gitk:9388 gitk:9445 +msgid "ID:" +msgstr "Id:" + +#: gitk:9266 +msgid "Tag name:" +msgstr "Taggnamn:" + +#: gitk:9269 +msgid "Tag message is optional" +msgstr "Taggmeddelandet är valfritt" + +#: gitk:9271 +msgid "Tag message:" +msgstr "Taggmeddelande:" + +#: gitk:9275 gitk:9454 +msgid "Create" +msgstr "Skapa" + +#: gitk:9293 +msgid "No tag name specified" +msgstr "Inget taggnamn angavs" + +#: gitk:9297 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Taggen \"%s\" finns redan" + +#: gitk:9307 +msgid "Error creating tag:" +msgstr "Fel vid skapande av tagg:" + +#: gitk:9397 +msgid "Command:" +msgstr "Kommando:" + +#: gitk:9405 +msgid "Write" +msgstr "Skriv" + +#: gitk:9423 +msgid "Error writing commit:" +msgstr "Fel vid skrivning av incheckning:" + +#: gitk:9450 +msgid "Name:" +msgstr "Namn:" + +#: gitk:9473 +msgid "Please specify a name for the new branch" +msgstr "Ange ett namn för den nya grenen" + +#: gitk:9478 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Grenen \"%s\" finns redan. Skriva över?" + +#: gitk:9545 +#, 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:9550 +msgid "Cherry-picking" +msgstr "Plockar" + +#: gitk:9559 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Cherry-pick misslyckades på grund av lokala ändringar i filen \"%s\".\n" +"Checka in, återställ eller spara undan (stash) dina ändringar och försök " +"igen." + +#: gitk:9565 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" +"Vill du köra git citool för att lösa den?" + +#: gitk:9581 gitk:9639 +msgid "No changes committed" +msgstr "Inga ändringar incheckade" + +#: gitk:9608 +#, 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:9613 +msgid "Reverting" +msgstr "Ångrar" + +#: gitk:9621 +#, 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:9625 +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:9668 +msgid "Confirm reset" +msgstr "Bekräfta återställning" + +#: gitk:9670 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Återställa grenen %s till %s?" + +#: gitk:9672 +msgid "Reset type:" +msgstr "Typ av återställning:" + +#: gitk:9675 +msgid "Soft: Leave working tree and index untouched" +msgstr "Mjuk: Rör inte utcheckning och index" + +#: gitk:9678 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "Blandad: Rör inte utcheckning, återställ index" + +#: gitk:9681 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hård: Återställ utcheckning och index\n" +"(förkastar ALLA lokala ändringar)" + +#: gitk:9698 +msgid "Resetting" +msgstr "Återställer" + +#: gitk:9758 +msgid "Checking out" +msgstr "Checkar ut" + +#: gitk:9811 +msgid "Cannot delete the currently checked-out branch" +msgstr "Kan inte ta bort den just nu utcheckade grenen" + +#: gitk:9817 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Incheckningarna på grenen %s existerar inte på någon annan gren.\n" +"Vill du verkligen ta bort grenen %s?" + +#: gitk:9848 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Taggar och huvuden: %s" + +#: gitk:9865 +msgid "Filter" +msgstr "Filter" + +#: gitk:10161 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Fel vid läsning av information om incheckningstopologi; information om " +"grenar och föregående/senare taggar kommer inte vara komplett." + +#: gitk:11138 +msgid "Tag" +msgstr "Tagg" + +#: gitk:11142 +msgid "Id" +msgstr "Id" + +#: gitk:11225 +msgid "Gitk font chooser" +msgstr "Teckensnittsväljare för Gitk" + +#: gitk:11242 +msgid "B" +msgstr "F" + +#: gitk:11245 +msgid "I" +msgstr "K" + +#: gitk:11363 +msgid "Commit list display options" +msgstr "Alternativ för incheckningslistvy" + +#: gitk:11366 +msgid "Maximum graph width (lines)" +msgstr "Maximal grafbredd (rader)" + +#: gitk:11370 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Maximal grafbredd (% av ruta)" + +#: gitk:11373 +msgid "Show local changes" +msgstr "Visa lokala ändringar" + +#: gitk:11376 +msgid "Auto-select SHA1 (length)" +msgstr "Välj SHA1 (längd) automatiskt" + +#: gitk:11380 +msgid "Hide remote refs" +msgstr "Dölj fjärr-referenser" + +#: gitk:11384 +msgid "Diff display options" +msgstr "Alternativ för diffvy" + +#: gitk:11386 +msgid "Tab spacing" +msgstr "Blanksteg för tabulatortecken" + +#: gitk:11389 +msgid "Display nearby tags/heads" +msgstr "Visa närliggande taggar/huvuden" + +#: gitk:11392 +msgid "Maximum # tags/heads to show" +msgstr "Maximalt antal taggar/huvuden att visa" + +#: gitk:11395 +msgid "Limit diffs to listed paths" +msgstr "Begränsa diff till listade sökvägar" + +#: gitk:11398 +msgid "Support per-file encodings" +msgstr "Stöd för filspecifika teckenkodningar" + +#: gitk:11404 gitk:11551 +msgid "External diff tool" +msgstr "Externt diff-verktyg" + +#: gitk:11405 +msgid "Choose..." +msgstr "Välj..." + +#: gitk:11410 +msgid "General options" +msgstr "Allmänna inställningar" + +#: gitk:11413 +msgid "Use themed widgets" +msgstr "Använd tema på fönsterelement" + +#: gitk:11415 +msgid "(change requires restart)" +msgstr "(ändringen kräver omstart)" + +#: gitk:11417 +msgid "(currently unavailable)" +msgstr "(för närvarande inte tillgängligt)" + +#: gitk:11428 +msgid "Colors: press to choose" +msgstr "Färger: tryck för att välja" + +#: gitk:11431 +msgid "Interface" +msgstr "Gränssnitt" + +#: gitk:11432 +msgid "interface" +msgstr "gränssnitt" + +#: gitk:11435 +msgid "Background" +msgstr "Bakgrund" + +#: gitk:11436 gitk:11466 +msgid "background" +msgstr "bakgrund" + +#: gitk:11439 +msgid "Foreground" +msgstr "Förgrund" + +#: gitk:11440 +msgid "foreground" +msgstr "förgrund" + +#: gitk:11443 +msgid "Diff: old lines" +msgstr "Diff: gamla rader" + +#: gitk:11444 +msgid "diff old lines" +msgstr "diff gamla rader" + +#: gitk:11448 +msgid "Diff: new lines" +msgstr "Diff: nya rader" + +#: gitk:11449 +msgid "diff new lines" +msgstr "diff nya rader" + +#: gitk:11453 +msgid "Diff: hunk header" +msgstr "Diff: delhuvud" + +#: gitk:11455 +msgid "diff hunk header" +msgstr "diff delhuvud" + +#: gitk:11459 +msgid "Marked line bg" +msgstr "Markerad rad bakgrund" + +#: gitk:11461 +msgid "marked line background" +msgstr "markerad rad bakgrund" + +#: gitk:11465 +msgid "Select bg" +msgstr "Markerad bakgrund" + +#: gitk:11474 +msgid "Fonts: press to choose" +msgstr "Teckensnitt: tryck för att välja" + +#: gitk:11476 +msgid "Main font" +msgstr "Huvudteckensnitt" + +#: gitk:11477 +msgid "Diff display font" +msgstr "Teckensnitt för diffvisning" + +#: gitk:11478 +msgid "User interface font" +msgstr "Teckensnitt för användargränssnitt" + +#: gitk:11500 +msgid "Gitk preferences" +msgstr "Inställningar för Gitk" + +#: gitk:11509 +msgid "General" +msgstr "Allmänt" + +#: gitk:11510 +msgid "Colors" +msgstr "Färger" + +#: gitk:11511 +msgid "Fonts" +msgstr "Teckensnitt" + +#: gitk:11561 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: välj färg för %s" + +#: gitk:12074 +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:12284 +msgid "Cannot find a git repository here." +msgstr "Hittar inget git-arkiv här." + +#: gitk:12331 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Tvetydigt argument \"%s\": både revision och filnamn" + +#: gitk:12343 +msgid "Bad arguments to gitk:" +msgstr "Felaktiga argument till gitk:" + +#~ msgid "mc" +#~ msgstr "mc" + - #~ msgid "" - #~ "\n" - #~ "Gitk - a commit viewer for git\n" - #~ "\n" - #~ "Copyright © 2005-2015 Paul Mackerras\n" - #~ "\n" - #~ "Use and redistribute under the terms of the GNU General Public License" - #~ msgstr "" - #~ "\n" - #~ "Gitk - en incheckningsvisare för git\n" - #~ "\n" - #~ "Copyright © 2005-2015 Paul Mackerras\n" - #~ "\n" - #~ "Använd och vidareförmedla enligt villkoren i GNU General Public License" - +#~ msgid "next" +#~ msgstr "nästa" + +#~ msgid "prev" +#~ msgstr "föreg" + +#~ msgid "CDate" +#~ msgstr "Skapat datum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Hittar inte git-katalogen \"%s\"." + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1-id: " + +#~ msgid "- stopping\n" +#~ msgstr "- stannar\n" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "Tagg/huvud %s är okänt" + +#~ msgid "/\t\tMove to next find hit, or redo find" +#~ msgstr "/\t\tGå till nästa sökträff, eller sök på nytt" + +#~ msgid "Name" +#~ msgstr "Namn" diff --cc gitk-git/po/vi.po index 8966812368,0000000000..5967498660 mode 100644,000000..100644 --- a/gitk-git/po/vi.po +++ b/gitk-git/po/vi.po @@@ -1,1379 -1,0 +1,1379 @@@ +# Vietnamese translations for gitk package. +# Bản dịch tiếng Việt cho gói gitk. +# This file is distributed under the same license as the gitk package. +# Trần Ngọc Quân , 2013, 2015. +# +msgid "" +msgstr "" +"Project-Id-Version: gitk @@GIT_VERSION@@\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2015-09-15 07:33+0700\n" +"Last-Translator: Trần Ngọc Quân \n" +"Language-Team: Vietnamese \n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Gtranslator 2.91.7\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:8220 gitk:8253 +msgid "Markup words" +msgstr "Đánh dấu chữ" + +#: gitk:324 +msgid "Error parsing revisions:" +msgstr "Gặp lỗi khi phân tích điểm xét duyệt:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:" + +#: gitk:393 +msgid "No files selected: --merge specified but no files are unmerged." +msgstr "" +"Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn." + +#: gitk:396 +msgid "" +"No files selected: --merge specified but no unmerged files are within file " +"limit." +msgstr "" +"Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn " +"trong giới hạn tập tin." + +#: gitk:418 gitk:566 +msgid "Error executing git log:" +msgstr "Gặp lỗi khi thực hiện lệnh git log:" + +#: gitk:436 gitk:582 +msgid "Reading" +msgstr "Đang đọc" + +#: gitk:496 gitk:4525 +msgid "Reading commits..." +msgstr "Đang đọc các lần chuyển giao…" + +#: gitk:499 gitk:1637 gitk:4528 +msgid "No commits selected" +msgstr "Chưa chọn các lần chuyển giao" + +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Dòng lệnh" + +#: gitk:1511 +msgid "Can't parse git log output:" +msgstr "Không thể phân tích kết xuất từ lệnh git log:" + +#: gitk:1740 +msgid "No commit information available" +msgstr "Không có thông tin về lần chuyển giao nào" + +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +msgid "OK" +msgstr "Đồng ý" + +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 +msgid "Cancel" +msgstr "Thôi" + +#: gitk:2069 +msgid "&Update" +msgstr "Cập nhật" + +#: gitk:2070 +msgid "&Reload" +msgstr "Tải lại" + +#: gitk:2071 +msgid "Reread re&ferences" +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 "Tùy thích" + +#: 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 gitk:4043 +msgid "&All files" +msgstr "Mọi tập tin" + +#: gitk:2083 gitk:4067 +msgid "&View" +msgstr "Trình bày" + +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" +msgstr "Giới thiệu về gitk" + +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "Tổ hợp phím" + +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "Trợ giúp" + +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" + +#: gitk:2229 +msgid "Row" +msgstr "Hàng" + +#: gitk:2267 +msgid "Find" +msgstr "Tìm" + +#: gitk:2295 +msgid "commit" +msgstr "lần chuyển giao" + +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 +msgid "containing:" +msgstr "có chứa:" + +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +msgid "touching paths:" +msgstr "đang chạm đường dẫn:" + +#: gitk:2303 gitk:4777 +msgid "adding/removing string:" +msgstr "thêm/gỡ bỏ chuỗi:" + +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "những dòng thay đổi khớp mẫu:" + +#: gitk:2313 gitk:2315 gitk:4766 +msgid "Exact" +msgstr "Chính xác" + +#: gitk:2315 gitk:4854 gitk:6723 +msgid "IgnCase" +msgstr "BquaHt" + +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +msgid "Regexp" +msgstr "BTCQ" + +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +msgid "All fields" +msgstr "Mọi trường" + +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +msgid "Headline" +msgstr "Nội dung chính" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +msgid "Comments" +msgstr "Ghi chú" + +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 +msgid "Author" +msgstr "Tác giả" + +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +msgid "Committer" +msgstr "Người chuyển giao" + +#: gitk:2350 +msgid "Search" +msgstr "Tìm kiếm" + +#: gitk:2358 +msgid "Diff" +msgstr "So sánh" + +#: gitk:2360 +msgid "Old version" +msgstr "Phiên bản cũ" + +#: gitk:2362 +msgid "New version" +msgstr "Phiên bản mới" + +#: gitk:2364 +msgid "Lines of context" +msgstr "Các dòng của nội dung" + +#: gitk:2374 +msgid "Ignore space change" +msgstr "Không xét đến thay đổi do khoảng trắng" + +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "Khác biệt theo dòng" + +#: gitk:2445 +msgid "Patch" +msgstr "Vá" + +#: gitk:2447 +msgid "Tree" +msgstr "Cây" + +#: gitk:2617 gitk:2637 +msgid "Diff this -> selected" +msgstr "So sánh cái này -> cái đã chọn" + +#: gitk:2618 gitk:2638 +msgid "Diff selected -> this" +msgstr "So sánh cái đã chọn -> cái này" + +#: gitk:2619 gitk:2639 +msgid "Make patch" +msgstr "Tạo miếng vá" + +#: gitk:2620 gitk:9254 +msgid "Create tag" +msgstr "Tạo thẻ" + +#: gitk:2621 gitk:9371 +msgid "Write commit to file" +msgstr "Ghi lần chuyển giao ra tập tin" + +#: gitk:2622 gitk:9428 +msgid "Create new branch" +msgstr "Tạo nhánh mới" + +#: gitk:2623 +msgid "Cherry-pick this commit" +msgstr "Cherry-pick lần chuyển giao này" + +#: gitk:2624 +msgid "Reset HEAD branch to here" +msgstr "Đặt lại HEAD của nhánh vào đây" + +#: gitk:2625 +msgid "Mark this commit" +msgstr "Đánh dấu lần chuyển giao này" + +#: gitk:2626 +msgid "Return to mark" +msgstr "Quay lại vị trí dấu" + +#: gitk:2627 +msgid "Find descendant of this and mark" +msgstr "Tìm con cháu của cái này và cái đã đánh dấu" + +#: gitk:2628 +msgid "Compare with marked commit" +msgstr "So sánh với lần chuyển giao đã đánh dấu" + +#: gitk:2629 gitk:2640 +msgid "Diff this -> marked commit" +msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu" + +#: gitk:2630 gitk:2641 +msgid "Diff marked commit -> this" +msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này" + +#: gitk:2631 +msgid "Revert this commit" +msgstr "Hoàn lại lần chuyển giao này" + +#: gitk:2647 +msgid "Check out this branch" +msgstr "Lấy ra nhánh này" + +#: gitk:2648 +msgid "Remove this branch" +msgstr "Gỡ bỏ nhánh này" + +#: gitk:2649 +msgid "Copy branch name" +msgstr "Chép tên nhánh" + +#: gitk:2656 +msgid "Highlight this too" +msgstr "Cũng tô sáng nó" + +#: gitk:2657 +msgid "Highlight this only" +msgstr "Chỉ tô sáng cái này" + +#: gitk:2658 +msgid "External diff" +msgstr "diff từ bên ngoài" + +#: gitk:2659 +msgid "Blame parent commit" +msgstr "Xem công trạng lần chuyển giao cha mẹ" + +#: gitk:2660 +msgid "Copy path" +msgstr "Chép đường dẫn" + +#: gitk:2667 +msgid "Show origin of this line" +msgstr "Hiển thị nguyên gốc của dòng này" + +#: gitk:2668 +msgid "Run git gui blame on this line" +msgstr "Chạy lệnh git gui blame cho dòng này" + +#: gitk:3014 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" - "Copyright © 2005-2014 Paul Mackerras\n" ++"Copyright © 2005-2016 Paul Mackerras\n" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - ứng dụng để xem các lần chuyển giao dành cho git\n" +"\n" - "Bản quyền © 2005-2014 Paul Mackerras\n" ++"Bản quyền © 2005-2016 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:3022 gitk:3089 gitk:9857 +msgid "Close" +msgstr "Đóng" + +#: gitk:3043 +msgid "Gitk key bindings" +msgstr "Tổ hợp phím gitk" + +#: gitk:3046 +msgid "Gitk key bindings:" +msgstr "Tổ hợp phím gitk:" + +#: gitk:3048 +#, tcl-format +msgid "<%s-Q>\t\tQuit" +msgstr "<%s-Q>\t\tThoát" + +#: gitk:3049 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tĐóng cửa sổ" + +#: gitk:3050 +msgid "\t\tMove to first commit" +msgstr "\t\tChuyển đến lần chuyển giao đầu tiên" + +#: gitk:3051 +msgid "\t\tMove to last commit" +msgstr "\t\tChuyển đến lần chuyển giao cuối" + +#: gitk:3052 +msgid ", p, k\tMove up one commit" +msgstr ", p, k\tDi chuyển lên một lần chuyển giao" + +#: gitk:3053 +msgid ", n, j\tMove down one commit" +msgstr ", n, j\tDi chuyển xuống một lần chuyển giao" + +#: gitk:3054 +msgid ", z, h\tGo back in history list" +msgstr ", z, h\tQuay trở lại danh sách lịch sử" + +#: gitk:3055 +msgid ", x, l\tGo forward in history list" +msgstr ", x, l\tDi chuyển tiếp trong danh sách lịch sử" + +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" +"<%s-n>\tĐến cha thứ n của lần chuyển giao hiện tại trong danh sách lịch sử" + +#: gitk:3057 +msgid "\tMove up one page in commit list" +msgstr "\tDi chuyển lên một trang trong danh sách lần chuyển giao" + +#: gitk:3058 +msgid "\tMove down one page in commit list" +msgstr "\tDi chuyển xuống một trang trong danh sách lần chuyển giao" + +#: gitk:3059 +#, tcl-format +msgid "<%s-Home>\tScroll to top of commit list" +msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao" + +#: gitk:3060 +#, tcl-format +msgid "<%s-End>\tScroll to bottom of commit list" +msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao" + +#: gitk:3061 +#, tcl-format +msgid "<%s-Up>\tScroll commit list up one line" +msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng" + +#: gitk:3062 +#, tcl-format +msgid "<%s-Down>\tScroll commit list down one line" +msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng" + +#: gitk:3063 +#, tcl-format +msgid "<%s-PageUp>\tScroll commit list up one page" +msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang" + +#: gitk:3064 +#, tcl-format +msgid "<%s-PageDown>\tScroll commit list down one page" +msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang" + +#: gitk:3065 +msgid "\tFind backwards (upwards, later commits)" +msgstr "\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)" + +#: gitk:3066 +msgid "\tFind forwards (downwards, earlier commits)" +msgstr "" +"\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)" + +#: gitk:3067 +msgid ", b\tScroll diff view up one page" +msgstr ", b\tCuộn phần trình bày diff lên một trang" + +#: gitk:3068 +msgid "\tScroll diff view up one page" +msgstr "\tCuộn phần trình bày diff lên một trang" + +#: gitk:3069 +msgid "\t\tScroll diff view down one page" +msgstr "\t\tCuộn phần trình bày diff xuống một trang" + +#: gitk:3070 +msgid "u\t\tScroll diff view up 18 lines" +msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng" + +#: gitk:3071 +msgid "d\t\tScroll diff view down 18 lines" +msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng" + +#: gitk:3072 +#, tcl-format +msgid "<%s-F>\t\tFind" +msgstr "<%s-F>\t\tTìm kiếm" + +#: gitk:3073 +#, tcl-format +msgid "<%s-G>\t\tMove to next find hit" +msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp" + +#: gitk:3074 +msgid "\tMove to next find hit" +msgstr "\t\tDi chuyển đến chỗ gặp kế tiếp" + +#: gitk:3075 +msgid "g\t\tGo to commit" +msgstr "g\t\tChuyển đến lần chuyển giao" + +#: gitk:3076 +msgid "/\t\tFocus the search box" +msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm" + +#: gitk:3077 +msgid "?\t\tMove to previous find hit" +msgstr "?\t\tDi chuyển đến chỗ gặp kế trước" + +#: gitk:3078 +msgid "f\t\tScroll diff view to next file" +msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế" + +#: gitk:3079 +#, tcl-format +msgid "<%s-S>\t\tSearch for next hit in diff view" +msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp" + +#: gitk:3080 +#, tcl-format +msgid "<%s-R>\t\tSearch for previous hit in diff view" +msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước" + +#: gitk:3081 +#, tcl-format +msgid "<%s-KP+>\tIncrease font size" +msgstr "<%s-KP+>\tTăng cỡ chữ" + +#: gitk:3082 +#, tcl-format +msgid "<%s-plus>\tIncrease font size" +msgstr "<%s-plus>\tTăng cỡ chữ" + +#: gitk:3083 +#, tcl-format +msgid "<%s-KP->\tDecrease font size" +msgstr "<%s-KP->\tGiảm cỡ chữ" + +#: gitk:3084 +#, tcl-format +msgid "<%s-minus>\tDecrease font size" +msgstr "<%s-minus>\tGiảm cỡ chữ" + +#: gitk:3085 +msgid "\t\tUpdate" +msgstr "\t\tCập nhật" + +#: gitk:3550 gitk:3559 +#, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Gặp lỗi khi tạo thư mục tạm %s:" + +#: gitk:3572 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Lỗi chào hỏi \"%s\" từ %s:" + +#: gitk:3635 +msgid "command failed:" +msgstr "lệnh gặp lỗi:" + +#: gitk:3784 +msgid "No such commit" +msgstr "Không có lần chuyển giao như vậy" + +#: gitk:3798 +msgid "git gui blame: command failed:" +msgstr "git gui blame: lệnh gặp lỗi:" + +#: gitk:3829 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "Không thể độc đầu của hòa trộn: %s" + +# tcl-format +#: gitk:3837 +#, tcl-format +msgid "Error reading index: %s" +msgstr "Gặp lỗi khi đọc chỉ mục: %s" + +#: gitk:3862 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "Không thể khởi chạy git blame: %s" + +#: gitk:3865 gitk:6754 +msgid "Searching" +msgstr "Đang tìm kiếm" + +#: gitk:3897 +#, tcl-format +msgid "Error running git blame: %s" +msgstr "Gặp lỗi khi chạy git blame: %s" + +#: gitk:3925 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này" + +#: gitk:3939 +msgid "External diff viewer failed:" +msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:" + +#: gitk:4070 +msgid "Gitk view definition" +msgstr "Định nghĩa cách trình bày gitk" + +#: gitk:4074 +msgid "Remember this view" +msgstr "Nhớ cách trình bày này" + +#: gitk:4075 +msgid "References (space separated list):" +msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):" + +#: gitk:4076 +msgid "Branches & tags:" +msgstr "Nhánh & thẻ:" + +#: gitk:4077 +msgid "All refs" +msgstr "Mọi tham chiếu" + +#: gitk:4078 +msgid "All (local) branches" +msgstr "Mọi nhánh (nội bộ)" + +#: gitk:4079 +msgid "All tags" +msgstr "Mọi thẻ" + +#: gitk:4080 +msgid "All remote-tracking branches" +msgstr "Mọi nhánh remote-tracking" + +#: gitk:4081 +msgid "Commit Info (regular expressions):" +msgstr "Thông tin chuyển giao (biểu thức chính quy):" + +#: gitk:4082 +msgid "Author:" +msgstr "Tác giả:" + +#: gitk:4083 +msgid "Committer:" +msgstr "Người chuyển giao:" + +#: gitk:4084 +msgid "Commit Message:" +msgstr "Chú thích của lần chuyển giao:" + +#: gitk:4085 +msgid "Matches all Commit Info criteria" +msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" + +#: gitk:4086 +msgid "Matches no Commit Info criteria" +msgstr "Khớp không điều kiện Thông tin Chuyển giao" + +#: gitk:4087 +msgid "Changes to Files:" +msgstr "Đổi thành Tập tin:" + +#: gitk:4088 +msgid "Fixed String" +msgstr "Chuỗi cố định" + +#: gitk:4089 +msgid "Regular Expression" +msgstr "Biểu thức chính quy" + +#: gitk:4090 +msgid "Search string:" +msgstr "Chuỗi tìm kiếm:" + +#: gitk:4091 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" +"Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" + +#: gitk:4092 +msgid "Since:" +msgstr "Kể từ:" + +#: gitk:4093 +msgid "Until:" +msgstr "Đến:" + +#: gitk:4094 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):" + +#: gitk:4095 +msgid "Number to show:" +msgstr "Số lượng hiển thị:" + +#: gitk:4096 +msgid "Number to skip:" +msgstr "Số lượng sẽ bỏ qua:" + +#: gitk:4097 +msgid "Miscellaneous options:" +msgstr "Tùy chọn hỗn hợp:" + +#: gitk:4098 +msgid "Strictly sort by date" +msgstr "Sắp xếp chặt chẽ theo ngày" + +#: gitk:4099 +msgid "Mark branch sides" +msgstr "Đánh dấu các cạnh nhánh" + +#: gitk:4100 +msgid "Limit to first parent" +msgstr "Giới hạn thành cha mẹ đầu tiên" + +#: gitk:4101 +msgid "Simple history" +msgstr "Lịch sử dạng đơn giản" + +#: gitk:4102 +msgid "Additional arguments to git log:" +msgstr "Đối số bổ xung cho lệnh git log:" + +#: gitk:4103 +msgid "Enter files and directories to include, one per line:" +msgstr "Nhập vào các tập tin và thư mục bao gồm, mỗi dòng một cái:" + +#: gitk:4104 +msgid "Command to generate more commits to include:" +msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:" + +#: gitk:4228 +msgid "Gitk: edit view" +msgstr "Gitk: sửa cách trình bày" + +#: gitk:4236 +msgid "-- criteria for selecting revisions" +msgstr "-- tiêu chuẩn chọn điểm xét duyệt" + +#: gitk:4241 +msgid "View Name" +msgstr "Tên cách trình bày" + +#: gitk:4316 +msgid "Apply (F5)" +msgstr "Áp dụng (F5)" + +#: gitk:4354 +msgid "Error in commit selection arguments:" +msgstr "Lỗi trong các đối số chọn chuyển giao:" + +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +msgid "None" +msgstr "Không" + +#: gitk:5021 gitk:5026 +msgid "Descendant" +msgstr "Con cháu" + +#: gitk:5022 +msgid "Not descendant" +msgstr "Không có con cháu" + +#: gitk:5029 gitk:5034 +msgid "Ancestor" +msgstr "Tổ tiên chung" + +#: gitk:5030 +msgid "Not ancestor" +msgstr "Không có chung tổ tiên" + +#: gitk:5324 +msgid "Local changes checked in to index but not committed" +msgstr "" +"Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao" + +#: gitk:5360 +msgid "Local uncommitted changes, not checked in to index" +msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục" + +#: gitk:7134 +msgid "and many more" +msgstr "và nhiều nữa" + +#: gitk:7137 +msgid "many" +msgstr "nhiều" + +#: gitk:7328 +msgid "Tags:" +msgstr "Thẻ:" + +#: gitk:7345 gitk:7351 gitk:8825 +msgid "Parent" +msgstr "Cha" + +#: gitk:7356 +msgid "Child" +msgstr "Con" + +#: gitk:7365 +msgid "Branch" +msgstr "Nhánh" + +#: gitk:7368 +msgid "Follows" +msgstr "Đứng sau" + +#: gitk:7371 +msgid "Precedes" +msgstr "Đứng trước" + +# tcl-format +#: gitk:7966 +#, tcl-format +msgid "Error getting diffs: %s" +msgstr "Lỗi lấy diff: %s" + +#: gitk:8650 +msgid "Goto:" +msgstr "Nhảy tới:" + +#: gitk:8671 +#, tcl-format +msgid "Short SHA1 id %s is ambiguous" +msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng" + +#: gitk:8678 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Không hiểu điểm xét duyệt %s" + +#: gitk:8688 +#, tcl-format +msgid "SHA1 id %s is not known" +msgstr "Không hiểu định danh SHA1 %s" + +#: gitk:8690 +#, tcl-format +msgid "Revision %s is not in the current view" +msgstr "Điểm %s không ở trong phần hiển thị hiện tại" + +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Ngày" + +#: gitk:8835 +msgid "Children" +msgstr "Con cháu" + +#: gitk:8898 +#, tcl-format +msgid "Reset %s branch to here" +msgstr "Đặt lại nhánh %s tại đây" + +#: gitk:8900 +msgid "Detached head: can't reset" +msgstr "Head đã bị tách rời: không thể đặt lại" + +#: gitk:9005 gitk:9011 +msgid "Skipping merge commit " +msgstr "Bỏ qua lần chuyển giao hòa trộn " + +#: gitk:9020 gitk:9025 +msgid "Error getting patch ID for " +msgstr "Gặp lỗi khi lấy ID miếng vá cho " + +#: gitk:9021 gitk:9026 +msgid " - stopping\n" +msgstr " - dừng\n" + +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +msgid "Commit " +msgstr "Commit " + +#: gitk:9035 +msgid "" +" is the same patch as\n" +" " +msgstr "" +" là cùng một miếng vá với\n" +" " + +#: gitk:9043 +msgid "" +" differs from\n" +" " +msgstr "" +" khác biệt từ\n" +" " + +#: gitk:9045 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" +"Khác biệt của lần chuyển giao (commit):\n" +"\n" + +#: gitk:9057 gitk:9066 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " có %s con - dừng\n" + +#: gitk:9085 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s" + +#: gitk:9091 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s" + +#: gitk:9137 +msgid "Top" +msgstr "Đỉnh" + +#: gitk:9138 +msgid "From" +msgstr "Từ" + +#: gitk:9143 +msgid "To" +msgstr "Đến" + +#: gitk:9167 +msgid "Generate patch" +msgstr "Tạo miếng vá" + +#: gitk:9169 +msgid "From:" +msgstr "Từ:" + +#: gitk:9178 +msgid "To:" +msgstr "Đến:" + +#: gitk:9187 +msgid "Reverse" +msgstr "Đảo ngược" + +#: gitk:9189 gitk:9385 +msgid "Output file:" +msgstr "Tập tin kết xuất:" + +#: gitk:9195 +msgid "Generate" +msgstr "Tạo" + +#: gitk:9233 +msgid "Error creating patch:" +msgstr "Gặp lỗi khi tạo miếng vá:" + +#: gitk:9256 gitk:9373 gitk:9430 +msgid "ID:" +msgstr "Mã số:" + +#: gitk:9265 +msgid "Tag name:" +msgstr "Tên thẻ:" + +#: gitk:9268 +msgid "Tag message is optional" +msgstr "Ghi chú thẻ chỉ là tùy chọn" + +#: gitk:9270 +msgid "Tag message:" +msgstr "Ghi chú cho thẻ:" + +#: gitk:9274 gitk:9439 +msgid "Create" +msgstr "Tạo" + +#: gitk:9292 +msgid "No tag name specified" +msgstr "Chưa chỉ ra tên của thẻ" + +#: gitk:9296 +#, tcl-format +msgid "Tag \"%s\" already exists" +msgstr "Thẻ “%s” đã có sẵn rồi" + +#: gitk:9306 +msgid "Error creating tag:" +msgstr "Gặp lỗi khi tạo thẻ:" + +#: gitk:9382 +msgid "Command:" +msgstr "Lệnh:" + +#: gitk:9390 +msgid "Write" +msgstr "Ghi" + +#: gitk:9408 +msgid "Error writing commit:" +msgstr "Gặp lỗi trong quá trình ghi chuyển giao:" + +#: gitk:9435 +msgid "Name:" +msgstr "Tên:" + +#: gitk:9458 +msgid "Please specify a name for the new branch" +msgstr "Vui lòng chỉ định tên cho nhánh mới" + +#: gitk:9463 +#, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?" + +#: gitk:9530 +#, tcl-format +msgid "Commit %s is already included in branch %s -- really re-apply it?" +msgstr "" +"Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn " +"áp dụng lại nó không?" + +#: gitk:9535 +msgid "Cherry-picking" +msgstr "Đang cherry-pick" + +#: gitk:9544 +#, tcl-format +msgid "" +"Cherry-pick failed because of local changes to file '%s'.\n" +"Please commit, reset or stash your changes and try again." +msgstr "" +"Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n" +"Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại." + +#: gitk:9550 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n" +"Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?" + +#: gitk:9566 gitk:9624 +msgid "No changes committed" +msgstr "Không có thay đổi nào cần chuyển giao" + +#: gitk:9593 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn " +"“revert” nó không?" + +#: gitk:9598 +msgid "Reverting" +msgstr "Đang hoàn tác" + +#: gitk:9606 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "" +"Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n" +"Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại." + +#: gitk:9610 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Revert gặp lỗi bởi vì xung đột hòa trộn.\n" +" Bạn có muốn chạy lệnh “git citool” để phân giải nó không?" + +#: gitk:9653 +msgid "Confirm reset" +msgstr "Xác nhật đặt lại" + +#: gitk:9655 +#, tcl-format +msgid "Reset branch %s to %s?" +msgstr "Đặt lại nhánh “%s” thành “%s”?" + +#: gitk:9657 +msgid "Reset type:" +msgstr "Kiểu đặt lại:" + +#: gitk:9660 +msgid "Soft: Leave working tree and index untouched" +msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục" + +#: gitk:9663 +msgid "Mixed: Leave working tree untouched, reset index" +msgstr "" +"Pha trộn: Không động chạm đến thư mục làm việc nhưng đặt lại bảng mục lục" + +#: gitk:9666 +msgid "" +"Hard: Reset working tree and index\n" +"(discard ALL local changes)" +msgstr "" +"Hard: Đặt lại cây làm việc và mục lục\n" +"(hủy bỏ MỌI thay đổi nội bộ)" + +#: gitk:9683 +msgid "Resetting" +msgstr "Đang đặt lại" + +#: gitk:9743 +msgid "Checking out" +msgstr "Đang checkout" + +#: gitk:9796 +msgid "Cannot delete the currently checked-out branch" +msgstr "Không thể xóa nhánh hiện tại đang được lấy ra" + +#: gitk:9802 +#, tcl-format +msgid "" +"The commits on branch %s aren't on any other branch.\n" +"Really delete branch %s?" +msgstr "" +"Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n" +"Thực sự muốn xóa nhánh %s?" + +#: gitk:9833 +#, tcl-format +msgid "Tags and heads: %s" +msgstr "Thẻ và Đầu: %s" + +#: gitk:9850 +msgid "Filter" +msgstr "Bộ lọc" + +#: gitk:10146 +msgid "" +"Error reading commit topology information; branch and preceding/following " +"tag information will be incomplete." +msgstr "" +"Gặp lỗi khi đọc thông tin hình học lần chuyển giao; thông tin nhánh và thẻ " +"trước/sau sẽ không hoàn thiện." + +#: gitk:11123 +msgid "Tag" +msgstr "Thẻ" + +#: gitk:11127 +msgid "Id" +msgstr "Id" + +#: gitk:11210 +msgid "Gitk font chooser" +msgstr "Hộp thoại chọn phông Gitk" + +#: gitk:11227 +msgid "B" +msgstr "B" + +#: gitk:11230 +msgid "I" +msgstr "I" + +#: gitk:11348 +msgid "Commit list display options" +msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao" + +#: gitk:11351 +msgid "Maximum graph width (lines)" +msgstr "Độ rộng biểu đồ tối đa (dòng)" + +#: gitk:11355 +#, no-tcl-format +msgid "Maximum graph width (% of pane)" +msgstr "Độ rộng đồ thị tối đa (% của bảng)" + +#: gitk:11358 +msgid "Show local changes" +msgstr "Hiển thị các thay đổi nội bộ" + +#: gitk:11361 +msgid "Auto-select SHA1 (length)" +msgstr "Tự chọn (độ dài) SHA1" + +#: gitk:11365 +msgid "Hide remote refs" +msgstr "Ẩn tham chiếu đến máy chủ" + +#: gitk:11369 +msgid "Diff display options" +msgstr "Các tùy chọn trình bày các khác biệt" + +#: gitk:11371 +msgid "Tab spacing" +msgstr "Khoảng cách tab" + +#: gitk:11374 +msgid "Display nearby tags/heads" +msgstr "Hiển thị các thẻ/đầu xung quanh" + +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị" + +#: gitk:11380 +msgid "Limit diffs to listed paths" +msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê" + +#: gitk:11383 +msgid "Support per-file encodings" +msgstr "Hỗ trợ mã hóa mỗi-dòng" + +#: gitk:11389 gitk:11536 +msgid "External diff tool" +msgstr "Công cụ so sánh từ bên ngoài" + +#: gitk:11390 +msgid "Choose..." +msgstr "Chọn…" + +#: gitk:11395 +msgid "General options" +msgstr "Các tùy chọn chung" + +#: gitk:11398 +msgid "Use themed widgets" +msgstr "Dùng các widget chủ đề" + +#: gitk:11400 +msgid "(change requires restart)" +msgstr "(để thay đổi cần khởi động lại)" + +#: gitk:11402 +msgid "(currently unavailable)" +msgstr "(hiện tại không sẵn sàng)" + +#: gitk:11413 +msgid "Colors: press to choose" +msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu" + +#: gitk:11416 +msgid "Interface" +msgstr "Giao diện" + +#: gitk:11417 +msgid "interface" +msgstr "giao diện" + +#: gitk:11420 +msgid "Background" +msgstr "Nền" + +#: gitk:11421 gitk:11451 +msgid "background" +msgstr "nền" + +#: gitk:11424 +msgid "Foreground" +msgstr "Tiền cảnh" + +#: gitk:11425 +msgid "foreground" +msgstr "tiền cảnh" + +#: gitk:11428 +msgid "Diff: old lines" +msgstr "So sánh: dòng cũ" + +#: gitk:11429 +msgid "diff old lines" +msgstr "diff dòng cũ" + +#: gitk:11433 +msgid "Diff: new lines" +msgstr "So sánh: dòng mới" + +#: gitk:11434 +msgid "diff new lines" +msgstr "màu dòng mới" + +#: gitk:11438 +msgid "Diff: hunk header" +msgstr "So sánh: phần đầu của đoạn" + +#: gitk:11440 +msgid "diff hunk header" +msgstr "màu của phần đầu của đoạn khi so sánh" + +#: gitk:11444 +msgid "Marked line bg" +msgstr "Nền dòng đánh dấu" + +#: gitk:11446 +msgid "marked line background" +msgstr "nền dòng được đánh dấu" + +#: gitk:11450 +msgid "Select bg" +msgstr "Màu nền" + +#: gitk:11459 +msgid "Fonts: press to choose" +msgstr "Phông chữ: bấm vào các nút ở dưới để chọn" + +#: gitk:11461 +msgid "Main font" +msgstr "Phông chữ chính" + +#: gitk:11462 +msgid "Diff display font" +msgstr "Phông chữ dùng khi so sánh" + +#: gitk:11463 +msgid "User interface font" +msgstr "Phông chữ giao diện" + +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Cá nhân hóa các cài đặt cho Gitk" + +#: gitk:11494 +msgid "General" +msgstr "Chung" + +#: gitk:11495 +msgid "Colors" +msgstr "Màu sắc" + +#: gitk:11496 +msgid "Fonts" +msgstr "Phông chữ" + +#: gitk:11546 +#, tcl-format +msgid "Gitk: choose color for %s" +msgstr "Gitk: chọn màu cho %s" + +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Rất tiếc, gitk không thể chạy Tcl/Tk phiên bản này.\n" +" Gitk cần ít nhất là Tcl/Tk 8.4." + +#: gitk:12269 +msgid "Cannot find a git repository here." +msgstr "Không thể tìm thấy kho git ở đây." + +#: gitk:12316 +#, tcl-format +msgid "Ambiguous argument '%s': both revision and filename" +msgstr "Đối số “%s” chưa rõ ràng: vừa là điểm xét duyệt vừa là tên tập tin" + +#: gitk:12328 +msgid "Bad arguments to gitk:" +msgstr "Đối số cho gitk không hợp lệ:" + +#~ msgid "mc" +#~ msgstr "mc" + +#~ msgid "next" +#~ msgstr "tiếp" + +#~ msgid "prev" +#~ msgstr "trước"