diff options
Diffstat (limited to 'gitk-git/po')
| -rw-r--r-- | gitk-git/po/bg.po | 833 | ||||
| -rw-r--r-- | gitk-git/po/ca.po | 1369 | ||||
| -rw-r--r-- | gitk-git/po/de.po | 845 | ||||
| -rw-r--r-- | gitk-git/po/es.po | 1036 | ||||
| -rw-r--r-- | gitk-git/po/fr.po | 968 | ||||
| -rw-r--r-- | gitk-git/po/hu.po | 828 | ||||
| -rw-r--r-- | gitk-git/po/it.po | 795 | ||||
| -rw-r--r-- | gitk-git/po/ja.po | 867 | ||||
| -rw-r--r-- | gitk-git/po/pt_br.po | 801 | ||||
| -rw-r--r-- | gitk-git/po/ru.po | 1096 | ||||
| -rw-r--r-- | gitk-git/po/sv.po | 782 | ||||
| -rw-r--r-- | gitk-git/po/vi.po | 1379 |
12 files changed, 7955 insertions, 3644 deletions
diff --git a/gitk-git/po/bg.po b/gitk-git/po/bg.po index 782397e6b5..99aa77aa63 100644 --- a/gitk-git/po/bg.po +++ b/gitk-git/po/bg.po @@ -1,15 +1,15 @@ # Bulgarian translation of gitk po-file. -# Copyright (C) 2014 Alexander Shopov <ash@kambanaria.org>. +# Copyright (C) 2014, 2015 Alexander Shopov <ash@kambanaria.org>. # This file is distributed under the same license as the git package. -# Alexander Shopov <ash@kambanaria.org>, 2014. +# Alexander Shopov <ash@kambanaria.org>, 2014, 2015. # # msgid "" msgstr "" "Project-Id-Version: gitk master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2014-01-08 08:03+0200\n" +"POT-Creation-Date: 2015-12-19 11:48+0200\n" +"PO-Revision-Date: 2015-12-19 11:49+0200\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" "Language: bg\n" @@ -22,851 +22,889 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Списъкът с неслети файлове не може да бъде получен:" -#: gitk:212 gitk:2353 +#: gitk:212 gitk:2399 msgid "Color words" msgstr "Оцветяване на думите" -#: gitk:217 gitk:2353 gitk:8103 gitk:8136 +#: gitk:217 gitk:2399 gitk:8239 gitk:8272 msgid "Markup words" msgstr "Отбелязване на думите" -#: gitk:322 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Грешка при разбор на версиите:" -#: gitk:378 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Грешка при изпълнение на командата с „--argscmd“." -#: gitk:391 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." -msgstr "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове." +msgstr "" +"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове." -#: gitk:394 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." -msgstr "Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове в ограниченията." +msgstr "" +"Не са избрани файлове — указана е опцията „--merge“, но няма неслети файлове " +"в ограниченията." -#: gitk:416 gitk:564 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Грешка при изпълнение на „git log“:" -#: gitk:434 gitk:580 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Прочитане" -#: gitk:494 gitk:4429 +#: gitk:496 gitk:4544 msgid "Reading commits..." msgstr "Прочитане на подаванията…" -#: gitk:497 gitk:1635 gitk:4432 +#: gitk:499 gitk:1637 gitk:4547 msgid "No commits selected" msgstr "Не са избрани подавания" -#: gitk:1509 +#: gitk:1445 gitk:4064 gitk:12469 +msgid "Command line" +msgstr "Команден ред" + +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Изходът от „git log“ не може да се анализира:" -#: gitk:1738 +#: gitk:1740 msgid "No commit information available" msgstr "Липсва информация за подавания" -#: gitk:1895 -msgid "mc" -msgstr "mc" - -#: gitk:1930 gitk:4222 gitk:9552 gitk:11122 gitk:11401 +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 msgid "OK" msgstr "Добре" -#: gitk:1932 gitk:4224 gitk:9079 gitk:9158 gitk:9274 gitk:9323 gitk:9554 -#: gitk:11123 gitk:11402 +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 +#: gitk:11275 gitk:11555 msgid "Cancel" msgstr "Отказ" -#: gitk:2067 -msgid "Update" -msgstr "Обновяване" +#: gitk:2083 +msgid "&Update" +msgstr "&Обновяване" -#: gitk:2068 -msgid "Reload" -msgstr "Презареждане" +#: gitk:2084 +msgid "&Reload" +msgstr "&Презареждане" -#: gitk:2069 -msgid "Reread references" -msgstr "Наново прочитане на настройките" +#: gitk:2085 +msgid "Reread re&ferences" +msgstr "&Наново прочитане на настройките" -#: gitk:2070 -msgid "List references" -msgstr "Изброяване на указателите" +#: gitk:2086 +msgid "&List references" +msgstr "&Изброяване на указателите" -#: gitk:2072 -msgid "Start git gui" -msgstr "Стартиране на git gui" +#: gitk:2088 +msgid "Start git &gui" +msgstr "&Стартиране на „git gui“" -#: gitk:2074 -msgid "Quit" -msgstr "Спиране на програмата" +#: gitk:2090 +msgid "&Quit" +msgstr "&Спиране на програмата" -#: gitk:2066 -msgid "File" -msgstr "Файл" +#: gitk:2082 +msgid "&File" +msgstr "&Файл" -#: gitk:2078 -msgid "Preferences" -msgstr "Настройки" +#: gitk:2094 +msgid "&Preferences" +msgstr "&Настройки" -#: gitk:2077 -msgid "Edit" -msgstr "Редактиране" +#: gitk:2093 +msgid "&Edit" +msgstr "&Редактиране" -#: gitk:2082 -msgid "New view..." -msgstr "Нов изглед…" +#: gitk:2098 +msgid "&New view..." +msgstr "&Нов изглед…" -#: gitk:2083 -msgid "Edit view..." -msgstr "Редактиране на изгледа…" +#: gitk:2099 +msgid "&Edit view..." +msgstr "&Редактиране на изгледа…" -#: gitk:2084 -msgid "Delete view" -msgstr "Изтриване на изгледа" +#: gitk:2100 +msgid "&Delete view" +msgstr "&Изтриване на изгледа" -#: gitk:2086 -msgid "All files" -msgstr "Всички файлове" +#: gitk:2102 +msgid "&All files" +msgstr "&Всички файлове" -#: gitk:2081 gitk:3975 -msgid "View" -msgstr "Изглед" +#: gitk:2097 +msgid "&View" +msgstr "&Изглед" -#: gitk:2091 gitk:2101 gitk:2945 -msgid "About gitk" -msgstr "Относно gitk" +#: gitk:2107 gitk:2117 +msgid "&About gitk" +msgstr "&Относно gitk" -#: gitk:2092 gitk:2106 -msgid "Key bindings" -msgstr "Клавишни комбинации" +#: gitk:2108 gitk:2122 +msgid "&Key bindings" +msgstr "&Клавишни комбинации" -#: gitk:2090 gitk:2105 -msgid "Help" -msgstr "Помощ" +#: gitk:2106 gitk:2121 +msgid "&Help" +msgstr "Помо&щ" -#: gitk:2183 gitk:8535 +#: gitk:2199 gitk:8671 msgid "SHA1 ID:" msgstr "SHA1:" -#: gitk:2227 +#: gitk:2243 msgid "Row" msgstr "Ред" -#: gitk:2265 +#: gitk:2281 msgid "Find" msgstr "Търсене" -#: gitk:2266 -msgid "next" -msgstr "следващо" - -#: gitk:2267 -msgid "prev" -msgstr "предишно" - -#: gitk:2268 +#: gitk:2309 msgid "commit" msgstr "подаване" -#: gitk:2271 gitk:2273 gitk:4590 gitk:4613 gitk:4637 gitk:6653 gitk:6725 -#: gitk:6810 +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 +#: gitk:6931 msgid "containing:" msgstr "съдържащо:" -#: gitk:2274 gitk:3457 gitk:3462 gitk:4666 +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 msgid "touching paths:" msgstr "засягащо пътищата:" -#: gitk:2275 gitk:4680 +#: gitk:2317 gitk:4796 msgid "adding/removing string:" msgstr "добавящо/премахващо низ" -#: gitk:2276 gitk:4682 +#: gitk:2318 gitk:4798 msgid "changing lines matching:" msgstr "променящо редове напасващи:" -#: gitk:2285 gitk:2287 gitk:4669 +#: gitk:2327 gitk:2329 gitk:4785 msgid "Exact" msgstr "Точно" -#: gitk:2287 gitk:4757 gitk:6621 +#: gitk:2329 gitk:4873 gitk:6742 msgid "IgnCase" msgstr "Без регистър" -#: gitk:2287 gitk:4639 gitk:4755 gitk:6617 +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 msgid "Regexp" -msgstr "Рег. изр." +msgstr "Рег. израз" -#: gitk:2289 gitk:2290 gitk:4777 gitk:4807 gitk:4814 gitk:6746 gitk:6814 +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 msgid "All fields" msgstr "Всички полета" -#: gitk:2290 gitk:4774 gitk:4807 gitk:6684 +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 msgid "Headline" msgstr "Първи ред" -#: gitk:2291 gitk:4774 gitk:6684 gitk:6814 gitk:7283 +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 msgid "Comments" msgstr "Коментари" -#: gitk:2291 gitk:4774 gitk:4779 gitk:4814 gitk:6684 gitk:7218 gitk:8713 -#: gitk:8728 +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 +#: gitk:8864 msgid "Author" msgstr "Автор" -#: gitk:2291 gitk:4774 gitk:6684 gitk:7220 +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 msgid "Committer" msgstr "Подаващ" -#: gitk:2322 +#: gitk:2367 msgid "Search" msgstr "Търсене" -#: gitk:2330 +#: gitk:2375 msgid "Diff" msgstr "Разлики" -#: gitk:2332 +#: gitk:2377 msgid "Old version" msgstr "Стара версия" -#: gitk:2334 +#: gitk:2379 msgid "New version" msgstr "Нова версия" -#: gitk:2336 +#: gitk:2382 msgid "Lines of context" msgstr "Контекст в редове" -#: gitk:2346 +#: gitk:2392 msgid "Ignore space change" msgstr "Празните знаци без значение" -#: gitk:2350 gitk:2352 gitk:7842 gitk:8089 +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 msgid "Line diff" msgstr "Поредови разлики" -#: gitk:2417 +#: gitk:2463 msgid "Patch" msgstr "Кръпка" -#: gitk:2419 +#: gitk:2465 msgid "Tree" msgstr "Дърво" -#: gitk:2577 gitk:2597 +#: gitk:2635 gitk:2656 msgid "Diff this -> selected" msgstr "Разлики между това и избраното" -#: gitk:2578 gitk:2598 +#: gitk:2636 gitk:2657 msgid "Diff selected -> this" msgstr "Разлики между избраното и това" -#: gitk:2579 gitk:2599 +#: gitk:2637 gitk:2658 msgid "Make patch" msgstr "Създаване на кръпка" -#: gitk:2580 gitk:9137 +#: gitk:2638 gitk:9273 msgid "Create tag" msgstr "Създаване на етикет" -#: gitk:2581 gitk:9254 +#: gitk:2639 +msgid "Copy commit summary" +msgstr "Копиране на информацията за подаване" + +#: gitk:2640 gitk:9404 msgid "Write commit to file" msgstr "Запазване на подаването във файл" -#: gitk:2582 gitk:9311 +#: gitk:2641 gitk:9461 msgid "Create new branch" msgstr "Създаване на нов клон" -#: gitk:2583 +#: gitk:2642 msgid "Cherry-pick this commit" msgstr "Отбиране на това подаване" -#: gitk:2584 +#: gitk:2643 msgid "Reset HEAD branch to here" msgstr "Привеждане на върха на клона към текущото подаване" -#: gitk:2585 +#: gitk:2644 msgid "Mark this commit" msgstr "Отбелязване на това подаване" -#: gitk:2586 +#: gitk:2645 msgid "Return to mark" msgstr "Връщане към отбелязаното подаване" -#: gitk:2587 +#: gitk:2646 msgid "Find descendant of this and mark" msgstr "Откриване и отбелязване на наследниците" -#: gitk:2588 +#: gitk:2647 msgid "Compare with marked commit" msgstr "Сравнение с отбелязаното подаване" -#: gitk:2589 gitk:2600 +#: gitk:2648 gitk:2659 msgid "Diff this -> marked commit" msgstr "Разлики между това и отбелязаното" -#: gitk:2590 gitk:2601 +#: gitk:2649 gitk:2660 msgid "Diff marked commit -> this" msgstr "Разлики между отбелязаното и това" -#: gitk:2591 +#: gitk:2650 msgid "Revert this commit" msgstr "Отмяна на това подаване" -#: gitk:2607 +#: gitk:2666 msgid "Check out this branch" msgstr "Изтегляне на този клон" -#: gitk:2608 +#: gitk:2667 msgid "Remove this branch" msgstr "Изтриване на този клон" -#: gitk:2615 +#: gitk:2668 +msgid "Copy branch name" +msgstr "Копиране на името на клона" + +#: gitk:2675 msgid "Highlight this too" msgstr "Отбелязване и на това" -#: gitk:2616 +#: gitk:2676 msgid "Highlight this only" msgstr "Отбелязване само на това" -#: gitk:2617 +#: gitk:2677 msgid "External diff" msgstr "Външна програма за разлики" -#: gitk:2618 +#: gitk:2678 msgid "Blame parent commit" msgstr "Анотиране на родителското подаване" -#: gitk:2625 +#: gitk:2679 +msgid "Copy path" +msgstr "Копиране на пътя" + +#: gitk:2686 msgid "Show origin of this line" msgstr "Показване на произхода на този ред" -#: gitk:2626 +#: gitk:2687 msgid "Run git gui blame on this line" msgstr "Изпълнение на „git gui blame“ върху този ред" -#: gitk:2947 +#: gitk:3031 +msgid "About gitk" +msgstr "Относно gitk" + +#: gitk:3033 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright © 2005-2011 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk — визуализация на подаванията в Git\n" "\n" -"Авторски права: © 2005-2011 Paul Mackerras\n" +"Авторски права: © 2005-2014 Paul Mackerras\n" "\n" "Използвайте и разпространявайте при условията на ОПЛ на ГНУ" -#: gitk:2955 gitk:3020 gitk:9738 +#: gitk:3041 gitk:3108 gitk:9890 msgid "Close" msgstr "Затваряне" -#: gitk:2976 +#: gitk:3062 msgid "Gitk key bindings" msgstr "Клавишни комбинации" -#: gitk:2979 +#: gitk:3065 msgid "Gitk key bindings:" msgstr "Клавишни комбинации:" -#: gitk:2981 +#: gitk:3067 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tСпиране на програмата" -#: gitk:2982 +#: gitk:3068 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tЗатваряне на прозореца" -#: gitk:2983 +#: gitk:3069 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tКъм първото подаване" -#: gitk:2984 +#: gitk:3070 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tКъм последното подаване" -#: gitk:2985 +#: gitk:3071 msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, k\tЕдно подаване нагоре" -#: gitk:2986 +#: gitk:3072 msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, j\tЕдно подаване надолу" -#: gitk:2987 +#: gitk:3073 msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, h\tНазад в историята" -#: gitk:2988 +#: gitk:3074 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tНапред в историята" -#: gitk:2989 +#: 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 "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tЕдна страница нагоре в списъка с подаванията" +msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията" -#: gitk:2990 +#: gitk:3077 msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tЕдна страница надолу в списъка с подаванията" +msgstr "<PageDown>\tСтраница надолу в списъка с подаванията" -#: gitk:2991 +#: gitk:3078 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tКъм началото на списъка с подаванията" -#: gitk:2992 +#: gitk:3079 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tКъм края на списъка с подаванията" -#: gitk:2993 +#: gitk:3080 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tПридвижване на списъка с подавания с един ред нагоре" +msgstr "<%s-Up>\tРед нагоре в списъка с подавания" -#: gitk:2994 +#: gitk:3081 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tПридвижване на списъка с подавания с един ред надолу" +msgstr "<%s-Down>\tРед надолу в списъка с подавания" -#: gitk:2995 +#: gitk:3082 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tПридвижване на списъка с подавания с една страница нагоре" +msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания" -#: gitk:2996 +#: gitk:3083 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tПридвижване на списъка с подавания с една страница надолу" +msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания" -#: gitk:2997 +#: gitk:3084 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)" -#: gitk:2998 +#: gitk:3085 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)" +msgstr "" +"<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)" -#: gitk:2999 +#: gitk:3086 msgid "<Delete>, b\tScroll diff view up one page" -msgstr "<Delete>, b\tПридвижване на изгледа за разлики една страница нагоре" +msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики" -#: gitk:3000 +#: gitk:3087 msgid "<Backspace>\tScroll diff view up one page" -msgstr "<Backspace>\tПридвижване на изгледа за разлики една страница нагоре" +msgstr "<Backspace>\tСтраница надолу в изгледа за разлики" -#: gitk:3001 +#: gitk:3088 msgid "<Space>\t\tScroll diff view down one page" -msgstr "<Space>\t\tПридвижване на изгледа за разлики една страница надолу" +msgstr "<Space>\t\tСтраница надолу в изгледа за разлики" -#: gitk:3002 +#: gitk:3089 msgid "u\t\tScroll diff view up 18 lines" -msgstr "u\t\tПридвижване на изгледа за разлики 18 реда нагоре" +msgstr "u\t\t18 реда нагоре в изгледа за разлики" -#: gitk:3003 +#: gitk:3090 msgid "d\t\tScroll diff view down 18 lines" -msgstr "d\t\tПридвижване на изгледа за разлики 18 реда надолу" +msgstr "d\t\t18 реда надолу в изгледа за разлики" -#: gitk:3004 +#: gitk:3091 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tТърсене" -#: gitk:3005 +#: gitk:3092 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tКъм следващата поява" -#: gitk:3006 +#: gitk:3093 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tКъм следващата поява" -#: gitk:3007 +#: gitk:3094 +msgid "g\t\tGo to commit" +msgstr "g\t\tКъм последното подаване" + +#: gitk:3095 msgid "/\t\tFocus the search box" msgstr "/\t\tФокус върху полето за търсене" -#: gitk:3008 +#: gitk:3096 msgid "?\t\tMove to previous find hit" msgstr "?\t\tКъм предишната поява" -#: gitk:3009 +#: gitk:3097 msgid "f\t\tScroll diff view to next file" -msgstr "f\t\tПридвижване на изгледа за разлики към следващия ред" +msgstr "f\t\tСледващ файл в изгледа за разлики" -#: gitk:3010 +#: gitk:3098 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики" -#: gitk:3011 +#: gitk:3099 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики" -#: gitk:3012 +#: gitk:3100 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tПо-голям размер на шрифта" -#: gitk:3013 +#: gitk:3101 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tПо-голям размер на шрифта" -#: gitk:3014 +#: gitk:3102 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tПо-малък размер на шрифта" -#: gitk:3015 +#: gitk:3103 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tПо-малък размер на шрифта" -#: gitk:3016 +#: gitk:3104 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tОбновяване" -#: gitk:3471 gitk:3480 +#: gitk:3569 gitk:3578 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Грешка при създаването на временната директория „%s“:" -#: gitk:3493 +#: gitk:3591 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Грешка при получаването на „%s“ от %s:" -#: gitk:3556 +#: gitk:3654 msgid "command failed:" msgstr "неуспешно изпълнение на команда:" -#: gitk:3705 +#: gitk:3803 msgid "No such commit" msgstr "Такова подаване няма" -#: gitk:3719 +#: gitk:3817 msgid "git gui blame: command failed:" -msgstr "git gui blame: неуспешно изпълнение на команда:" +msgstr "„git gui blame“: неуспешно изпълнение на команда:" -#: gitk:3750 +#: gitk:3848 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Върхът за сливане не може да бъде прочетен: %s" -#: gitk:3758 +#: gitk:3856 #, tcl-format msgid "Error reading index: %s" msgstr "Грешка при прочитане на индекса: %s" -#: gitk:3783 +#: gitk:3881 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Командата „git blame“ не може да бъде стартирана: %s" -#: gitk:3786 gitk:6652 +#: gitk:3884 gitk:6773 msgid "Searching" msgstr "Търсене" -#: gitk:3818 +#: gitk:3916 #, tcl-format msgid "Error running git blame: %s" msgstr "Грешка при изпълнението на „git blame“: %s" -#: gitk:3846 +#: gitk:3944 #, tcl-format msgid "That line comes from commit %s, which is not in this view" -msgstr "Този ред идва от подаването %s, което не е в изгледа" +msgstr "Този ред идва от подаването %s, което не е в изгледа" -#: gitk:3860 +#: gitk:3958 msgid "External diff viewer failed:" msgstr "Неуспешно изпълнение на външната програма за разлики:" -#: gitk:3978 +#: gitk:4062 +msgid "All files" +msgstr "Всички файлове" + +#: gitk:4086 +msgid "View" +msgstr "Изглед" + +#: gitk:4089 msgid "Gitk view definition" msgstr "Дефиниция на изглед в Gitk" -#: gitk:3982 +#: gitk:4093 msgid "Remember this view" msgstr "Запазване на този изглед" -#: gitk:3983 +#: gitk:4094 msgid "References (space separated list):" msgstr "Указатели (списък с разделител интервал):" -#: gitk:3984 +#: gitk:4095 msgid "Branches & tags:" msgstr "Клони и етикети:" -#: gitk:3985 +#: gitk:4096 msgid "All refs" msgstr "Всички указатели" -#: gitk:3986 +#: gitk:4097 msgid "All (local) branches" msgstr "Всички (локални) клони" -#: gitk:3987 +#: gitk:4098 msgid "All tags" msgstr "Всички етикети" -#: gitk:3988 +#: gitk:4099 msgid "All remote-tracking branches" msgstr "Всички следящи клони" -#: gitk:3989 +#: gitk:4100 msgid "Commit Info (regular expressions):" msgstr "Информация за подаване (рег. изр.):" -#: gitk:3990 +#: gitk:4101 msgid "Author:" msgstr "Автор:" -#: gitk:3991 +#: gitk:4102 msgid "Committer:" msgstr "Подал:" -#: gitk:3992 +#: gitk:4103 msgid "Commit Message:" msgstr "Съобщение при подаване:" -#: gitk:3993 +#: gitk:4104 msgid "Matches all Commit Info criteria" -msgstr "Съвпадение по коя да е информация за подаването" +msgstr "Съвпадение по всички характеристики на подаването" + +#: gitk:4105 +msgid "Matches no Commit Info criteria" +msgstr "Не съвпада по никоя от характеристиките на подаването" -#: gitk:3994 +#: gitk:4106 msgid "Changes to Files:" msgstr "Промени по файловете:" -#: gitk:3995 +#: gitk:4107 msgid "Fixed String" msgstr "Дословен низ" -#: gitk:3996 +#: gitk:4108 msgid "Regular Expression" msgstr "Регулярен израз" -#: gitk:3997 +#: gitk:4109 msgid "Search string:" msgstr "Низ за търсене:" -#: gitk:3998 +#: 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“):" +msgstr "" +"Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, " +"„March 17, 2009 15:27:38“):" -#: gitk:3999 +#: gitk:4111 msgid "Since:" msgstr "От:" -#: gitk:4000 +#: gitk:4112 msgid "Until:" msgstr "До:" -#: gitk:4001 +#: gitk:4113 msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло число):" +msgstr "" +"Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло " +"число):" -#: gitk:4002 +#: gitk:4114 msgid "Number to show:" msgstr "Брой показани:" -#: gitk:4003 +#: gitk:4115 msgid "Number to skip:" msgstr "Брой прескочени:" -#: gitk:4004 +#: gitk:4116 msgid "Miscellaneous options:" msgstr "Разни:" -#: gitk:4005 +#: gitk:4117 msgid "Strictly sort by date" msgstr "Подреждане по дата" -#: gitk:4006 +#: gitk:4118 msgid "Mark branch sides" msgstr "Отбелязване на страните по клона" -#: gitk:4007 +#: gitk:4119 msgid "Limit to first parent" -msgstr "Само първият родител" +msgstr "Само първия родител" -#: gitk:4008 +#: gitk:4120 msgid "Simple history" msgstr "Опростена история" -#: gitk:4009 +#: gitk:4121 msgid "Additional arguments to git log:" msgstr "Допълнителни аргументи към „git log“:" -#: gitk:4010 +#: gitk:4122 msgid "Enter files and directories to include, one per line:" msgstr "Въведете файловете и директориите за включване, по елемент на ред" -#: gitk:4011 +#: gitk:4123 msgid "Command to generate more commits to include:" -msgstr "Команда за генерирането на допълнителни подавания, които да бъдат включени:" +msgstr "" +"Команда за генерирането на допълнителни подавания, които да бъдат включени:" -#: gitk:4135 +#: gitk:4247 msgid "Gitk: edit view" msgstr "Gitk: редактиране на изглед" -#: gitk:4143 +#: gitk:4255 msgid "-- criteria for selecting revisions" msgstr "— критерии за избор на версии" -#: gitk:4148 +#: gitk:4260 msgid "View Name" msgstr "Име на изглед" -#: gitk:4223 +#: gitk:4335 msgid "Apply (F5)" msgstr "Прилагане (F5)" -#: gitk:4261 +#: gitk:4373 msgid "Error in commit selection arguments:" msgstr "Грешка в аргументите за избор на подавания:" -#: gitk:4314 gitk:4366 gitk:4827 gitk:4841 gitk:6107 gitk:12184 gitk:12185 +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 msgid "None" msgstr "Няма" -#: gitk:4924 gitk:4929 +#: gitk:5040 gitk:5045 msgid "Descendant" msgstr "Наследник" -#: gitk:4925 +#: gitk:5041 msgid "Not descendant" msgstr "Не е наследник" -#: gitk:4932 gitk:4937 +#: gitk:5048 gitk:5053 msgid "Ancestor" msgstr "Предшественик" -#: gitk:4933 +#: gitk:5049 msgid "Not ancestor" msgstr "Не е предшественик" -#: gitk:5223 +#: gitk:5343 msgid "Local changes checked in to index but not committed" msgstr "Локални промени добавени към индекса, но неподадени" -#: gitk:5259 +#: gitk:5379 msgid "Local uncommitted changes, not checked in to index" msgstr "Локални промени извън индекса" -#: gitk:7032 +#: gitk:7153 msgid "and many more" msgstr "и още много" -#: gitk:7035 +#: gitk:7156 msgid "many" msgstr "много" -#: gitk:7222 +#: gitk:7347 msgid "Tags:" msgstr "Етикети:" -#: gitk:7239 gitk:7245 gitk:8708 +#: gitk:7364 gitk:7370 gitk:8844 msgid "Parent" msgstr "Родител" -#: gitk:7250 +#: gitk:7375 msgid "Child" msgstr "Дете" -#: gitk:7259 +#: gitk:7384 msgid "Branch" msgstr "Клон" -#: gitk:7262 +#: gitk:7387 msgid "Follows" msgstr "Следва" -#: gitk:7265 +#: gitk:7390 msgid "Precedes" msgstr "Предшества" -#: gitk:7849 +#: gitk:7985 #, tcl-format msgid "Error getting diffs: %s" msgstr "Грешка при получаването на разликите: %s" -#: gitk:8533 +#: gitk:8669 msgid "Goto:" msgstr "Към ред:" -#: gitk:8554 +#: gitk:8690 #, tcl-format msgid "Short SHA1 id %s is ambiguous" -msgstr "Съкратената SHA1 %s не е еднозначна" +msgstr "Съкратената сума по SHA1 %s не е еднозначна" -#: gitk:8561 +#: gitk:8697 #, tcl-format msgid "Revision %s is not known" msgstr "Непозната версия %s" -#: gitk:8571 +#: gitk:8707 #, tcl-format msgid "SHA1 id %s is not known" -msgstr "Непозната SHA1 %s" +msgstr "Непозната сума по SHA1 %s" -#: gitk:8573 +#: gitk:8709 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Версия %s не е в текущия изглед" -#: gitk:8715 gitk:8730 +#: gitk:8851 gitk:8866 msgid "Date" msgstr "Дата" -#: gitk:8718 +#: gitk:8854 msgid "Children" msgstr "Деца" -#: gitk:8781 +#: gitk:8917 #, tcl-format msgid "Reset %s branch to here" msgstr "Зануляване на клона „%s“ към текущото подаване" -#: gitk:8783 +#: gitk:8919 msgid "Detached head: can't reset" msgstr "Несвързан връх: невъзможно зануляване" -#: gitk:8888 gitk:8894 +#: gitk:9024 gitk:9030 msgid "Skipping merge commit " msgstr "Пропускане на подаването на сливането" -#: gitk:8903 gitk:8908 +#: gitk:9039 gitk:9044 msgid "Error getting patch ID for " msgstr "Грешка при получаването на идентификатора на " -#: gitk:8904 gitk:8909 +#: gitk:9040 gitk:9045 msgid " - stopping\n" msgstr " — спиране\n" -#: gitk:8914 gitk:8917 gitk:8925 gitk:8939 gitk:8948 +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 msgid "Commit " msgstr "Подаване" -#: gitk:8918 +#: gitk:9054 msgid "" " is the same patch as\n" " " @@ -874,7 +912,7 @@ msgstr "" " е същата кръпка като\n" " " -#: gitk:8926 +#: gitk:9062 msgid "" " differs from\n" " " @@ -882,135 +920,138 @@ msgstr "" " се различава от\n" " " -#: gitk:8928 +#: gitk:9064 msgid "" "Diff of commits:\n" "\n" -msgstr "Разлика между подаванията:\n\n" +msgstr "" +"Разлика между подаванията:\n" +"\n" -#: gitk:8940 gitk:8949 +#: gitk:9076 gitk:9085 #, tcl-format msgid " has %s children - stopping\n" msgstr " има %s деца — спиране\n" -#: gitk:8968 +#: gitk:9104 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Грешка при запазването на подаването във файл: %s" -#: gitk:8974 +#: gitk:9110 #, tcl-format msgid "Error diffing commits: %s" msgstr "Грешка при изчисляването на разликите между подаванията: %s" -#: gitk:9020 +#: gitk:9156 msgid "Top" msgstr "Най-горе" -#: gitk:9021 +#: gitk:9157 msgid "From" msgstr "От" -#: gitk:9026 +#: gitk:9162 msgid "To" msgstr "До" -#: gitk:9050 +#: gitk:9186 msgid "Generate patch" msgstr "Генериране на кръпка" -#: gitk:9052 +#: gitk:9188 msgid "From:" msgstr "От:" -#: gitk:9061 +#: gitk:9197 msgid "To:" msgstr "До:" -#: gitk:9070 +#: gitk:9206 msgid "Reverse" msgstr "Обръщане" -#: gitk:9072 gitk:9268 +#: gitk:9208 gitk:9418 msgid "Output file:" msgstr "Запазване във файла:" -#: gitk:9078 +#: gitk:9214 msgid "Generate" msgstr "Генериране" -#: gitk:9116 +#: gitk:9252 msgid "Error creating patch:" msgstr "Грешка при създаването на кръпка:" -#: gitk:9139 gitk:9256 gitk:9313 +#: gitk:9275 gitk:9406 gitk:9463 msgid "ID:" msgstr "Идентификатор:" -#: gitk:9148 +#: gitk:9284 msgid "Tag name:" msgstr "Име на етикет:" -#: gitk:9151 +#: gitk:9287 msgid "Tag message is optional" msgstr "Съобщението за етикет е незадължително" -#: gitk:9153 +#: gitk:9289 msgid "Tag message:" msgstr "Съобщение за етикет:" -#: gitk:9157 gitk:9322 +#: gitk:9293 gitk:9472 msgid "Create" msgstr "Създаване" -#: gitk:9175 +#: gitk:9311 msgid "No tag name specified" msgstr "Липсва име на етикет" -#: gitk:9179 +#: gitk:9315 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Етикетът „%s“ вече съществува" -#: gitk:9189 +#: gitk:9325 msgid "Error creating tag:" msgstr "Грешка при създаването на етикет:" -#: gitk:9265 +#: gitk:9415 msgid "Command:" msgstr "Команда:" -#: gitk:9273 +#: gitk:9423 msgid "Write" -msgstr "Pdmdpldke" +msgstr "Запазване" -#: gitk:9291 +#: gitk:9441 msgid "Error writing commit:" msgstr "Грешка при запазването на подаването:" -#: gitk:9318 +#: gitk:9468 msgid "Name:" msgstr "Име:" -#: gitk:9341 +#: gitk:9491 msgid "Please specify a name for the new branch" msgstr "Укажете име за новия клон" -#: gitk:9346 +#: gitk:9496 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?" -#: gitk:9413 +#: gitk:9563 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" +msgstr "" +"Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" -#: gitk:9418 +#: gitk:9568 msgid "Cherry-picking" msgstr "Отбиране" -#: gitk:9427 +#: gitk:9577 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1019,7 +1060,7 @@ msgstr "" "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги скатайте и пробвайте отново." -#: gitk:9433 +#: gitk:9583 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1027,20 +1068,20 @@ msgstr "" "Неуспешно отбиране поради конфликти при сливане.\n" "Искате ли да ги коригирате чрез „git citool“?" -#: gitk:9449 gitk:9507 +#: gitk:9599 gitk:9657 msgid "No changes committed" msgstr "Не са подадени промени" -#: gitk:9476 +#: gitk:9626 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" -#: gitk:9481 +#: gitk:9631 msgid "Reverting" msgstr "Отмяна" -#: gitk:9489 +#: gitk:9639 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1049,7 +1090,7 @@ msgstr "" "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги скатайте и пробвайте отново.<" -#: gitk:9493 +#: gitk:9643 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1057,28 +1098,28 @@ msgstr "" "Неуспешно отмяна поради конфликти при сливане.\n" "Искате ли да ги коригирате чрез „git citool“?" -#: gitk:9536 +#: gitk:9686 msgid "Confirm reset" msgstr "Потвърждаване на зануляването" -#: gitk:9538 +#: gitk:9688 #, tcl-format msgid "Reset branch %s to %s?" -msgstr "Да се занули ли клона „%s“ към „%s“?" +msgstr "Да се занули ли клонът „%s“ към „%s“?" -#: gitk:9540 +#: gitk:9690 msgid "Reset type:" msgstr "Вид зануляване:" -#: gitk:9543 +#: gitk:9693 msgid "Soft: Leave working tree and index untouched" msgstr "Слабо: работното дърво и индекса остават същите" -#: gitk:9546 +#: gitk:9696 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Смесено: работното дърво остава същото, индексът се занулява" -#: gitk:9549 +#: gitk:9699 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1086,249 +1127,255 @@ msgstr "" "Силно: зануляване и на работното дърво, и на индекса\n" "(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" -#: gitk:9566 +#: gitk:9716 msgid "Resetting" msgstr "Зануляване" -#: gitk:9626 +#: gitk:9776 msgid "Checking out" msgstr "Изтегляне" -#: gitk:9679 +#: gitk:9829 msgid "Cannot delete the currently checked-out branch" msgstr "Текущо изтегленият клон не може да бъде изтрит" -#: gitk:9685 +#: 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“?" +"Наистина ли да се изтрие клонът „%s“?" -#: gitk:9716 +#: gitk:9866 #, tcl-format msgid "Tags and heads: %s" msgstr "Етикети и върхове: %s" -#: gitk:9731 +#: gitk:9883 msgid "Filter" msgstr "Филтриране" -#: gitk:10027 +#: gitk:10179 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." -msgstr "Грешка при прочитането на топологията на подаванията. Информацията за клона и предшестващите/следващите етикети ще е непълна." +msgstr "" +"Грешка при прочитането на топологията на подаванията. Информацията за клона " +"и предшестващите/следващите етикети ще е непълна." -#: gitk:11004 +#: gitk:11156 msgid "Tag" msgstr "Етикет" -#: gitk:11008 +#: gitk:11160 msgid "Id" msgstr "Идентификатор" -#: gitk:11091 +#: gitk:11243 msgid "Gitk font chooser" msgstr "Избор на шрифт за Gitk" -#: gitk:11108 +#: gitk:11260 msgid "B" msgstr "Ч" -#: gitk:11111 +#: gitk:11263 msgid "I" msgstr "К" -#: gitk:11229 +#: gitk:11381 msgid "Commit list display options" msgstr "Настройки на списъка с подавания" -#: gitk:11232 +#: gitk:11384 msgid "Maximum graph width (lines)" msgstr "Максимална широчина на графа (в редове)" -#: gitk:11235 -#, tcl-format +#: gitk:11388 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Максимална широчина на графа (% от панела)" -#: gitk:11238 +#: gitk:11391 msgid "Show local changes" msgstr "Показване на локалните промени" -#: gitk:11241 +#: gitk:11394 msgid "Auto-select SHA1 (length)" msgstr "Автоматично избиране на SHA1 (дължина)" -#: gitk:11245 +#: gitk:11398 msgid "Hide remote refs" msgstr "Скриване на отдалечените указатели" -#: gitk:11249 +#: gitk:11402 msgid "Diff display options" msgstr "Настройки на показването на разликите" -#: gitk:11251 +#: gitk:11404 msgid "Tab spacing" msgstr "Широчина на табулатора" -#: gitk:11254 +#: gitk:11407 msgid "Display nearby tags/heads" msgstr "Извеждане на близките етикети и върхове" -#: gitk:11257 +#: gitk:11410 msgid "Maximum # tags/heads to show" msgstr "Максимален брой етикети/върхове за показване" -#: gitk:11260 +#: gitk:11413 msgid "Limit diffs to listed paths" msgstr "Разлика само в избраните пътища" -#: gitk:11263 +#: gitk:11416 msgid "Support per-file encodings" msgstr "Поддръжка на различни кодирания за всеки файл" -#: gitk:11269 gitk:11416 +#: gitk:11422 gitk:11569 msgid "External diff tool" msgstr "Външен инструмент за разлики" -#: gitk:11270 +#: gitk:11423 msgid "Choose..." msgstr "Избор…" -#: gitk:11275 +#: gitk:11428 msgid "General options" msgstr "Общи настройки" -#: gitk:11278 +#: gitk:11431 msgid "Use themed widgets" msgstr "Използване на тема за графичните обекти" -#: gitk:11280 +#: gitk:11433 msgid "(change requires restart)" msgstr "(промяната изисква рестартиране на Gitk)" -#: gitk:11282 +#: gitk:11435 msgid "(currently unavailable)" msgstr "(в момента недостъпно)" -#: gitk:11293 +#: gitk:11446 msgid "Colors: press to choose" msgstr "Цветове: избира се с натискане" -#: gitk:11296 +#: gitk:11449 msgid "Interface" msgstr "Интерфейс" -#: gitk:11297 +#: gitk:11450 msgid "interface" msgstr "интерфейс" -#: gitk:11300 +#: gitk:11453 msgid "Background" msgstr "Фон" -#: gitk:11301 gitk:11331 +#: gitk:11454 gitk:11484 msgid "background" -msgstr "Фон" +msgstr "фон" -#: gitk:11304 +#: gitk:11457 msgid "Foreground" msgstr "Знаци" -#: gitk:11305 +#: gitk:11458 msgid "foreground" msgstr "знаци" -#: gitk:11308 +#: gitk:11461 msgid "Diff: old lines" msgstr "Разлика: стари редове" -#: gitk:11309 +#: gitk:11462 msgid "diff old lines" msgstr "разлика, стари редове" -#: gitk:11313 +#: gitk:11466 msgid "Diff: new lines" msgstr "Разлика: нови редове" -#: gitk:11314 +#: gitk:11467 msgid "diff new lines" msgstr "разлика, нови редове" -#: gitk:11318 +#: gitk:11471 msgid "Diff: hunk header" msgstr "Разлика: начало на парче" -#: gitk:11320 +#: gitk:11473 msgid "diff hunk header" msgstr "разлика, начало на парче" -#: gitk:11324 +#: gitk:11477 msgid "Marked line bg" msgstr "Фон на отбелязан ред" -#: gitk:11326 +#: gitk:11479 msgid "marked line background" -msgstr "Фон на отбелязан ред" +msgstr "фон на отбелязан ред" -#: gitk:11330 +#: gitk:11483 msgid "Select bg" msgstr "Избор на фон" -#: gitk:11339 +#: gitk:11492 msgid "Fonts: press to choose" msgstr "Шрифтове: избира се с натискане" -#: gitk:11341 +#: gitk:11494 msgid "Main font" msgstr "Основен шрифт" -#: gitk:11342 +#: gitk:11495 msgid "Diff display font" msgstr "Шрифт за разликите" -#: gitk:11343 +#: gitk:11496 msgid "User interface font" msgstr "Шрифт на интерфейса" -#: gitk:11365 +#: gitk:11518 msgid "Gitk preferences" msgstr "Настройки на Gitk" -#: gitk:11374 +#: gitk:11527 msgid "General" msgstr "Общи" -#: gitk:11375 +#: gitk:11528 msgid "Colors" msgstr "Цветове" -#: gitk:11376 +#: gitk:11529 msgid "Fonts" msgstr "Шрифтове" -#: gitk:11426 +#: gitk:11579 #, tcl-format msgid "Gitk: choose color for %s" -msgstr "Gitk: избор на цвят на %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:12080 +#: gitk:12302 msgid "Cannot find a git repository here." msgstr "Тук липсва хранилище на Git." -#: gitk:12127 +#: gitk:12349 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл" -#: gitk:12139 +#: gitk:12361 msgid "Bad arguments to gitk:" msgstr "Неправилни аргументи на gitk:" - -#: gitk:12242 -msgid "Command line" -msgstr "Команден ред" diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po new file mode 100644 index 0000000000..5ad066f7ce --- /dev/null +++ b/gitk-git/po/ca.po @@ -0,0 +1,1369 @@ +# Translation of gitk +# Copyright (C) 2005-2014 Paul Mackerras +# This file is distributed under the same license as the gitk package. +# Alex Henrie <alexhenrie24@gmail.com>, 2015. +# +# +msgid "" +msgstr "" +"Project-Id-Version: gitk\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2015-10-05 22:23-0600\n" +"Last-Translator: Alex Henrie <alexhenrie24@gmail.com>\n" +"Language-Team: Catalan\n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.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" +"\n" +"Use and redistribute under the terms of the GNU General Public License" +msgstr "" +"\n" +"Gitk - visualitzador de comissions per al git\n" +"\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU" + +#: gitk: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 "<Home>\t\tMove to first commit" +msgstr "<Inici>\t\tVés a la primera comissió" + +#: gitk:3051 +msgid "<End>\t\tMove to last commit" +msgstr "<Fi>\t\tVés a l'última comissió" + +#: gitk:3052 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Amunt>, p, k\tMou-te cap amunt per una comissió" + +#: gitk:3053 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Avall>, n, j\tMou-te cap avall per una comissió" + +#: gitk:3054 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Esquerra>, z, h\tRetrocedeix en la llista d'història" + +#: gitk:3055 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Dreta>, 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 "<PageUp>\tMove up one page in commit list" +msgstr "<RePàg>\tMou-te cap amunt per una pàgina en la llista de comissions" + +#: gitk:3058 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<AvPàg>\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 "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Maj-Amunt>\tCerca cap enrere (cap amunt, les comissions més noves)" + +#: gitk:3066 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "<Maj-Avall>\tCerca cap endavant (cap avall, les comissions més velles)" + +#: gitk:3067 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Supr>, b\tDesplaça la vista de diferència cap amunt per una pàgina" + +#: gitk:3068 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Retrocés>\tDesplaça la vista de diferència cap amunt per una pàgina" + +#: gitk:3069 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Espai>\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 "<Return>\tMove to next find hit" +msgstr "<Retorn>\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 "<F5>\t\tUpdate" +msgstr "<F5>\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 --git a/gitk-git/po/de.po b/gitk-git/po/de.po index bd194a3dff..bde749ed8a 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -8,33 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-27 20:21+0100\n" -"PO-Revision-Date: 2010-01-27 20:27+0100\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 <stimming@tuhh.de>\n" "Language-Team: German\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" -#: gitk:274 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "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:329 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" -#: gitk:342 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren " "keine nicht zusammengeführten Dateien." -#: gitk:345 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,801 +51,841 @@ msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " "nicht zusammengeführten Dateien in der Dateiauswahl." -#: gitk:367 gitk:514 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fehler beim Ausführen von »git log«:" -#: gitk:385 gitk:530 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lesen" -#: gitk:445 gitk:4261 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Versionen werden gelesen ..." -#: gitk:448 gitk:1578 gitk:4264 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Keine Versionen ausgewählt" -#: gitk:1454 +#: 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:1674 +#: gitk:1740 msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:1816 -msgid "mc" -msgstr "mc" - -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 -#: gitk:10586 gitk:10805 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Abbrechen" -#: gitk:1975 -msgid "Update" -msgstr "Aktualisieren" +#: gitk:2069 +msgid "&Update" +msgstr "&Aktualisieren" -#: gitk:1976 -msgid "Reload" -msgstr "Neu laden" +#: gitk:2070 +msgid "&Reload" +msgstr "&Neu laden" -#: gitk:1977 -msgid "Reread references" -msgstr "Zweige neu laden" +#: gitk:2071 +msgid "Reread re&ferences" +msgstr "&Zweige neu laden" -#: gitk:1978 -msgid "List references" -msgstr "Zweige/Markierungen auflisten" +#: gitk:2072 +msgid "&List references" +msgstr "Zweige/Markierungen auf&listen" -#: gitk:1980 -msgid "Start git gui" -msgstr "»git gui« starten" +#: gitk:2074 +msgid "Start git &gui" +msgstr "»git &gui« starten" -#: gitk:1982 -msgid "Quit" -msgstr "Beenden" +#: gitk:2076 +msgid "&Quit" +msgstr "&Beenden" -#: gitk:1974 -msgid "File" -msgstr "Datei" +#: gitk:2068 +msgid "&File" +msgstr "&Datei" -#: gitk:1986 -msgid "Preferences" -msgstr "Einstellungen" +#: gitk:2080 +msgid "&Preferences" +msgstr "&Einstellungen" -#: gitk:1985 -msgid "Edit" -msgstr "Bearbeiten" +#: gitk:2079 +msgid "&Edit" +msgstr "&Bearbeiten" -#: gitk:1990 -msgid "New view..." -msgstr "Neue Ansicht ..." +#: gitk:2084 +msgid "&New view..." +msgstr "&Neue Ansicht ..." -#: gitk:1991 -msgid "Edit view..." -msgstr "Ansicht bearbeiten ..." +#: gitk:2085 +msgid "&Edit view..." +msgstr "Ansicht &bearbeiten ..." -#: gitk:1992 -msgid "Delete view" -msgstr "Ansicht entfernen" +#: gitk:2086 +msgid "&Delete view" +msgstr "Ansicht &entfernen" -#: gitk:1994 -msgid "All files" -msgstr "Alle Dateien" +#: gitk:2088 gitk:4043 +msgid "&All files" +msgstr "&Alle Dateien" -#: gitk:1989 gitk:3808 -msgid "View" -msgstr "Ansicht" +#: gitk:2083 gitk:4067 +msgid "&View" +msgstr "&Ansicht" -#: gitk:1999 gitk:2009 gitk:2780 -msgid "About gitk" -msgstr "Über gitk" +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" +msgstr "Über &gitk" -#: gitk:2000 gitk:2014 -msgid "Key bindings" -msgstr "Tastenkürzel" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "&Tastenkürzel" -#: gitk:1998 gitk:2013 -msgid "Help" -msgstr "Hilfe" +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "&Hilfe" -#: gitk:2091 gitk:8110 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2122 +#: gitk:2229 msgid "Row" msgstr "Zeile" -#: gitk:2160 +#: gitk:2267 msgid "Find" msgstr "Suche" -#: gitk:2161 -msgid "next" -msgstr "nächste" - -#: gitk:2162 -msgid "prev" -msgstr "vorige" - -#: gitk:2163 +#: gitk:2295 msgid "commit" msgstr "Version nach" -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 -#: gitk:6566 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "Beschreibung:" -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "Dateien:" -#: gitk:2170 gitk:4502 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "Änderungen:" -#: gitk:2179 gitk:2181 +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "Geänderte Zeilen entsprechen:" + +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exakt" -#: gitk:2181 gitk:4577 gitk:6378 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Alle Felder" -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Überschrift" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Beschreibung" -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 -#: gitk:8300 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Eintragender" -#: gitk:2216 +#: gitk:2350 msgid "Search" msgstr "Suchen" -#: gitk:2224 +#: gitk:2358 msgid "Diff" msgstr "Vergleich" -#: gitk:2226 +#: gitk:2360 msgid "Old version" msgstr "Alte Version" -#: gitk:2228 +#: gitk:2362 msgid "New version" msgstr "Neue Version" -#: gitk:2230 +#: gitk:2364 msgid "Lines of context" msgstr "Kontextzeilen" -#: gitk:2240 +#: gitk:2374 msgid "Ignore space change" msgstr "Leerzeichenänderungen ignorieren" -#: gitk:2299 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "Zeilenunterschied" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2301 +#: gitk:2447 msgid "Tree" msgstr "Baum" -#: gitk:2456 gitk:2473 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Vergleich: diese -> gewählte" -#: gitk:2457 gitk:2474 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2458 gitk:2475 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:2459 gitk:8692 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:2460 gitk:8808 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:2461 gitk:8865 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:2462 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:2463 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:2464 +#: gitk:2625 msgid "Mark this commit" msgstr "Lesezeichen setzen" -#: gitk:2465 +#: gitk:2626 msgid "Return to mark" msgstr "Zum Lesezeichen" -#: gitk:2466 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Abkömmling von Lesezeichen und dieser Version finden" -#: gitk:2467 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" -#: gitk:2481 +#: 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:2482 +#: gitk:2648 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:2489 +#: gitk:2649 +msgid "Copy branch name" +msgstr "Zweigname kopieren" + +#: gitk:2656 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:2490 +#: gitk:2657 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:2491 +#: gitk:2658 msgid "External diff" msgstr "Externes Diff-Programm" -#: gitk:2492 +#: gitk:2659 msgid "Blame parent commit" msgstr "Annotieren der Elternversion" -#: gitk:2499 +#: gitk:2660 +msgid "Copy path" +msgstr "Pfad kopieren" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Herkunft dieser Zeile anzeigen" -#: gitk:2500 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" -#: gitk:2782 +#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - eine Visualisierung der Git-Historie\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright \\u00a9 2005-2014 Paul Mackerras\n" "\n" -"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License" +"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " +"License" -#: gitk:2790 gitk:2854 gitk:9230 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Schließen" -#: gitk:2811 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk-Tastaturbelegung" -#: gitk:2814 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk-Tastaturbelegung:" -#: gitk:2816 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" -#: gitk:2817 +#: gitk:3049 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tFenster schließen" + +#: gitk:3050 msgid "<Home>\t\tMove to first commit" msgstr "<Pos1>\t\tZur neuesten Version springen" -#: gitk:2818 +#: gitk:3051 msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tZur ältesten Version springen" -#: gitk:2819 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Hoch>, p, i\tNächste neuere Version" +#: gitk:3052 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Hoch>, p, k\tNächste neuere Version" -#: gitk:2820 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Runter>, n, k\tNächste ältere Version" +#: gitk:3053 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Runter>, n, j\tNächste ältere Version" -#: gitk:2821 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Links>, z, j\tEine Version zurückgehen" +#: gitk:3054 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Links>, z, h\tEine Version zurückgehen" -#: gitk:2822 +#: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Rechts>, x, l\tEine Version weitergehen" -#: gitk:2823 +#: 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 "<PageUp>\tMove up one page in commit list" msgstr "<BildHoch>\tEine Seite nach oben blättern" -#: gitk:2824 +#: gitk:3058 msgid "<PageDown>\tMove down one page in commit list" msgstr "<BildRunter>\tEine Seite nach unten blättern" -#: gitk:2825 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" -#: gitk:2826 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" -#: gitk:2827 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" -#: gitk:2828 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" -#: gitk:2829 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" -#: gitk:2830 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" -#: gitk:2831 +#: gitk:3065 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)" -#: gitk:2832 +#: gitk:3066 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)" -#: gitk:2833 +#: gitk:3067 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern" -#: gitk:2834 +#: gitk:3068 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern" -#: gitk:2835 +#: gitk:3069 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern" -#: gitk:2836 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" -#: gitk:2837 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" -#: gitk:2838 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSuchen" -#: gitk:2839 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tWeitersuchen" -#: gitk:2840 +#: gitk:3074 msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tWeitersuchen" -#: gitk:2841 +#: 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:2842 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tRückwärts weitersuchen" -#: gitk:2843 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tVergleich zur nächsten Datei blättern" -#: gitk:2844 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tWeitersuchen im Vergleich" -#: gitk:2845 +#: 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:2846 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" -#: gitk:2847 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tSchrift vergrößern" -#: gitk:2848 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:2849 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tSchrift verkleinern" -#: gitk:2850 +#: gitk:3085 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAktualisieren" -#: gitk:3305 gitk:3314 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" -#: gitk:3327 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fehler beim Holen von »%s« von »%s«:" -#: gitk:3390 +#: gitk:3635 msgid "command failed:" msgstr "Kommando fehlgeschlagen:" -#: gitk:3539 +#: gitk:3784 msgid "No such commit" msgstr "Version nicht gefunden" -#: gitk:3553 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: Kommando fehlgeschlagen:" -#: gitk:3584 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" -#: gitk:3592 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" -#: gitk:3617 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "»git blame« konnte nicht gestartet werden: %s" -#: gitk:3620 gitk:6409 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Suchen" -#: gitk:3652 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Fehler beim Ausführen von »git blame«: %s" -#: gitk:3680 +#: 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:3694 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Externes Diff-Programm fehlgeschlagen:" -#: gitk:3812 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk-Ansichten" -#: gitk:3816 +#: gitk:4074 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:3817 +#: gitk:4075 msgid "References (space separated list):" msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" -#: gitk:3818 +#: gitk:4076 msgid "Branches & tags:" msgstr "Zweige/Markierungen:" -#: gitk:3819 +#: gitk:4077 msgid "All refs" msgstr "Alle Markierungen und Zweige" -#: gitk:3820 +#: gitk:4078 msgid "All (local) branches" msgstr "Alle (lokalen) Zweige" -#: gitk:3821 +#: gitk:4079 msgid "All tags" msgstr "Alle Markierungen" -#: gitk:3822 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Alle Übernahmezweige" -#: gitk:3823 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Versionsinformationen (reguläre Ausdrücke):" -#: gitk:3824 +#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:3825 +#: gitk:4083 msgid "Committer:" msgstr "Eintragender:" -#: gitk:3826 +#: gitk:4084 msgid "Commit Message:" msgstr "Versionsbeschreibung:" -#: gitk:3827 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:3828 +#: gitk:4086 +msgid "Matches no Commit Info criteria" +msgstr "keine Versionsinformationen-Kriterien erfüllen" + +#: gitk:4087 msgid "Changes to Files:" msgstr "Dateien:" -#: gitk:3829 +#: gitk:4088 msgid "Fixed String" msgstr "Zeichenkette" -#: gitk:3830 +#: gitk:4089 msgid "Regular Expression" msgstr "Regulärer Ausdruck" -#: gitk:3831 +#: gitk:4090 msgid "Search string:" msgstr "Suchausdruck:" -#: gitk:3832 +#: 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«)" +msgstr "" +"Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" -#: gitk:3833 +#: gitk:4092 msgid "Since:" msgstr "Von:" -#: gitk:3834 +#: gitk:4093 msgid "Until:" msgstr "Bis:" -#: gitk:3835 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" -#: gitk:3836 +#: gitk:4095 msgid "Number to show:" msgstr "Anzeigen:" -#: gitk:3837 +#: gitk:4096 msgid "Number to skip:" msgstr "Überspringen:" -#: gitk:3838 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Sonstiges:" -#: gitk:3839 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Streng nach Datum sortieren" -#: gitk:3840 +#: gitk:4099 msgid "Mark branch sides" msgstr "Zweig-Seiten markieren" -#: gitk:3841 +#: gitk:4100 msgid "Limit to first parent" msgstr "Auf erste Elternversion beschränken" -#: gitk:3842 +#: gitk:4101 msgid "Simple history" msgstr "Einfache Historie" -#: gitk:3843 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Zusätzliche Argumente für »git log«:" -#: gitk:3844 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" -#: gitk:3845 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" -#: gitk:3967 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: Ansicht bearbeiten" -#: gitk:3975 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- Auswahl der angezeigten Versionen" -#: gitk:3980 +#: gitk:4241 msgid "View Name" msgstr "Ansichtsname" -#: gitk:4055 +#: gitk:4316 msgid "Apply (F5)" msgstr "Anwenden (F5)" -#: gitk:4093 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Keine" -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 -msgid "Date" -msgstr "Datum" - -#: gitk:4594 gitk:6441 -msgid "CDate" -msgstr "Eintragedatum" - -#: gitk:4743 gitk:4748 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Abkömmling" -#: gitk:4744 +#: gitk:5022 msgid "Not descendant" msgstr "Kein Abkömmling" -#: gitk:4751 gitk:4756 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:4752 +#: gitk:5030 msgid "Not ancestor" msgstr "Kein Vorgänger" -#: gitk:5042 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:5078 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:6759 +#: gitk:7134 +msgid "and many more" +msgstr "und weitere" + +#: gitk:7137 msgid "many" msgstr "viele" -#: gitk:6942 +#: gitk:7328 msgid "Tags:" msgstr "Markierungen:" -#: gitk:6959 gitk:6965 gitk:8280 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Eltern" -#: gitk:6970 +#: gitk:7356 msgid "Child" msgstr "Kind" -#: gitk:6979 +#: gitk:7365 msgid "Branch" msgstr "Zweig" -#: gitk:6982 +#: gitk:7368 msgid "Follows" msgstr "Folgt auf" -#: gitk:6985 +#: gitk:7371 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:7522 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:8108 +#: gitk:8650 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:8129 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:8136 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Version »%s« ist unbekannt" -#: gitk:8146 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:8148 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" -#: gitk:8290 +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Datum" + +#: gitk:8835 msgid "Children" msgstr "Kinder" -#: gitk:8348 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:8350 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" -#: gitk:8459 gitk:8465 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Überspringe Zusammenführungs-Version " -#: gitk:8474 gitk:8479 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Fehler beim Holen der Patch-ID für " -#: gitk:8475 gitk:8480 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - Abbruch.\n" -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Version " -#: gitk:8489 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -844,7 +893,7 @@ msgstr "" " ist das gleiche Patch wie\n" " " -#: gitk:8497 +#: gitk:9043 msgid "" " differs from\n" " " @@ -852,7 +901,7 @@ msgstr "" " ist unterschiedlich von\n" " " -#: gitk:8499 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -860,130 +909,131 @@ msgstr "" "Vergleich der Versionen:\n" "\n" -#: gitk:8511 gitk:8520 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " hat %s Kinder. Abbruch\n" -#: gitk:8539 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fehler beim Schreiben der Version in Datei: %s" -#: gitk:8545 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fehler beim Vergleichen der Versionen: %s" -#: gitk:8575 +#: gitk:9137 msgid "Top" msgstr "Oben" -#: gitk:8576 +#: gitk:9138 msgid "From" msgstr "Von" -#: gitk:8581 +#: gitk:9143 msgid "To" msgstr "bis" -#: gitk:8605 +#: gitk:9167 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:8607 +#: gitk:9169 msgid "From:" msgstr "Von:" -#: gitk:8616 +#: gitk:9178 msgid "To:" msgstr "bis:" -#: gitk:8625 +#: gitk:9187 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:8627 gitk:8822 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:8633 +#: gitk:9195 msgid "Generate" msgstr "Erzeugen" -#: gitk:8671 +#: gitk:9233 msgid "Error creating patch:" msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:8694 gitk:8810 gitk:8867 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:8703 +#: gitk:9265 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:8706 +#: gitk:9268 msgid "Tag message is optional" msgstr "Eine Markierungsbeschreibung ist optional" -#: gitk:8708 +#: gitk:9270 msgid "Tag message:" msgstr "Markierungsbeschreibung:" -#: gitk:8712 gitk:8876 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Erstellen" -#: gitk:8730 +#: gitk:9292 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:8734 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:8744 +#: gitk:9306 msgid "Error creating tag:" msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:8819 +#: gitk:9382 msgid "Command:" msgstr "Kommando:" -#: gitk:8827 +#: gitk:9390 msgid "Write" msgstr "Schreiben" -#: gitk:8845 +#: gitk:9408 msgid "Error writing commit:" msgstr "Fehler beim Schreiben der Version:" -#: gitk:8872 +#: gitk:9435 msgid "Name:" msgstr "Name:" -#: gitk:8895 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:8900 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" -#: gitk:8966 +#: 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?" +"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " +"eintragen?" -#: gitk:8971 +#: gitk:9535 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:8980 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -993,7 +1043,7 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:8986 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1002,34 +1052,63 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:9002 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:9028 +#: 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:9030 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:9032 +#: gitk:9657 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:9035 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:9038 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:9041 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1037,21 +1116,21 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:9058 +#: gitk:9683 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:9118 +#: gitk:9743 msgid "Checking out" msgstr "Umstellen" -#: gitk:9171 +#: 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:9177 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1060,16 +1139,16 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:9208 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:9223 +#: gitk:9850 msgid "Filter" msgstr "Filtern" -#: gitk:9518 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1077,202 +1156,232 @@ msgstr "" "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " "Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:10504 +#: gitk:11123 msgid "Tag" msgstr "Markierung" -#: gitk:10504 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:10554 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk-Schriften wählen" -#: gitk:10571 +#: gitk:11227 msgid "B" msgstr "F" -#: gitk:10574 +#: gitk:11230 msgid "I" msgstr "K" -#: gitk:10692 -msgid "Gitk preferences" -msgstr "Gitk-Einstellungen" - -#: gitk:10694 +#: gitk:11348 msgid "Commit list display options" msgstr "Anzeige der Versionsliste" -#: gitk:10697 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:10700 -#, tcl-format +#: gitk:11355 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:10703 +#: gitk:11358 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:10706 -msgid "Auto-select SHA1" -msgstr "SHA1-Hashwert automatisch auswählen" +#: gitk:11361 +msgid "Auto-select SHA1 (length)" +msgstr "SHA1-Hashwert (Länge) automatisch auswählen" -#: gitk:10709 +#: gitk:11365 msgid "Hide remote refs" msgstr "Entfernte Zweige/Markierungen ausblenden" -#: gitk:10713 +#: gitk:11369 msgid "Diff display options" msgstr "Anzeige des Vergleichs" -#: gitk:10715 +#: gitk:11371 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:10718 -msgid "Display nearby tags" -msgstr "Naheliegende Markierungen anzeigen" +#: 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:10721 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Vergleich nur für angezeigte Pfade" -#: gitk:10724 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Zeichenkodierung pro Datei ermitteln" -#: gitk:10730 gitk:10819 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Externes Diff-Programm" -#: gitk:10731 +#: gitk:11390 msgid "Choose..." msgstr "Wählen ..." -#: gitk:10736 +#: gitk:11395 msgid "General options" msgstr "Allgemeine Optionen" -#: gitk:10739 +#: gitk:11398 msgid "Use themed widgets" msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" -#: gitk:10741 +#: gitk:11400 msgid "(change requires restart)" msgstr "(Änderungen werden erst nach Neustart wirksam)" -#: gitk:10743 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(Momentan nicht verfügbar)" -#: gitk:10747 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:10750 +#: gitk:11416 msgid "Interface" msgstr "Benutzeroberfläche" -#: gitk:10751 +#: gitk:11417 msgid "interface" msgstr "Benutzeroberfläche" -#: gitk:10754 +#: gitk:11420 msgid "Background" msgstr "Hintergrund" -#: gitk:10755 gitk:10785 +#: gitk:11421 gitk:11451 msgid "background" msgstr "Hintergrund" -#: gitk:10758 +#: gitk:11424 msgid "Foreground" msgstr "Vordergrund" -#: gitk:10759 +#: gitk:11425 msgid "foreground" msgstr "Vordergrund" -#: gitk:10762 +#: gitk:11428 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:10763 +#: gitk:11429 msgid "diff old lines" msgstr "Vergleich - Alte Zeilen" -#: gitk:10767 +#: gitk:11433 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:10768 +#: gitk:11434 msgid "diff new lines" msgstr "Vergleich - Neue Zeilen" -#: gitk:10772 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:10774 +#: gitk:11440 msgid "diff hunk header" msgstr "Vergleich - Änderungstitel" -#: gitk:10778 +#: gitk:11444 msgid "Marked line bg" msgstr "Hintergrund für markierte Zeile" -#: gitk:10780 +#: gitk:11446 msgid "marked line background" msgstr "Hintergrund für markierte Zeile" -#: gitk:10784 +#: gitk:11450 msgid "Select bg" msgstr "Hintergrundfarbe auswählen" -#: gitk:10788 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:10790 +#: gitk:11461 msgid "Main font" msgstr "Programmschriftart" -#: gitk:10791 +#: gitk:11462 msgid "Diff display font" msgstr "Schriftart für Vergleich" -#: gitk:10792 +#: gitk:11463 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:10829 +#: 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:11433 +#: 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:11437 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-Verzeichnis »%s« wurde nicht gefunden." - -#: gitk:11484 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:11496 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" -#: gitk:11587 -msgid "Command line" -msgstr "Kommandozeile" +#~ 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 --git a/gitk-git/po/es.po b/gitk-git/po/es.po index 0471dd0672..ddcb0a5f68 100644 --- a/gitk-git/po/es.po +++ b/gitk-git/po/es.po @@ -8,25 +8,43 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-10-18 22:03+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2008-03-25 11:20+0100\n" "Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n" "Language-Team: Spanish\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Imposible obtener la lista de archivos pendientes de fusión:" -#: gitk:340 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +msgid "Markup words" +msgstr "" + +#: gitk:324 +#, fuzzy +msgid "Error parsing revisions:" +msgstr "Error al leer las diferencias de fusión:" + +#: gitk:380 +msgid "Error executing --argscmd command:" +msgstr "" + +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero no hay " "archivos pendientes de fusión." -#: gitk:343 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -34,254 +52,325 @@ msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero los " "archivos especificados no necesitan fusión." -#: gitk:378 +#: gitk:418 gitk:566 +#, fuzzy +msgid "Error executing git log:" +msgstr "Error al crear la etiqueta:" + +#: gitk:436 gitk:582 msgid "Reading" msgstr "Leyendo" -#: gitk:438 gitk:3462 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Leyendo revisiones..." -#: gitk:441 gitk:1528 gitk:3465 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "No se seleccionaron revisiones" -#: gitk:1399 +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Línea de comandos" + +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Error analizando la salida de git log:" -#: gitk:1605 +#: gitk:1740 msgid "No commit information available" msgstr "Falta información sobre las revisiones" -#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Aceptar" -#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766 -#: gitk:9294 gitk:9467 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancelar" -#: gitk:1811 -msgid "Update" +#: gitk:2069 +msgid "&Update" msgstr "Actualizar" -#: gitk:1813 -msgid "Reread references" +#: gitk:2070 +msgid "&Reload" +msgstr "" + +#: gitk:2071 +msgid "Reread re&ferences" msgstr "Releer referencias" -#: gitk:1814 -msgid "List references" +#: gitk:2072 +msgid "&List references" msgstr "Lista de referencias" -#: gitk:1815 -msgid "Quit" +#: gitk:2074 +msgid "Start git &gui" +msgstr "" + +#: gitk:2076 +msgid "&Quit" msgstr "Salir" -#: gitk:1810 -msgid "File" +#: gitk:2068 +msgid "&File" msgstr "Archivo" -#: gitk:1818 -msgid "Preferences" +#: gitk:2080 +msgid "&Preferences" msgstr "Preferencias" -#: gitk:1817 -msgid "Edit" +#: gitk:2079 +msgid "&Edit" msgstr "Editar" -#: gitk:1821 -msgid "New view..." +#: gitk:2084 +msgid "&New view..." msgstr "Nueva vista..." -#: gitk:1822 -msgid "Edit view..." +#: gitk:2085 +msgid "&Edit view..." msgstr "Modificar vista..." -#: gitk:1823 -msgid "Delete view" +#: gitk:2086 +msgid "&Delete view" msgstr "Eliminar vista" -#: gitk:1825 -msgid "All files" +#: gitk:2088 gitk:4043 +msgid "&All files" msgstr "Todos los archivos" -#: gitk:1820 gitk:3196 -msgid "View" +#: gitk:2083 gitk:4067 +msgid "&View" msgstr "Vista" -#: gitk:1828 gitk:2487 -msgid "About gitk" +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" msgstr "Acerca de gitk" -#: gitk:1829 -msgid "Key bindings" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" msgstr "Combinaciones de teclas" -#: gitk:1827 -msgid "Help" +#: gitk:2092 gitk:2107 +msgid "&Help" msgstr "Ayuda" -#: gitk:1887 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:1918 +#: gitk:2229 msgid "Row" msgstr "" -#: gitk:1949 +#: gitk:2267 msgid "Find" msgstr "Buscar" -#: gitk:1950 -msgid "next" -msgstr "<<" - -#: gitk:1951 -msgid "prev" -msgstr ">>" - -#: gitk:1952 +#: gitk:2295 msgid "commit" msgstr "revisión" -#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "que contiene:" -#: gitk:1958 gitk:2954 gitk:2959 gitk:3692 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "que modifica la ruta:" -#: gitk:1959 gitk:3697 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "que añade/elimina cadena:" -#: gitk:1968 gitk:1970 +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exacto" -#: gitk:1970 gitk:3773 gitk:5518 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "NoMayús" -#: gitk:1970 gitk:3666 gitk:3771 gitk:5514 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regex" -#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Todos los campos" -#: gitk:1973 gitk:3790 gitk:3822 gitk:5580 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Título" -#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Comentarios" -#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285 -#: gitk:7300 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:1974 gitk:3790 gitk:5580 gitk:6047 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "" -#: gitk:2003 +#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2010 +#: gitk:2358 msgid "Diff" msgstr "Diferencia" -#: gitk:2012 +#: gitk:2360 msgid "Old version" msgstr "Versión antigua" -#: gitk:2014 +#: gitk:2362 msgid "New version" msgstr "Versión nueva" -#: gitk:2016 +#: gitk:2364 msgid "Lines of context" msgstr "Líneas de contexto" -#: gitk:2026 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignora cambios de espaciado" -#: gitk:2084 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Parche" -#: gitk:2086 +#: gitk:2447 msgid "Tree" msgstr "Árbol" -#: gitk:2213 gitk:2226 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2214 gitk:2227 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2215 gitk:2228 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Crear patch" -#: gitk:2216 gitk:7494 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crear etiqueta" -#: gitk:2217 gitk:7593 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Escribir revisiones a archivo" -#: gitk:2218 gitk:7647 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crear nueva rama" -#: gitk:2219 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2220 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Traer la rama HEAD aquí" -#: gitk:2234 +#: gitk:2625 +#, fuzzy +msgid "Mark this commit" +msgstr "Añadir esta revisión a la rama actual (cherry-pick)" + +#: gitk:2626 +msgid "Return to mark" +msgstr "" + +#: gitk:2627 +msgid "Find descendant of this and mark" +msgstr "" + +#: gitk:2628 +msgid "Compare with marked commit" +msgstr "" + +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diferencia de esta -> seleccionada" + +#: gitk:2630 gitk:2641 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diferencia de seleccionada -> esta" + +#: gitk:2631 +#, fuzzy +msgid "Revert this commit" +msgstr "Añadir esta revisión a la rama actual (cherry-pick)" + +#: gitk:2647 msgid "Check out this branch" msgstr "Cambiar a esta rama" -#: gitk:2235 +#: gitk:2648 msgid "Remove this branch" msgstr "Eliminar esta rama" -#: gitk:2242 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Seleccionar también" -#: gitk:2243 +#: gitk:2657 msgid "Highlight this only" msgstr "Seleccionar sólo" -#: gitk:2245 +#: gitk:2658 +msgid "External diff" +msgstr "" + +#: gitk:2659 msgid "Blame parent commit" msgstr "" -#: gitk:2488 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 +msgid "Show origin of this line" +msgstr "" + +#: gitk:2668 +msgid "Run git gui blame on this line" +msgstr "" + +#: gitk:3014 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -293,425 +382,733 @@ msgstr "" "Uso y redistribución permitidos según los términos de la Licencia Pública " "General de GNU (GNU GPL)" -#: gitk:2496 gitk:2557 gitk:7943 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Cerrar" -#: gitk:2515 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Combinaciones de tecla de Gitk" -#: gitk:2517 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Combinaciones de tecla de Gitk:" -#: gitk:2519 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSalir" -#: gitk:2520 +#: gitk:3049 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tBuscar" + +#: gitk:3050 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tIr a la primera revisión" -#: gitk:2521 +#: gitk:3051 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tIr a la última revisión" -#: gitk:2522 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3052 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tSubir una revisión" -#: gitk:2523 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3053 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tBajar una revisión" -#: gitk:2524 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3054 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tRetroceder en la historia" -#: gitk:2525 +#: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tAvanzar en la historia" -#: gitk:2526 +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3057 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tSubir una página en la lista de revisiones" -#: gitk:2527 +#: gitk:3058 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tBajar una página en la lista de revisiones" -#: gitk:2528 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones" -#: gitk:2529 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones" -#: gitk:2530 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones" -#: gitk:2531 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones" -#: gitk:2532 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones" -#: gitk:2533 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones" -#: gitk:2534 +#: gitk:3065 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)" -#: gitk:2535 +#: gitk:3066 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)" -#: gitk:2536 +#: gitk:3067 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:2537 +#: gitk:3068 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:2538 +#: gitk:3069 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias" -#: gitk:2539 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias" -#: gitk:2540 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias" -#: gitk:2541 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tBuscar" -#: gitk:2542 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tBuscar el siguiente" -#: gitk:2543 +#: gitk:3074 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tBuscar el siguiente" -#: gitk:2544 -msgid "/\t\tMove to next find hit, or redo find" -msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "<End>\t\tIr a la última revisión" + +#: gitk:3076 +msgid "/\t\tFocus the search box" +msgstr "" -#: gitk:2545 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tBuscar el anterior" -#: gitk:2546 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:2547 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias" -#: gitk:2548 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias" -#: gitk:2549 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamaño del texto" -#: gitk:2550 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamaño del texto" -#: gitk:2551 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminuir tamaño del texto" -#: gitk:2552 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDisminuir tamaño del texto" -#: gitk:2553 +#: gitk:3085 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tActualizar" -#: gitk:3200 +#: gitk:3550 gitk:3559 +#, fuzzy, tcl-format +msgid "Error creating temporary directory %s:" +msgstr "Error en la creación del parche:" + +#: gitk:3572 +#, fuzzy, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Error al leer las diferencias de fusión:" + +#: gitk:3635 +#, fuzzy +msgid "command failed:" +msgstr "Línea de comandos" + +#: gitk:3784 +#, fuzzy +msgid "No such commit" +msgstr "No se han guardado cambios" + +#: gitk:3798 +msgid "git gui blame: command failed:" +msgstr "" + +#: gitk:3829 +#, tcl-format +msgid "Couldn't read merge head: %s" +msgstr "" + +#: gitk:3837 +#, fuzzy, tcl-format +msgid "Error reading index: %s" +msgstr "Error al crear la etiqueta:" + +#: gitk:3862 +#, tcl-format +msgid "Couldn't start git blame: %s" +msgstr "" + +#: gitk:3865 gitk:6754 +msgid "Searching" +msgstr "Buscando" + +#: gitk:3897 +#, fuzzy, tcl-format +msgid "Error running git blame: %s" +msgstr "Error al crear la etiqueta:" + +#: gitk:3925 +#, tcl-format +msgid "That line comes from commit %s, which is not in this view" +msgstr "" + +#: gitk:3939 +#, fuzzy +msgid "External diff viewer failed:" +msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" + +#: gitk:4070 msgid "Gitk view definition" msgstr "Definición de vistas de Gitk" -#: gitk:3225 -msgid "Name" -msgstr "Nombre" - -#: gitk:3228 +#: gitk:4074 msgid "Remember this view" msgstr "Recordar esta vista" -#: gitk:3232 -msgid "Commits to include (arguments to git log):" +#: gitk:4075 +msgid "References (space separated list):" +msgstr "" + +#: gitk:4076 +msgid "Branches & tags:" +msgstr "" + +#: gitk:4077 +#, fuzzy +msgid "All refs" +msgstr "Todos los archivos" + +#: gitk:4078 +msgid "All (local) branches" +msgstr "" + +#: gitk:4079 +msgid "All tags" +msgstr "" + +#: gitk:4080 +msgid "All remote-tracking branches" +msgstr "" + +#: gitk:4081 +msgid "Commit Info (regular expressions):" +msgstr "" + +#: gitk:4082 +#, fuzzy +msgid "Author:" +msgstr "Autor" + +#: gitk:4083 +#, fuzzy +msgid "Committer:" +msgstr "revisión" + +#: gitk:4084 +msgid "Commit Message:" +msgstr "" + +#: gitk:4085 +msgid "Matches all Commit Info criteria" +msgstr "" + +#: gitk:4086 +msgid "Matches no Commit Info criteria" +msgstr "" + +#: gitk:4087 +msgid "Changes to Files:" +msgstr "" + +#: gitk:4088 +msgid "Fixed String" +msgstr "" + +#: gitk:4089 +msgid "Regular Expression" +msgstr "" + +#: gitk:4090 +#, fuzzy +msgid "Search string:" +msgstr "Buscando" + +#: gitk:4091 +msgid "" +"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " +"15:27:38\"):" +msgstr "" + +#: gitk:4092 +msgid "Since:" +msgstr "" + +#: gitk:4093 +msgid "Until:" +msgstr "" + +#: gitk:4094 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "" + +#: gitk:4095 +msgid "Number to show:" +msgstr "" + +#: gitk:4096 +msgid "Number to skip:" +msgstr "" + +#: gitk:4097 +msgid "Miscellaneous options:" +msgstr "" + +#: gitk:4098 +msgid "Strictly sort by date" +msgstr "" + +#: gitk:4099 +msgid "Mark branch sides" +msgstr "" + +#: gitk:4100 +#, fuzzy +msgid "Limit to first parent" +msgstr "Limitar las diferencias a las rutas seleccionadas" + +#: gitk:4101 +msgid "Simple history" +msgstr "" + +#: gitk:4102 +#, fuzzy +msgid "Additional arguments to git log:" msgstr "Revisiones a incluir (argumentos a git log):" -#: gitk:3239 +#: gitk:4103 +msgid "Enter files and directories to include, one per line:" +msgstr "Introducir archivos y directorios a incluir, uno por línea:" + +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando que genera más revisiones a incluir:" -#: gitk:3246 -msgid "Enter files and directories to include, one per line:" -msgstr "Introducir archivos y directorios a incluir, uno por línea:" +#: gitk:4228 +msgid "Gitk: edit view" +msgstr "" -#: gitk:3293 +#: gitk:4236 +msgid "-- criteria for selecting revisions" +msgstr "" + +#: gitk:4241 +#, fuzzy +msgid "View Name" +msgstr "Vista" + +#: gitk:4316 +msgid "Apply (F5)" +msgstr "" + +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Error en los argumentos de selección de las revisiones:" -#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Ninguno" -#: gitk:3790 gitk:5580 gitk:7287 gitk:7302 -msgid "Date" -msgstr "Fecha" - -#: gitk:3790 gitk:5580 -msgid "CDate" -msgstr "Fecha de creación" - -#: gitk:3939 gitk:3944 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendiente" -#: gitk:3940 +#: gitk:5022 msgid "Not descendant" msgstr "No descendiente" -#: gitk:3947 gitk:3952 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Antepasado" -#: gitk:3948 +#: gitk:5030 msgid "Not ancestor" msgstr "No antepasado" -#: gitk:4187 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Cambios locales añadidos al índice pero sin completar revisión" -#: gitk:4220 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Cambios locales sin añadir al índice" -#: gitk:5549 -msgid "Searching" -msgstr "Buscando" +#: gitk:7134 +msgid "and many more" +msgstr "" -#: gitk:6049 +#: gitk:7137 +msgid "many" +msgstr "" + +#: gitk:7328 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:6066 gitk:6072 gitk:7280 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Padre" -#: gitk:6077 +#: gitk:7356 msgid "Child" msgstr "Hija" -#: gitk:6086 +#: gitk:7365 msgid "Branch" msgstr "Rama" -#: gitk:6089 +#: gitk:7368 msgid "Follows" msgstr "Sigue-a" -#: gitk:6092 +#: gitk:7371 msgid "Precedes" msgstr "Precede-a" -#: gitk:6378 -msgid "Error getting merge diffs:" +#: gitk:7966 +#, fuzzy, tcl-format +msgid "Error getting diffs: %s" msgstr "Error al leer las diferencias de fusión:" -#: gitk:7113 +#: gitk:8650 msgid "Goto:" msgstr "Ir a:" -#: gitk:7115 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7134 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La id SHA1 abreviada %s es ambigua" -#: gitk:7146 +#: gitk:8678 +#, fuzzy, tcl-format +msgid "Revision %s is not known" +msgstr "La id SHA1 %s es desconocida" + +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:7148 +#: gitk:8690 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "La etiqueta/rama %s es deconocida" +msgid "Revision %s is not in the current view" +msgstr "" -#: gitk:7290 +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Fecha" + +#: gitk:8835 msgid "Children" msgstr "Hijas" -#: gitk:7347 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Poner la rama %s en esta revisión" -#: gitk:7349 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "" -#: gitk:7381 +#: gitk:9005 gitk:9011 +msgid "Skipping merge commit " +msgstr "" + +#: gitk:9020 gitk:9025 +#, fuzzy +msgid "Error getting patch ID for " +msgstr "Error en la creación del parche:" + +#: gitk:9021 gitk:9026 +msgid " - stopping\n" +msgstr "" + +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +#, fuzzy +msgid "Commit " +msgstr "revisión" + +#: gitk:9035 +msgid "" +" is the same patch as\n" +" " +msgstr "" + +#: gitk:9043 +msgid "" +" differs from\n" +" " +msgstr "" + +#: gitk:9045 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "" + +#: gitk:9057 gitk:9066 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr "" + +#: gitk:9085 +#, fuzzy, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Error al escribir revisión:" + +#: gitk:9091 +#, fuzzy, tcl-format +msgid "Error diffing commits: %s" +msgstr "Error al escribir revisión:" + +#: gitk:9137 msgid "Top" msgstr "Origen" -#: gitk:7382 +#: gitk:9138 msgid "From" msgstr "De" -#: gitk:7387 +#: gitk:9143 msgid "To" msgstr "A" -#: gitk:7410 +#: gitk:9167 msgid "Generate patch" msgstr "Generar parche" -#: gitk:7412 +#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:7421 +#: gitk:9178 msgid "To:" msgstr "Para:" -#: gitk:7430 +#: gitk:9187 msgid "Reverse" msgstr "Invertir" -#: gitk:7432 gitk:7607 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Escribir a archivo:" -#: gitk:7438 +#: gitk:9195 msgid "Generate" msgstr "Generar" -#: gitk:7474 +#: gitk:9233 msgid "Error creating patch:" msgstr "Error en la creación del parche:" -#: gitk:7496 gitk:7595 gitk:7649 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:7505 +#: gitk:9265 msgid "Tag name:" msgstr "Nombre de etiqueta:" -#: gitk:7509 gitk:7659 +#: gitk:9268 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9270 +#, fuzzy +msgid "Tag message:" +msgstr "Nombre de etiqueta:" + +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crear" -#: gitk:7524 +#: gitk:9292 msgid "No tag name specified" msgstr "No se ha especificado etiqueta" -#: gitk:7528 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:7534 +#: gitk:9306 msgid "Error creating tag:" msgstr "Error al crear la etiqueta:" -#: gitk:7604 +#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:7612 +#: gitk:9390 msgid "Write" msgstr "Escribir" -#: gitk:7628 +#: gitk:9408 msgid "Error writing commit:" msgstr "Error al escribir revisión:" -#: gitk:7654 +#: gitk:9435 msgid "Name:" msgstr "Nombre:" -#: gitk:7674 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Especifique un nombre para la nueva rama" -#: gitk:7703 +#: gitk:9463 +#, fuzzy, tcl-format +msgid "Branch '%s' already exists. Overwrite?" +msgstr "La etiqueta \"%s\" ya existe" + +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:7708 +#: gitk:9535 msgid "Cherry-picking" msgstr "Eligiendo revisiones (cherry-picking)" -#: gitk:7720 +#: 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 "" + +#: gitk:9550 +msgid "" +"Cherry-pick failed because of merge conflict.\n" +"Do you wish to run git citool to resolve it?" +msgstr "" + +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "No se han guardado cambios" -#: gitk:7745 +#: gitk:9593 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" + +#: gitk:9598 +#, fuzzy +msgid "Reverting" +msgstr "Reponiendo" + +#: 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 "" + +#: gitk:9610 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" + +#: gitk:9653 msgid "Confirm reset" msgstr "Confirmar git reset" -#: gitk:7747 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "¿Reponer la rama %s a %s?" -#: gitk:7751 +#: gitk:9657 msgid "Reset type:" msgstr "Tipo de reposición:" -#: gitk:7755 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Suave: No altera la copia de trabajo ni el índice" -#: gitk:7758 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo" -#: gitk:7761 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -719,19 +1116,19 @@ msgstr "" "Dura: Actualiza el índice y la copia de trabajo\n" "(abandona TODAS las modificaciones locales)" -#: gitk:7777 +#: gitk:9683 msgid "Resetting" msgstr "Reponiendo" -#: gitk:7834 +#: gitk:9743 msgid "Checking out" msgstr "Creando copia de trabajo" -#: gitk:7885 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "No se puede borrar la rama actual" -#: gitk:7891 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -740,16 +1137,16 @@ msgstr "" "Las revisiones de la rama %s no están presentes en otras ramas.\n" "¿Borrar la rama %s?" -#: gitk:7922 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetas y ramas: %s" -#: gitk:7936 +#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:8230 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -757,129 +1154,211 @@ msgstr "" "Error al leer la topología de revisiones: la información sobre las ramas y " "etiquetas precedentes y siguientes será incompleta." -#: gitk:9216 +#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:9216 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:9262 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Selector de tipografías gitk" -#: gitk:9279 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:9282 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:9375 -msgid "Gitk preferences" -msgstr "Preferencias de gitk" - -#: gitk:9376 +#: gitk:11348 msgid "Commit list display options" msgstr "Opciones de visualización de la lista de revisiones" -#: gitk:9379 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Ancho máximo del gráfico (en líneas)" -#: gitk:9383 -#, tcl-format +#: gitk:11355 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Ancho máximo del gráfico (en % del panel)" -#: gitk:9388 +#: gitk:11358 msgid "Show local changes" msgstr "Mostrar cambios locales" -#: gitk:9393 -msgid "Auto-select SHA1" +#: gitk:11361 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Seleccionar automáticamente SHA1 hash" -#: gitk:9398 +#: gitk:11365 +msgid "Hide remote refs" +msgstr "" + +#: gitk:11369 msgid "Diff display options" msgstr "Opciones de visualización de diferencias" -#: gitk:9400 +#: gitk:11371 msgid "Tab spacing" msgstr "Espaciado de tabulador" -#: gitk:9404 -msgid "Display nearby tags" +#: gitk:11374 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Mostrar etiquetas cercanas" -#: gitk:9409 +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:9414 +#: gitk:11383 msgid "Support per-file encodings" msgstr "" -#: gitk:9421 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "" -#: gitk:9423 +#: gitk:11390 msgid "Choose..." msgstr "" -#: gitk:9428 +#: gitk:11395 +#, fuzzy +msgid "General options" +msgstr "Generar parche" + +#: gitk:11398 +msgid "Use themed widgets" +msgstr "" + +#: gitk:11400 +msgid "(change requires restart)" +msgstr "" + +#: gitk:11402 +msgid "(currently unavailable)" +msgstr "" + +#: gitk:11413 msgid "Colors: press to choose" msgstr "Colores: pulse para seleccionar" -#: gitk:9431 +#: gitk:11416 +msgid "Interface" +msgstr "" + +#: gitk:11417 +#, fuzzy +msgid "interface" +msgstr "Tipografía para interfaz de usuario" + +#: gitk:11420 msgid "Background" msgstr "Fondo" -#: gitk:9435 +#: gitk:11421 gitk:11451 +#, fuzzy +msgid "background" +msgstr "Fondo" + +#: gitk:11424 msgid "Foreground" msgstr "Primer plano" -#: gitk:9439 +#: gitk:11425 +#, fuzzy +msgid "foreground" +msgstr "Primer plano" + +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: líneas viejas" -#: gitk:9444 +#: gitk:11429 +#, fuzzy +msgid "diff old lines" +msgstr "Diff: líneas viejas" + +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: líneas nuevas" -#: gitk:9449 +#: gitk:11434 +#, fuzzy +msgid "diff new lines" +msgstr "Diff: líneas nuevas" + +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:9455 +#: gitk:11440 +#, fuzzy +msgid "diff hunk header" +msgstr "Diff: cabecera de fragmento" + +#: gitk:11444 +msgid "Marked line bg" +msgstr "" + +#: gitk:11446 +msgid "marked line background" +msgstr "" + +#: gitk:11450 msgid "Select bg" msgstr "Color de fondo de la selección" -#: gitk:9459 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Tipografías: pulse para elegir" -#: gitk:9461 +#: gitk:11461 msgid "Main font" msgstr "Tipografía principal" -#: gitk:9462 +#: gitk:11462 msgid "Diff display font" msgstr "Tipografía para diferencias" -#: gitk:9463 +#: gitk:11463 msgid "User interface font" msgstr "Tipografía para interfaz de usuario" -#: gitk:9488 +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Preferencias de gitk" + +#: gitk:11494 +#, fuzzy +msgid "General" +msgstr "Generar" + +#: gitk:11495 +msgid "Colors" +msgstr "" + +#: gitk:11496 +msgid "Fonts" +msgstr "" + +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: elegir color para %s" -#: gitk:9934 +#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -887,25 +1366,40 @@ msgstr "" "Esta versión de Tcl/Tk es demasiado antigua.\n" " Gitk requiere Tcl/Tk versión 8.4 o superior." -#: gitk:10047 +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "No hay un repositorio git aquí." -#: gitk:10051 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "No hay directorio git \"%s\"." - -#: gitk:10098 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo" -#: gitk:10110 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Argumentos incorrectos a Gitk:" -#: gitk:10170 -msgid "Command line" -msgstr "Línea de comandos" +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "<<" + +#~ msgid "prev" +#~ msgstr ">>" + +#~ msgid "/\t\tMove to next find hit, or redo find" +#~ msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda" + +#~ msgid "Name" +#~ msgstr "Nombre" + +#~ msgid "CDate" +#~ msgstr "Fecha de creación" + +#~ msgid "Tag/Head %s is not known" +#~ msgstr "La etiqueta/rama %s es deconocida" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "No hay directorio git \"%s\"." diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po index 5370ddc393..c44f994fa5 100644 --- a/gitk-git/po/fr.po +++ b/gitk-git/po/fr.po @@ -3,642 +3,705 @@ # This file is distributed under the same license as the gitk package. # Translators: # Emmanuel Trillaud <etrillaud@gmail.com> -# +# Jean-Noël Avila <jn.avila@free.fr> msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-10-05 15:16+0200\n" -"PO-Revision-Date: 2009-11-19 22:13+0100\n" -"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n" +"POT-Creation-Date: 2016-01-22 22:04+0100\n" +"PO-Revision-Date: 2016-01-22 23:28+0100\n" +"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n" "Language-Team: git@vger.kernel.org\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" -#: gitk:269 +#: gitk:212 gitk: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:324 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erreur à l'exécution de la commande --argscmd :" -#: gitk:337 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont " "fusionnés." # FIXME : améliorer la traduction de 'file limite' -#: gitk:340 -#, fuzzy +#: 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." +msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers." -#: gitk:362 gitk:509 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erreur à l'exécution de git log :" -#: gitk:380 gitk:525 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lecture en cours" -#: gitk:440 gitk:4123 +#: gitk:496 gitk:4544 msgid "Reading commits..." msgstr "Lecture des commits..." -#: gitk:443 gitk:1561 gitk:4126 +#: gitk:499 gitk:1637 gitk:4547 msgid "No commits selected" msgstr "Aucun commit sélectionné" -#: gitk:1437 +#: 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:1657 +#: gitk:1740 msgid "No commit information available" msgstr "Aucune information disponible sur le commit" -#: gitk:1793 gitk:1817 gitk:3916 gitk:8786 gitk:10322 gitk:10498 +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 msgid "OK" msgstr "OK" -#: gitk:1819 gitk:3918 gitk:8383 gitk:8457 gitk:8567 gitk:8616 gitk:8788 -#: gitk:10323 gitk:10499 +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 +#: gitk:11275 gitk:11555 msgid "Cancel" msgstr "Annuler" -#: gitk:1919 -msgid "Update" +#: gitk:2083 +msgid "&Update" msgstr "Mise à jour" -#: gitk:1920 -msgid "Reload" -msgstr "Recharger" +#: gitk:2084 +msgid "&Reload" +msgstr "&Recharger" -#: gitk:1921 -msgid "Reread references" -msgstr "Relire les références" +#: gitk:2085 +msgid "Reread re&ferences" +msgstr "Relire les ré&férences" -#: gitk:1922 -msgid "List references" -msgstr "Lister les références" +#: gitk:2086 +msgid "&List references" +msgstr "&Lister les références" -#: gitk:1924 -msgid "Start git gui" -msgstr "Démarrer git gui" +#: gitk:2088 +msgid "Start git &gui" +msgstr "Démarrer git &gui" -#: gitk:1926 -msgid "Quit" -msgstr "Quitter" +#: gitk:2090 +msgid "&Quit" +msgstr "&Quitter" -#: gitk:1918 -msgid "File" -msgstr "Fichier" +#: gitk:2082 +msgid "&File" +msgstr "&Fichier" -#: gitk:1930 -msgid "Preferences" +#: gitk:2094 +msgid "&Preferences" msgstr "Préférences" -#: gitk:1929 -msgid "Edit" -msgstr "Éditer" +#: gitk:2093 +msgid "&Edit" +msgstr "&Éditer" -#: gitk:1934 -msgid "New view..." -msgstr "Nouvelle vue..." +#: gitk:2098 +msgid "&New view..." +msgstr "&Nouvelle vue..." -#: gitk:1935 -msgid "Edit view..." -msgstr "Éditer la vue..." +#: gitk:2099 +msgid "&Edit view..." +msgstr "&Éditer la vue..." -#: gitk:1936 -msgid "Delete view" +#: gitk:2100 +msgid "&Delete view" msgstr "Supprimer la vue" -#: gitk:1938 -msgid "All files" +#: gitk:2102 +msgid "&All files" msgstr "Tous les fichiers" -#: gitk:1933 gitk:3670 -msgid "View" -msgstr "Vue" +#: gitk:2097 +msgid "&View" +msgstr "&Vue" -#: gitk:1943 gitk:1953 gitk:2654 -msgid "About gitk" +#: gitk:2107 gitk:2117 +msgid "&About gitk" msgstr "À propos de gitk" -#: gitk:1944 gitk:1958 -msgid "Key bindings" +#: gitk:2108 gitk:2122 +msgid "&Key bindings" msgstr "Raccourcis clavier" -#: gitk:1942 gitk:1957 -msgid "Help" +#: gitk:2106 gitk:2121 +msgid "&Help" msgstr "Aide" -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "ID SHA1 :" +#: gitk:2199 gitk:8671 +msgid "SHA1 ID:" +msgstr "Id SHA1 :" -#: gitk:2049 +#: gitk:2243 msgid "Row" msgstr "Colonne" -#: gitk:2080 +#: gitk:2281 msgid "Find" msgstr "Recherche" -#: gitk:2081 -msgid "next" -msgstr "suivant" - -#: gitk:2082 -msgid "prev" -msgstr "précédent" - -#: gitk:2083 +#: gitk:2309 msgid "commit" msgstr "commit" -#: gitk:2086 gitk:2088 gitk:4284 gitk:4307 gitk:4331 gitk:6272 gitk:6344 -#: gitk:6428 +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 +#: gitk:6931 msgid "containing:" msgstr "contient :" -#: gitk:2089 gitk:3162 gitk:3167 gitk:4359 +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 msgid "touching paths:" msgstr "chemins modifiés :" -#: gitk:2090 gitk:4364 +#: gitk:2317 gitk:4796 msgid "adding/removing string:" msgstr "ajoute/supprime la chaîne :" -#: gitk:2099 gitk:2101 +#: 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:2101 gitk:4439 gitk:6240 +#: gitk:2329 gitk:4873 gitk:6742 msgid "IgnCase" msgstr "Ignorer la casse" -#: gitk:2101 gitk:4333 gitk:4437 gitk:6236 +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 msgid "Regexp" msgstr "Expression régulière" -#: gitk:2103 gitk:2104 gitk:4458 gitk:4488 gitk:4495 gitk:6364 gitk:6432 +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 msgid "All fields" msgstr "Tous les champs" -#: gitk:2104 gitk:4456 gitk:4488 gitk:6303 +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 msgid "Headline" -msgstr "Surligner" +msgstr "Titre" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6432 gitk:6866 +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 msgid "Comments" msgstr "Commentaires" -#: gitk:2105 gitk:4456 gitk:4460 gitk:4495 gitk:6303 gitk:6801 gitk:8063 -#: gitk:8078 +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 +#: gitk:8864 msgid "Author" msgstr "Auteur" -#: gitk:2105 gitk:4456 gitk:6303 gitk:6803 +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 msgid "Committer" -msgstr "Auteur du commit" +msgstr "Validateur" -#: gitk:2134 +#: gitk:2367 msgid "Search" msgstr "Rechercher" -#: gitk:2141 +#: gitk:2375 msgid "Diff" msgstr "Diff" -#: gitk:2143 +#: gitk:2377 msgid "Old version" msgstr "Ancienne version" -#: gitk:2145 +#: gitk:2379 msgid "New version" msgstr "Nouvelle version" -#: gitk:2147 +#: gitk:2382 msgid "Lines of context" msgstr "Lignes de contexte" -#: gitk:2157 +#: gitk:2392 msgid "Ignore space change" msgstr "Ignorer les modifications d'espace" -#: gitk:2215 +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 +msgid "Line diff" +msgstr "différence par ligne" + +#: gitk:2463 msgid "Patch" msgstr "Patch" -#: gitk:2217 +#: gitk:2465 msgid "Tree" msgstr "Arbre" -#: gitk:2361 gitk:2378 +#: gitk:2635 gitk:2656 msgid "Diff this -> selected" -msgstr "Diff entre ceci et la sélection" +msgstr "Diff ceci -> la sélection" -#: gitk:2362 gitk:2379 +#: gitk:2636 gitk:2657 msgid "Diff selected -> this" -msgstr "Diff entre sélection et ceci" +msgstr "Diff sélection -> ceci" -#: gitk:2363 gitk:2380 +#: gitk:2637 gitk:2658 msgid "Make patch" msgstr "Créer patch" -#: gitk:2364 gitk:8441 +#: gitk:2638 gitk:9273 msgid "Create tag" -msgstr "Créer tag" +msgstr "Créer étiquette" + +#: gitk:2639 +msgid "Copy commit summary" +msgstr "Copié le résumé du commit" -#: gitk:2365 gitk:8547 +#: gitk:2640 gitk:9404 msgid "Write commit to file" msgstr "Écrire le commit dans un fichier" -#: gitk:2366 gitk:8604 +#: gitk:2641 gitk:9461 msgid "Create new branch" msgstr "Créer une nouvelle branche" -#: gitk:2367 +#: gitk:2642 msgid "Cherry-pick this commit" msgstr "Cueillir (cherry-pick) ce commit" -#: gitk:2368 +#: gitk:2643 msgid "Reset HEAD branch to here" msgstr "Réinitialiser la branche HEAD vers cet état" -#: gitk:2369 +#: gitk:2644 msgid "Mark this commit" msgstr "Marquer ce commit" -#: gitk:2370 +#: gitk:2645 msgid "Return to mark" msgstr "Retourner à la marque" -#: gitk:2371 +#: gitk:2646 msgid "Find descendant of this and mark" msgstr "Chercher le descendant de ceci et le marquer" -#: gitk:2372 +#: gitk:2647 msgid "Compare with marked commit" msgstr "Comparer avec le commit marqué" -#: gitk:2386 +#: 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:2387 +#: gitk:2667 msgid "Remove this branch" msgstr "Supprimer cette branche" -#: gitk:2394 +#: gitk:2668 +msgid "Copy branch name" +msgstr "Copier la nom de la branche" + +#: gitk:2675 msgid "Highlight this too" msgstr "Surligner également ceci" -#: gitk:2395 +#: gitk:2676 msgid "Highlight this only" msgstr "Surligner seulement ceci" -#: gitk:2396 +#: gitk:2677 msgid "External diff" msgstr "Diff externe" -#: gitk:2397 +#: gitk:2678 msgid "Blame parent commit" msgstr "Blâmer le commit parent" -#: gitk:2404 +#: 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:2405 +#: gitk:2687 msgid "Run git gui blame on this line" msgstr "Exécuter git gui blame sur cette ligne" -#: gitk:2656 +#: gitk:3031 +msgid "About gitk" +msgstr "À propos de gitk" + +#: gitk:3033 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - visualisateur de commit pour git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright \\u00a9 2005-2014 Paul Mackerras\n" "\n" -"Utilisation et redistribution soumises aux termes de la GNU General Public " -"License" +"Utilisation et redistribution soumises aux termes de la GNU General Public License" -#: gitk:2664 gitk:2726 gitk:8969 +#: gitk:3041 gitk:3108 gitk:9890 msgid "Close" msgstr "Fermer" -#: gitk:2683 +#: gitk:3062 msgid "Gitk key bindings" msgstr "Raccourcis clavier de Gitk" -#: gitk:2686 +#: gitk:3065 msgid "Gitk key bindings:" msgstr "Raccourcis clavier de Gitk :" -#: gitk:2688 +#: gitk:3067 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tQuitter" -#: gitk:2689 +#: gitk:3068 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tFermer la fenêtre" + +#: gitk:3069 msgid "<Home>\t\tMove to first commit" msgstr "<Début>\t\tAller au premier commit" -#: gitk:2690 +#: gitk:3070 msgid "<End>\t\tMove to last commit" msgstr "<Fin>\t\tAller au dernier commit" -#: gitk:2691 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Haut>, p, i\t Aller au commit suivant" +#: gitk:3071 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Haut>, p, k\t Aller au commit précédent" -#: gitk:2692 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Bas>, n, k\t Aller au commit précédent" +#: gitk:3072 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Bas>, n, j\t Aller au commit suivant" -#: gitk:2693 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Gauche>, z, j\tReculer dans l'historique" +#: gitk:3073 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Gauche>, z, h\tReculer dans l'historique" -#: gitk:2694 +#: gitk:3074 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Droite>, x, l\tAvancer dans l'historique" -#: gitk:2695 +#: 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 "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tMonter d'une page dans la liste des commits" -#: gitk:2696 +#: gitk:3077 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tDescendre d'une page dans la liste des commits" -#: gitk:2697 +#: 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:2698 +#: 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:2699 +#: 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:2700 +#: 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:2701 +#: 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:2702 +#: 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:2703 +#: gitk:3084 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "" "<Shift-Up>\tRecherche en arrière (vers l'avant, commits les plus anciens)" -#: gitk:2704 +#: gitk:3085 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "" "<Shift-Down>\tRecherche en avant (vers l'arrière, commit les plus récents)" -#: gitk:2705 +#: gitk:3086 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff" -#: gitk:2706 +#: gitk:3087 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tMonter d'une page dans la vue des diff" -#: gitk:2707 +#: gitk:3088 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff" -#: gitk:2708 +#: gitk:3089 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tMonter de 18 lignes dans la vue des diff" -#: gitk:2709 +#: gitk:3090 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" -#: gitk:2710 +#: gitk:3091 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tRechercher" -#: gitk:2711 +#: 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:2712 +#: gitk:3093 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tAller au résultat de recherche suivant" -#: gitk:2713 +#: 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:2714 +#: gitk:3096 msgid "?\t\tMove to previous find hit" msgstr "?\t\tAller au résultat de recherche précédent" -#: gitk:2715 +#: gitk:3097 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tAller au prochain fichier dans la vue des diff" -#: gitk:2716 +#: 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:2717 +#: 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:2718 +#: gitk:3100 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenter la taille de la police" -#: gitk:2719 +#: gitk:3101 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAugmenter la taille de la police" -#: gitk:2720 +#: gitk:3102 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuer la taille de la police" -#: gitk:2721 +#: gitk:3103 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDiminuer la taille de la police" -#: gitk:2722 +#: gitk:3104 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tMise à jour" -#: gitk:3177 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Erreur en obtenant \"%s\" de %s:" - -#: gitk:3234 gitk:3243 +#: gitk:3569 gitk:3578 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erreur lors de la création du répertoire temporaire %s :" -#: gitk:3255 +#: 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:3401 +#: gitk:3803 msgid "No such commit" msgstr "Commit inexistant" -#: gitk:3415 +#: gitk:3817 msgid "git gui blame: command failed:" msgstr "git gui blame : échec de la commande :" -#: gitk:3446 +#: gitk:3848 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossible de lire le head de la fusion : %s" -#: gitk:3454 +#: gitk:3856 #, tcl-format msgid "Error reading index: %s" msgstr "Erreur à la lecture de l'index : %s" -#: gitk:3479 +#: gitk:3881 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossible de démarrer git blame : %s" -#: gitk:3482 gitk:6271 +#: gitk:3884 gitk:6773 msgid "Searching" msgstr "Recherche en cours" -#: gitk:3514 +#: gitk:3916 #, tcl-format msgid "Error running git blame: %s" msgstr "Erreur à l'exécution de git blame : %s" -#: gitk:3542 +#: 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:3556 +#: gitk:3958 msgid "External diff viewer failed:" -msgstr "Échec de l'outil externe de visualisation des diff" +msgstr "Échec de l'outil externe de visualisation des diff :" + +#: gitk:4062 +msgid "All files" +msgstr "Tous les fichiers" + +#: gitk:4086 +msgid "View" +msgstr "Vue" -#: gitk:3674 +#: gitk:4089 msgid "Gitk view definition" msgstr "Définition des vues de Gitk" -#: gitk:3678 +#: gitk:4093 msgid "Remember this view" msgstr "Se souvenir de cette vue" -#: gitk:3679 +#: gitk:4094 msgid "References (space separated list):" msgstr "Références (liste d'éléments séparés par des espaces) :" -#: gitk:3680 +#: gitk:4095 msgid "Branches & tags:" -msgstr "Branches & tags :" +msgstr "Branches & étiquettes :" -#: gitk:3681 +#: gitk:4096 msgid "All refs" msgstr "Toutes les références" -#: gitk:3682 +#: gitk:4097 msgid "All (local) branches" msgstr "Toutes les branches (locales)" -#: gitk:3683 +#: gitk:4098 msgid "All tags" -msgstr "Tous les tags" +msgstr "Toutes les étiquettes" -#: gitk:3684 +#: gitk:4099 msgid "All remote-tracking branches" msgstr "Toutes les branches de suivi à distance" -#: gitk:3685 +#: gitk:4100 msgid "Commit Info (regular expressions):" msgstr "Info sur les commits (expressions régulières) :" -#: gitk:3686 +#: gitk:4101 msgid "Author:" msgstr "Auteur :" -#: gitk:3687 +#: gitk:4102 msgid "Committer:" -msgstr "Commiteur :" +msgstr "Validateur :" -#: gitk:3688 +#: gitk:4103 msgid "Commit Message:" msgstr "Message de commit :" -#: gitk:3689 +#: gitk:4104 msgid "Matches all Commit Info criteria" msgstr "Correspond à tous les critères d'Info sur les commits" -#: gitk:3690 +#: 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:3691 +#: gitk:4107 msgid "Fixed String" msgstr "Chaîne Figée" -#: gitk:3692 +#: gitk:4108 msgid "Regular Expression" msgstr "Expression Régulière" -#: gitk:3693 +#: gitk:4109 msgid "Search string:" msgstr "Recherche de la chaîne :" -#: gitk:3694 +#: gitk:4110 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -646,207 +709,201 @@ msgstr "" "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\") :" -#: gitk:3695 +#: gitk:4111 msgid "Since:" -msgstr "De :" +msgstr "Depuis :" -#: gitk:3696 +#: gitk:4112 msgid "Until:" msgstr "Jusqu'au :" -#: gitk:3697 +#: 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:3698 +#: gitk:4114 msgid "Number to show:" msgstr "Nombre à afficher :" -#: gitk:3699 +#: gitk:4115 msgid "Number to skip:" msgstr "Nombre à sauter :" -#: gitk:3700 +#: gitk:4116 msgid "Miscellaneous options:" msgstr "Options diverses :" -#: gitk:3701 +#: gitk:4117 msgid "Strictly sort by date" msgstr "Trier par date" -# FIXME : traduction de "branch sides" -#: gitk:3702 -#, fuzzy +#: gitk:4118 msgid "Mark branch sides" -msgstr "Marquer les extrémités des branches" +msgstr "Indiquer les côtés des branches" -#: gitk:3703 +#: gitk:4119 msgid "Limit to first parent" msgstr "Limiter au premier ancêtre" -#: gitk:3704 +#: gitk:4120 msgid "Simple history" msgstr "Historique simple" -#: gitk:3705 +#: gitk:4121 msgid "Additional arguments to git log:" msgstr "Arguments supplémentaires de git log :" -#: gitk:3706 +#: gitk:4122 msgid "Enter files and directories to include, one per line:" msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" -#: gitk:3707 +#: gitk:4123 msgid "Command to generate more commits to include:" msgstr "Commande pour générer plus de commits à inclure :" -#: gitk:3829 +#: gitk:4247 msgid "Gitk: edit view" msgstr "Gitk : éditer la vue" -#: gitk:3837 +#: gitk:4255 msgid "-- criteria for selecting revisions" msgstr "-- critère pour la sélection des révisions" -#: gitk:3842 -msgid "View Name:" -msgstr "Nom de la vue :" +#: gitk:4260 +msgid "View Name" +msgstr "Nom de la vue" -#: gitk:3917 +#: gitk:4335 msgid "Apply (F5)" msgstr "Appliquer (F5)" -#: gitk:3955 +#: gitk:4373 msgid "Error in commit selection arguments:" msgstr "Erreur dans les arguments de sélection des commits :" -#: gitk:4008 gitk:4060 gitk:4508 gitk:4522 gitk:5783 gitk:11196 gitk:11197 +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 msgid "None" msgstr "Aucun" -#: gitk:4456 gitk:6303 gitk:8065 gitk:8080 -msgid "Date" -msgstr "Date" - -#: gitk:4456 gitk:6303 -msgid "CDate" -msgstr "CDate" - -#: gitk:4605 gitk:4610 +#: gitk:5040 gitk:5045 msgid "Descendant" msgstr "Descendant" -#: gitk:4606 +#: gitk:5041 msgid "Not descendant" msgstr "Pas un descendant" -#: gitk:4613 gitk:4618 +#: gitk:5048 gitk:5053 msgid "Ancestor" msgstr "Ancêtre" -#: gitk:4614 +#: gitk:5049 msgid "Not ancestor" msgstr "Pas un ancêtre" -#: gitk:4904 +#: gitk:5343 msgid "Local changes checked in to index but not committed" -msgstr "Modifications locales enregistrées dans l'index mais non commitées" +msgstr "Modifications locales enregistrées dans l'index mais non validées" -#: gitk:4940 +#: gitk:5379 msgid "Local uncommitted changes, not checked in to index" -msgstr "Modifications locales non enregistrées dans l'index et non commitées" +msgstr "Modifications locales non enregistrées dans l'index et non validées" + +#: gitk:7153 +msgid "and many more" +msgstr "et beaucoup plus" -#: gitk:6621 +#: gitk:7156 msgid "many" msgstr "nombreux" -#: gitk:6805 +#: gitk:7347 msgid "Tags:" -msgstr "Tags :" +msgstr "Étiquettes :" -#: gitk:6822 gitk:6828 gitk:8058 +#: gitk:7364 gitk:7370 gitk:8844 msgid "Parent" msgstr "Parent" -#: gitk:6833 +#: gitk:7375 msgid "Child" msgstr "Enfant" -#: gitk:6842 +#: gitk:7384 msgid "Branch" msgstr "Branche" -#: gitk:6845 +#: gitk:7387 msgid "Follows" msgstr "Suit" -#: gitk:6848 +#: gitk:7390 msgid "Precedes" msgstr "Précède" -#: gitk:7346 +#: gitk:7985 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erreur lors de la récupération des diff : %s" -#: gitk:7886 +#: gitk:8669 msgid "Goto:" msgstr "Aller à :" -#: gitk:7888 -msgid "SHA1 ID:" -msgstr "Id SHA1 :" - -#: gitk:7907 +#: gitk:8690 #, tcl-format msgid "Short SHA1 id %s is ambiguous" -msgstr "Id SHA1 court %s est ambigu" +msgstr "L'id SHA1 court %s est ambigu" -#: gitk:7914 +#: gitk:8697 #, tcl-format msgid "Revision %s is not known" -msgstr "Id SHA1 %s est inconnu" +msgstr "La révision %s est inconnu" -#: gitk:7924 +#: gitk:8707 #, tcl-format msgid "SHA1 id %s is not known" -msgstr "Id SHA1 %s est inconnu" +msgstr "L'id SHA1 %s est inconnu" -#: gitk:7926 +#: 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:8068 +#: gitk:8851 gitk:8866 +msgid "Date" +msgstr "Date" + +#: gitk:8854 msgid "Children" msgstr "Enfants" -#: gitk:8125 +#: gitk:8917 #, tcl-format msgid "Reset %s branch to here" msgstr "Réinitialiser la branche %s vers cet état" -#: gitk:8127 +#: gitk:8919 msgid "Detached head: can't reset" msgstr "Head détaché : impossible de réinitialiser" -#: gitk:8236 gitk:8242 +#: gitk:9024 gitk:9030 msgid "Skipping merge commit " msgstr "Éviter le commit de la fusion " -#: gitk:8251 gitk:8256 +#: gitk:9039 gitk:9044 msgid "Error getting patch ID for " msgstr "Erreur à l'obtention de l'ID du patch pour " -#: gitk:8252 gitk:8257 +#: gitk:9040 gitk:9045 msgid " - stopping\n" msgstr " - arrêt en cours\n" -#: gitk:8262 gitk:8265 gitk:8273 gitk:8283 gitk:8292 +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 msgid "Commit " msgstr "Commit " -#: gitk:8266 +#: gitk:9054 msgid "" " is the same patch as\n" " " @@ -854,7 +911,7 @@ msgstr "" "est le même patch que \n" " " -#: gitk:8274 +#: gitk:9062 msgid "" " differs from\n" " " @@ -862,186 +919,226 @@ msgstr "" " diffère de\n" " " -#: gitk:8276 -msgid "- stopping\n" -msgstr "- arrêt en cours\n" +#: gitk:9064 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "Diff des commits :\n\n" -#: gitk:8284 gitk:8293 +#: gitk:9076 gitk:9085 #, tcl-format msgid " has %s children - stopping\n" -msgstr "a %s enfants - arrêt en cours\n" +msgstr " a %s enfants - arrêt en cours\n" -#: gitk:8324 +#: 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:8325 +#: gitk:9157 msgid "From" msgstr "De" -#: gitk:8330 +#: gitk:9162 msgid "To" msgstr "À" -#: gitk:8354 +#: gitk:9186 msgid "Generate patch" msgstr "Générer le patch" -#: gitk:8356 +#: gitk:9188 msgid "From:" msgstr "De :" -#: gitk:8365 +#: gitk:9197 msgid "To:" msgstr "À :" -#: gitk:8374 +#: gitk:9206 msgid "Reverse" msgstr "Inverser" -#: gitk:8376 gitk:8561 +#: gitk:9208 gitk:9418 msgid "Output file:" msgstr "Fichier de sortie :" -#: gitk:8382 +#: gitk:9214 msgid "Generate" msgstr "Générer" -#: gitk:8420 +#: gitk:9252 msgid "Error creating patch:" msgstr "Erreur à la création du patch :" -#: gitk:8443 gitk:8549 gitk:8606 +#: gitk:9275 gitk:9406 gitk:9463 msgid "ID:" msgstr "ID :" -#: gitk:8452 +#: gitk:9284 msgid "Tag name:" -msgstr "Nom du Tag :" +msgstr "Nom de l'étiquette :" + +#: gitk:9287 +msgid "Tag message is optional" +msgstr "Le message d'étiquette est optionnel" -#: gitk:8456 gitk:8615 +#: gitk:9289 +msgid "Tag message:" +msgstr "Message d'étiquette :" + +#: gitk:9293 gitk:9472 msgid "Create" msgstr "Créer" -#: gitk:8473 +#: gitk:9311 msgid "No tag name specified" -msgstr "Aucun nom de tag spécifié" +msgstr "Aucun nom d'étiquette spécifié" -#: gitk:8477 +#: gitk:9315 #, tcl-format msgid "Tag \"%s\" already exists" -msgstr "Le tag \"%s\" existe déjà" +msgstr "L'étiquette \"%s\" existe déjà" -#: gitk:8483 +#: gitk:9325 msgid "Error creating tag:" -msgstr "Erreur à la création du tag :" +msgstr "Erreur à la création de l'étiquette :" -#: gitk:8558 +#: gitk:9415 msgid "Command:" msgstr "Commande :" -#: gitk:8566 +#: gitk:9423 msgid "Write" msgstr "Écrire" -#: gitk:8584 +#: gitk:9441 msgid "Error writing commit:" msgstr "Erreur à l'ecriture du commit :" -#: gitk:8611 +#: gitk:9468 msgid "Name:" msgstr "Nom :" -#: gitk:8634 +#: gitk:9491 msgid "Please specify a name for the new branch" msgstr "Veuillez spécifier un nom pour la nouvelle branche" -#: gitk:8639 +#: gitk:9496 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branche '%s' existe déjà. Écraser?" -#: gitk:8705 +#: 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:8710 +#: gitk:9568 msgid "Cherry-picking" -msgstr "Cueillir (Cherry-picking)" +msgstr "Picorer (Cherry-picking)" -#: gitk:8719 +#: gitk:9577 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" "Please commit, reset or stash your changes and try again." msgstr "" -"La cueillette (cherry-pick) a échouée à cause de modifications locales du " -"fichier '%s'.\n" -"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " -"nouveau." +"Le picorage (cherry-pick) a échouée à cause de modifications locales du fichier '%s'.\n" +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de nouveau." -#: gitk:8725 +#: gitk:9583 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" msgstr "" -"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une " -"fusion.\n" +"Le picorage (cherry-pick) a échouée à cause d'un conflit lors d'une fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:8741 +#: gitk:9599 gitk:9657 msgid "No changes committed" -msgstr "Aucun changement commité" +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:8767 +#: 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:8769 +#: gitk:9688 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Réinitialiser la branche %s à %s?" -#: gitk:8773 +#: gitk:9690 msgid "Reset type:" msgstr "Type de réinitialisation :" -#: gitk:8777 +#: gitk:9693 msgid "Soft: Leave working tree and index untouched" msgstr "Douce : Laisse le répertoire de travail et l'index intacts" -#: gitk:8780 +#: 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:8783 +#: gitk:9699 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" msgstr "" "Dure : Réinitialise le répertoire de travail et l'index\n" -"(abandonne TOUS les changements locaux)" +"(abandonne TOUTES les modifications locale)" -#: gitk:8800 +#: gitk:9716 msgid "Resetting" msgstr "Réinitialisation" # Fixme: Récupération est-il vraiment une mauvaise traduction? -#: gitk:8857 -#, fuzzy +#: gitk:9776 msgid "Checking out" -msgstr "Récupération" +msgstr "Extraction" -#: gitk:8910 +#: gitk:9829 msgid "Cannot delete the currently checked-out branch" -msgstr "Impossible de supprimer la branche en cours" +msgstr "Impossible de supprimer la branche extraite" -#: gitk:8916 +#: gitk:9835 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1050,16 +1147,16 @@ msgstr "" "Les commits de la branche %s ne sont dans aucune autre branche.\n" "Voulez-vous vraiment supprimer cette branche %s ?" -#: gitk:8947 +#: gitk:9866 #, tcl-format msgid "Tags and heads: %s" -msgstr "Tags et heads : %s" +msgstr "Étiquettes et heads : %s" -#: gitk:8962 +#: gitk:9883 msgid "Filter" msgstr "Filtrer" -#: gitk:9257 +#: gitk:10179 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1068,162 +1165,202 @@ msgstr "" "informations sur les branches et les tags précédents/suivants seront " "incomplètes." -#: gitk:10243 +#: gitk:11156 msgid "Tag" -msgstr "Tag" +msgstr "Étiquette" -#: gitk:10243 +#: gitk:11160 msgid "Id" msgstr "Id" -#: gitk:10291 +#: gitk:11243 msgid "Gitk font chooser" msgstr "Sélecteur de police de Gitk" -#: gitk:10308 +#: gitk:11260 msgid "B" msgstr "B" -#: gitk:10311 +#: gitk:11263 msgid "I" msgstr "I" -#: gitk:10407 -msgid "Gitk preferences" -msgstr "Préférences de Gitk" - -#: gitk:10409 +#: gitk:11381 msgid "Commit list display options" msgstr "Options d'affichage de la liste des commits" -#: gitk:10412 +#: gitk:11384 msgid "Maximum graph width (lines)" msgstr "Longueur maximum du graphe (lignes)" # FIXME : Traduction standard de "pane"? -#: gitk:10416 -#, fuzzy, tcl-format +#: gitk:11388 +#, no-tcl-format msgid "Maximum graph width (% of pane)" -msgstr "Longueur maximum du graphe (% du panneau)" +msgstr "Largeur maximum du graphe (% du panneau)" -#: gitk:10420 +#: gitk:11391 msgid "Show local changes" -msgstr "Montrer les changements locaux" +msgstr "Montrer les modifications locales" -#: gitk:10423 -msgid "Auto-select SHA1" -msgstr "Sélection auto. du SHA1" +#: gitk:11394 +msgid "Auto-select SHA1 (length)" +msgstr "Sélection auto. du SHA1 (longueur)" -#: gitk:10427 +#: gitk:11398 +msgid "Hide remote refs" +msgstr "Cacher les refs distantes" + +#: gitk:11402 msgid "Diff display options" msgstr "Options d'affichage des diff" -#: gitk:10429 +#: gitk:11404 msgid "Tab spacing" msgstr "Taille des tabulations" -#: gitk:10432 -msgid "Display nearby tags" +#: gitk:11407 +msgid "Display nearby tags/heads" msgstr "Afficher les tags les plus proches" -#: gitk:10435 -msgid "Hide remote refs" -msgstr "Cacher les refs distantes" +#: gitk:11410 +msgid "Maximum # tags/heads to show" +msgstr "Nombre maximum d'étiquettes/heads à afficher" -#: gitk:10438 +#: gitk:11413 msgid "Limit diffs to listed paths" msgstr "Limiter les différences aux chemins listés" -#: gitk:10441 +#: gitk:11416 msgid "Support per-file encodings" msgstr "Support pour un encodage des caractères par fichier" -#: gitk:10447 gitk:10512 +#: gitk:11422 gitk:11569 msgid "External diff tool" msgstr "Outil diff externe" -#: gitk:10449 +#: gitk:11423 msgid "Choose..." msgstr "Choisir..." -#: gitk:10454 +#: 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:10457 +#: gitk:11449 +msgid "Interface" +msgstr "Interface" + +#: gitk:11450 +msgid "interface" +msgstr "interface" + +#: gitk:11453 msgid "Background" msgstr "Arrière-plan" -#: gitk:10458 gitk:10488 +#: gitk:11454 gitk:11484 msgid "background" msgstr "arrière-plan" -#: gitk:10461 +#: gitk:11457 msgid "Foreground" msgstr "Premier plan" -#: gitk:10462 +#: gitk:11458 msgid "foreground" msgstr "premier plan" -#: gitk:10465 +#: gitk:11461 msgid "Diff: old lines" msgstr "Diff : anciennes lignes" -#: gitk:10466 +#: gitk:11462 msgid "diff old lines" msgstr "diff anciennes lignes" -#: gitk:10470 +#: gitk:11466 msgid "Diff: new lines" msgstr "Diff : nouvelles lignes" -#: gitk:10471 +#: gitk:11467 msgid "diff new lines" msgstr "diff nouvelles lignes" -#: gitk:10475 +#: gitk:11471 msgid "Diff: hunk header" msgstr "Diff : entête du hunk" -#: gitk:10477 +#: gitk:11473 msgid "diff hunk header" msgstr "diff : entête du hunk" -#: gitk:10481 +#: gitk:11477 msgid "Marked line bg" -msgstr "Arrière-plan de la ligne marquée" +msgstr "Fond de la ligne marquée" -#: gitk:10483 +#: gitk:11479 msgid "marked line background" -msgstr "Arrière-plan de la ligne marquée" +msgstr "Fond de la ligne marquée" -#: gitk:10487 +#: gitk:11483 msgid "Select bg" -msgstr "Sélectionner l'arrière-plan" +msgstr "Sélectionner le fond" -#: gitk:10491 +#: gitk:11492 msgid "Fonts: press to choose" msgstr "Polices : cliquer pour choisir" -#: gitk:10493 +#: gitk:11494 msgid "Main font" msgstr "Police principale" -#: gitk:10494 +#: gitk:11495 msgid "Diff display font" msgstr "Police d'affichage des diff" -#: gitk:10495 +#: gitk:11496 msgid "User interface font" msgstr "Police de l'interface utilisateur" -#: gitk:10522 +#: 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:10973 +#: gitk:12092 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1231,24 +1368,33 @@ msgstr "" "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" " Gitk requiert Tcl/Tk version 8.4 ou supérieur." -#: gitk:11101 +#: gitk:12302 msgid "Cannot find a git repository here." msgstr "Impossible de trouver un dépôt git ici." -#: gitk:11105 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Impossible de trouver le répertoire git \"%s\"." - -#: gitk:11152 +#: gitk: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:11164 +#: gitk:12361 msgid "Bad arguments to gitk:" msgstr "Arguments invalides pour gitk :" -#: gitk:11249 -msgid "Command line" -msgstr "Ligne de commande" +#~ msgid "SHA1 ID: " +#~ msgstr "ID SHA1 :" + +#~ msgid "next" +#~ msgstr "suivant" + +#~ msgid "prev" +#~ msgstr "précédent" + +#~ msgid "CDate" +#~ msgstr "CDate" + +#~ msgid "- stopping\n" +#~ msgstr "- arrêt en cours\n" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Impossible de trouver le répertoire git \"%s\"." diff --git a/gitk-git/po/hu.po b/gitk-git/po/hu.po index 7262b610dc..66fd75ba5b 100644 --- a/gitk-git/po/hu.po +++ b/gitk-git/po/hu.po @@ -8,32 +8,41 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 13:33+0100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-12-14 14:04+0100\n" "Last-Translator: Laszlo Papp <djszapi@archlinux.us>\n" "Language-Team: Hungarian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Nem sikerült letölteni az unmerged fájl listát:" -#: gitk:271 +#: 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 "Hiba történt értelmezés közben:" -#: gitk:326 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Hiba történt a végrehajtáskor --argscmd parancs:" -#: gitk:339 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged." -#: gitk:342 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -41,299 +50,323 @@ msgstr "" "Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a " "fájlon belül limit." -#: gitk:364 gitk:511 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Hiba történt a git log végrehajtása közben:" -#: gitk:382 gitk:527 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Olvasás" -#: gitk:442 gitk:4258 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Commitok olvasása ..." -#: gitk:445 gitk:1575 gitk:4261 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nincsen commit kiválasztva" -#: gitk:1451 +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Parancs sor" + +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Nem lehet értelmezni a git log kimenetét:" -#: gitk:1671 +#: gitk:1740 msgid "No commit information available" msgstr "Nincsen elérhető commit információ" -#: gitk:1813 -msgid "mc" -msgstr "mc" - -#: gitk:1848 gitk:4051 gitk:9029 gitk:10570 gitk:10789 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1850 gitk:4053 gitk:8629 gitk:8703 gitk:8813 gitk:8862 gitk:9031 -#: gitk:10571 gitk:10790 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Visszavonás" -#: gitk:1972 -msgid "Update" +#: gitk:2069 +msgid "&Update" msgstr "Frissités" -#: gitk:1973 -msgid "Reload" +#: gitk:2070 +msgid "&Reload" msgstr "Újratöltés" -#: gitk:1974 -msgid "Reread references" +#: gitk:2071 +msgid "Reread re&ferences" msgstr "Referenciák újraolvasása" -#: gitk:1975 -msgid "List references" +#: gitk:2072 +msgid "&List references" msgstr "Referenciák listázása" -#: gitk:1977 -msgid "Start git gui" +#: gitk:2074 +msgid "Start git &gui" msgstr "Git gui indítása" -#: gitk:1979 -msgid "Quit" +#: gitk:2076 +msgid "&Quit" msgstr "Kilépés" -#: gitk:1971 -msgid "File" +#: gitk:2068 +msgid "&File" msgstr "Fájl" -#: gitk:1983 -msgid "Preferences" +#: gitk:2080 +msgid "&Preferences" msgstr "Beállítások" -#: gitk:1982 -msgid "Edit" +#: gitk:2079 +msgid "&Edit" msgstr "Szerkesztés" -#: gitk:1987 -msgid "New view..." +#: gitk:2084 +msgid "&New view..." msgstr "Új nézet ..." -#: gitk:1988 -msgid "Edit view..." +#: gitk:2085 +msgid "&Edit view..." msgstr "Nézet szerkesztése ..." -#: gitk:1989 -msgid "Delete view" +#: gitk:2086 +msgid "&Delete view" msgstr "Nézet törlése" -#: gitk:1991 -msgid "All files" +#: gitk:2088 gitk:4043 +msgid "&All files" msgstr "Minden fájl" -#: gitk:1986 gitk:3805 -msgid "View" +#: gitk:2083 gitk:4067 +msgid "&View" msgstr "Nézet" -#: gitk:1996 gitk:2006 gitk:2777 -msgid "About gitk" +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" msgstr "Gitk névjegy" -#: gitk:1997 gitk:2011 -msgid "Key bindings" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" msgstr "Billentyűkombináció" -#: gitk:1995 gitk:2010 -msgid "Help" +#: gitk:2092 gitk:2107 +msgid "&Help" msgstr "Segítség" -#: gitk:2088 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2119 +#: gitk:2229 msgid "Row" msgstr "Sor" -#: gitk:2157 +#: gitk:2267 msgid "Find" msgstr "Keresés" -#: gitk:2158 -msgid "next" -msgstr "következő" - -#: gitk:2159 -msgid "prev" -msgstr "előző" - -#: gitk:2160 +#: gitk:2295 msgid "commit" msgstr "commit" -#: gitk:2163 gitk:2165 gitk:4419 gitk:4442 gitk:4466 gitk:6407 gitk:6479 -#: gitk:6563 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "tartalmazás:" -#: gitk:2166 gitk:3287 gitk:3292 gitk:4494 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "érintendő útvonalak:" -#: gitk:2167 gitk:4499 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "string hozzáadása/törlése:" -#: gitk:2176 gitk:2178 +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Pontos" -#: gitk:2178 gitk:4574 gitk:6375 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Kis/nagy betű nem számít" -#: gitk:2178 gitk:4468 gitk:4572 gitk:6371 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2180 gitk:2181 gitk:4593 gitk:4623 gitk:4630 gitk:6499 gitk:6567 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Minden mező" -#: gitk:2181 gitk:4591 gitk:4623 gitk:6438 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Főcím" -#: gitk:2182 gitk:4591 gitk:6438 gitk:6567 gitk:7000 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Megjegyzések" -#: gitk:2182 gitk:4591 gitk:4595 gitk:4630 gitk:6438 gitk:6935 gitk:8280 -#: gitk:8295 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Szerző" -#: gitk:2182 gitk:4591 gitk:6438 gitk:6937 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Commitoló" -#: gitk:2213 +#: gitk:2350 msgid "Search" msgstr "Keresés" -#: gitk:2221 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2223 +#: gitk:2360 msgid "Old version" msgstr "Régi verzió" -#: gitk:2225 +#: gitk:2362 msgid "New version" msgstr "Új verzió" -#: gitk:2227 +#: gitk:2364 msgid "Lines of context" msgstr "Tartalmi sorok" -#: gitk:2237 +#: gitk:2374 msgid "Ignore space change" msgstr "Space váltás mellőzése" -#: gitk:2296 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2298 +#: gitk:2447 msgid "Tree" msgstr "Tree" -#: gitk:2453 gitk:2470 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff ezeket -> kiválasztott" -#: gitk:2454 gitk:2471 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff kiválasztottakat -> ezt" -#: gitk:2455 gitk:2472 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Patch készítése" -#: gitk:2456 gitk:8687 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Tag készítése" -#: gitk:2457 gitk:8793 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Commit fáljba írása" -#: gitk:2458 gitk:8850 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Új branch készítése" -#: gitk:2459 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Cherry-pick erre a commitra" -#: gitk:2460 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "HEAD branch újraindítása ide" -#: gitk:2461 +#: gitk:2625 msgid "Mark this commit" msgstr "Ezen commit megjelölése" -#: gitk:2462 +#: gitk:2626 msgid "Return to mark" msgstr "Visszatérés a megjelöléshez" -#: gitk:2463 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Találd meg ezen utódokat és jelöld meg" -#: gitk:2464 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Összehasonlítás a megjelölt commit-tal" -#: gitk:2478 +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Diff ezeket -> kiválasztott" + +#: gitk:2630 gitk:2641 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Diff kiválasztottakat -> ezt" + +#: gitk:2631 +#, fuzzy +msgid "Revert this commit" +msgstr "Ezen commit megjelölése" + +#: gitk:2647 msgid "Check out this branch" msgstr "Check out ezt a branchot" -#: gitk:2479 +#: gitk:2648 msgid "Remove this branch" msgstr "Töröld ezt a branch-ot" -#: gitk:2486 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Emeld ki ezt is" -#: gitk:2487 +#: gitk:2657 msgid "Highlight this only" msgstr "Csak ezt emeld ki" -#: gitk:2488 +#: gitk:2658 msgid "External diff" msgstr "Külső diff" -#: gitk:2489 +#: gitk:2659 msgid "Blame parent commit" msgstr "Blame szülő kommitra" -#: gitk:2496 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Mutasd meg ennek a sornak az eredetét" -#: gitk:2497 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Futtasd a git gui blame-t ezen a soron" -#: gitk:2779 +#: gitk:3014 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -344,298 +377,321 @@ msgstr "" "\n" "Használd és terjeszd a GNU General Public License feltételei mellett" -#: gitk:2787 gitk:2851 gitk:9215 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Bezárás" -#: gitk:2808 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk-billentyű hozzárendelés" -#: gitk:2811 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk-billentyű hozzaárendelés:" -#: gitk:2813 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tKilépés" -#: gitk:2814 +#: gitk:3049 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tKeresés" + +#: gitk:3050 msgid "<Home>\t\tMove to first commit" msgstr "<Pos1>\t\tElső commithoz" -#: gitk:2815 +#: gitk:3051 msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tUtolsó commithoz" -#: gitk:2816 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3052 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Hoch>, p, i\tEgy committal feljebb" -#: gitk:2817 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3053 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Runter>, n, k\tEgy committal lejjebb" -#: gitk:2818 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3054 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Links>, z, j\tVissza a history listába" -#: gitk:2819 +#: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Rechts>, x, l\tElőre a history listába" -#: gitk:2820 +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3057 msgid "<PageUp>\tMove up one page in commit list" msgstr "<BildHoch>\tEgy lappal feljebb a commit listába" -#: gitk:2821 +#: gitk:3058 msgid "<PageDown>\tMove down one page in commit list" msgstr "<BildRunter>\tEgy lappal lejjebb a commit listába" -#: gitk:2822 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" -#: gitk:2823 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tGörgetés a commit lista aljához" -#: gitk:2824 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" -#: gitk:2825 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:2826 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" -#: gitk:2827 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:2828 +#: gitk:3065 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Umschalt-Hoch>\tKeresés visszafele (felfele, utolsó commitok)" -#: gitk:2829 +#: gitk:3066 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Umschalt-Runter>\tKeresés előre (lefelé; korábbi commitok)" -#: gitk:2830 +#: gitk:3067 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Entf>, b\t\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:2831 +#: gitk:3068 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Löschtaste>\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:2832 +#: gitk:3069 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\tEgy lappal lejjebb görgetés a diff nézetben" -#: gitk:2833 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" -#: gitk:2834 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" -#: gitk:2835 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tKeresés" -#: gitk:2836 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tKövetkező találathoz" -#: gitk:2837 +#: gitk:3074 msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tKövetkező találathoz" -#: gitk:2838 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "<Ende>\t\tUtolsó commithoz" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tLépj a keresési mezőre" -#: gitk:2839 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tElőző találathoz" -#: gitk:2840 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tKövetkező fájlra görgetés diff nézetben" -#: gitk:2841 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben" -#: gitk:2842 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben" -#: gitk:2843 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" -#: gitk:2844 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tBetűméret növelése" -#: gitk:2845 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" -#: gitk:2846 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tBetűméret csökkentése" -#: gitk:2847 +#: gitk:3085 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tFrissítés" -#: gitk:3302 gitk:3311 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" -#: gitk:3324 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Hiba történt \"%s\" letöltése közben %s-ről:" -#: gitk:3387 +#: gitk:3635 msgid "command failed:" msgstr "parancs hiba:" -#: gitk:3536 +#: gitk:3784 msgid "No such commit" msgstr "Nincs ilyen commit" -#: gitk:3550 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: parancs hiba:" -#: gitk:3581 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Nem sikerült a Merge head olvasása: %s" -#: gitk:3589 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Hiba történt az index olvasása közben: %s" -#: gitk:3614 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Nem sikerült a git blame indítása: %s" -#: gitk:3617 gitk:6406 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Keresés" -#: gitk:3649 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Hiba történt a git blame futtatása közben: %s" -#: gitk:3677 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "A %s commitból származik az a sor, amelyik nem található ebben a nézetben" -#: gitk:3691 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Külső diff nézegető hiba:" -#: gitk:3809 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk nézet meghatározása" -#: gitk:3813 +#: gitk:4074 msgid "Remember this view" msgstr "Maradj ennél a nézetnél" -#: gitk:3814 +#: gitk:4075 msgid "References (space separated list):" msgstr "Referenciák (szóközzel tagolt lista" -#: gitk:3815 +#: gitk:4076 msgid "Branches & tags:" msgstr "Branch-ek & tagek:" -#: gitk:3816 +#: gitk:4077 msgid "All refs" msgstr "Minden ref" -#: gitk:3817 +#: gitk:4078 msgid "All (local) branches" msgstr "Minden (helyi) branch" -#: gitk:3818 +#: gitk:4079 msgid "All tags" msgstr "Minden tag" -#: gitk:3819 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Minden távoli követő branch" -#: gitk:3820 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Commit Infó (reguláris kifejezés):" -#: gitk:3821 +#: gitk:4082 msgid "Author:" msgstr "Szerző:" -#: gitk:3822 +#: gitk:4083 msgid "Committer:" msgstr "Commitoló:" -#: gitk:3823 +#: gitk:4084 msgid "Commit Message:" msgstr "Commit üzenet:" -#: gitk:3824 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Egyezik minen Commit Infó feltétellel" -#: gitk:3825 +#: gitk:4086 +#, fuzzy +msgid "Matches no Commit Info criteria" +msgstr "Egyezik minen Commit Infó feltétellel" + +#: gitk:4087 msgid "Changes to Files:" msgstr "Fájl változások:" -#: gitk:3826 +#: gitk:4088 msgid "Fixed String" msgstr "Fix String" -#: gitk:3827 +#: gitk:4089 msgid "Regular Expression" msgstr "Reguláris kifejezés" -#: gitk:3828 +#: gitk:4090 msgid "Search string:" msgstr "Keresés szöveg:" -#: gitk:3829 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -643,206 +699,203 @@ msgstr "" "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3830 +#: gitk:4092 msgid "Since:" msgstr "Ettől:" -#: gitk:3831 +#: gitk:4093 msgid "Until:" msgstr "Eddig:" -#: gitk:3832 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):" -#: gitk:3833 +#: gitk:4095 msgid "Number to show:" msgstr "Mutatandó szám:" -#: gitk:3834 +#: gitk:4096 msgid "Number to skip:" msgstr "Kihagyandó szám:" -#: gitk:3835 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Különféle opciók:" -#: gitk:3836 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Szigorú rendezás dátum alapján" -#: gitk:3837 +#: gitk:4099 msgid "Mark branch sides" msgstr "Jelölje meg az ágakat" -#: gitk:3838 +#: gitk:4100 msgid "Limit to first parent" msgstr "Korlátozás az első szülőre" -#: gitk:3839 +#: gitk:4101 msgid "Simple history" msgstr "Egyszerű history" -#: gitk:3840 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "További argumentok a git log-hoz:" -#: gitk:3841 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" -#: gitk:3842 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Parancs több tartalmazó commit generálására:" -#: gitk:3964 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: szerkesztés nézet" -#: gitk:3972 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- kritériumok a revíziók kiválasztásához" -#: gitk:3977 +#: gitk:4241 msgid "View Name" msgstr "Nézet neve" -#: gitk:4052 +#: gitk:4316 msgid "Apply (F5)" msgstr "Alkalmaz (F5)" -#: gitk:4090 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Hiba történt a commit argumentumok kiválasztása közben:" -#: gitk:4143 gitk:4195 gitk:4643 gitk:4657 gitk:5918 gitk:11519 gitk:11520 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Keine" -#: gitk:4591 gitk:6438 gitk:8282 gitk:8297 -msgid "Date" -msgstr "Dátum" - -#: gitk:4591 gitk:6438 -msgid "CDate" -msgstr "Dátum" - -#: gitk:4740 gitk:4745 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Leszármazott" -#: gitk:4741 +#: gitk:5022 msgid "Not descendant" msgstr "Nem leszármazott" -#: gitk:4748 gitk:4753 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Előd" -#: gitk:4749 +#: gitk:5030 msgid "Not ancestor" msgstr "Nem előd" -#: gitk:5039 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "" "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " "commitolva" -#: gitk:5075 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" -#: gitk:6756 +#: gitk:7134 +msgid "and many more" +msgstr "" + +#: gitk:7137 msgid "many" msgstr "sok" -#: gitk:6939 +#: gitk:7328 msgid "Tags:" msgstr "Tagek:" -#: gitk:6956 gitk:6962 gitk:8275 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Eltern" -#: gitk:6967 +#: gitk:7356 msgid "Child" msgstr "Gyerek" -#: gitk:6976 +#: gitk:7365 msgid "Branch" msgstr "Ág" -#: gitk:6979 +#: gitk:7368 msgid "Follows" msgstr "Következők" -#: gitk:6982 +#: gitk:7371 msgid "Precedes" msgstr "Megelőzők" -#: gitk:7519 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Hiba történt a diff-ek letöltése közben: %s" -#: gitk:8103 +#: gitk:8650 msgid "Goto:" msgstr "Menj:" -#: gitk:8105 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:8124 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Rövid SHA1 id %s félreérthető" -#: gitk:8131 +#: gitk:8678 +#, tcl-format msgid "Revision %s is not known" msgstr "A(z) %s revízió nem ismert" -#: gitk:8141 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s nem ismert" -#: gitk:8143 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A(z) %s revízió nincs a jelenlegi nézetben" -#: gitk:8285 +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Dátum" + +#: gitk:8835 msgid "Children" msgstr "Gyerekek" -#: gitk:8343 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Állítsd vissza a %s branch-ot ide" -#: gitk:8345 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Elkülönített head: nem lehet visszaállítani" -#: gitk:8454 gitk:8460 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Merge commit kihagyása " -#: gitk:8469 gitk:8474 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Hiba történt a patch ID megszerzése közben a következőnél " -#: gitk:8470 gitk:8475 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - abbahagyás\n" -#: gitk:8480 gitk:8483 gitk:8491 gitk:8505 gitk:8514 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Commit " -#: gitk:8484 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -850,7 +903,7 @@ msgstr "" " Ugyanaz a patch mint\n" " " -#: gitk:8492 +#: gitk:9043 msgid "" " differs from\n" " " @@ -858,7 +911,7 @@ msgstr "" " különbözik innentől\n" " " -#: gitk:8494 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -866,121 +919,132 @@ msgstr "" "A commitok diffje:\n" "\n" -#: gitk:8506 gitk:8515 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " %s gyereke van. abbahagyás\n" -#: gitk:8534 +#: gitk:9085 +#, tcl-format msgid "Error writing commit to file: %s" msgstr "Hiba történt a commit fájlba írása közben: %s" -#: gitk:8540 +#: gitk:9091 +#, tcl-format msgid "Error diffing commits: %s" msgstr "Hiba történt a commitok diffelése közben: %s" -#: gitk:8570 +#: gitk:9137 msgid "Top" msgstr "Teteje" -#: gitk:8571 +#: gitk:9138 msgid "From" msgstr "Innen" -#: gitk:8576 +#: gitk:9143 msgid "To" msgstr "Ide" -#: gitk:8600 +#: gitk:9167 msgid "Generate patch" msgstr "Patch generálása" -#: gitk:8602 +#: gitk:9169 msgid "From:" msgstr "Innen:" -#: gitk:8611 +#: gitk:9178 msgid "To:" msgstr "Ide:" -#: gitk:8620 +#: gitk:9187 msgid "Reverse" msgstr "Visszafele" -#: gitk:8622 gitk:8807 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Kimeneti fájl:" -#: gitk:8628 +#: gitk:9195 msgid "Generate" msgstr "Generálás" -#: gitk:8666 +#: gitk:9233 msgid "Error creating patch:" msgstr "Hiba törtét a patch készítése közben:" -#: gitk:8689 gitk:8795 gitk:8852 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:8698 +#: gitk:9265 msgid "Tag name:" msgstr "Tag név:" -#: gitk:8702 gitk:8861 +#: gitk:9268 +msgid "Tag message is optional" +msgstr "" + +#: gitk:9270 +#, fuzzy +msgid "Tag message:" +msgstr "Tag név:" + +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Létrehozás" -#: gitk:8719 +#: gitk:9292 msgid "No tag name specified" msgstr "A tag neve nincsen megadva" -#: gitk:8723 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "%s Tag már létezik" -#: gitk:8729 +#: gitk:9306 msgid "Error creating tag:" msgstr "Hiba történt a tag létrehozása közben:" -#: gitk:8804 +#: gitk:9382 msgid "Command:" msgstr "Parancs:" -#: gitk:8812 +#: gitk:9390 msgid "Write" msgstr "Írás" -#: gitk:8830 +#: gitk:9408 msgid "Error writing commit:" msgstr "Hiba történt a commit írása közben:" -#: gitk:8857 +#: gitk:9435 msgid "Name:" msgstr "Név:" -#: gitk:8880 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Kérem adja meg a nevét az új branchhoz" -#: gitk:8885 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "%s branch már létezik. Felülírja?" -#: gitk:8951 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" "eintragen?" -#: gitk:8956 +#: gitk:9535 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:8965 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -990,7 +1054,7 @@ msgstr "" "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " "újra." -#: gitk:8971 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -998,32 +1062,63 @@ msgstr "" "Cherry-pick hiba történt merge konfliktus miatt.\n" "Kívánja futtatni a git citool-t a probléma megoldásához?" -#: gitk:8987 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nincsen változás commitolva" -#: gitk:9013 +#: gitk:9593 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "" +"%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" +"eintragen?" + +#: gitk:9598 +#, fuzzy +msgid "Reverting" +msgstr "Újraindítás" + +#: 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 "" +"Cherry-pick hiba történt lokális váltotások miatt a '%s' fájlban.\n" +"Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " +"újra." + +#: gitk:9610 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"Cherry-pick hiba történt merge konfliktus miatt.\n" +"Kívánja futtatni a git citool-t a probléma megoldásához?" + +#: gitk:9653 msgid "Confirm reset" msgstr "Újraindítás megerősítése" -#: gitk:9015 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Újraindítja a %s branchot %s-ig?" -#: gitk:9017 +#: gitk:9657 msgid "Reset type:" msgstr "Újraindítás típusa:" -#: gitk:9020 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" -#: gitk:9023 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" -#: gitk:9026 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1031,19 +1126,19 @@ msgstr "" "Hard: Indítsd újra a working tree-t és az indexet\n" "(MINDEN lokális változás eldobása)" -#: gitk:9043 +#: gitk:9683 msgid "Resetting" msgstr "Újraindítás" -#: gitk:9103 +#: gitk:9743 msgid "Checking out" msgstr "Kivesz" -#: gitk:9156 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Nem lehet a jelenleg kivett branch-ot törölni" -#: gitk:9162 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1052,16 +1147,16 @@ msgstr "" "A %s branchon található commit nem található meg semelyik másik branchon.\n" "Tényleg törli a %s branchot?" -#: gitk:9193 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Tagek és headek: %s" -#: gitk:9208 +#: gitk:9850 msgid "Filter" msgstr "Szűrő" -#: gitk:9503 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1069,205 +1164,241 @@ msgstr "" "Hiba történt a commit topológiai információ olvasása közben; branch ésa " "megelőző/következő információ nem lesz teljes." -#: gitk:10489 +#: gitk:11123 msgid "Tag" msgstr "Tag" -#: gitk:10489 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:10539 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk-betű kiválasztó" -#: gitk:10556 +#: gitk:11227 msgid "B" msgstr "F" -#: gitk:10559 +#: gitk:11230 msgid "I" msgstr "K" -#: gitk:10677 -msgid "Gitk preferences" -msgstr "Gitk beállítások" - -#: gitk:10679 +#: gitk:11348 msgid "Commit list display options" msgstr "Commit lista kijelzési opciók" -#: gitk:10682 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximális grafikon szélesség (sorok)" -#: gitk:10685 -#, tcl-format +#: gitk:11355 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximális grafikon szélesség (táble %-je)" -#: gitk:10688 +#: gitk:11358 msgid "Show local changes" msgstr "Mutasd a lokális változtatásokat" -#: gitk:10691 -msgid "Auto-select SHA1" +#: gitk:11361 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "SHA1 Automatikus kiválasztása" -#: gitk:10694 +#: gitk:11365 msgid "Hide remote refs" msgstr "A távoli refek elrejtése" -#: gitk:10698 +#: gitk:11369 msgid "Diff display options" msgstr "Diff kijelző opciók" -#: gitk:10700 +#: gitk:11371 msgid "Tab spacing" msgstr "Tab sorköz" -#: gitk:10703 -msgid "Display nearby tags" +#: gitk:11374 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Szomszédos tagek kijelzése" -#: gitk:10706 +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Korlátozott diffek a kilistázott útvonalakhoz" -#: gitk:10709 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Fájlonkénti kódolás támgatása" -#: gitk:10715 gitk:10804 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Külső diff alkalmazás" -#: gitk:10716 +#: gitk:11390 msgid "Choose..." msgstr "Válaszd ..." -#: gitk:10721 +#: gitk:11395 msgid "General options" msgstr "Általános opciók" -#: gitk:10724 +#: gitk:11398 msgid "Use themed widgets" msgstr "Témázott vezérlők használata" -#: gitk:10726 +#: gitk:11400 msgid "(change requires restart)" msgstr "(a változás újraindítást igényel)" -#: gitk:10728 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(jelenleg nem elérhető)" -#: gitk:10732 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Színek: nyomja meg a kiválasztáshoz" -#: gitk:10735 +#: gitk:11416 msgid "Interface" msgstr "Interfész" -#: gitk:10736 +#: gitk:11417 msgid "interface" msgstr "interfész" -#: gitk:10739 +#: gitk:11420 msgid "Background" msgstr "Háttér" -#: gitk:10740 gitk:10770 +#: gitk:11421 gitk:11451 msgid "background" msgstr "háttér" -#: gitk:10743 +#: gitk:11424 msgid "Foreground" msgstr "Előtér" -#: gitk:10744 +#: gitk:11425 msgid "foreground" msgstr "előtér" -#: gitk:10747 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: régi sorok" -#: gitk:10748 +#: gitk:11429 msgid "diff old lines" msgstr "diff régi sorok" -#: gitk:10752 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: új sorok" -#: gitk:10753 +#: gitk:11434 msgid "diff new lines" msgstr "diff - új sorok" -#: gitk:10757 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: nagy headerök" -#: gitk:10759 +#: gitk:11440 msgid "diff hunk header" msgstr "diff - nagy headerök" -#: gitk:10763 +#: gitk:11444 msgid "Marked line bg" msgstr "Megjelölt sor háttér" -#: gitk:10765 +#: gitk:11446 msgid "marked line background" msgstr "megjelölt sor háttér" -#: gitk:10769 +#: gitk:11450 msgid "Select bg" msgstr "Válasszon hátteret" -#: gitk:10773 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Betű: nyomja meg a kiválasztáshoz" -#: gitk:10775 +#: gitk:11461 msgid "Main font" msgstr "Fő betű" -#: gitk:10776 +#: gitk:11462 msgid "Diff display font" msgstr "Diff kijelző betű" -#: gitk:10777 +#: gitk:11463 msgid "User interface font" msgstr "Felhasználói interfész betű" -#: gitk:10814 +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Gitk beállítások" + +#: gitk:11494 +#, fuzzy +msgid "General" +msgstr "Generálás" + +#: gitk:11495 +msgid "Colors" +msgstr "" + +#: gitk:11496 +msgid "Fonts" +msgstr "" + +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: válasszon színt a %s-ra" -#: gitk:11418 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" +"Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Nem találhatü git repository itt." -#: gitk:11422 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Nem található a \"%s\" könyvtár." - -#: gitk:11469 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Félreérthető argumentum '%s': revízió és fájlnév is" -#: gitk:11481 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Rossz gitk argumentumok:" -#: gitk:11572 -msgid "Command line" -msgstr "Parancs sor" +#~ msgid "mc" +#~ msgstr "mc" + +#~ msgid "SHA1 ID: " +#~ msgstr "SHA1 ID: " + +#~ msgid "next" +#~ msgstr "következő" + +#~ msgid "prev" +#~ msgstr "előző" + +#~ msgid "CDate" +#~ msgstr "Dátum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Nem található a \"%s\" könyvtár." #~ msgid "Use all refs" #~ msgstr "Használd az összes referenciát" @@ -1286,10 +1417,3 @@ msgstr "Parancs sor" #~ msgid "- stopping\n" #~ msgstr "- abbahagyás.\n" - -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" -#~ "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." diff --git a/gitk-git/po/it.po b/gitk-git/po/it.po index a730d63a42..b5f002db7d 100644 --- a/gitk-git/po/it.po +++ b/gitk-git/po/it.po @@ -8,33 +8,42 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-28 18:40+0100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-01-28 18:41+0100\n" "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n" "Language-Team: Italian\n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" -#: gitk:274 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "" + +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +msgid "Markup words" +msgstr "" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "Errore nella lettura delle revisioni:" -#: gitk:329 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" -#: gitk:342 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " "sono file in attesa di fusione." -#: gitk:345 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,299 +51,323 @@ msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma i file " "specificati non sono in attesa di fusione." -#: gitk:367 gitk:514 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Errore nell'esecuzione di git log:" -#: gitk:385 gitk:530 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lettura in corso" -#: gitk:445 gitk:4261 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:448 gitk:1578 gitk:4264 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nessuna revisione selezionata" -#: gitk:1454 +#: 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:1674 +#: gitk:1740 msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:1816 -msgid "mc" -msgstr "" - -#: gitk:1851 gitk:4054 gitk:9044 gitk:10585 gitk:10804 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1853 gitk:4056 gitk:8634 gitk:8713 gitk:8828 gitk:8877 gitk:9046 -#: gitk:10586 gitk:10805 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Annulla" -#: gitk:1975 -msgid "Update" +#: gitk:2069 +msgid "&Update" msgstr "Aggiorna" -#: gitk:1976 -msgid "Reload" +#: gitk:2070 +msgid "&Reload" msgstr "Ricarica" -#: gitk:1977 -msgid "Reread references" +#: gitk:2071 +msgid "Reread re&ferences" msgstr "Rileggi riferimenti" -#: gitk:1978 -msgid "List references" +#: gitk:2072 +msgid "&List references" msgstr "Elenca riferimenti" -#: gitk:1980 -msgid "Start git gui" +#: gitk:2074 +msgid "Start git &gui" msgstr "Avvia git gui" -#: gitk:1982 -msgid "Quit" +#: gitk:2076 +msgid "&Quit" msgstr "Esci" -#: gitk:1974 -msgid "File" -msgstr "File" +#: gitk:2068 +msgid "&File" +msgstr "&File" -#: gitk:1986 -msgid "Preferences" +#: gitk:2080 +msgid "&Preferences" msgstr "Preferenze" -#: gitk:1985 -msgid "Edit" +#: gitk:2079 +msgid "&Edit" msgstr "Modifica" -#: gitk:1990 -msgid "New view..." +#: gitk:2084 +msgid "&New view..." msgstr "Nuova vista..." -#: gitk:1991 -msgid "Edit view..." +#: gitk:2085 +msgid "&Edit view..." msgstr "Modifica vista..." -#: gitk:1992 -msgid "Delete view" +#: gitk:2086 +msgid "&Delete view" msgstr "Elimina vista" -#: gitk:1994 -msgid "All files" +#: gitk:2088 gitk:4043 +msgid "&All files" msgstr "Tutti i file" -#: gitk:1989 gitk:3808 -msgid "View" +#: gitk:2083 gitk:4067 +msgid "&View" msgstr "Vista" -#: gitk:1999 gitk:2009 gitk:2780 -msgid "About gitk" +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" msgstr "Informazioni su gitk" -#: gitk:2000 gitk:2014 -msgid "Key bindings" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" msgstr "Scorciatoie da tastiera" -#: gitk:1998 gitk:2013 -msgid "Help" +#: gitk:2092 gitk:2107 +msgid "&Help" msgstr "Aiuto" -#: gitk:2091 gitk:8110 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2122 +#: gitk:2229 msgid "Row" msgstr "Riga" -#: gitk:2160 +#: gitk:2267 msgid "Find" msgstr "Trova" -#: gitk:2161 -msgid "next" -msgstr "succ" - -#: gitk:2162 -msgid "prev" -msgstr "prec" - -#: gitk:2163 +#: gitk:2295 msgid "commit" msgstr "revisione" -#: gitk:2166 gitk:2168 gitk:4422 gitk:4445 gitk:4469 gitk:6410 gitk:6482 -#: gitk:6566 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "contenente:" -#: gitk:2169 gitk:3290 gitk:3295 gitk:4497 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:2170 gitk:4502 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:2179 gitk:2181 +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Esatto" -#: gitk:2181 gitk:4577 gitk:6378 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "" -#: gitk:2181 gitk:4471 gitk:4575 gitk:6374 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "" -#: gitk:2183 gitk:2184 gitk:4596 gitk:4626 gitk:4633 gitk:6502 gitk:6570 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Tutti i campi" -#: gitk:2184 gitk:4594 gitk:4626 gitk:6441 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Titolo" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6570 gitk:7003 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Commenti" -#: gitk:2185 gitk:4594 gitk:4598 gitk:4633 gitk:6441 gitk:6938 gitk:8285 -#: gitk:8300 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autore" -#: gitk:2185 gitk:4594 gitk:6441 gitk:6940 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Revisione creata da" -#: gitk:2216 +#: gitk:2350 msgid "Search" msgstr "Cerca" -#: gitk:2224 +#: gitk:2358 msgid "Diff" msgstr "" -#: gitk:2226 +#: gitk:2360 msgid "Old version" msgstr "Vecchia versione" -#: gitk:2228 +#: gitk:2362 msgid "New version" msgstr "Nuova versione" -#: gitk:2230 +#: gitk:2364 msgid "Lines of context" msgstr "Linee di contesto" -#: gitk:2240 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:2299 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Modifiche" -#: gitk:2301 +#: gitk:2447 msgid "Tree" msgstr "Directory" -#: gitk:2456 gitk:2473 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:2457 gitk:2474 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:2458 gitk:2475 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Crea patch" -#: gitk:2459 gitk:8692 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:2460 gitk:8808 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:2461 gitk:8865 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:2462 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:2463 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:2464 +#: gitk:2625 msgid "Mark this commit" msgstr "Segna questa revisione" -#: gitk:2465 +#: gitk:2626 msgid "Return to mark" msgstr "Torna alla revisione segnata" -#: gitk:2466 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Trova il discendente di questa revisione e di quella segnata" -#: gitk:2467 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Confronta con la revisione segnata" -#: gitk:2481 +#: 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:2482 +#: gitk:2648 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:2489 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:2490 +#: gitk:2657 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:2491 +#: gitk:2658 msgid "External diff" msgstr "Visualizza differenze in un altro programma" -#: gitk:2492 +#: gitk:2659 msgid "Blame parent commit" msgstr "Annota la revisione precedente" -#: gitk:2499 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Mostra la provenienza di questa riga" -#: gitk:2500 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Esegui git gui blame su questa riga" -#: gitk:2782 +#: gitk:3014 +#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" @@ -346,298 +379,321 @@ msgstr "" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:2790 gitk:2854 gitk:9230 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Chiudi" -#: gitk:2811 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:2814 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:2816 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:2817 +#: gitk:3049 +#, fuzzy, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-F>\t\tTrova" + +#: gitk:3050 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tVai alla prima revisione" -#: gitk:2818 +#: gitk:3051 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tVai all'ultima revisione" -#: gitk:2819 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3052 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Su>, p, i\tVai più in alto di una revisione" -#: gitk:2820 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3053 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Giù>, n, k\tVai più in basso di una revisione" -#: gitk:2821 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3054 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Sinistra>, z, j\tTorna indietro nella cronologia" -#: gitk:2822 +#: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Destra>, x, l\tVai avanti nella cronologia" -#: gitk:2823 +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3057 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PaginaSu>\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:2824 +#: gitk:3058 msgid "<PageDown>\tMove down one page in commit list" msgstr "" "<PaginaGiù>\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:2825 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:2826 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:2827 +#: 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:2828 +#: 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:2829 +#: 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:2830 +#: 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:2831 +#: gitk:3065 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Su>\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:2832 +#: gitk:3066 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Giù>\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:2833 +#: gitk:3067 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2834 +#: gitk:3068 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina" -#: gitk:2835 +#: gitk:3069 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Spazio>\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:2836 +#: 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:2837 +#: 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:2838 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:2839 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:2840 +#: gitk:3074 msgid "<Return>\tMove to next find hit" msgstr "<Invio>\tTrova in avanti" -#: gitk:2841 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "<End>\t\tVai all'ultima revisione" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tCursore nel box di ricerca" -#: gitk:2842 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:2843 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:2844 +#: 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:2845 +#: 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:2846 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumenta dimensione carattere" -#: gitk:2847 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-più>\tAumenta dimensione carattere" -#: gitk:2848 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuisci dimensione carattere" -#: gitk:2849 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-meno>\tDiminuisci dimensione carattere" -#: gitk:2850 +#: gitk:3085 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAggiorna" -#: gitk:3305 gitk:3314 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Errore durante la creazione della directory temporanea %s:" -#: gitk:3327 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Errore nella lettura di \"%s\" da %s:" -#: gitk:3390 +#: gitk:3635 msgid "command failed:" msgstr "impossibile eseguire il comando:" -#: gitk:3539 +#: gitk:3784 msgid "No such commit" msgstr "Revisione inesistente" -#: gitk:3553 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: impossibile eseguire il comando:" -#: gitk:3584 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossibile leggere merge head: %s" -#: gitk:3592 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Errore nella lettura dell'indice: %s" -#: gitk:3617 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossibile eseguire git blame: %s" -#: gitk:3620 gitk:6409 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Ricerca in corso" -#: gitk:3652 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Errore nell'esecuzione di git blame: %s" -#: gitk:3680 +#: 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:3694 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Impossibile eseguire il visualizzatore di differenze:" -#: gitk:3812 +#: gitk:4070 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:3816 +#: gitk:4074 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:3817 +#: gitk:4075 msgid "References (space separated list):" msgstr "Riferimenti (lista di elementi separati da spazi)" -#: gitk:3818 +#: gitk:4076 msgid "Branches & tags:" msgstr "Rami ed etichette" -#: gitk:3819 +#: gitk:4077 msgid "All refs" msgstr "Tutti i riferimenti" -#: gitk:3820 +#: gitk:4078 msgid "All (local) branches" msgstr "Tutti i rami (locali)" -#: gitk:3821 +#: gitk:4079 msgid "All tags" msgstr "Tutte le etichette" -#: gitk:3822 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Tutti i rami remoti" -#: gitk:3823 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informazioni sulla revisione (espressioni regolari):" -#: gitk:3824 +#: gitk:4082 msgid "Author:" msgstr "Autore:" -#: gitk:3825 +#: gitk:4083 msgid "Committer:" msgstr "Revisione creata da:" -#: gitk:3826 +#: gitk:4084 msgid "Commit Message:" msgstr "Messaggio di revisione:" -#: gitk:3827 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" -#: gitk:3828 +#: 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:3829 +#: gitk:4088 msgid "Fixed String" msgstr "Stringa fissa" -#: gitk:3830 +#: gitk:4089 msgid "Regular Expression" msgstr "Espressione regolare" -#: gitk:3831 +#: gitk:4090 msgid "Search string:" msgstr "Cerca stringa:" -#: gitk:3832 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -645,201 +701,201 @@ msgstr "" "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\"):" -#: gitk:3833 +#: gitk:4092 msgid "Since:" msgstr "Da:" -#: gitk:3834 +#: gitk:4093 msgid "Until:" msgstr "A:" -#: gitk:3835 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limita e/o salta N revisioni (intero positivo):" -#: gitk:3836 +#: gitk:4095 msgid "Number to show:" msgstr "Numero di revisioni da mostrare:" -#: gitk:3837 +#: gitk:4096 msgid "Number to skip:" msgstr "Numero di revisioni da saltare:" -#: gitk:3838 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Altre opzioni:" -#: gitk:3839 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordina solo per data" -#: gitk:3840 +#: gitk:4099 msgid "Mark branch sides" msgstr "Segna i lati del ramo" -#: gitk:3841 +#: gitk:4100 msgid "Limit to first parent" msgstr "Limita al primo genitore" -#: gitk:3842 +#: gitk:4101 msgid "Simple history" msgstr "Cronologia semplificata" -#: gitk:3843 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Ulteriori argomenti da passare a git log:" -#: gitk:3844 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:3845 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando che genera altre revisioni da visualizzare:" -#: gitk:3967 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: modifica vista" -#: gitk:3975 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- criteri per la scelta delle revisioni" -#: gitk:3980 +#: gitk:4241 msgid "View Name" msgstr "Nome vista" -#: gitk:4055 +#: gitk:4316 msgid "Apply (F5)" msgstr "Applica (F5)" -#: gitk:4093 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:4146 gitk:4198 gitk:4646 gitk:4660 gitk:5921 gitk:11534 gitk:11535 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Nessuno" -#: gitk:4594 gitk:6441 gitk:8287 gitk:8302 -msgid "Date" -msgstr "Data" - -#: gitk:4594 gitk:6441 -msgid "CDate" -msgstr "" - -#: gitk:4743 gitk:4748 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Discendente" -#: gitk:4744 +#: gitk:5022 msgid "Not descendant" msgstr "Non discendente" -#: gitk:4751 gitk:4756 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Ascendente" -#: gitk:4752 +#: gitk:5030 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:5042 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:5078 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:6759 +#: gitk:7134 +msgid "and many more" +msgstr "" + +#: gitk:7137 msgid "many" msgstr "molti" -#: gitk:6942 +#: gitk:7328 msgid "Tags:" msgstr "Etichette:" -#: gitk:6959 gitk:6965 gitk:8280 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Genitore" -#: gitk:6970 +#: gitk:7356 msgid "Child" msgstr "Figlio" -#: gitk:6979 +#: gitk:7365 msgid "Branch" msgstr "Ramo" -#: gitk:6982 +#: gitk:7368 msgid "Follows" msgstr "Segue" -#: gitk:6985 +#: gitk:7371 msgid "Precedes" msgstr "Precede" -#: gitk:7522 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Errore nella lettura delle differenze:" -#: gitk:8108 +#: gitk:8650 msgid "Goto:" msgstr "Vai a:" -#: gitk:8129 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:8136 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "La revisione %s è sconosciuta" -#: gitk:8146 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:8148 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La revisione %s non è presente nella vista attuale" -#: gitk:8290 +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Data" + +#: gitk:8835 msgid "Children" msgstr "Figli" -#: gitk:8348 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:8350 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Nessun ramo attivo: reset impossibile" -#: gitk:8459 gitk:8465 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Salto la revisione di fusione " -#: gitk:8474 gitk:8479 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Errore nella identificazione della patch per " -#: gitk:8475 gitk:8480 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - fine\n" -#: gitk:8485 gitk:8488 gitk:8496 gitk:8510 gitk:8519 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "La revisione " -#: gitk:8489 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -847,7 +903,7 @@ msgstr "" " ha le stesse differenze di\n" " " -#: gitk:8497 +#: gitk:9043 msgid "" " differs from\n" " " @@ -855,7 +911,7 @@ msgstr "" " è diversa da\n" " " -#: gitk:8499 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -863,129 +919,129 @@ msgstr "" "Differenze tra le revisioni:\n" "\n" -#: gitk:8511 gitk:8520 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " ha %s figli - fine\n" -#: gitk:8539 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Errore nella scrittura della revisione nel file: %s" -#: gitk:8545 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Errore nelle differenze tra le revisioni: %s" -#: gitk:8575 +#: gitk:9137 msgid "Top" msgstr "Inizio" -#: gitk:8576 +#: gitk:9138 msgid "From" msgstr "Da" -#: gitk:8581 +#: gitk:9143 msgid "To" msgstr "A" -#: gitk:8605 +#: gitk:9167 msgid "Generate patch" msgstr "Genera patch" -#: gitk:8607 +#: gitk:9169 msgid "From:" msgstr "Da:" -#: gitk:8616 +#: gitk:9178 msgid "To:" msgstr "A:" -#: gitk:8625 +#: gitk:9187 msgid "Reverse" msgstr "Inverti" -#: gitk:8627 gitk:8822 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:8633 +#: gitk:9195 msgid "Generate" msgstr "Genera" -#: gitk:8671 +#: gitk:9233 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:8694 gitk:8810 gitk:8867 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:8703 +#: gitk:9265 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:8706 +#: gitk:9268 msgid "Tag message is optional" msgstr "Il messaggio dell'etichetta è opzionale" -#: gitk:8708 +#: gitk:9270 msgid "Tag message:" msgstr "Messaggio dell'etichetta:" -#: gitk:8712 gitk:8876 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crea" -#: gitk:8730 +#: gitk:9292 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:8734 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già" -#: gitk:8744 +#: gitk:9306 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:8819 +#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:8827 +#: gitk:9390 msgid "Write" msgstr "Scrivi" -#: gitk:8845 +#: gitk:9408 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:8872 +#: gitk:9435 msgid "Name:" msgstr "Nome:" -#: gitk:8895 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:8900 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Il ramo '%s' esiste già. Sovrascrivere?" -#: gitk:8966 +#: 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:8971 +#: gitk:9535 msgid "Cherry-picking" msgstr "" -#: gitk:8980 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -996,7 +1052,7 @@ msgstr "" "Prima di riprovare, bisogna creare una nuova revisione, annullare le " "modifiche o usare 'git stash'." -#: gitk:8986 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1004,32 +1060,62 @@ msgstr "" "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" "Vuoi avviare git citool per risolverlo?" -#: gitk:9002 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:9028 +#: 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:9030 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:9032 +#: gitk:9657 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:9035 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:9038 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:9041 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1037,19 +1123,19 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:9058 +#: gitk:9683 msgid "Resetting" msgstr "git reset in corso" -#: gitk:9118 +#: gitk:9743 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:9171 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:9177 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1058,16 +1144,16 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:9208 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:9223 +#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:9518 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1075,202 +1161,227 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:10504 +#: gitk:11123 msgid "Tag" msgstr "Etichetta" -#: gitk:10504 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:10554 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:10571 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:10574 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:10692 -msgid "Gitk preferences" -msgstr "Preferenze gitk" - -#: gitk:10694 +#: gitk:11348 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:10697 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:10700 -#, tcl-format +#: gitk:11355 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:10703 +#: gitk:11358 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:10706 -msgid "Auto-select SHA1" +#: gitk:11361 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:10709 +#: gitk:11365 msgid "Hide remote refs" msgstr "Nascondi i riferimenti remoti" -#: gitk:10713 +#: gitk:11369 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:10715 +#: gitk:11371 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:10718 -msgid "Display nearby tags" +#: gitk:11374 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Mostra etichette vicine" -#: gitk:10721 +#: 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:10724 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Attiva codifica file per file" -#: gitk:10730 gitk:10819 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Visualizzatore di differenze" -#: gitk:10731 +#: gitk:11390 msgid "Choose..." msgstr "Scegli..." -#: gitk:10736 +#: gitk:11395 msgid "General options" msgstr "Opzioni generali" -#: gitk:10739 +#: gitk:11398 msgid "Use themed widgets" msgstr "Utilizza interfaccia a tema" -#: gitk:10741 +#: gitk:11400 msgid "(change requires restart)" msgstr "(una modifica richiede il riavvio)" -#: gitk:10743 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(momentaneamente non disponibile)" -#: gitk:10747 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Colori: premere per scegliere" -#: gitk:10750 +#: gitk:11416 msgid "Interface" msgstr "Interfaccia" -#: gitk:10751 +#: gitk:11417 msgid "interface" msgstr "interfaccia" -#: gitk:10754 +#: gitk:11420 msgid "Background" msgstr "Sfondo" -#: gitk:10755 gitk:10785 +#: gitk:11421 gitk:11451 msgid "background" msgstr "sfondo" -#: gitk:10758 +#: gitk:11424 msgid "Foreground" msgstr "Primo piano" -#: gitk:10759 +#: gitk:11425 msgid "foreground" msgstr "primo piano" -#: gitk:10762 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:10763 +#: gitk:11429 msgid "diff old lines" msgstr "vecchie linee" -#: gitk:10767 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:10768 +#: gitk:11434 msgid "diff new lines" msgstr "nuove linee" -#: gitk:10772 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:10774 +#: gitk:11440 msgid "diff hunk header" msgstr "intestazione della sezione" -#: gitk:10778 +#: gitk:11444 msgid "Marked line bg" msgstr "Sfondo riga selezionata" -#: gitk:10780 +#: gitk:11446 msgid "marked line background" msgstr "sfondo riga selezionata" -#: gitk:10784 +#: gitk:11450 msgid "Select bg" msgstr "Sfondo" -#: gitk:10788 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:10790 +#: gitk:11461 msgid "Main font" msgstr "Carattere principale" -#: gitk:10791 +#: gitk:11462 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:10792 +#: gitk:11463 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:10829 +#: 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:11433 +#: 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:11437 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Directory git \"%s\" non trovata." - -#: gitk:11484 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:11496 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" -#: gitk:11587 -msgid "Command line" -msgstr "Linea di comando" +#~ msgid "next" +#~ msgstr "succ" + +#~ msgid "prev" +#~ msgstr "prec" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Directory git \"%s\" non trovata." diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po index 4f4705164c..f143753db0 100644 --- a/gitk-git/po/ja.po +++ b/gitk-git/po/ja.po @@ -1,41 +1,51 @@ # Japanese translations for gitk package. -# Copyright (C) 2005-2009 Paul Mackerras +# Copyright (C) 2005-2015 Paul Mackerras # This file is distributed under the same license as the gitk package. # +# YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>, 2015. # Mizar <mizar.jp@gmail.com>, 2009. # Junio C Hamano <gitster@pobox.com>, 2009. msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-04 00:08+0900\n" -"PO-Revision-Date: 2009-11-06 01:45+0900\n" -"Last-Translator: Mizar <mizar.jp@gmail.com>\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2015-11-12 13:00+0900\n" +"Last-Translator: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>\n" "Language-Team: Japanese\n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gitk:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "マージされていないファイルのリストを取得できません:" -#: gitk:269 +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "変更を着色" + +#: gitk:217 gitk:2381 gitk:8221 gitk:8254 +msgid "Markup words" +msgstr "変更をマークアップ" + +#: gitk:324 msgid "Error parsing revisions:" msgstr "リビジョン解析エラー:" -#: gitk:324 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "--argscmd コマンド実行エラー:" -#: gitk:337 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "ファイル未選択: --merge が指定されましたが、マージされていないファイルはあり" "ません。" -#: gitk:340 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -43,600 +53,654 @@ msgstr "" "ファイル未選択: --merge が指定されましたが、ファイル制限内にマージされていな" "いファイルはありません。" -#: gitk:362 gitk:509 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "git log 実行エラー:" -#: gitk:380 gitk:525 +#: gitk:436 gitk:582 msgid "Reading" msgstr "読み込み中" -#: gitk:440 gitk:4132 +#: gitk:496 gitk:4526 msgid "Reading commits..." msgstr "コミット読み込み中..." -#: gitk:443 gitk:1561 gitk:4135 +#: gitk:499 gitk:1637 gitk:4529 msgid "No commits selected" msgstr "コミットが選択されていません" -#: gitk:1437 +#: gitk:1445 gitk:4046 gitk:12447 +msgid "Command line" +msgstr "コマンド行" + +#: gitk:1511 msgid "Can't parse git log output:" msgstr "git log の出力を解析できません:" -#: gitk:1657 +#: gitk:1740 msgid "No commit information available" msgstr "有効なコミットの情報がありません" -#: gitk:1790 -msgid "mc" -msgstr "mc" - -#: gitk:1817 gitk:3925 gitk:8842 gitk:10378 gitk:10558 +#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 msgid "OK" msgstr "OK" -#: gitk:1819 gitk:3927 gitk:8439 gitk:8513 gitk:8623 gitk:8672 gitk:8844 -#: gitk:10379 gitk:10559 +#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 +#: gitk:11257 gitk:11537 msgid "Cancel" msgstr "キャンセル" -#: gitk:1919 -msgid "Update" -msgstr "更新" +#: gitk:2069 +msgid "&Update" +msgstr "更新(&U)" -#: gitk:1920 -msgid "Reload" -msgstr "リロード" +#: gitk:2070 +msgid "&Reload" +msgstr "リロード(&R)" -#: gitk:1921 -msgid "Reread references" -msgstr "リファレンスを再読み込み" +#: gitk:2071 +msgid "Reread re&ferences" +msgstr "リファレンスを再読み込み(&F)" -#: gitk:1922 -msgid "List references" -msgstr "リファレンスリストを表示" +#: gitk:2072 +msgid "&List references" +msgstr "リファレンスリストを表示(&L)" -#: gitk:1924 -msgid "Start git gui" -msgstr "git gui の開始" +#: gitk:2074 +msgid "Start git &gui" +msgstr "git gui の開始(&G)" -#: gitk:1926 -msgid "Quit" -msgstr "終了" +#: gitk:2076 +msgid "&Quit" +msgstr "終了(&Q)" -#: gitk:1918 -msgid "File" -msgstr "ファイル" +#: gitk:2068 +msgid "&File" +msgstr "ファイル(&F)" -#: gitk:1930 -msgid "Preferences" -msgstr "設定" +#: gitk:2080 +msgid "&Preferences" +msgstr "設定(&P)" -#: gitk:1929 -msgid "Edit" -msgstr "編集" +#: gitk:2079 +msgid "&Edit" +msgstr "編集(&E)" -#: gitk:1934 -msgid "New view..." -msgstr "新規ビュー..." +#: gitk:2084 +msgid "&New view..." +msgstr "新規ビュー(&N)..." -#: gitk:1935 -msgid "Edit view..." -msgstr "ビュー編集..." +#: gitk:2085 +msgid "&Edit view..." +msgstr "ビュー編集(&E)..." -#: gitk:1936 -msgid "Delete view" -msgstr "ビュー削除" +#: gitk:2086 +msgid "&Delete view" +msgstr "ビュー削除(&D)" -#: gitk:1938 -msgid "All files" -msgstr "全てのファイル" +#: gitk:2088 +msgid "&All files" +msgstr "全てのファイル(&A)" -#: gitk:1933 gitk:3679 -msgid "View" -msgstr "ビュー" +#: gitk:2083 +msgid "&View" +msgstr "ビュー(&V)" -#: gitk:1943 gitk:1953 gitk:2656 -msgid "About gitk" -msgstr "gitk について" +#: gitk:2093 gitk:2103 +msgid "&About gitk" +msgstr "gitk について(&A)" -#: gitk:1944 gitk:1958 -msgid "Key bindings" -msgstr "キーバインディング" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "キーバインディング(&K)" -#: gitk:1942 gitk:1957 -msgid "Help" -msgstr "ヘルプ" +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "ヘルプ(&H)" -#: gitk:2018 -msgid "SHA1 ID: " -msgstr "SHA1 ID: " +#: gitk:2185 gitk:8653 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2049 +#: gitk:2229 msgid "Row" msgstr "行" -#: gitk:2080 +#: gitk:2267 msgid "Find" msgstr "検索" -#: gitk:2081 -msgid "next" -msgstr "次" - -#: gitk:2082 -msgid "prev" -msgstr "前" - -#: gitk:2083 +#: gitk:2295 msgid "commit" msgstr "コミット" -#: gitk:2086 gitk:2088 gitk:4293 gitk:4316 gitk:4340 gitk:6281 gitk:6353 -#: gitk:6437 +#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 +#: gitk:6913 msgid "containing:" msgstr "含む:" -#: gitk:2089 gitk:3164 gitk:3169 gitk:4368 +#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 msgid "touching paths:" msgstr "パスの一部:" -#: gitk:2090 gitk:4373 +#: gitk:2303 gitk:4778 msgid "adding/removing string:" -msgstr "追加/除去する文字列:" +msgstr "追加/除去される文字列:" + +#: gitk:2304 gitk:4780 +msgid "changing lines matching:" +msgstr "変更される文字列" -#: gitk:2099 gitk:2101 +#: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" msgstr "英字の大小を区別する" -#: gitk:2101 gitk:4448 gitk:6249 +#: gitk:2315 gitk:4855 gitk:6724 msgid "IgnCase" msgstr "英字の大小を区別しない" -#: gitk:2101 gitk:4342 gitk:4446 gitk:6245 +#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 msgid "Regexp" msgstr "正規表現" -#: gitk:2103 gitk:2104 gitk:4467 gitk:4497 gitk:4504 gitk:6373 gitk:6441 +#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 msgid "All fields" msgstr "全ての項目" -#: gitk:2104 gitk:4465 gitk:4497 gitk:6312 +#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 msgid "Headline" msgstr "ヘッドライン" -#: gitk:2105 gitk:4465 gitk:6312 gitk:6441 gitk:6875 +#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 msgid "Comments" msgstr "コメント" -#: gitk:2105 gitk:4465 gitk:4469 gitk:4504 gitk:6312 gitk:6810 gitk:8091 -#: gitk:8106 +#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 +#: gitk:8846 msgid "Author" msgstr "作者" -#: gitk:2105 gitk:4465 gitk:6312 gitk:6812 +#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 msgid "Committer" msgstr "コミット者" -#: gitk:2134 +#: gitk:2350 msgid "Search" msgstr "検索" -#: gitk:2141 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2143 +#: gitk:2360 msgid "Old version" msgstr "旧バージョン" -#: gitk:2145 +#: gitk:2362 msgid "New version" msgstr "新バージョン" -#: gitk:2147 +#: gitk:2364 msgid "Lines of context" msgstr "文脈行数" -#: gitk:2157 +#: gitk:2374 msgid "Ignore space change" msgstr "空白の違いを無視" -#: gitk:2215 +#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 +msgid "Line diff" +msgstr "行毎のdiff" + +#: gitk:2445 msgid "Patch" msgstr "パッチ" -#: gitk:2217 +#: gitk:2447 msgid "Tree" msgstr "ツリー" -#: gitk:2361 gitk:2378 +#: gitk:2617 gitk:2638 msgid "Diff this -> selected" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2362 gitk:2379 +#: gitk:2618 gitk:2639 msgid "Diff selected -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2363 gitk:2380 +#: gitk:2619 gitk:2640 msgid "Make patch" msgstr "パッチ作成" -#: gitk:2364 gitk:8497 +#: gitk:2620 gitk:9255 msgid "Create tag" msgstr "タグ生成" -#: gitk:2365 gitk:8603 +#: gitk:2621 +msgid "Copy commit summary" +msgstr "コミットの要約をコピーする" + +#: gitk:2622 gitk:9386 msgid "Write commit to file" msgstr "コミットをファイルに書き出す" -#: gitk:2366 gitk:8660 +#: gitk:2623 gitk:9443 msgid "Create new branch" msgstr "新規ブランチ生成" -#: gitk:2367 +#: gitk:2624 msgid "Cherry-pick this commit" msgstr "このコミットをチェリーピックする" -#: gitk:2368 +#: gitk:2625 msgid "Reset HEAD branch to here" msgstr "ブランチのHEADをここにリセットする" -#: gitk:2369 +#: gitk:2626 msgid "Mark this commit" msgstr "このコミットにマークをつける" -#: gitk:2370 +#: gitk:2627 msgid "Return to mark" msgstr "マークを付けた所に戻る" -#: gitk:2371 +#: gitk:2628 msgid "Find descendant of this and mark" msgstr "これとマークをつけた所との子孫を見つける" -#: gitk:2372 +#: gitk:2629 msgid "Compare with marked commit" msgstr "マークを付けたコミットと比較する" -#: gitk:2386 +#: gitk:2630 gitk:2641 +msgid "Diff this -> marked commit" +msgstr "これと選択したコミットのdiffを見る" + +#: gitk:2631 gitk:2642 +msgid "Diff marked commit -> this" +msgstr "選択したコミットとこれのdiffを見る" + +#: gitk:2632 +msgid "Revert this commit" +msgstr "このコミットを撤回する" + +#: gitk:2648 msgid "Check out this branch" msgstr "このブランチをチェックアウトする" -#: gitk:2387 +#: gitk:2649 msgid "Remove this branch" msgstr "このブランチを除去する" -#: gitk:2394 +#: gitk:2650 +msgid "Copy branch name" +msgstr "ブランチ名をコピーする" + +#: gitk:2657 msgid "Highlight this too" msgstr "これもハイライトさせる" -#: gitk:2395 +#: gitk:2658 msgid "Highlight this only" msgstr "これだけをハイライトさせる" -#: gitk:2396 +#: gitk:2659 msgid "External diff" msgstr "外部diffツール" -#: gitk:2397 +#: gitk:2660 msgid "Blame parent commit" msgstr "親コミットから blame をかける" -#: gitk:2404 +#: gitk:2661 +msgid "Copy path" +msgstr "パス名をコピーする" + +#: gitk:2668 msgid "Show origin of this line" msgstr "この行の出自を表示する" -#: gitk:2405 +#: gitk:2669 msgid "Run git gui blame on this line" msgstr "この行に git gui で blame をかける" -#: gitk:2658 +#: gitk:3013 +msgid "About gitk" +msgstr "gitk について" + +#: gitk:3015 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - gitコミットビューア\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "使用および再配布は GNU General Public License に従ってください" -#: gitk:2666 gitk:2728 gitk:9025 +#: gitk:3023 gitk:3090 gitk:9872 msgid "Close" msgstr "閉じる" -#: gitk:2685 +#: gitk:3044 msgid "Gitk key bindings" msgstr "Gitk キーバインディング" -#: gitk:2688 +#: gitk:3047 msgid "Gitk key bindings:" msgstr "Gitk キーバインディング:" -#: gitk:2690 +#: gitk:3049 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" -#: gitk:2691 +#: gitk:3050 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tウィンドウを閉じる" + +#: gitk:3051 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\t最初のコミットに移動" -#: gitk:2692 +#: gitk:3052 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\t最後のコミットに移動" -#: gitk:2693 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\t一つ上のコミットに移動" +#: gitk:3053 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, k\t一つ上のコミットに移動" -#: gitk:2694 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\t一つ下のコミットに移動" +#: gitk:3054 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, j\t一つ下のコミットに移動" -#: gitk:2695 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\t履歴の前に戻る" +#: gitk:3055 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, h\t履歴の前に戻る" -#: gitk:2696 +#: gitk:3056 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\t履歴の次へ進む" -#: gitk:2697 +#: gitk:3057 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動" + +#: gitk:3058 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tコミットリストの一つ上のページに移動" -#: gitk:2698 +#: gitk:3059 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tコミットリストの一つ下のページに移動" -#: gitk:2699 +#: gitk:3060 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" -#: gitk:2700 +#: gitk:3061 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tコミットリストの一番下にスクロールする" -#: gitk:2701 +#: gitk:3062 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" -#: gitk:2702 +#: gitk:3063 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" -#: gitk:2703 +#: gitk:3064 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" -#: gitk:2704 +#: gitk:3065 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" -#: gitk:2705 +#: gitk:3066 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)" -#: gitk:2706 +#: gitk:3067 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\t前方を検索（下方の・古いコミット）" -#: gitk:2707 +#: gitk:3068 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tdiff画面を上のページにスクロールする" -#: gitk:2708 +#: gitk:3069 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tdiff画面を上のページにスクロールする" -#: gitk:2709 +#: gitk:3070 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tdiff画面を下のページにスクロールする" -#: gitk:2710 +#: gitk:3071 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tdiff画面を上に18行スクロールする" -#: gitk:2711 +#: gitk:3072 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tdiff画面を下に18行スクロールする" -#: gitk:2712 +#: gitk:3073 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t検索" -#: gitk:2713 +#: gitk:3074 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t次を検索して移動" -#: gitk:2714 +#: gitk:3075 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t次を検索して移動" -#: gitk:2715 +#: gitk:3076 +msgid "g\t\tGo to commit" +msgstr "g\t\t指定してコミットに移動" + +#: gitk:3077 msgid "/\t\tFocus the search box" msgstr "/\t\t検索ボックスにフォーカス" -#: gitk:2716 +#: gitk:3078 msgid "?\t\tMove to previous find hit" msgstr "?\t\t前を検索して移動" -#: gitk:2717 +#: gitk:3079 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t次のファイルにdiff画面をスクロールする" -#: gitk:2718 +#: gitk:3080 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tdiff画面の次を検索" -#: gitk:2719 +#: gitk:3081 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tdiff画面の前を検索" -#: gitk:2720 +#: gitk:3082 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\t文字サイズを拡大" -#: gitk:2721 +#: gitk:3083 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\t文字サイズを拡大" -#: gitk:2722 +#: gitk:3084 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\t文字サイズを縮小" -#: gitk:2723 +#: gitk:3085 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\t文字サイズを縮小" -#: gitk:2724 +#: gitk:3086 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\t更新" -#: gitk:3179 gitk:3188 +#: gitk:3551 gitk:3560 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "一時ディレクトリ %s 生成時エラー:" -#: gitk:3201 +#: gitk:3573 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "\"%s\" のエラーが %s に発生:" -#: gitk:3264 +#: gitk:3636 msgid "command failed:" msgstr "コマンド失敗:" -#: gitk:3410 +#: gitk:3785 msgid "No such commit" msgstr "そのようなコミットはありません" -#: gitk:3424 +#: gitk:3799 msgid "git gui blame: command failed:" msgstr "git gui blame: コマンド失敗:" -#: gitk:3455 +#: gitk:3830 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "マージする HEAD を読み込めません: %s" -#: gitk:3463 +#: gitk:3838 #, tcl-format msgid "Error reading index: %s" msgstr "インデックス読み込みエラー: %s" -#: gitk:3488 +#: gitk:3863 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "git blame を始められません: %s" -#: gitk:3491 gitk:6280 +#: gitk:3866 gitk:6755 msgid "Searching" msgstr "検索中" -#: gitk:3523 +#: gitk:3898 #, tcl-format msgid "Error running git blame: %s" msgstr "git blame 実行エラー: %s" -#: gitk:3551 +#: gitk:3926 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "コミット %s に由来するその行は、このビューに表示されていません" -#: gitk:3565 +#: gitk:3940 msgid "External diff viewer failed:" msgstr "外部diffビューアが失敗:" -#: gitk:3683 +#: gitk:4044 +msgid "All files" +msgstr "全てのファイル" + +#: gitk:4068 +msgid "View" +msgstr "ビュー" + +#: gitk:4071 msgid "Gitk view definition" msgstr "Gitk ビュー定義" -#: gitk:3687 +#: gitk:4075 msgid "Remember this view" msgstr "このビューを記憶する" -#: gitk:3688 +#: gitk:4076 msgid "References (space separated list):" msgstr "リファレンス（スペース区切りのリスト）:" -#: gitk:3689 +#: gitk:4077 msgid "Branches & tags:" msgstr "ブランチ＆タグ:" -#: gitk:3690 +#: gitk:4078 msgid "All refs" msgstr "全てのリファレンス" -#: gitk:3691 +#: gitk:4079 msgid "All (local) branches" msgstr "全ての（ローカルな）ブランチ" -#: gitk:3692 +#: gitk:4080 msgid "All tags" msgstr "全てのタグ" -#: gitk:3693 +#: gitk:4081 msgid "All remote-tracking branches" msgstr "全てのリモート追跡ブランチ" -#: gitk:3694 +#: gitk:4082 msgid "Commit Info (regular expressions):" msgstr "コミット情報（正規表現）:" -#: gitk:3695 +#: gitk:4083 msgid "Author:" msgstr "作者:" -#: gitk:3696 +#: gitk:4084 msgid "Committer:" msgstr "コミット者:" -#: gitk:3697 +#: gitk:4085 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: gitk:3698 +#: gitk:4086 msgid "Matches all Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:3699 +#: gitk:4087 +msgid "Matches no Commit Info criteria" +msgstr "コミット情報の全ての条件に不一致" + +#: gitk:4088 msgid "Changes to Files:" msgstr "変更したファイル:" -#: gitk:3700 +#: gitk:4089 msgid "Fixed String" msgstr "固定文字列" -#: gitk:3701 +#: gitk:4090 msgid "Regular Expression" msgstr "正規表現" -#: gitk:3702 +#: gitk:4091 msgid "Search string:" msgstr "検索文字列:" -#: gitk:3703 +#: gitk:4092 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -644,205 +708,201 @@ msgstr "" "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3704 +#: gitk:4093 msgid "Since:" msgstr "期間の始め:" -#: gitk:3705 +#: gitk:4094 msgid "Until:" msgstr "期間の終わり:" -#: gitk:3706 +#: gitk:4095 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "制限・省略するリビジョンの数（正の整数）:" -#: gitk:3707 +#: gitk:4096 msgid "Number to show:" msgstr "表示する数:" -#: gitk:3708 +#: gitk:4097 msgid "Number to skip:" msgstr "省略する数:" -#: gitk:3709 +#: gitk:4098 msgid "Miscellaneous options:" msgstr "その他のオプション:" -#: gitk:3710 +#: gitk:4099 msgid "Strictly sort by date" msgstr "厳密に日付順で並び替え" -#: gitk:3711 +#: gitk:4100 msgid "Mark branch sides" msgstr "側枝マーク" -#: gitk:3712 +#: gitk:4101 msgid "Limit to first parent" msgstr "最初の親に制限" -#: gitk:3713 +#: gitk:4102 msgid "Simple history" msgstr "簡易な履歴" -#: gitk:3714 +#: gitk:4103 msgid "Additional arguments to git log:" msgstr "git log への追加の引数:" -#: gitk:3715 +#: gitk:4104 msgid "Enter files and directories to include, one per line:" msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" -#: gitk:3716 +#: gitk:4105 msgid "Command to generate more commits to include:" msgstr "コミット追加コマンド:" -#: gitk:3838 +#: gitk:4229 msgid "Gitk: edit view" msgstr "Gitk: ビュー編集" -#: gitk:3846 +#: gitk:4237 msgid "-- criteria for selecting revisions" msgstr "― リビジョンの選択条件" -#: gitk:3851 -msgid "View Name:" +#: gitk:4242 +msgid "View Name" msgstr "ビュー名:" -#: gitk:3926 +#: gitk:4317 msgid "Apply (F5)" msgstr "適用 (F5)" -#: gitk:3964 +#: gitk:4355 msgid "Error in commit selection arguments:" msgstr "コミット選択引数のエラー:" -#: gitk:4017 gitk:4069 gitk:4517 gitk:4531 gitk:5792 gitk:11263 gitk:11264 +#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 msgid "None" msgstr "無し" -#: gitk:4465 gitk:6312 gitk:8093 gitk:8108 -msgid "Date" -msgstr "日付" - -#: gitk:4465 gitk:6312 -msgid "CDate" -msgstr "作成日" - -#: gitk:4614 gitk:4619 +#: gitk:5022 gitk:5027 msgid "Descendant" msgstr "子孫" -#: gitk:4615 +#: gitk:5023 msgid "Not descendant" msgstr "非子孫" -#: gitk:4622 gitk:4627 +#: gitk:5030 gitk:5035 msgid "Ancestor" msgstr "祖先" -#: gitk:4623 +#: gitk:5031 msgid "Not ancestor" msgstr "非祖先" -#: gitk:4913 +#: gitk:5325 msgid "Local changes checked in to index but not committed" msgstr "ステージされた、コミット前のローカルな変更" -#: gitk:4949 +#: gitk:5361 msgid "Local uncommitted changes, not checked in to index" msgstr "ステージされていない、コミット前のローカルな変更" -#: gitk:6630 +#: gitk:7135 +msgid "and many more" +msgstr "他多数" + +#: gitk:7138 msgid "many" msgstr "多数" -#: gitk:6814 +#: gitk:7329 msgid "Tags:" msgstr "タグ:" -#: gitk:6831 gitk:6837 gitk:8086 +#: gitk:7346 gitk:7352 gitk:8826 msgid "Parent" msgstr "親" -#: gitk:6842 +#: gitk:7357 msgid "Child" msgstr "子" -#: gitk:6851 +#: gitk:7366 msgid "Branch" msgstr "ブランチ" -#: gitk:6854 +#: gitk:7369 msgid "Follows" msgstr "下位" -#: gitk:6857 +#: gitk:7372 msgid "Precedes" msgstr "上位" -#: gitk:7359 +#: gitk:7967 #, tcl-format msgid "Error getting diffs: %s" msgstr "diff取得エラー: %s" -#: gitk:7914 +#: gitk:8651 msgid "Goto:" msgstr "Goto:" -#: gitk:7916 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7935 +#: gitk:8672 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "%s を含む SHA1 ID は複数存在します" -#: gitk:7942 +#: gitk:8679 #, tcl-format msgid "Revision %s is not known" msgstr "リビジョン %s は不明です" -#: gitk:7952 +#: gitk:8689 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s は不明です" -#: gitk:7954 +#: gitk:8691 #, tcl-format msgid "Revision %s is not in the current view" msgstr "リビジョン %s は現在のビューにはありません" -#: gitk:8096 +#: gitk:8833 gitk:8848 +msgid "Date" +msgstr "日付" + +#: gitk:8836 msgid "Children" msgstr "子" -#: gitk:8153 +#: gitk:8899 #, tcl-format msgid "Reset %s branch to here" msgstr "%s ブランチをここにリセットする" -#: gitk:8155 +#: gitk:8901 msgid "Detached head: can't reset" msgstr "切り離されたHEAD: リセットできません" -#: gitk:8264 gitk:8270 +#: gitk:9006 gitk:9012 msgid "Skipping merge commit " msgstr "コミットマージをスキップ: " -#: gitk:8279 gitk:8284 +#: gitk:9021 gitk:9026 msgid "Error getting patch ID for " msgstr "パッチ取得エラー: ID " -#: gitk:8280 gitk:8285 +#: gitk:9022 gitk:9027 msgid " - stopping\n" msgstr " - 停止\n" -#: gitk:8290 gitk:8293 gitk:8301 gitk:8314 gitk:8323 +#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 msgid "Commit " msgstr "コミット " -#: gitk:8294 +#: gitk:9036 msgid "" " is the same patch as\n" " " @@ -850,7 +910,7 @@ msgstr "" " は下記のパッチと同等\n" " " -#: gitk:8302 +#: gitk:9044 msgid "" " differs from\n" " " @@ -858,7 +918,7 @@ msgstr "" " 下記からのdiff\n" " " -#: gitk:8304 +#: gitk:9046 msgid "" "Diff of commits:\n" "\n" @@ -866,122 +926,130 @@ msgstr "" "コミットのdiff:\n" "\n" -#: gitk:8315 gitk:8324 +#: gitk:9058 gitk:9067 #, tcl-format msgid " has %s children - stopping\n" msgstr " には %s の子があります - 停止\n" -#: gitk:8344 +#: gitk:9086 #, tcl-format msgid "Error writing commit to file: %s" msgstr "ファイルへのコミット書き出しエラー: %s" -#: gitk:8350 +#: gitk:9092 #, tcl-format msgid "Error diffing commits: %s" msgstr "コミットのdiff実行エラー: %s" -#: gitk:8380 +#: gitk:9138 msgid "Top" msgstr "Top" -#: gitk:8381 +#: gitk:9139 msgid "From" msgstr "From" -#: gitk:8386 +#: gitk:9144 msgid "To" msgstr "To" -#: gitk:8410 +#: gitk:9168 msgid "Generate patch" msgstr "パッチ生成" -#: gitk:8412 +#: gitk:9170 msgid "From:" msgstr "From:" -#: gitk:8421 +#: gitk:9179 msgid "To:" msgstr "To:" -#: gitk:8430 +#: gitk:9188 msgid "Reverse" msgstr "逆" -#: gitk:8432 gitk:8617 +#: gitk:9190 gitk:9400 msgid "Output file:" msgstr "出力ファイル:" -#: gitk:8438 +#: gitk:9196 msgid "Generate" msgstr "生成" -#: gitk:8476 +#: gitk:9234 msgid "Error creating patch:" msgstr "パッチ生成エラー:" -#: gitk:8499 gitk:8605 gitk:8662 +#: gitk:9257 gitk:9388 gitk:9445 msgid "ID:" msgstr "ID:" -#: gitk:8508 +#: gitk:9266 msgid "Tag name:" msgstr "タグ名:" -#: gitk:8512 gitk:8671 +#: gitk:9269 +msgid "Tag message is optional" +msgstr "タグメッセージを付ける事も出来ます" + +#: gitk:9271 +msgid "Tag message:" +msgstr "タグメッセージ:" + +#: gitk:9275 gitk:9454 msgid "Create" msgstr "生成" -#: gitk:8529 +#: gitk:9293 msgid "No tag name specified" msgstr "タグの名称が指定されていません" -#: gitk:8533 +#: gitk:9297 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "タグ \"%s\" は既に存在します" -#: gitk:8539 +#: gitk:9307 msgid "Error creating tag:" msgstr "タグ生成エラー:" -#: gitk:8614 +#: gitk:9397 msgid "Command:" msgstr "コマンド:" -#: gitk:8622 +#: gitk:9405 msgid "Write" msgstr "書き出し" -#: gitk:8640 +#: gitk:9423 msgid "Error writing commit:" msgstr "コミット書き出しエラー:" -#: gitk:8667 +#: gitk:9450 msgid "Name:" msgstr "名前:" -#: gitk:8690 +#: gitk:9473 msgid "Please specify a name for the new branch" msgstr "新しいブランチの名前を指定してください" -#: gitk:8695 +#: gitk:9478 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "ブランチ '%s' は既に存在します。上書きしますか？" -#: gitk:8761 +#: gitk:9545 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:8766 +#: gitk:9550 msgid "Cherry-picking" msgstr "チェリーピック中" -#: gitk:8775 +#: gitk:9559 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -991,7 +1059,7 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:8781 +#: gitk:9565 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -999,32 +1067,56 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:8797 +#: gitk:9581 gitk:9639 msgid "No changes committed" msgstr "何の変更もコミットされていません" -#: gitk:8823 +#: gitk:9608 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか？" + +#: gitk:9613 +msgid "Reverting" +msgstr "撤回中" + +#: 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 "ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に commit, reset, stash のいずれかを行ってからやり直してください。" + +#: gitk:9625 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"マージの衝突によって撤回は失敗しました。\n" +"この解決のために git citool を実行したいですか？" + +#: gitk:9668 msgid "Confirm reset" msgstr "確認を取り消す" -#: gitk:8825 +#: gitk:9670 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ブランチ %s を %s にリセットしますか？" -#: gitk:8829 +#: gitk:9672 msgid "Reset type:" msgstr "Reset タイプ:" -#: gitk:8833 +#: gitk:9675 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作業ツリーもインデックスもそのままにする" -#: gitk:8836 +#: gitk:9678 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" -#: gitk:8839 +#: gitk:9681 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1032,19 +1124,19 @@ msgstr "" "Hard: 作業ツリーやインデックスをリセット\n" "（「全ての」ローカルな変更を破棄）" -#: gitk:8856 +#: gitk:9698 msgid "Resetting" msgstr "リセット中" -#: gitk:8913 +#: gitk:9758 msgid "Checking out" msgstr "チェックアウト" -#: gitk:8966 +#: gitk:9811 msgid "Cannot delete the currently checked-out branch" msgstr "現在チェックアウトされているブランチを削除することはできません" -#: gitk:8972 +#: gitk:9817 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1053,16 +1145,16 @@ msgstr "" "ブランチ %s には他のブランチに存在しないコミットがあります。\n" "本当にブランチ %s を削除しますか？" -#: gitk:9003 +#: gitk:9848 #, tcl-format msgid "Tags and heads: %s" msgstr "タグとHEAD: %s" -#: gitk:9018 +#: gitk:9865 msgid "Filter" msgstr "フィルター" -#: gitk:9313 +#: gitk:10161 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1070,186 +1162,217 @@ msgstr "" "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" "ようです。" -#: gitk:10299 +#: gitk:11138 msgid "Tag" msgstr "タグ" -#: gitk:10299 +#: gitk:11142 msgid "Id" msgstr "ID" -#: gitk:10347 +#: gitk:11225 msgid "Gitk font chooser" msgstr "Gitk フォント選択" -#: gitk:10364 +#: gitk:11242 msgid "B" msgstr "B" -#: gitk:10367 +#: gitk:11245 msgid "I" msgstr "I" -#: gitk:10463 -msgid "Gitk preferences" -msgstr "Gitk 設定" - -#: gitk:10465 +#: gitk:11363 msgid "Commit list display options" msgstr "コミットリスト表示オプション" -#: gitk:10468 +#: gitk:11366 msgid "Maximum graph width (lines)" msgstr "最大グラフ幅（線の本数）" -#: gitk:10472 -#, tcl-format +#: gitk:11370 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大グラフ幅（ペインに対する％）" -#: gitk:10476 +#: gitk:11373 msgid "Show local changes" msgstr "ローカルな変更を表示" -#: gitk:10479 -msgid "Auto-select SHA1" -msgstr "SHA1 の自動選択" +#: gitk:11376 +msgid "Auto-select SHA1 (length)" +msgstr "SHA1 の自動選択 (選択文字数指定)" -#: gitk:10483 +#: gitk:11380 +msgid "Hide remote refs" +msgstr "リモートリファレンスを隠す" + +#: gitk:11384 msgid "Diff display options" msgstr "diff表示オプション" -#: gitk:10485 +#: gitk:11386 msgid "Tab spacing" msgstr "タブ空白幅" -#: gitk:10488 -msgid "Display nearby tags" -msgstr "近くのタグを表示する" +#: gitk:11389 +msgid "Display nearby tags/heads" +msgstr "近くの タグ/head を表示する" -#: gitk:10491 -msgid "Hide remote refs" -msgstr "リモートリファレンスを隠す" +#: gitk:11392 +msgid "Maximum # tags/heads to show" +msgstr "タグ/head の最大表示数" -#: gitk:10494 +#: gitk:11395 msgid "Limit diffs to listed paths" msgstr "diff をリストのパスに制限" -#: gitk:10497 +#: gitk:11398 msgid "Support per-file encodings" msgstr "ファイルごとのエンコーディングのサポート" -#: gitk:10503 gitk:10572 +#: gitk:11404 gitk:11551 msgid "External diff tool" msgstr "外部diffツール" -#: gitk:10505 +#: gitk:11405 msgid "Choose..." msgstr "選択..." -#: gitk:10510 +#: gitk:11410 +msgid "General options" +msgstr "全体設定" + +#: gitk:11413 +msgid "Use themed widgets" +msgstr "テーマウィジェットを使用する" + +#: gitk:11415 +msgid "(change requires restart)" +msgstr "(変更には再起動が必要です)" + +#: gitk:11417 +msgid "(currently unavailable)" +msgstr "(現在は使用出来ません)" + +#: gitk:11428 msgid "Colors: press to choose" msgstr "色: ボタンを押して選択" -#: gitk:10513 +#: gitk:11431 msgid "Interface" msgstr "インターフェイス" -#: gitk:10514 +#: gitk:11432 msgid "interface" msgstr "インターフェイス" -#: gitk:10517 +#: gitk:11435 msgid "Background" msgstr "背景" -#: gitk:10518 gitk:10548 +#: gitk:11436 gitk:11466 msgid "background" msgstr "背景" -#: gitk:10521 +#: gitk:11439 msgid "Foreground" msgstr "前景" -#: gitk:10522 +#: gitk:11440 msgid "foreground" msgstr "前景" -#: gitk:10525 +#: gitk:11443 msgid "Diff: old lines" msgstr "Diff: 旧バージョン" -#: gitk:10526 +#: gitk:11444 msgid "diff old lines" msgstr "diff 旧バージョン" -#: gitk:10530 +#: gitk:11448 msgid "Diff: new lines" msgstr "Diff: 新バージョン" -#: gitk:10531 +#: gitk:11449 msgid "diff new lines" msgstr "diff 新バージョン" -#: gitk:10535 +#: gitk:11453 msgid "Diff: hunk header" msgstr "Diff: hunkヘッダ" -#: gitk:10537 +#: gitk:11455 msgid "diff hunk header" msgstr "diff hunkヘッダ" -#: gitk:10541 +#: gitk:11459 msgid "Marked line bg" msgstr "マーク行の背景" -#: gitk:10543 +#: gitk:11461 msgid "marked line background" msgstr "マーク行の背景" -#: gitk:10547 +#: gitk:11465 msgid "Select bg" msgstr "選択の背景" -#: gitk:10551 +#: gitk:11474 msgid "Fonts: press to choose" msgstr "フォント: ボタンを押して選択" -#: gitk:10553 +#: gitk:11476 msgid "Main font" msgstr "主フォント" -#: gitk:10554 +#: gitk:11477 msgid "Diff display font" msgstr "Diff表示用フォント" -#: gitk:10555 +#: gitk:11478 msgid "User interface font" msgstr "UI用フォント" -#: gitk:10582 +#: gitk:11500 +msgid "Gitk preferences" +msgstr "Gitk 設定" + +#: gitk:11509 +msgid "General" +msgstr "一般" + +#: gitk:11510 +msgid "Colors" +msgstr "色" + +#: gitk:11511 +msgid "Fonts" +msgstr "フォント" + +#: gitk:11561 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: 「%s」 の色を選択" -#: gitk:11168 +#: gitk:12074 +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" +"Gitkの実行には Tcl/Tk 8.4 以上が必要です。" + +#: gitk:12284 msgid "Cannot find a git repository here." msgstr "ここにはgitリポジトリがありません。" -#: gitk:11172 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "gitディレクトリ \"%s\" を見つけられません。" - -#: gitk:11219 +#: gitk:12331 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" -#: gitk:11231 +#: gitk:12343 msgid "Bad arguments to gitk:" msgstr "gitkへの不正な引数:" - -#: gitk:11316 -msgid "Command line" -msgstr "コマンド行" diff --git a/gitk-git/po/pt_br.po b/gitk-git/po/pt_br.po index 1486e3205a..3f78f1b748 100644 --- a/gitk-git/po/pt_br.po +++ b/gitk-git/po/pt_br.po @@ -9,33 +9,42 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-12-06 23:39-0200\n" "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n" "Language-Team: Brazilian Portuguese <>\n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Não foi possível obter a lista dos arquivos não mesclados:" -#: gitk:274 +#: 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 "Erro ao interpretar revisões:" -#: gitk:330 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erro ao executar o comando--argscmd:" -#: gitk:343 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" "mesclados." -#: gitk:346 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -43,603 +52,647 @@ msgstr "" "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" "mesclados dentro dos limites." -#: gitk:368 gitk:516 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erro ao executar git log:" -#: gitk:386 gitk:532 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Lendo" -#: gitk:446 gitk:4271 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lendo revisões..." -#: gitk:449 gitk:1580 gitk:4274 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nenhuma revisão foi selecionada" -#: gitk:1456 +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Linha de comando" + +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Não foi possível interpretar a saída do \"git log\":" -#: gitk:1676 +#: gitk:1740 msgid "No commit information available" msgstr "Não há informações disponíveis sobre a revisão" -#: gitk:1818 -msgid "mc" -msgstr "mc" - -#: gitk:1853 gitk:4064 gitk:9067 gitk:10607 gitk:10817 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1855 gitk:4066 gitk:8657 gitk:8736 gitk:8851 gitk:8900 gitk:9069 -#: gitk:10608 gitk:10818 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancelar" -#: gitk:1980 -msgid "Update" +#: gitk:2069 +msgid "&Update" msgstr "Atualizar" -#: gitk:1981 -msgid "Reload" +#: gitk:2070 +msgid "&Reload" msgstr "Recarregar" -#: gitk:1982 -msgid "Reread references" +#: gitk:2071 +msgid "Reread re&ferences" msgstr "Ler as referências novamente" -#: gitk:1983 -msgid "List references" +#: gitk:2072 +msgid "&List references" msgstr "Listar referências" -#: gitk:1985 -msgid "Start git gui" +#: gitk:2074 +msgid "Start git &gui" msgstr "Iniciar Git GUI" -#: gitk:1987 -msgid "Quit" +#: gitk:2076 +msgid "&Quit" msgstr "Sair" -#: gitk:1979 -msgid "File" +#: gitk:2068 +msgid "&File" msgstr "Arquivo" -#: gitk:1991 -msgid "Preferences" +#: gitk:2080 +msgid "&Preferences" msgstr "Preferências" -#: gitk:1990 -msgid "Edit" +#: gitk:2079 +msgid "&Edit" msgstr "Editar" -#: gitk:1995 -msgid "New view..." +#: gitk:2084 +msgid "&New view..." msgstr "Nova vista..." -#: gitk:1996 -msgid "Edit view..." +#: gitk:2085 +msgid "&Edit view..." msgstr "Editar vista..." -#: gitk:1997 -msgid "Delete view" +#: gitk:2086 +msgid "&Delete view" msgstr "Apagar vista" -#: gitk:1999 -msgid "All files" +#: gitk:2088 gitk:4043 +msgid "&All files" msgstr "Todos os arquivos" -#: gitk:1994 gitk:3817 -msgid "View" +#: gitk:2083 gitk:4067 +msgid "&View" msgstr "Exibir" -#: gitk:2004 gitk:2014 gitk:2787 -msgid "About gitk" +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" msgstr "Sobre o gitk" -#: gitk:2005 gitk:2019 -msgid "Key bindings" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" msgstr "Atalhos de teclado" -#: gitk:2003 gitk:2018 -msgid "Help" +#: gitk:2092 gitk:2107 +msgid "&Help" msgstr "Ajuda" -#: gitk:2096 gitk:8132 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2127 +#: gitk:2229 msgid "Row" msgstr "Linha" -#: gitk:2165 +#: gitk:2267 msgid "Find" msgstr "Encontrar" -#: gitk:2166 -msgid "next" -msgstr "Próximo" - -#: gitk:2167 -msgid "prev" -msgstr "Anterior" - -#: gitk:2168 +#: gitk:2295 msgid "commit" msgstr "Revisão" -#: gitk:2171 gitk:2173 gitk:4432 gitk:4455 gitk:4479 gitk:6420 gitk:6492 -#: gitk:6576 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "contendo:" -#: gitk:2174 gitk:3298 gitk:3303 gitk:4507 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "envolvendo os caminhos:" -#: gitk:2175 gitk:4512 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "Adicionando/removendo texto:" -#: gitk:2184 gitk:2186 +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "" + +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exatamente" -#: gitk:2186 gitk:4587 gitk:6388 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Ignorar maiúsculas/minúsculas" -#: gitk:2186 gitk:4481 gitk:4585 gitk:6384 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Expressão regular" -#: gitk:2188 gitk:2189 gitk:4606 gitk:4636 gitk:4643 gitk:6512 gitk:6580 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Todos os campos" -#: gitk:2189 gitk:4604 gitk:4636 gitk:6451 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Assunto" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6580 gitk:7013 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Descrição da revisão" -#: gitk:2190 gitk:4604 gitk:4608 gitk:4643 gitk:6451 gitk:6948 gitk:8307 -#: gitk:8322 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6950 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Revisor" -#: gitk:2221 +#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2229 +#: gitk:2358 msgid "Diff" msgstr "Diferenças" -#: gitk:2231 +#: gitk:2360 msgid "Old version" msgstr "Versão antiga" -#: gitk:2233 +#: gitk:2362 msgid "New version" msgstr "Versão nova" -#: gitk:2235 +#: gitk:2364 msgid "Lines of context" msgstr "Número de linhas de contexto" -#: gitk:2245 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignorar mudanças de caixa" -#: gitk:2304 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "" + +#: gitk:2445 msgid "Patch" msgstr "Diferenças" -#: gitk:2306 +#: gitk:2447 msgid "Tree" msgstr "Árvore" -#: gitk:2463 gitk:2480 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Comparar esta revisão com a selecionada" -#: gitk:2464 gitk:2481 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Comparar a revisão selecionada com esta" -#: gitk:2465 gitk:2482 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Criar patch" -#: gitk:2466 gitk:8715 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Criar etiqueta" -#: gitk:2467 gitk:8831 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Salvar revisão para um arquivo" -#: gitk:2468 gitk:8888 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Criar novo ramo" -#: gitk:2469 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Fazer cherry-pick desta revisão" -#: gitk:2470 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Redefinir HEAD para cá" -#: gitk:2471 +#: gitk:2625 msgid "Mark this commit" msgstr "Marcar esta revisão" -#: gitk:2472 +#: gitk:2626 msgid "Return to mark" msgstr "Voltar à marca" -#: gitk:2473 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Encontrar descendente e marcar" -#: gitk:2474 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Comparar com a revisão marcada" -#: gitk:2488 +#: gitk:2629 gitk:2640 +#, fuzzy +msgid "Diff this -> marked commit" +msgstr "Comparar esta revisão com a selecionada" + +#: gitk:2630 gitk:2641 +#, fuzzy +msgid "Diff marked commit -> this" +msgstr "Comparar a revisão selecionada com esta" + +#: gitk:2631 +#, fuzzy +msgid "Revert this commit" +msgstr "Marcar esta revisão" + +#: gitk:2647 msgid "Check out this branch" msgstr "Efetuar checkout deste ramo" -#: gitk:2489 +#: gitk:2648 msgid "Remove this branch" msgstr "Excluir este ramo" -#: gitk:2496 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Marcar este também" -#: gitk:2497 +#: gitk:2657 msgid "Highlight this only" msgstr "Marcar apenas este" -#: gitk:2498 +#: gitk:2658 msgid "External diff" msgstr "Diff externo" -#: gitk:2499 +#: gitk:2659 msgid "Blame parent commit" msgstr "Anotar revisão anterior" -#: gitk:2506 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Exibir origem desta linha" -#: gitk:2507 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Executar 'git blame' nesta linha" -#: gitk:2789 -msgid "\n" +#: gitk:3014 +#, fuzzy +msgid "" +"\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" -msgstr "\n" +msgstr "" +"\n" "Gitk - um visualizador de revisões para o git \n" "\n" "Copyright ©9 2005-2010 Paul Mackerras\n" "\n" "Uso e distribuição segundo os termos da Licença Pública Geral GNU" -#: gitk:2797 gitk:2862 gitk:9253 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Fechar" -#: gitk:2818 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Atalhos de teclado" -#: gitk:2821 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Atalhos de teclado:" -#: gitk:2823 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSair" -#: gitk:2824 +#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tFechar janela" -#: gitk:2825 +#: gitk:3050 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tIr para a primeira revisão" -#: gitk:2826 +#: gitk:3051 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tIr para a última revisão" -#: gitk:2827 -msgid "<Up>, p, i\tMove up one commit" +#: gitk:3052 +#, fuzzy +msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, i\tIr para uma revisão acima" -#: gitk:2828 -msgid "<Down>, n, k\tMove down one commit" +#: gitk:3053 +#, fuzzy +msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, k\tIr para uma revisão abaixo" -#: gitk:2829 -msgid "<Left>, z, j\tGo back in history list" +#: gitk:3054 +#, fuzzy +msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, j\tVoltar no histórico" -#: gitk:2830 +#: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tAvançar no histórico" -#: gitk:2831 +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "" + +#: gitk:3057 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tSubir uma página na lista de revisões" -#: gitk:2832 +#: gitk:3058 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tDescer uma página na lista de revisões" -#: gitk:2833 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRolar para o início da lista de revisões" -#: gitk:2834 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRolar para o final da lista de revisões" -#: gitk:2835 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões" -#: gitk:2836 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões" -#: gitk:2837 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões" -#: gitk:2838 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões" -#: gitk:2839 +#: gitk:3065 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tProcurar próxima (revisões mas recentes)" -#: gitk:2840 +#: gitk:3066 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\tProcurar anterior (revisões mais antigas)" -#: gitk:2841 +#: gitk:3067 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRola alterações uma página acima" -#: gitk:2842 +#: gitk:3068 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tRolar alterações uma página abaixo" -#: gitk:2843 +#: gitk:3069 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tRolar alterações uma página abaixo" -#: gitk:2844 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRolar alterações 18 linhas acima" -#: gitk:2845 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRolar alterações 18 linhas abaixo" -#: gitk:2846 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tProcurar" -#: gitk:2847 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tIr para a próxima ocorrência" -#: gitk:2848 +#: gitk:3074 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tIr para a próxima ocorrência" -#: gitk:2849 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "<End>\t\tIr para a última revisão" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tPor foco na caixa de busca" -#: gitk:2850 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tIr para a ocorrência anterior" -#: gitk:2851 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRolar alterações para o próximo arquivo" -#: gitk:2852 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações" -#: gitk:2853 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações" -#: gitk:2854 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamanho da fonte" -#: gitk:2855 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamanho da fonte" -#: gitk:2856 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tReduzir tamanho da fonte" -#: gitk:2857 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tReduzir tamanho da fonte" -#: gitk:2858 +#: gitk:3085 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tAtualizar" -#: gitk:3313 gitk:3322 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erro ao criar o diretório temporário %s:" -#: gitk:3335 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erro ao ler \"%s\" de %s:" -#: gitk:3398 +#: gitk:3635 msgid "command failed:" msgstr "O comando falhou:" -#: gitk:3547 +#: gitk:3784 msgid "No such commit" msgstr "Revisão não encontrada" -#: gitk:3561 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "Comando 'git gui blame' falhou:" -#: gitk:3592 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossível ler merge head: %s" -#: gitk:3600 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Erro ao ler o índice: %s" -#: gitk:3625 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Não foi possível inciar o 'git blame': %s" -#: gitk:3628 gitk:6419 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Procurando" -#: gitk:3660 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Erro ao executar 'git blame': %s" -#: gitk:3688 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Esta linha vem da revisão %s, que não está nesta vista" -#: gitk:3702 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Erro do visualizador de alterações externo:" -#: gitk:3820 +#: gitk:4070 msgid "Gitk view definition" msgstr "Definir vista" -#: gitk:3824 +#: gitk:4074 msgid "Remember this view" msgstr "Lembrar esta vista" -#: gitk:3825 +#: gitk:4075 msgid "References (space separated list):" msgstr "Referências (separar a lista com um espaço):" -#: gitk:3826 +#: gitk:4076 msgid "Branches & tags:" msgstr "Ramos & etiquetas:" -#: gitk:3827 +#: gitk:4077 msgid "All refs" msgstr "Todas as referências" -#: gitk:3828 +#: gitk:4078 msgid "All (local) branches" msgstr "Todos os ramos locais" -#: gitk:3829 +#: gitk:4079 msgid "All tags" msgstr "Todas as etiquetas" -#: gitk:3830 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Todos os ramos de rastreio" -#: gitk:3831 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informações da revisão (expressões regulares):" -#: gitk:3832 +#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:3833 +#: gitk:4083 msgid "Committer:" msgstr "Revisor:" -#: gitk:3834 +#: gitk:4084 msgid "Commit Message:" msgstr "Descrição da revisão:" -#: gitk:3835 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Coincidir todos os critérios de informações da revisão" -#: gitk:3836 +#: gitk:4086 +#, fuzzy +msgid "Matches no Commit Info criteria" +msgstr "Coincidir todos os critérios de informações da revisão" + +#: gitk:4087 msgid "Changes to Files:" msgstr "Mudanças para os arquivos:" -#: gitk:3837 +#: gitk:4088 msgid "Fixed String" msgstr "Texto fixo" -#: gitk:3838 +#: gitk:4089 msgid "Regular Expression" msgstr "Expressão regular" -#: gitk:3839 +#: gitk:4090 msgid "Search string:" msgstr "Texto de busca" -#: gitk:3840 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -647,201 +700,201 @@ msgstr "" "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3841 +#: gitk:4092 msgid "Since:" msgstr "Desde:" -#: gitk:3842 +#: gitk:4093 msgid "Until:" msgstr "Até:" -#: gitk:3843 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" -#: gitk:3844 +#: gitk:4095 msgid "Number to show:" msgstr "Número para mostrar:" -#: gitk:3845 +#: gitk:4096 msgid "Number to skip:" msgstr "Número para ignorar:" -#: gitk:3846 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Opções diversas:" -#: gitk:3847 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordenar estritamente pela data" -#: gitk:3848 +#: gitk:4099 msgid "Mark branch sides" msgstr "Marcar os dois lados do ramo" -#: gitk:3849 +#: gitk:4100 msgid "Limit to first parent" msgstr "Limitar ao primeiro antecessor" -#: gitk:3850 +#: gitk:4101 msgid "Simple history" msgstr "Histórico simplificado" -#: gitk:3851 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Argumentos adicionais para o 'git log':" -#: gitk:3852 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Arquivos e diretórios para incluir, um por linha" -#: gitk:3853 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando para gerar mais revisões para incluir:" -#: gitk:3977 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: editar vista" -#: gitk:3985 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- critérios para selecionar revisões" -#: gitk:3990 +#: gitk:4241 msgid "View Name" msgstr "Nome da vista" -#: gitk:4065 +#: gitk:4316 msgid "Apply (F5)" msgstr "Aplicar (F5)" -#: gitk:4103 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Erro nos argumentos de seleção de revisões:" -#: gitk:4156 gitk:4208 gitk:4656 gitk:4670 gitk:5931 gitk:11551 gitk:11552 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Nenhum" -#: gitk:4604 gitk:6451 gitk:8309 gitk:8324 -msgid "Date" -msgstr "Data" - -#: gitk:4604 gitk:6451 -msgid "CDate" -msgstr "DataR" - -#: gitk:4753 gitk:4758 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendente de" -#: gitk:4754 +#: gitk:5022 msgid "Not descendant" msgstr "Não descendente de" -#: gitk:4761 gitk:4766 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Antecessor de" -#: gitk:4762 +#: gitk:5030 msgid "Not ancestor" msgstr "Não antecessor de" -#: gitk:5052 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Mudanças locais marcadas, porém não salvas" -#: gitk:5088 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Mudanças locais não marcadas" -#: gitk:6769 +#: gitk:7134 +msgid "and many more" +msgstr "" + +#: gitk:7137 msgid "many" msgstr "muitas" -#: gitk:6952 +#: gitk:7328 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:6969 gitk:6975 gitk:8302 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Antecessor" -#: gitk:6980 +#: gitk:7356 msgid "Child" msgstr "Descendente" -#: gitk:6989 +#: gitk:7365 msgid "Branch" msgstr "Ramo" -#: gitk:6992 +#: gitk:7368 msgid "Follows" msgstr "Segue" -#: gitk:6995 +#: gitk:7371 msgid "Precedes" msgstr "Precede" -#: gitk:7532 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erro ao obter diferenças: %s" -#: gitk:8130 +#: gitk:8650 msgid "Goto:" msgstr "Ir para:" -#: gitk:8151 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "O id SHA1 %s é ambíguo" -#: gitk:8158 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Revisão %s desconhecida" -#: gitk:8168 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Id SHA1 %s desconhecido" -#: gitk:8170 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A revisão %s não está na vista atual" -#: gitk:8312 +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Data" + +#: gitk:8835 msgid "Children" msgstr "Descendentes" -#: gitk:8370 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Redefinir ramo %s para este ponto" -#: gitk:8372 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Detached head: impossível redefinir" -#: gitk:8481 gitk:8487 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Saltando revisão de mesclagem" -#: gitk:8496 gitk:8501 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Erro ao obter patch ID para" -#: gitk:8497 gitk:8502 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr "- parando\n" -#: gitk:8507 gitk:8510 gitk:8518 gitk:8532 gitk:8541 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Revisão" -#: gitk:8511 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -849,13 +902,13 @@ msgstr "" "é o mesmo patch que\n" " " -#: gitk:8519 +#: gitk:9043 msgid "" " differs from\n" " " msgstr "difere de" -#: gitk:8521 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -863,129 +916,129 @@ msgstr "" "Diferença de revisões:\n" "\n" -#: gitk:8533 gitk:8542 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "possui %s descendentes - parando\n" -#: gitk:8561 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Erro ao salvar revisão para o arquivo: %s" -#: gitk:8567 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Erro ao comparar revisões: %s" -#: gitk:8598 +#: gitk:9137 msgid "Top" msgstr "Início" -#: gitk:8599 +#: gitk:9138 msgid "From" msgstr "De" -#: gitk:8604 +#: gitk:9143 msgid "To" msgstr "Para" -#: gitk:8628 +#: gitk:9167 msgid "Generate patch" msgstr "Gerar patch" -#: gitk:8630 +#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:8639 +#: gitk:9178 msgid "To:" msgstr "Para:" -#: gitk:8648 +#: gitk:9187 msgid "Reverse" msgstr "Inverter" -#: gitk:8650 gitk:8845 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Arquivo de saída:" -#: gitk:8656 +#: gitk:9195 msgid "Generate" msgstr "Gerar" -#: gitk:8694 +#: gitk:9233 msgid "Error creating patch:" msgstr "Erro ao criar patch:" -#: gitk:8717 gitk:8833 gitk:8890 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:8726 +#: gitk:9265 msgid "Tag name:" msgstr "Nome da etiqueta:" -#: gitk:8729 +#: gitk:9268 msgid "Tag message is optional" msgstr "A descrição da etiqueta é opcional" -#: gitk:8731 +#: gitk:9270 msgid "Tag message:" msgstr "Descrição da etiqueta" -#: gitk:8735 gitk:8899 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Criar" -#: gitk:8753 +#: gitk:9292 msgid "No tag name specified" msgstr "Nome da etiqueta não indicado" -#: gitk:8757 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Etiqueta \"%s\" já existe" -#: gitk:8767 +#: gitk:9306 msgid "Error creating tag:" msgstr "Erro ao criar etiqueta:" -#: gitk:8842 +#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:8850 +#: gitk:9390 msgid "Write" msgstr "Exportar" -#: gitk:8868 +#: gitk:9408 msgid "Error writing commit:" msgstr "Erro ao exportar revisão" -#: gitk:8895 +#: gitk:9435 msgid "Name:" msgstr "Nome:" -#: gitk:8918 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Indique um nome para o novo ramo" -#: gitk:8923 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "O ramo \"%s\" já existe. Sobrescrever?" -#: gitk:8989 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" -#: gitk:8994 +#: gitk:9535 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:9003 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -995,7 +1048,7 @@ msgstr "" "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " "novamente." -#: gitk:9009 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1003,32 +1056,61 @@ msgstr "" "O cherry-pick falhou porque houve um conflito na mesclagem.\n" "Executar o 'git citool' para resolvê-lo?" -#: gitk:9025 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nenhuma revisão foi salva" -#: gitk:9051 +#: gitk:9593 +#, fuzzy, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" + +#: gitk:9598 +#, fuzzy +msgid "Reverting" +msgstr "Redefinindo" + +#: 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 "" +"O cherry-pick falhou porque o arquivo \"%s\" possui mudanças locais.\n" +"Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " +"novamente." + +#: gitk:9610 +#, fuzzy +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "" +"O cherry-pick falhou porque houve um conflito na mesclagem.\n" +"Executar o 'git citool' para resolvê-lo?" + +#: gitk:9653 msgid "Confirm reset" msgstr "Confirmar redefinição" -#: gitk:9053 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Você realmente deseja redefinir o ramo %s para %s?" -#: gitk:9055 +#: gitk:9657 msgid "Reset type:" msgstr "Tipo de redefinição" -#: gitk:9058 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: deixa a árvore de trabalho e o índice intocados" -#: gitk:9061 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice" -#: gitk:9064 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1036,19 +1118,19 @@ msgstr "" "Hard: Redefine a árvore de trabalho e o índice\n" "(descarta TODAS as mudanças locais)" -#: gitk:9081 +#: gitk:9683 msgid "Resetting" msgstr "Redefinindo" -#: gitk:9141 +#: gitk:9743 msgid "Checking out" msgstr "Abrindo" -#: gitk:9194 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossível excluir o ramo atualmente aberto" -#: gitk:9200 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1057,16 +1139,16 @@ msgstr "" "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n" "Você realmente deseja excluir ramo \"%s\"?" -#: gitk:9231 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Referências: %s" -#: gitk:9246 +#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:9541 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1074,204 +1156,235 @@ msgstr "" "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas " "antecessoras/sucessoras estarão incompletas" -#: gitk:10527 +#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:10527 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:10576 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Selecionar fontes do Gitk" -#: gitk:10593 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:10596 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:10714 -msgid "Gitk preferences" -msgstr "Preferências do Gitk" - -#: gitk:10716 +#: gitk:11348 msgid "Commit list display options" msgstr "Opções da lista de revisões" -#: gitk:10719 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Largura máxima do grafo (linhas)" -#: gitk:10722 -#, tcl-format +#: gitk:11355 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Largura máxima do grafo (% do painel)" -#: gitk:10725 +#: gitk:11358 msgid "Show local changes" msgstr "Exibir mudanças locais" -#: gitk:10728 -msgid "Auto-select SHA1" +#: gitk:11361 +#, fuzzy +msgid "Auto-select SHA1 (length)" msgstr "Selecionar o SHA1 automaticamente" -#: gitk:10731 +#: gitk:11365 msgid "Hide remote refs" msgstr "Ocultar referências remotas" -#: gitk:10735 +#: gitk:11369 msgid "Diff display options" msgstr "Opções de exibição das alterações" -#: gitk:10737 +#: gitk:11371 msgid "Tab spacing" msgstr "Espaços por tabulação" -#: gitk:10740 -msgid "Display nearby tags" +#: gitk:11374 +#, fuzzy +msgid "Display nearby tags/heads" msgstr "Exibir etiquetas próximas" -#: gitk:10743 +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "" + +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limitar diferenças aos caminhos listados" -#: gitk:10746 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Usar codificações distintas por arquivo" -#: gitk:10752 gitk:10832 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Ferramenta 'diff' externa" -#: gitk:10753 +#: gitk:11390 msgid "Choose..." msgstr "Selecionar..." -#: gitk:10758 +#: gitk:11395 msgid "General options" msgstr "Opções gerais" -#: gitk:10761 +#: gitk:11398 msgid "Use themed widgets" msgstr "Usar temas para as janelas" -#: gitk:10763 +#: gitk:11400 msgid "(change requires restart)" msgstr "(exige reinicialização)" -#: gitk:10765 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(atualmente indisponível)" -#: gitk:10769 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Cores: clique para escolher" -#: gitk:10772 +#: gitk:11416 msgid "Interface" msgstr "Interface" -#: gitk:10773 +#: gitk:11417 msgid "interface" msgstr "interface" -#: gitk:10776 +#: gitk:11420 msgid "Background" msgstr "Segundo plano" -#: gitk:10777 gitk:10807 +#: gitk:11421 gitk:11451 msgid "background" msgstr "segundo plano" -#: gitk:10780 +#: gitk:11424 msgid "Foreground" msgstr "Primeiro plano" -#: gitk:10781 +#: gitk:11425 msgid "foreground" msgstr "primeiro plano" -#: gitk:10784 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: linhas excluídas" -#: gitk:10785 +#: gitk:11429 msgid "diff old lines" msgstr "linhas excluídas" -#: gitk:10789 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: linhas adicionadas" -#: gitk:10790 +#: gitk:11434 msgid "diff new lines" msgstr "linhas adicionadas" -#: gitk:10794 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: cabeçalho do bloco" -#: gitk:10796 +#: gitk:11440 msgid "diff hunk header" msgstr "cabeçalho do bloco" -#: gitk:10800 +#: gitk:11444 msgid "Marked line bg" msgstr "2º plano da linha marcada" -#: gitk:10802 +#: gitk:11446 msgid "marked line background" msgstr "segundo plano da linha marcada" -#: gitk:10806 +#: gitk:11450 msgid "Select bg" msgstr "2º plano da seleção" -#: gitk:10810 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Fontes: clique para escolher" -#: gitk:10812 +#: gitk:11461 msgid "Main font" msgstr "Fonte principal" -#: gitk:10813 +#: gitk:11462 msgid "Diff display font" msgstr "Fonte da lista de mudanças" -#: gitk:10814 +#: gitk:11463 msgid "User interface font" msgstr "Fonte da interface" -#: gitk:10842 +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Preferências do Gitk" + +#: gitk:11494 +#, fuzzy +msgid "General" +msgstr "Gerar" + +#: gitk:11495 +msgid "Colors" +msgstr "" + +#: gitk:11496 +msgid "Fonts" +msgstr "" + +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: selecionar cor para %s" -#: gitk:11445 +#: 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 "Não há nenhum repositório git aqui." -#: gitk:11449 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Impossível encontrar o diretório git \"%s\"." - -#: gitk:11496 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de " "arquivo)" -#: gitk:11508 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Argumentos incorretos para o gitk:" -#: gitk:11604 -msgid "Command line" -msgstr "Linha de comando" +#~ msgid "mc" +#~ msgstr "mc" + +#~ msgid "next" +#~ msgstr "Próximo" + +#~ msgid "prev" +#~ msgstr "Anterior" + +#~ msgid "CDate" +#~ msgstr "DataR" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Impossível encontrar o diretório git \"%s\"." diff --git a/gitk-git/po/ru.po b/gitk-git/po/ru.po index 59873033af..17ed026aa7 100644 --- a/gitk-git/po/ru.po +++ b/gitk-git/po/ru.po @@ -1,1085 +1,1329 @@ -# # Translation of gitk to Russian. # +# Translators: +# 0xAX <kuleshovmail@gmail.com>, 2014 +# Alex Riesen <raa.lkml@gmail.com>, 2015 +# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015 +# Dmitry Potapov <dpotapov@gmail.com>, 2009 +# Skip <bsvskip@rambler.ru>, 2011 msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-24 16:00+0200\n" -"PO-Revision-Date: 2009-04-24 16:00+0200\n" -"Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n" -"Language-Team: Russian\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" +"PO-Revision-Date: 2015-10-12 10:14+0000\n" +"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\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:113 +#: gitk:140 msgid "Couldn't get list of unmerged files:" -msgstr "" -"Невозможно получить список файлов незавершённой операции слияния:" +msgstr "Невозможно получить список файлов незавершённой операции слияния:" + +#: gitk:212 gitk:2381 +msgid "Color words" +msgstr "Цветные слова" -#: gitk:268 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +msgid "Markup words" +msgstr "Помеченые слова" + +#: gitk:324 msgid "Error parsing revisions:" -msgstr "Ошибка в идентификаторе версии:" +msgstr "Ошибка при разборе редакции:" -#: gitk:323 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Ошибка выполнения команды заданной --argscmd:" -#: gitk:336 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." -msgstr "" -"Файлы не выбраны: указан --merge, но не было найдено ни одного файла " -"где эта операция должна быть завершена." +msgstr "Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта операция должна быть завершена." -#: gitk:339 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." -msgstr "" -"Файлы не выбраны: указан --merge, но в рамках указанного " -"ограничения на имена файлов нет ни одного " -"где эта операция должна быть завершена." +msgstr "Файлы не выбраны: указан --merge, но в рамках указанного ограничения на имена файлов нет ни одного где эта операция должна быть завершена." -#: gitk:361 gitk:508 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Ошибка запуска git log:" -#: gitk:379 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Чтение" -#: gitk:439 gitk:4021 +#: gitk:496 gitk:4525 msgid "Reading commits..." -msgstr "Чтение версий..." +msgstr "Чтение коммитов..." -#: gitk:442 gitk:1560 gitk:4024 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Ничего не выбрано" -#: gitk:1436 +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Командная строка" + +#: gitk:1511 msgid "Can't parse git log output:" msgstr "Ошибка обработки вывода команды git log:" -#: gitk:1656 +#: gitk:1740 msgid "No commit information available" -msgstr "Нет информации о состоянии" +msgstr "Нет информации о коммите" -#: gitk:1791 gitk:1815 gitk:3814 gitk:8478 gitk:10014 gitk:10186 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1817 gitk:3816 gitk:8078 gitk:8152 gitk:8259 gitk:8308 gitk:8480 -#: gitk:10015 gitk:10187 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Отмена" -#: gitk:1915 -msgid "Update" +#: gitk:2069 +msgid "&Update" msgstr "Обновить" -#: gitk:1916 -msgid "Reload" +#: gitk:2070 +msgid "&Reload" msgstr "Перечитать" -#: gitk:1917 -msgid "Reread references" +#: gitk:2071 +msgid "Reread re&ferences" msgstr "Обновить список ссылок" -#: gitk:1918 -msgid "List references" +#: gitk:2072 +msgid "&List references" msgstr "Список ссылок" -#: gitk:1920 -msgid "Start git gui" +#: gitk:2074 +msgid "Start git &gui" msgstr "Запустить git gui" -#: gitk:1922 -msgid "Quit" +#: gitk:2076 +msgid "&Quit" msgstr "Завершить" -#: gitk:1914 -msgid "File" +#: gitk:2068 +msgid "&File" msgstr "Файл" -#: gitk:1925 -msgid "Preferences" +#: gitk:2080 +msgid "&Preferences" msgstr "Настройки" -#: gitk:1924 -msgid "Edit" +#: gitk:2079 +msgid "&Edit" msgstr "Редактировать" -#: gitk:1928 -msgid "New view..." +#: gitk:2084 +msgid "&New view..." msgstr "Новое представление..." -#: gitk:1929 -msgid "Edit view..." +#: gitk:2085 +msgid "&Edit view..." msgstr "Редактировать представление..." -#: gitk:1930 -msgid "Delete view" +#: gitk:2086 +msgid "&Delete view" msgstr "Удалить представление" -#: gitk:1932 -msgid "All files" +#: gitk:2088 gitk:4043 +msgid "&All files" msgstr "Все файлы" -#: gitk:1927 gitk:3626 -msgid "View" +#: gitk:2083 gitk:4067 +msgid "&View" msgstr "Представление" -#: gitk:1935 gitk:2609 -msgid "About gitk" +#: gitk:2093 gitk:2103 gitk:3012 +msgid "&About gitk" msgstr "О gitk" -#: gitk:1936 -msgid "Key bindings" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" msgstr "Назначения клавиатуры" -#: gitk:1934 -msgid "Help" +#: gitk:2092 gitk:2107 +msgid "&Help" msgstr "Подсказка" -#: gitk:1994 -msgid "SHA1 ID: " -msgstr "SHA1:" +#: gitk:2185 gitk:8652 +msgid "SHA1 ID:" +msgstr "SHA1 ID:" -#: gitk:2025 +#: gitk:2229 msgid "Row" msgstr "Строка" -#: gitk:2056 +#: gitk:2267 msgid "Find" msgstr "Поиск" -#: gitk:2057 -msgid "next" -msgstr "След." - -#: gitk:2058 -msgid "prev" -msgstr "Пред." - -#: gitk:2059 +#: gitk:2295 msgid "commit" -msgstr "состояние" +msgstr "коммит" -#: gitk:2062 gitk:2064 gitk:4179 gitk:4202 gitk:4226 gitk:6164 gitk:6236 -#: gitk:6320 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "содержащее:" -#: gitk:2065 gitk:3117 gitk:3122 gitk:4254 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "касательно файлов:" -#: gitk:2066 gitk:4259 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "добавив/удалив строку:" -#: gitk:2075 gitk:2077 +#: gitk:2304 gitk:4779 +msgid "changing lines matching:" +msgstr "изменяя совпадающие строки:" + +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Точно" -#: gitk:2077 gitk:4334 gitk:6132 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Игнорировать большие/маленькие" -#: gitk:2077 gitk:4228 gitk:4332 gitk:6128 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Регулярные выражения" -#: gitk:2079 gitk:2080 gitk:4353 gitk:4383 gitk:4390 gitk:6256 gitk:6324 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Во всех полях" -#: gitk:2080 gitk:4351 gitk:4383 gitk:6195 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Заголовок" -#: gitk:2081 gitk:4351 gitk:6195 gitk:6324 gitk:6737 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Комментарии" -#: gitk:2081 gitk:4351 gitk:4355 gitk:4390 gitk:6195 gitk:6672 gitk:7923 -#: gitk:7938 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Автор" -#: gitk:2081 gitk:4351 gitk:6195 gitk:6674 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" -msgstr "Сохранивший состояние" +msgstr "Коммитер" -#: gitk:2110 +#: gitk:2350 msgid "Search" msgstr "Найти" -#: gitk:2117 +#: gitk:2358 msgid "Diff" msgstr "Сравнить" -#: gitk:2119 +#: gitk:2360 msgid "Old version" msgstr "Старая версия" -#: gitk:2121 +#: gitk:2362 msgid "New version" msgstr "Новая версия" -#: gitk:2123 +#: gitk:2364 msgid "Lines of context" msgstr "Строк контекста" -#: gitk:2133 +#: gitk:2374 msgid "Ignore space change" msgstr "Игнорировать пробелы" -#: gitk:2191 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +msgid "Line diff" +msgstr "Изменения строк" + +#: gitk:2445 msgid "Patch" msgstr "Патч" -#: gitk:2193 +#: gitk:2447 msgid "Tree" msgstr "Файлы" -#: gitk:2326 gitk:2339 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" -msgstr "Сравнить это состояние с выделенным" +msgstr "Сравнить этот коммит с выделенным" -#: gitk:2327 gitk:2340 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" -msgstr "Сравнить выделенное с этим состоянием" +msgstr "Сравнить выделенный с этим коммитом" -#: gitk:2328 gitk:2341 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Создать патч" -#: gitk:2329 gitk:8136 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Создать метку" -#: gitk:2330 gitk:8239 +#: gitk:2621 gitk:9371 msgid "Write commit to file" -msgstr "Сохранить изменения в файл" +msgstr "Сохранить коммит в файл" -#: gitk:2331 gitk:8296 +#: gitk:2622 gitk:9428 msgid "Create new branch" -msgstr "Создать ветвь" +msgstr "Создать ветку" -#: gitk:2332 +#: gitk:2623 msgid "Cherry-pick this commit" -msgstr "Скопировать это состояние" +msgstr "Отбор лучшего для этого коммита" -#: gitk:2333 +#: gitk:2624 msgid "Reset HEAD branch to here" -msgstr "Установить HEAD на это состояние" +msgstr "Установить HEAD на этот коммит" + +#: gitk:2625 +msgid "Mark this commit" +msgstr "Пометить этот коммит" + +#: gitk:2626 +msgid "Return to mark" +msgstr "Вернуться на пометку" + +#: gitk:2627 +msgid "Find descendant of this and mark" +msgstr "Найти и пометить потомка этого коммита" + +#: gitk:2628 +msgid "Compare with marked commit" +msgstr "Сравнить с помеченным коммитом" + +#: gitk:2629 gitk:2640 +msgid "Diff this -> marked commit" +msgstr "Сравнить выделенное с помеченным коммитом" -#: gitk:2347 +#: gitk:2630 gitk:2641 +msgid "Diff marked commit -> this" +msgstr "Сравнить помеченный с этим коммитом" + +#: gitk:2631 +msgid "Revert this commit" +msgstr "Возврат этого коммита" + +#: gitk:2647 msgid "Check out this branch" -msgstr "Перейти на эту ветвь" +msgstr "Перейти на эту ветку" -#: gitk:2348 +#: gitk:2648 msgid "Remove this branch" -msgstr "Удалить эту ветвь" +msgstr "Удалить эту ветку" + +#: gitk:2649 +msgid "Copy branch name" +msgstr "Копировать имя ветки" -#: gitk:2355 +#: gitk:2656 msgid "Highlight this too" msgstr "Подсветить этот тоже" -#: gitk:2356 +#: gitk:2657 msgid "Highlight this only" msgstr "Подсветить только этот" -#: gitk:2357 +#: gitk:2658 msgid "External diff" msgstr "Программа сравнения" -#: gitk:2358 +#: gitk:2659 msgid "Blame parent commit" -msgstr "Аннотировать родительское состояние" +msgstr "Авторы изменений родительского коммита" -#: gitk:2365 +#: gitk:2660 +msgid "Copy path" +msgstr "Копировать путь" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Показать источник этой строки" -#: gitk:2366 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Запустить git gui blame для этой строки" -#: gitk:2611 +#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" +"Copyright 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" -msgstr "" -"\n" -"Gitk - программа просмотра истории репозиториев Git\n" -"\n" -"Copyright \\u00a9 2005-2010 Paul Mackerras\n" -"\n" -"Использование и распространение согласно условиям GNU General Public License" +msgstr "\nGitk - программа просмотра истории репозиториев git\n\n© 2005-2014 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License" -#: gitk:2619 gitk:2681 gitk:8661 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Закрыть" -#: gitk:2638 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Назначения клавиатуры в Gitk" -#: gitk:2641 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Назначения клавиатуры в Gitk:" -#: gitk:2643 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tЗавершить" -#: gitk:2644 +#: gitk:3049 +#, tcl-format +msgid "<%s-W>\t\tClose window" +msgstr "<%s-W>\t\tЗакрыть окно" + +#: gitk:3050 msgid "<Home>\t\tMove to first commit" -msgstr "<Home>\t\tПерейти к первому состоянию" +msgstr "<Home>\t\tПерейти к первому коммиту" -#: gitk:2645 +#: gitk:3051 msgid "<End>\t\tMove to last commit" -msgstr "<End>\t\tПерейти к последнему состоянию" +msgstr "<End>\t\tПерейти к последнему коммиту" -#: gitk:2646 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Up>, p, i\tПерейти к следующему состоянию" +#: gitk:3052 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, k\tПерейти на один коммит вверх" -#: gitk:2647 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Down>, n, k\tПерейти к предыдущему состоянию" +#: gitk:3053 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, j\tПерейти на один коммит вниз" -#: gitk:2648 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Left>, z, j\tПоказать ранее посещённое состояние" +#: gitk:3054 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, h\tПоказать ранее посещённое состояние" -#: gitk:2649 +#: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" -msgstr "<Right>, x, l\tПоказать следующее посещённое состояние" +msgstr "<Right>, x, l\tПоказать следующий посещённый коммит" -#: gitk:2650 +#: gitk:3056 +#, tcl-format +msgid "<%s-n>\tGo to n-th parent of current commit in history list" +msgstr "<%s-n>\tПерейти на n родителя от текущего коммита" + +#: gitk:3057 msgid "<PageUp>\tMove up one page in commit list" -msgstr "<PageUp>\tПерейти на страницу выше в списке состояний" +msgstr "<PageUp>\tПерейти на страницу выше в списке коммитов" -#: gitk:2651 +#: gitk:3058 msgid "<PageDown>\tMove down one page in commit list" -msgstr "<PageDown>\tПерейти на страницу ниже в списке состояний" +msgstr "<PageDown>\tПерейти на страницу ниже в списке коммитов" -#: gitk:2652 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" -msgstr "<%s-Home>\tПоказать начало списка состояний" +msgstr "<%s-Home>\tПерейти на начало списка коммитов" -#: gitk:2653 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" -msgstr "<%s-End>\tПоказать конец списка состояний" +msgstr "<%s-End>\tПерейти на конец списка коммитов" -#: gitk:2654 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" -msgstr "<%s-Up>\tПровернуть список состояний вверх" +msgstr "<%s-Up>\tПровернуть список коммитов вверх" -#: gitk:2655 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" -msgstr "<%s-Down>\tПровернуть список состояний вниз" +msgstr "<%s-Down>\tПровернуть список коммитов вниз" -#: gitk:2656 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" -msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх" +msgstr "<%s-PageUp>\tПровернуть список коммитов на страницу вверх" -#: gitk:2657 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" -msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз" +msgstr "<%s-PageDown>\tПровернуть список коммитов на страницу вниз" -#: gitk:2658 +#: gitk:3065 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" -msgstr "" -"<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых состояний)" +msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых коммитов)" -#: gitk:2659 +#: gitk:3066 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" -msgstr "<Shift-Down>\tПоиск (вниз, среди старых состояний)" +msgstr "<Shift-Down>\tПоиск (вниз, среди старых коммитов)" -#: gitk:2660 +#: gitk:3067 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше" -#: gitk:2661 +#: gitk:3068 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tПрокрутить список изменений на страницу выше" -#: gitk:2662 +#: gitk:3069 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже" -#: gitk:2663 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tПрокрутить список изменений на 18 строк вверх" -#: gitk:2664 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tПрокрутить список изменений на 18 строк вниз" -#: gitk:2665 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tПоиск" -#: gitk:2666 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" -msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию" +msgstr "<%s-G>\t\tПерейти к следующему найденному коммиту" -#: gitk:2667 +#: gitk:3074 msgid "<Return>\tMove to next find hit" -msgstr "<Return>\tПерейти к следующему найденному состоянию" +msgstr "<Return>\tПерейти к следующему найденному коммиту" -#: gitk:2668 +#: gitk:3075 +msgid "g\t\tGo to commit" +msgstr "g\t\tПерейти на коммит" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tПерейти к полю поиска" -#: gitk:2669 +#: gitk:3077 msgid "?\t\tMove to previous find hit" -msgstr "?\t\tПерейти к предыдущему найденному состоянию" +msgstr "?\t\tПерейти к предыдущему найденному коммиту" -#: gitk:2670 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tПрокрутить список изменений к следующему файлу" -#: gitk:2671 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tПродолжить поиск в списке изменений" -#: gitk:2672 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений" -#: gitk:2673 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tУвеличить размер шрифта" -#: gitk:2674 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tУвеличить размер шрифта" -#: gitk:2675 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tУменьшить размер шрифта" -#: gitk:2676 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tУменьшить размер шрифта" -#: gitk:2677 +#: gitk:3085 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tОбновить" -#: gitk:3132 -#, tcl-format -msgid "Error getting \"%s\" from %s:" -msgstr "Ошибка получения \"%s\" из %s:" - -#: gitk:3189 gitk:3198 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Ошибка создания временного каталога %s:" -#: gitk:3211 +#: gitk:3572 +#, tcl-format +msgid "Error getting \"%s\" from %s:" +msgstr "Ошибка получения «%s» из %s:" + +#: gitk:3635 msgid "command failed:" msgstr "ошибка выполнения команды:" -#: gitk:3357 +#: gitk:3784 msgid "No such commit" -msgstr "Состояние не найдено" +msgstr "Коммит не найден" -#: gitk:3371 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: ошибка выполнения команды:" -#: gitk:3402 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Ошибка чтения MERGE_HEAD: %s" -#: gitk:3410 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Ошибка чтения индекса: %s" -#: gitk:3435 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Ошибка запуска git blame: %s" -#: gitk:3438 gitk:6163 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Поиск" -#: gitk:3470 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Ошибка выполнения git blame: %s" -#: gitk:3498 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" -msgstr "" -"Эта строка принадлежит состоянию %s, которое не показано в этом " -"представлении" +msgstr "Эта строка принадлежит коммиту %s, который не показан в этом представлении" -#: gitk:3512 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Ошибка выполнения программы сравнения:" -#: gitk:3630 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk определение представлений" -#: gitk:3634 +#: gitk:4074 msgid "Remember this view" msgstr "Запомнить представление" -#: gitk:3635 -msgid "Commits to include (arguments to git log):" -msgstr "Включить состояния (аргументы для git-log):" +#: gitk:4075 +msgid "References (space separated list):" +msgstr "Ссылки (разделённые пробелом):" -#: gitk:3636 -msgid "Use all refs" -msgstr "Использовать все ветви" +#: gitk:4076 +msgid "Branches & tags:" +msgstr "Ветки и метки" -#: gitk:3637 -msgid "Strictly sort by date" -msgstr "Строгая сортировка по дате" +#: gitk:4077 +msgid "All refs" +msgstr "Все ссылки" -#: gitk:3638 -msgid "Mark branch sides" -msgstr "Отметить стороны ветвей" +#: gitk:4078 +msgid "All (local) branches" +msgstr "Все (локальные) ветки" + +#: gitk:4079 +msgid "All tags" +msgstr "Все метки" + +#: gitk:4080 +msgid "All remote-tracking branches" +msgstr "Все внешние отслеживаемые ветки" + +#: gitk:4081 +msgid "Commit Info (regular expressions):" +msgstr "Информация о коммите (регулярные выражения):" + +#: gitk:4082 +msgid "Author:" +msgstr "Автор:" + +#: gitk:4083 +msgid "Committer:" +msgstr "Коммитер:" + +#: gitk:4084 +msgid "Commit Message:" +msgstr "Сообщение коммита:" -#: gitk:3639 -msgid "Since date:" +#: gitk:4085 +msgid "Matches all Commit Info criteria" +msgstr "Совпадает со всеми условиями информации о коммите" + +#: gitk:4086 +msgid "Matches no Commit Info criteria" +msgstr "Не совпадает с условиями информации о коммите" + +#: gitk:4087 +msgid "Changes to Files:" +msgstr "Изменения файлов:" + +#: gitk:4088 +msgid "Fixed String" +msgstr "Обычная строка" + +#: gitk:4089 +msgid "Regular Expression" +msgstr "Регулярное выражение:" + +#: gitk:4090 +msgid "Search string:" +msgstr "Строка для поиска:" + +#: gitk:4091 +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 +msgid "Since:" msgstr "С даты:" -#: gitk:3640 -msgid "Until date:" +#: gitk:4093 +msgid "Until:" msgstr "По дату:" -#: gitk:3641 -msgid "Max count:" -msgstr "Макс. количество:" +#: gitk:4094 +msgid "Limit and/or skip a number of revisions (positive integer):" +msgstr "Ограничить и/или пропустить количество редакций (положительное число):" + +#: gitk:4095 +msgid "Number to show:" +msgstr "Показать количество:" + +#: gitk:4096 +msgid "Number to skip:" +msgstr "Пропустить количество:" -#: gitk:3642 -msgid "Skip:" -msgstr "Пропустить:" +#: gitk:4097 +msgid "Miscellaneous options:" +msgstr "Различные опции:" -#: gitk:3643 +#: gitk:4098 +msgid "Strictly sort by date" +msgstr "Строгая сортировка по дате" + +#: gitk:4099 +msgid "Mark branch sides" +msgstr "Отметить стороны веток" + +#: gitk:4100 msgid "Limit to first parent" msgstr "Ограничить первым предком" -#: gitk:3644 -msgid "Command to generate more commits to include:" -msgstr "Дополнительная команда для списка состояний:" +#: gitk:4101 +msgid "Simple history" +msgstr "Упрощенная история" -#: gitk:3753 -msgid "Name" -msgstr "Имя" +#: gitk:4102 +msgid "Additional arguments to git log:" +msgstr "Дополнительные аргументы для git log:" -#: gitk:3801 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Файлы и каталоги для ограничения истории, по одному на строку:" -#: gitk:3815 +#: gitk:4104 +msgid "Command to generate more commits to include:" +msgstr "Дополнительная команда для списка коммитов:" + +#: gitk:4228 +msgid "Gitk: edit view" +msgstr "Gitk: изменить представление" + +#: gitk:4236 +msgid "-- criteria for selecting revisions" +msgstr "— критерий поиска редакций" + +#: gitk:4241 +msgid "View Name" +msgstr "Имя представления" + +#: gitk:4316 msgid "Apply (F5)" msgstr "Применить (F5)" -#: gitk:3853 +#: gitk:4354 msgid "Error in commit selection arguments:" -msgstr "Ошибка в параметрах выбора состояний:" +msgstr "Ошибка в параметрах выбора коммитов:" -#: gitk:3906 gitk:3958 gitk:4403 gitk:4417 gitk:5675 gitk:10867 gitk:10868 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Ни одного" -#: gitk:4351 gitk:6195 gitk:7925 gitk:7940 -msgid "Date" -msgstr "Дата" - -#: gitk:4351 gitk:6195 -msgid "CDate" -msgstr "Дата ввода" - -#: gitk:4500 gitk:4505 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Порождённое" -#: gitk:4501 +#: gitk:5022 msgid "Not descendant" msgstr "Не порождённое" -#: gitk:4508 gitk:4513 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Предок" -#: gitk:4509 +#: gitk:5030 msgid "Not ancestor" msgstr "Не предок" -#: gitk:4799 +#: gitk:5324 msgid "Local changes checked in to index but not committed" -msgstr "Изменения зарегистрированные в индексе, но не сохранённые" +msgstr "Проиндексированные изменения" -#: gitk:4835 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" -msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе" +msgstr "Непроиндексированные изменения" + +#: gitk:7134 +msgid "and many more" +msgstr "и многое другое" -#: gitk:6676 +#: gitk:7137 +msgid "many" +msgstr "много" + +#: gitk:7328 msgid "Tags:" -msgstr "Таги:" +msgstr "Метки:" -#: gitk:6693 gitk:6699 gitk:7918 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Предок" -#: gitk:6704 +#: gitk:7356 msgid "Child" msgstr "Потомок" -#: gitk:6713 +#: gitk:7365 msgid "Branch" -msgstr "Ветвь" +msgstr "Ветка" -#: gitk:6716 +#: gitk:7368 msgid "Follows" msgstr "Следует за" -#: gitk:6719 +#: gitk:7371 msgid "Precedes" msgstr "Предшествует" -#: gitk:7212 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Ошибка получения изменений: %s" -#: gitk:7751 +#: gitk:8650 msgid "Goto:" msgstr "Перейти к:" -#: gitk:7753 -msgid "SHA1 ID:" -msgstr "SHA1 ID:" - -#: gitk:7772 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" -#: gitk:7784 +#: gitk:8678 +#, tcl-format +msgid "Revision %s is not known" +msgstr "Редакция %s не найдена" + +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 идентификатор %s не найден" -#: gitk:7786 +#: gitk:8690 #, tcl-format -msgid "Tag/Head %s is not known" -msgstr "Метка или ветвь %s не найдена" +msgid "Revision %s is not in the current view" +msgstr "Редакция %s не найдена в текущем представлении" + +#: gitk:8832 gitk:8847 +msgid "Date" +msgstr "Дата" -#: gitk:7928 +#: gitk:8835 msgid "Children" msgstr "Потомки" -#: gitk:7985 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" -msgstr "Установить ветвь %s на это состояние" +msgstr "Сбросить ветку %s на этот коммит" -#: gitk:7987 +#: gitk:8900 msgid "Detached head: can't reset" -msgstr "Состояние не принадлежит ни одной ветви, переход невозможен" +msgstr "Коммит не принадлежит ни одной ветке, сбросить невозможно" + +#: gitk:9005 gitk:9011 +msgid "Skipping merge commit " +msgstr "Пропускаю коммит-слияние" + +#: gitk:9020 gitk:9025 +msgid "Error getting patch ID for " +msgstr "Не удалось получить идентификатор патча для " + +#: gitk:9021 gitk:9026 +msgid " - stopping\n" +msgstr " — останов\n" + +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +msgid "Commit " +msgstr "Коммит" + +#: gitk:9035 +msgid "" +" is the same patch as\n" +" " +msgstr " такой же патч, как и\n " + +#: gitk:9043 +msgid "" +" differs from\n" +" " +msgstr " отличается от\n " + +#: gitk:9045 +msgid "" +"Diff of commits:\n" +"\n" +msgstr "Различия коммитов:\n\n" + +#: gitk:9057 gitk:9066 +#, tcl-format +msgid " has %s children - stopping\n" +msgstr " является %s потомком — останов\n" + +#: gitk:9085 +#, tcl-format +msgid "Error writing commit to file: %s" +msgstr "Произошла ошибка при записи коммита в файл: %s" + +#: gitk:9091 +#, tcl-format +msgid "Error diffing commits: %s" +msgstr "Произошла ошибка при выводе различий коммитов: %s" -#: gitk:8019 +#: gitk:9137 msgid "Top" msgstr "Верх" -#: gitk:8020 +#: gitk:9138 msgid "From" msgstr "От" -#: gitk:8025 +#: gitk:9143 msgid "To" msgstr "До" -#: gitk:8049 +#: gitk:9167 msgid "Generate patch" msgstr "Создать патч" -#: gitk:8051 +#: gitk:9169 msgid "From:" msgstr "От:" -#: gitk:8060 +#: gitk:9178 msgid "To:" msgstr "До:" -#: gitk:8069 +#: gitk:9187 msgid "Reverse" msgstr "В обратном порядке" -#: gitk:8071 gitk:8253 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Файл для сохранения:" -#: gitk:8077 +#: gitk:9195 msgid "Generate" msgstr "Создать" -#: gitk:8115 +#: gitk:9233 msgid "Error creating patch:" msgstr "Ошибка создания патча:" -#: gitk:8138 gitk:8241 gitk:8298 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:8147 +#: gitk:9265 msgid "Tag name:" msgstr "Имя метки:" -#: gitk:8151 gitk:8307 +#: gitk:9268 +msgid "Tag message is optional" +msgstr "Описание метки указывать не обязательно" + +#: gitk:9270 +msgid "Tag message:" +msgstr "Описание метки:" + +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Создать" -#: gitk:8168 +#: gitk:9292 msgid "No tag name specified" msgstr "Не задано имя метки" -#: gitk:8172 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" -msgstr "Метка \"%s\" уже существует" +msgstr "Метка «%s» уже существует" -#: gitk:8178 +#: gitk:9306 msgid "Error creating tag:" msgstr "Ошибка создания метки:" -#: gitk:8250 +#: gitk:9382 msgid "Command:" msgstr "Команда:" -#: gitk:8258 +#: gitk:9390 msgid "Write" msgstr "Запись" -#: gitk:8276 +#: gitk:9408 msgid "Error writing commit:" -msgstr "Ошибка сохранения состояния:" +msgstr "Произошла ошибка при записи коммита:" -#: gitk:8303 +#: gitk:9435 msgid "Name:" msgstr "Имя:" -#: gitk:8326 +#: gitk:9458 msgid "Please specify a name for the new branch" -msgstr "Укажите имя для новой ветви" +msgstr "Укажите имя для новой ветки" -#: gitk:8331 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" -msgstr "Ветвь '%s' уже существует. Переписать?" +msgstr "Ветка «%s» уже существует. Переписать?" -#: gitk:8397 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"Состояние %s уже принадлежит ветви %s. Продолжить операцию?" +msgstr "Коммит %s уже включён в ветку %s. Продолжить операцию?" -#: gitk:8402 +#: gitk:9535 msgid "Cherry-picking" msgstr "Копирование изменений" -#: gitk:8411 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" "Please commit, reset or stash your changes and try again." -msgstr "" -"Копирование невозможно из-за изменений в файле '%s'.\n" -"Сохраните или отмените изменения и повторите операцию." +msgstr "Отбор лучшего невозможен из-за изменений в файле «%s».\nЗакомитьте, сбросьте или спрячьте изменения и повторите операцию." -#: gitk:8417 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" -msgstr "" -"Копирование изменений невозможно из-за незавершённой операции " -"слияния.\nЗапустить git citool для завершения этой операции?" +msgstr "Копирование изменений невозможно из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?" -#: gitk:8433 +#: gitk:9566 gitk:9624 msgid "No changes committed" -msgstr "Изменения не сохранены" +msgstr "Изменения не закоммичены" + +#: gitk:9593 +#, tcl-format +msgid "Commit %s is not included in branch %s -- really revert it?" +msgstr "Коммит %s не включён в ветку %s. Продолжить операцию?" + +#: gitk:9598 +msgid "Reverting" +msgstr "Возврат изменений" + +#: gitk:9606 +#, tcl-format +msgid "" +"Revert failed because of local changes to the following files:%s Please " +"commit, reset or stash your changes and try again." +msgstr "Возврат изменений коммита не удался из-за локальных изменений в указанных файлах: %s\nЗакомитьте, сбросьте или спрячьте изменения и повторите операцию." -#: gitk:8459 +#: gitk:9610 +msgid "" +"Revert failed because of merge conflict.\n" +" Do you wish to run git citool to resolve it?" +msgstr "Возврат изменений невозможен из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?" + +#: gitk:9653 msgid "Confirm reset" msgstr "Подтвердите операцию перехода" -#: gitk:8461 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" -msgstr "Установить ветвь %s на состояние %s?" +msgstr "Сбросить ветку %s на коммит %s?" -#: gitk:8465 +#: gitk:9657 msgid "Reset type:" msgstr "Тип операции перехода:" -#: gitk:8469 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными" -#: gitk:8472 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"Смешанный: оставить рабочий каталог неизменным, установить индекс" +msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс" -#: gitk:8475 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" -msgstr "" -"Жесткий: переписать индекс и рабочий каталог\n" -"(все изменения в рабочем каталоги будут потеряны)" +msgstr "Жесткий: переписать индекс и рабочий каталог\n(все изменения в рабочем каталоге будут потеряны)" -#: gitk:8492 +#: gitk:9683 msgid "Resetting" -msgstr "Установка" +msgstr "Сброс" -#: gitk:8549 +#: gitk:9743 msgid "Checking out" msgstr "Переход" -#: gitk:8602 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" -msgstr "Активная ветвь не может быть удалена" +msgstr "Активная ветка не может быть удалена" -#: gitk:8608 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" "Really delete branch %s?" -msgstr "" -"Состояния ветви %s больше не принадлежат никакой другой ветви.\n" -"Действительно удалить ветвь %s?" +msgstr "Коммиты из ветки %s не принадлежат больше никакой другой ветке.\nДействительно удалить ветку %s?" -#: gitk:8639 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" -msgstr "Метки и ветви: %s" +msgstr "Метки и ветки: %s" -#: gitk:8654 +#: gitk:9850 msgid "Filter" msgstr "Фильтровать" -#: gitk:8949 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." -msgstr "" -"Ошибка чтения истории проекта; информация о ветвях и состояниях " -"вокруг меток (до/после) может быть неполной." +msgstr "Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток (до/после) может быть неполной." -#: gitk:9935 +#: gitk:11123 msgid "Tag" msgstr "Метка" -#: gitk:9935 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:9983 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Шрифт Gitk" -#: gitk:10000 +#: gitk:11227 msgid "B" msgstr "Ж" -#: gitk:10003 +#: gitk:11230 msgid "I" msgstr "К" -#: gitk:10098 -msgid "Gitk preferences" -msgstr "Настройки Gitk" - -#: gitk:10100 +#: gitk:11348 msgid "Commit list display options" -msgstr "Параметры показа списка состояний" +msgstr "Параметры показа списка коммитов" -#: gitk:10103 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Макс. ширина графа (строк)" -#: gitk:10107 -#, tcl-format +#: gitk:11355 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Макс. ширина графа (% ширины панели)" -#: gitk:10111 +#: gitk:11358 msgid "Show local changes" msgstr "Показывать изменения в рабочем каталоге" -#: gitk:10114 -msgid "Auto-select SHA1" -msgstr "Выделить SHA1" +#: gitk:11361 +msgid "Auto-select SHA1 (length)" +msgstr "Автоматически выделить SHA1 (длинна)" -#: gitk:10118 +#: gitk:11365 +msgid "Hide remote refs" +msgstr "Скрыть внешние ссылки" + +#: gitk:11369 msgid "Diff display options" msgstr "Параметры показа изменений" -#: gitk:10120 +#: gitk:11371 msgid "Tab spacing" msgstr "Ширина табуляции" -#: gitk:10123 -msgid "Display nearby tags" -msgstr "Показывать близкие метки" +#: gitk:11374 +msgid "Display nearby tags/heads" +msgstr "Показывать близкие метки/ветки" + +#: gitk:11377 +msgid "Maximum # tags/heads to show" +msgstr "Показывать максимальное количество меток/веток" -#: gitk:10126 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Ограничить показ изменений выбранными файлами" -#: gitk:10129 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Поддержка кодировок в отдельных файлах" -#: gitk:10135 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Программа для показа изменений" -#: gitk:10137 +#: gitk:11390 msgid "Choose..." msgstr "Выберите..." -#: gitk:10142 +#: gitk:11395 +msgid "General options" +msgstr "Общие опции" + +#: gitk:11398 +msgid "Use themed widgets" +msgstr "Использовать стили виджетов" + +#: gitk:11400 +msgid "(change requires restart)" +msgstr "(изменение потребует перезапуск)" + +#: gitk:11402 +msgid "(currently unavailable)" +msgstr "(недоступно в данный момент)" + +#: gitk:11413 msgid "Colors: press to choose" msgstr "Цвета: нажмите для выбора" -#: gitk:10145 +#: gitk:11416 +msgid "Interface" +msgstr "Интерфейс" + +#: gitk:11417 +msgid "interface" +msgstr "интерфейс" + +#: gitk:11420 msgid "Background" msgstr "Фон" -#: gitk:10146 gitk:10176 +#: gitk:11421 gitk:11451 msgid "background" msgstr "фон" -#: gitk:10149 +#: gitk:11424 msgid "Foreground" msgstr "Передний план" -#: gitk:10150 +#: gitk:11425 msgid "foreground" msgstr "передний план" -#: gitk:10153 +#: gitk:11428 msgid "Diff: old lines" msgstr "Изменения: старый текст" -#: gitk:10154 +#: gitk:11429 msgid "diff old lines" msgstr "старый текст изменения" -#: gitk:10158 +#: gitk:11433 msgid "Diff: new lines" msgstr "Изменения: новый текст" -#: gitk:10159 +#: gitk:11434 msgid "diff new lines" msgstr "новый текст изменения" -#: gitk:10163 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Изменения: заголовок блока" -#: gitk:10165 +#: gitk:11440 msgid "diff hunk header" msgstr "заголовок блока изменений" -#: gitk:10169 +#: gitk:11444 msgid "Marked line bg" msgstr "Фон выбранной строки" -#: gitk:10171 +#: gitk:11446 msgid "marked line background" msgstr "фон выбранной строки" -#: gitk:10175 +#: gitk:11450 msgid "Select bg" msgstr "Выберите фон" -#: gitk:10179 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Шрифт: нажмите для выбора" -#: gitk:10181 +#: gitk:11461 msgid "Main font" msgstr "Основной шрифт" -#: gitk:10182 +#: gitk:11462 msgid "Diff display font" msgstr "Шрифт показа изменений" -#: gitk:10183 +#: gitk:11463 msgid "User interface font" msgstr "Шрифт интерфейса" -#: gitk:10210 +#: gitk:11485 +msgid "Gitk preferences" +msgstr "Настройки Gitk" + +#: gitk:11494 +msgid "General" +msgstr "Общие" + +#: gitk:11495 +msgid "Colors" +msgstr "Цвета" + +#: gitk:11496 +msgid "Fonts" +msgstr "Шрифты" + +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: выберите цвет для %s" -#: gitk:10656 +#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." -msgstr "" -"К сожалению gitk не может работать с этой версий Tcl/Tk.\n" -"Требуется как минимум Tcl/Tk 8.4." +msgstr "К сожалению gitk не может работать с этой версий Tcl/Tk.\nТребуется как минимум Tcl/Tk 8.4." -#: gitk:10773 +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Git-репозитарий не найден в текущем каталоге." -#: gitk:10777 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Git-репозитарий \"%s\" не найден." - -#: gitk:10824 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" -msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла" +msgstr "Неоднозначный аргумент «%s»: существует как редакция и как имя файла" -#: gitk:10836 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Неправильные аргументы для gitk:" - -#: gitk:10896 -msgid "Command line" -msgstr "Командная строка" - diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po index df95e01b90..d9d4e87a44 100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@ -1,50 +1,52 @@ # Swedish translation for gitk -# Copyright (C) 2005-2013 Paul Mackerras +# Copyright (C) 2005-2015 Paul Mackerras # This file is distributed under the same license as the gitk package. # # Mikael Magnusson <mikachu@gmail.com>, 2008. -# Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013. +# Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013, 2015. # msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-16 08:06+0100\n" -"PO-Revision-Date: 2013-05-16 08:12+0100\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 <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.6\n" #: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Kunde inte hämta lista över ej sammanslagna filer:" -#: gitk:210 gitk:2334 +#: gitk:212 gitk:2381 msgid "Color words" msgstr "Färga ord" -#: gitk:215 gitk:2334 gitk:7977 gitk:8010 +#: gitk:217 gitk:2381 gitk:8221 gitk:8254 msgid "Markup words" msgstr "Märk upp ord" -#: gitk:312 +#: gitk:324 msgid "Error parsing revisions:" msgstr "Fel vid tolkning av revisioner:" -#: gitk:368 +#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fel vid körning av --argscmd-kommando:" -#: gitk:381 +#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer som inte har " "slagits samman." -#: gitk:384 +#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -52,625 +54,654 @@ msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer inom " "filbegränsningen." -#: gitk:406 gitk:554 +#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fel vid körning av git log:" -#: gitk:424 gitk:570 +#: gitk:436 gitk:582 msgid "Reading" msgstr "Läser" -#: gitk:484 gitk:4409 +#: gitk:496 gitk:4526 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:487 gitk:1625 gitk:4412 +#: gitk:499 gitk:1637 gitk:4529 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1499 +#: 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:1719 +#: gitk:1740 msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1876 -msgid "mc" -msgstr "mc" - -#: gitk:1911 gitk:4202 gitk:9437 gitk:10979 gitk:11258 +#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 msgid "OK" msgstr "OK" -#: gitk:1913 gitk:4204 gitk:8964 gitk:9043 gitk:9159 gitk:9208 gitk:9439 -#: gitk:10980 gitk:11259 +#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 +#: gitk:11257 gitk:11537 msgid "Cancel" msgstr "Avbryt" -#: gitk:2048 -msgid "Update" -msgstr "Uppdatera" +#: gitk:2069 +msgid "&Update" +msgstr "&Uppdatera" -#: gitk:2049 -msgid "Reload" -msgstr "Ladda om" +#: gitk:2070 +msgid "&Reload" +msgstr "Läs &om" -#: gitk:2050 -msgid "Reread references" -msgstr "Läs om referenser" +#: gitk:2071 +msgid "Reread re&ferences" +msgstr "Läs om &referenser" -#: gitk:2051 -msgid "List references" -msgstr "Visa referenser" +#: gitk:2072 +msgid "&List references" +msgstr "&Visa referenser" -#: gitk:2053 -msgid "Start git gui" -msgstr "Starta git gui" +#: gitk:2074 +msgid "Start git &gui" +msgstr "Starta git &gui" -#: gitk:2055 -msgid "Quit" -msgstr "Avsluta" +#: gitk:2076 +msgid "&Quit" +msgstr "&Avsluta" -#: gitk:2047 -msgid "File" -msgstr "Arkiv" +#: gitk:2068 +msgid "&File" +msgstr "&Arkiv" -#: gitk:2059 -msgid "Preferences" -msgstr "Inställningar" +#: gitk:2080 +msgid "&Preferences" +msgstr "&Inställningar" -#: gitk:2058 -msgid "Edit" -msgstr "Redigera" +#: gitk:2079 +msgid "&Edit" +msgstr "&Redigera" -#: gitk:2063 -msgid "New view..." -msgstr "Ny vy..." +#: gitk:2084 +msgid "&New view..." +msgstr "&Ny vy..." -#: gitk:2064 -msgid "Edit view..." -msgstr "Ändra vy..." +#: gitk:2085 +msgid "&Edit view..." +msgstr "&Ändra vy..." -#: gitk:2065 -msgid "Delete view" -msgstr "Ta bort vy" +#: gitk:2086 +msgid "&Delete view" +msgstr "&Ta bort vy" -#: gitk:2067 -msgid "All files" -msgstr "Alla filer" +#: gitk:2088 +msgid "&All files" +msgstr "&Alla filer" -#: gitk:2062 gitk:3955 -msgid "View" -msgstr "Visa" +#: gitk:2083 +msgid "&View" +msgstr "&Visa" -#: gitk:2072 gitk:2082 gitk:2925 -msgid "About gitk" -msgstr "Om gitk" +#: gitk:2093 gitk:2103 +msgid "&About gitk" +msgstr "&Om gitk" -#: gitk:2073 gitk:2087 -msgid "Key bindings" -msgstr "Tangentbordsbindningar" +#: gitk:2094 gitk:2108 +msgid "&Key bindings" +msgstr "&Tangentbordsbindningar" -#: gitk:2071 gitk:2086 -msgid "Help" -msgstr "Hjälp" +#: gitk:2092 gitk:2107 +msgid "&Help" +msgstr "&Hjälp" -#: gitk:2164 gitk:8420 +#: gitk:2185 gitk:8653 msgid "SHA1 ID:" msgstr "SHA1-id:" -#: gitk:2208 +#: gitk:2229 msgid "Row" msgstr "Rad" -#: gitk:2246 +#: gitk:2267 msgid "Find" msgstr "Sök" -#: gitk:2247 -msgid "next" -msgstr "nästa" - -#: gitk:2248 -msgid "prev" -msgstr "föreg" - -#: gitk:2249 +#: gitk:2295 msgid "commit" msgstr "incheckning" -#: gitk:2252 gitk:2254 gitk:4570 gitk:4593 gitk:4617 gitk:6592 gitk:6664 -#: gitk:6749 +#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 +#: gitk:6913 msgid "containing:" msgstr "som innehåller:" -#: gitk:2255 gitk:3437 gitk:3442 gitk:4646 +#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2256 gitk:4660 +#: gitk:2303 gitk:4778 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2257 gitk:4662 +#: gitk:2304 gitk:4780 msgid "changing lines matching:" msgstr "ändrar rader som matchar:" -#: gitk:2266 gitk:2268 gitk:4649 +#: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" msgstr "Exakt" -#: gitk:2268 gitk:4737 gitk:6560 +#: gitk:2315 gitk:4855 gitk:6724 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2268 gitk:4619 gitk:4735 gitk:6556 +#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2270 gitk:2271 gitk:4757 gitk:4787 gitk:4794 gitk:6685 gitk:6753 +#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 msgid "All fields" msgstr "Alla fält" -#: gitk:2271 gitk:4754 gitk:4787 gitk:6623 +#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 msgid "Headline" msgstr "Rubrik" -#: gitk:2272 gitk:4754 gitk:6623 gitk:6753 gitk:7221 +#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 msgid "Comments" msgstr "Kommentarer" -#: gitk:2272 gitk:4754 gitk:4759 gitk:4794 gitk:6623 gitk:7156 gitk:8598 -#: gitk:8613 +#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 +#: gitk:8846 msgid "Author" msgstr "Författare" -#: gitk:2272 gitk:4754 gitk:6623 gitk:7158 +#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 msgid "Committer" msgstr "Incheckare" -#: gitk:2303 +#: gitk:2350 msgid "Search" msgstr "Sök" -#: gitk:2311 +#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2313 +#: gitk:2360 msgid "Old version" msgstr "Gammal version" -#: gitk:2315 +#: gitk:2362 msgid "New version" msgstr "Ny version" -#: gitk:2317 +#: gitk:2364 msgid "Lines of context" msgstr "Rader sammanhang" -#: gitk:2327 +#: gitk:2374 msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2331 gitk:2333 gitk:7735 gitk:7963 +#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 msgid "Line diff" msgstr "Rad-diff" -#: gitk:2397 +#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2399 +#: gitk:2447 msgid "Tree" msgstr "Träd" -#: gitk:2557 gitk:2577 +#: gitk:2617 gitk:2638 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2558 gitk:2578 +#: gitk:2618 gitk:2639 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2559 gitk:2579 +#: gitk:2619 gitk:2640 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2560 gitk:9022 +#: gitk:2620 gitk:9255 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2561 gitk:9139 +#: gitk:2621 +msgid "Copy commit summary" +msgstr "Kopiera incheckningssammanfattning" + +#: gitk:2622 gitk:9386 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2562 gitk:9196 +#: gitk:2623 gitk:9443 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2563 +#: gitk:2624 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2564 +#: gitk:2625 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2565 +#: gitk:2626 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2566 +#: gitk:2627 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2567 +#: gitk:2628 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2568 +#: gitk:2629 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2569 gitk:2580 +#: gitk:2630 gitk:2641 msgid "Diff this -> marked commit" msgstr "Diff denna -> markerad incheckning" -#: gitk:2570 gitk:2581 +#: gitk:2631 gitk:2642 msgid "Diff marked commit -> this" msgstr "Diff markerad incheckning -> denna" -#: gitk:2571 +#: gitk:2632 msgid "Revert this commit" msgstr "Ångra denna incheckning" -#: gitk:2587 +#: gitk:2648 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2588 +#: gitk:2649 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2595 +#: gitk:2650 +msgid "Copy branch name" +msgstr "Kopiera namn på gren" + +#: gitk:2657 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2596 +#: gitk:2658 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2597 +#: gitk:2659 msgid "External diff" msgstr "Extern diff" -#: gitk:2598 +#: gitk:2660 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2605 +#: 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:2606 +#: gitk:2669 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:2927 +#: gitk:3013 +msgid "About gitk" +msgstr "Om gitk" + +#: gitk:3015 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright ©9 2005-2011 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - en incheckningsvisare för git\n" "\n" -"Copyright ©9 2005-2011 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:2935 gitk:3000 gitk:9623 +#: gitk:3023 gitk:3090 gitk:9872 msgid "Close" msgstr "Stäng" -#: gitk:2956 +#: gitk:3044 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:2959 +#: gitk:3047 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:2961 +#: gitk:3049 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:2962 +#: gitk:3050 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tStäng fönster" -#: gitk:2963 +#: gitk:3051 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tGå till första incheckning" -#: gitk:2964 +#: gitk:3052 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tGå till sista incheckning" -#: gitk:2965 +#: gitk:3053 msgid "<Up>, p, k\tMove up one commit" msgstr "<Upp>, p, k\tGå en incheckning upp" -#: gitk:2966 +#: gitk:3054 msgid "<Down>, n, j\tMove down one commit" msgstr "<Ned>, n, j\tGå en incheckning ned" -#: gitk:2967 +#: gitk:3055 msgid "<Left>, z, h\tGo back in history list" msgstr "<Vänster>, z, h\tGå bakåt i historiken" -#: gitk:2968 +#: gitk:3056 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Höger>, x, l\tGå framåt i historiken" -#: gitk:2969 +#: 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 "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tGå upp en sida i incheckningslistan" -#: gitk:2970 +#: gitk:3059 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tGå ned en sida i incheckningslistan" -#: gitk:2971 +#: gitk:3060 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:2972 +#: gitk:3061 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:2973 +#: gitk:3062 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:2974 +#: gitk:3063 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:2975 +#: gitk:3064 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:2976 +#: gitk:3065 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:2977 +#: gitk:3066 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:2978 +#: gitk:3067 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:2979 +#: gitk:3068 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRulla diffvisningen upp en sida" -#: gitk:2980 +#: gitk:3069 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Baksteg>\tRulla diffvisningen upp en sida" -#: gitk:2981 +#: gitk:3070 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" -#: gitk:2982 +#: gitk:3071 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:2983 +#: gitk:3072 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:2984 +#: gitk:3073 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:2985 +#: 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:2986 +#: gitk:3075 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tGå till nästa sökträff" -#: gitk:2987 +#: 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:2988 +#: gitk:3078 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:2989 +#: gitk:3079 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:2990 +#: 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:2991 +#: 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:2992 +#: gitk:3082 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:2993 +#: gitk:3083 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:2994 +#: gitk:3084 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:2995 +#: gitk:3085 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:2996 +#: gitk:3086 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tUppdatera" -#: gitk:3451 gitk:3460 +#: gitk:3551 gitk:3560 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3473 +#: gitk:3573 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fel vid hämtning av \"%s\" från %s:" -#: gitk:3536 +#: gitk:3636 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3685 +#: gitk:3785 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3699 +#: gitk:3799 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3730 +#: gitk:3830 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3738 +#: gitk:3838 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3763 +#: gitk:3863 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3766 gitk:6591 +#: gitk:3866 gitk:6755 msgid "Searching" msgstr "Söker" -#: gitk:3798 +#: gitk:3898 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3826 +#: 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:3840 +#: gitk:3940 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:3958 +#: 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:3962 +#: gitk:4075 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:3963 +#: gitk:4076 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:3964 +#: gitk:4077 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:3965 +#: gitk:4078 msgid "All refs" msgstr "Alla referenser" -#: gitk:3966 +#: gitk:4079 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:3967 +#: gitk:4080 msgid "All tags" msgstr "Alla taggar" -#: gitk:3968 +#: gitk:4081 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:3969 +#: gitk:4082 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:3970 +#: gitk:4083 msgid "Author:" msgstr "Författare:" -#: gitk:3971 +#: gitk:4084 msgid "Committer:" msgstr "Incheckare:" -#: gitk:3972 +#: gitk:4085 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:3973 +#: gitk:4086 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:3974 +#: 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:3975 +#: gitk:4089 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:3976 +#: gitk:4090 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:3977 +#: gitk:4091 msgid "Search string:" msgstr "Söksträng:" -#: gitk:3978 +#: gitk:4092 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -678,201 +709,201 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3979 +#: gitk:4093 msgid "Since:" msgstr "Från:" -#: gitk:3980 +#: gitk:4094 msgid "Until:" msgstr "Till:" -#: gitk:3981 +#: 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:3982 +#: gitk:4096 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:3983 +#: gitk:4097 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:3984 +#: gitk:4098 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:3985 +#: gitk:4099 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:3986 +#: gitk:4100 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:3987 +#: gitk:4101 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:3988 +#: gitk:4102 msgid "Simple history" msgstr "Enkel historik" -#: gitk:3989 +#: gitk:4103 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:3990 +#: gitk:4104 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:3991 +#: gitk:4105 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:4115 +#: gitk:4229 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:4123 +#: gitk:4237 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:4128 +#: gitk:4242 msgid "View Name" msgstr "Namn på vy" -#: gitk:4203 +#: gitk:4317 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:4241 +#: gitk:4355 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: gitk:4294 gitk:4346 gitk:4807 gitk:4821 gitk:6087 gitk:12041 gitk:12042 +#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 msgid "None" msgstr "Inget" -#: gitk:4904 gitk:4909 +#: gitk:5022 gitk:5027 msgid "Descendant" msgstr "Avkomling" -#: gitk:4905 +#: gitk:5023 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:4912 gitk:4917 +#: gitk:5030 gitk:5035 msgid "Ancestor" msgstr "Förfader" -#: gitk:4913 +#: gitk:5031 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:5203 +#: gitk:5325 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:5239 +#: gitk:5361 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:6971 +#: gitk:7135 msgid "and many more" msgstr "med många flera" -#: gitk:6974 +#: gitk:7138 msgid "many" msgstr "många" -#: gitk:7160 +#: gitk:7329 msgid "Tags:" msgstr "Taggar:" -#: gitk:7177 gitk:7183 gitk:8593 +#: gitk:7346 gitk:7352 gitk:8826 msgid "Parent" msgstr "Förälder" -#: gitk:7188 +#: gitk:7357 msgid "Child" msgstr "Barn" -#: gitk:7197 +#: gitk:7366 msgid "Branch" msgstr "Gren" -#: gitk:7200 +#: gitk:7369 msgid "Follows" msgstr "Följer" -#: gitk:7203 +#: gitk:7372 msgid "Precedes" msgstr "Föregår" -#: gitk:7742 +#: gitk:7967 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:8418 +#: gitk:8651 msgid "Goto:" msgstr "Gå till:" -#: gitk:8439 +#: gitk:8672 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:8446 +#: gitk:8679 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:8456 +#: gitk:8689 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:8458 +#: gitk:8691 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8600 gitk:8615 +#: gitk:8833 gitk:8848 msgid "Date" msgstr "Datum" -#: gitk:8603 +#: gitk:8836 msgid "Children" msgstr "Barn" -#: gitk:8666 +#: gitk:8899 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8668 +#: gitk:8901 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:8773 gitk:8779 +#: gitk:9006 gitk:9012 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:8788 gitk:8793 +#: gitk:9021 gitk:9026 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:8789 gitk:8794 +#: gitk:9022 gitk:9027 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:8799 gitk:8802 gitk:8810 gitk:8824 gitk:8833 +#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 msgid "Commit " msgstr "Incheckning " -#: gitk:8803 +#: gitk:9036 msgid "" " is the same patch as\n" " " @@ -880,7 +911,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:8811 +#: gitk:9044 msgid "" " differs from\n" " " @@ -888,7 +919,7 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:8813 +#: gitk:9046 msgid "" "Diff of commits:\n" "\n" @@ -896,131 +927,131 @@ msgstr "" "Skillnad mellan incheckningar:\n" "\n" -#: gitk:8825 gitk:8834 +#: gitk:9058 gitk:9067 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:8853 +#: gitk:9086 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fel vid skrivning av incheckning till fil: %s" -#: gitk:8859 +#: gitk:9092 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fel vid jämförelse av incheckningar: %s" -#: gitk:8905 +#: gitk:9138 msgid "Top" msgstr "Topp" -#: gitk:8906 +#: gitk:9139 msgid "From" msgstr "Från" -#: gitk:8911 +#: gitk:9144 msgid "To" msgstr "Till" -#: gitk:8935 +#: gitk:9168 msgid "Generate patch" msgstr "Generera patch" -#: gitk:8937 +#: gitk:9170 msgid "From:" msgstr "Från:" -#: gitk:8946 +#: gitk:9179 msgid "To:" msgstr "Till:" -#: gitk:8955 +#: gitk:9188 msgid "Reverse" msgstr "Vänd" -#: gitk:8957 gitk:9153 +#: gitk:9190 gitk:9400 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:8963 +#: gitk:9196 msgid "Generate" msgstr "Generera" -#: gitk:9001 +#: gitk:9234 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:9024 gitk:9141 gitk:9198 +#: gitk:9257 gitk:9388 gitk:9445 msgid "ID:" msgstr "Id:" -#: gitk:9033 +#: gitk:9266 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:9036 +#: gitk:9269 msgid "Tag message is optional" msgstr "Taggmeddelandet är valfritt" -#: gitk:9038 +#: gitk:9271 msgid "Tag message:" msgstr "Taggmeddelande:" -#: gitk:9042 gitk:9207 +#: gitk:9275 gitk:9454 msgid "Create" msgstr "Skapa" -#: gitk:9060 +#: gitk:9293 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:9064 +#: gitk:9297 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:9074 +#: gitk:9307 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:9150 +#: gitk:9397 msgid "Command:" msgstr "Kommando:" -#: gitk:9158 +#: gitk:9405 msgid "Write" msgstr "Skriv" -#: gitk:9176 +#: gitk:9423 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:9203 +#: gitk:9450 msgid "Name:" msgstr "Namn:" -#: gitk:9226 +#: gitk:9473 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:9231 +#: gitk:9478 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:9298 +#: 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:9303 +#: gitk:9550 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:9312 +#: gitk:9559 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1030,7 +1061,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9318 +#: gitk:9565 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1038,20 +1069,20 @@ msgstr "" "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:9334 gitk:9392 +#: gitk:9581 gitk:9639 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:9361 +#: 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:9366 +#: gitk:9613 msgid "Reverting" msgstr "Ångrar" -#: gitk:9374 +#: gitk:9621 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1061,7 +1092,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9378 +#: gitk:9625 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1069,28 +1100,28 @@ msgstr "" "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n" " Vill du köra git citool för att lösa den?" -#: gitk:9421 +#: gitk:9668 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:9423 +#: gitk:9670 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:9425 +#: gitk:9672 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:9428 +#: gitk:9675 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:9431 +#: gitk:9678 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:9434 +#: gitk:9681 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1098,19 +1129,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:9451 +#: gitk:9698 msgid "Resetting" msgstr "Återställer" -#: gitk:9511 +#: gitk:9758 msgid "Checking out" msgstr "Checkar ut" -#: gitk:9564 +#: gitk:9811 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:9570 +#: gitk:9817 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1119,16 +1150,16 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:9601 +#: gitk:9848 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:9616 +#: gitk:9865 msgid "Filter" msgstr "Filter" -#: gitk:9912 +#: gitk:10161 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1136,216 +1167,244 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:10899 +#: gitk:11138 msgid "Tag" msgstr "Tagg" -#: gitk:10899 +#: gitk:11142 msgid "Id" msgstr "Id" -#: gitk:10948 +#: gitk:11225 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:10965 +#: gitk:11242 msgid "B" msgstr "F" -#: gitk:10968 +#: gitk:11245 msgid "I" msgstr "K" -#: gitk:11086 +#: gitk:11363 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:11089 +#: gitk:11366 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:11092 -#, tcl-format +#: gitk:11370 +#, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:11095 +#: gitk:11373 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:11098 +#: gitk:11376 msgid "Auto-select SHA1 (length)" msgstr "Välj SHA1 (längd) automatiskt" -#: gitk:11102 +#: gitk:11380 msgid "Hide remote refs" msgstr "Dölj fjärr-referenser" -#: gitk:11106 +#: gitk:11384 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:11108 +#: gitk:11386 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:11111 +#: gitk:11389 msgid "Display nearby tags/heads" msgstr "Visa närliggande taggar/huvuden" -#: gitk:11114 +#: gitk:11392 msgid "Maximum # tags/heads to show" msgstr "Maximalt antal taggar/huvuden att visa" -#: gitk:11117 +#: gitk:11395 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:11120 +#: gitk:11398 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:11126 gitk:11273 +#: gitk:11404 gitk:11551 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:11127 +#: gitk:11405 msgid "Choose..." msgstr "Välj..." -#: gitk:11132 +#: gitk:11410 msgid "General options" msgstr "Allmänna inställningar" -#: gitk:11135 +#: gitk:11413 msgid "Use themed widgets" msgstr "Använd tema på fönsterelement" -#: gitk:11137 +#: gitk:11415 msgid "(change requires restart)" msgstr "(ändringen kräver omstart)" -#: gitk:11139 +#: gitk:11417 msgid "(currently unavailable)" msgstr "(för närvarande inte tillgängligt)" -#: gitk:11150 +#: gitk:11428 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:11153 +#: gitk:11431 msgid "Interface" msgstr "Gränssnitt" -#: gitk:11154 +#: gitk:11432 msgid "interface" msgstr "gränssnitt" -#: gitk:11157 +#: gitk:11435 msgid "Background" msgstr "Bakgrund" -#: gitk:11158 gitk:11188 +#: gitk:11436 gitk:11466 msgid "background" msgstr "bakgrund" -#: gitk:11161 +#: gitk:11439 msgid "Foreground" msgstr "Förgrund" -#: gitk:11162 +#: gitk:11440 msgid "foreground" msgstr "förgrund" -#: gitk:11165 +#: gitk:11443 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:11166 +#: gitk:11444 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:11170 +#: gitk:11448 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:11171 +#: gitk:11449 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:11175 +#: gitk:11453 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:11177 +#: gitk:11455 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:11181 +#: gitk:11459 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:11183 +#: gitk:11461 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:11187 +#: gitk:11465 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:11196 +#: gitk:11474 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:11198 +#: gitk:11476 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:11199 +#: gitk:11477 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:11200 +#: gitk:11478 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:11222 +#: gitk:11500 msgid "Gitk preferences" msgstr "Inställningar för Gitk" -#: gitk:11231 +#: gitk:11509 msgid "General" msgstr "Allmänt" -#: gitk:11232 +#: gitk:11510 msgid "Colors" msgstr "Färger" -#: gitk:11233 +#: gitk:11511 msgid "Fonts" msgstr "Teckensnitt" -#: gitk:11283 +#: gitk:11561 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:11937 +#: 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:11984 +#: gitk:12331 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": både revision och filnamn" -#: gitk:11996 +#: gitk:12343 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" -#: gitk:12099 -msgid "Command line" -msgstr "Kommandorad" +#~ 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" @@ -1359,13 +1418,6 @@ msgstr "Kommandorad" #~ msgid "- stopping\n" #~ msgstr "- stannar\n" -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" -#~ " Gitk kräver åtminstone Tcl/Tk 8.4." - #~ msgid "Tag/Head %s is not known" #~ msgstr "Tagg/huvud %s är okänt" diff --git a/gitk-git/po/vi.po b/gitk-git/po/vi.po new file mode 100644 index 0000000000..8966812368 --- /dev/null +++ b/gitk-git/po/vi.po @@ -0,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 <vnwildman@gmail.com>, 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 <vnwildman@gmail.com>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" +"Language: vi\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"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" +"\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" +"\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 "<Home>\t\tMove to first commit" +msgstr "<Home>\t\tChuyển đến lần chuyển giao đầu tiên" + +#: gitk:3051 +msgid "<End>\t\tMove to last commit" +msgstr "<End>\t\tChuyển đến lần chuyển giao cuối" + +#: gitk:3052 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Up>, p, k\tDi chuyển lên một lần chuyển giao" + +#: gitk:3053 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Down>, n, j\tDi chuyển xuống một lần chuyển giao" + +#: gitk:3054 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Left>, z, h\tQuay trở lại danh sách lịch sử" + +#: gitk:3055 +msgid "<Right>, x, l\tGo forward in history list" +msgstr "<Right>, x, l\tDi chuyển tiếp trong danh sách lịch sử" + +#: gitk: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 "<PageUp>\tMove up one page in commit list" +msgstr "<PageUp>\tDi chuyển lên một trang trong danh sách lần chuyển giao" + +#: gitk:3058 +msgid "<PageDown>\tMove down one page in commit list" +msgstr "<PageDown>\tDi chuyển xuống một trang trong danh sách lần chuyển giao" + +#: gitk: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 "<Shift-Up>\tFind backwards (upwards, later commits)" +msgstr "<Shift-Up>\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)" + +#: gitk:3066 +msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" +msgstr "" +"<Shift-Down>\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)" + +#: gitk:3067 +msgid "<Delete>, b\tScroll diff view up one page" +msgstr "<Delete>, b\tCuộn phần trình bày diff lên một trang" + +#: gitk:3068 +msgid "<Backspace>\tScroll diff view up one page" +msgstr "<Backspace>\tCuộn phần trình bày diff lên một trang" + +#: gitk:3069 +msgid "<Space>\t\tScroll diff view down one page" +msgstr "<Space>\t\tCuộn phần trình bày diff xuống một trang" + +#: gitk: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 "<Return>\tMove to next find hit" +msgstr "<Return>\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 "<F5>\t\tUpdate" +msgstr "<F5>\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" |