diff options
Diffstat (limited to 'gitk-git/po')
| -rw-r--r-- | gitk-git/po/bg.po | 656 | ||||
| -rw-r--r-- | gitk-git/po/de.po | 79 | ||||
| -rw-r--r-- | gitk-git/po/fr.po | 849 | ||||
| -rw-r--r-- | gitk-git/po/ja.po | 692 | ||||
| -rw-r--r-- | gitk-git/po/sv.po | 614 |
5 files changed, 1434 insertions, 1456 deletions
diff --git a/gitk-git/po/bg.po b/gitk-git/po/bg.po index 909a56463f..99aa77aa63 100644 --- a/gitk-git/po/bg.po +++ b/gitk-git/po/bg.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitk master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-27 20:44+0300\n" -"PO-Revision-Date: 2015-06-27 20:46+0300\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,11 +22,11 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Списъкът с неслети файлове не може да бъде получен:" -#: gitk:212 gitk:2381 +#: gitk:212 gitk:2399 msgid "Color words" msgstr "Оцветяване на думите" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +#: gitk:217 gitk:2399 gitk:8239 gitk:8272 msgid "Markup words" msgstr "Отбелязване на думите" @@ -59,15 +59,15 @@ msgstr "Грешка при изпълнение на „git log“:" msgid "Reading" msgstr "Прочитане" -#: gitk:496 gitk:4525 +#: gitk:496 gitk:4544 msgid "Reading commits..." msgstr "Прочитане на подаванията…" -#: gitk:499 gitk:1637 gitk:4528 +#: gitk:499 gitk:1637 gitk:4547 msgid "No commits selected" msgstr "Не са избрани подавания" -#: gitk:1445 gitk:4045 gitk:12432 +#: gitk:1445 gitk:4064 gitk:12469 msgid "Command line" msgstr "Команден ред" @@ -79,286 +79,294 @@ msgstr "Изходът от „git log“ не може да се анализи msgid "No commit information available" msgstr "Липсва информация за подавания" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 msgid "OK" msgstr "Добре" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 +#: gitk:11275 gitk:11555 msgid "Cancel" msgstr "Отказ" -#: gitk:2069 +#: gitk:2083 msgid "&Update" -msgstr "Обновяване" +msgstr "&Обновяване" -#: gitk:2070 +#: gitk:2084 msgid "&Reload" -msgstr "Презареждане" +msgstr "&Презареждане" -#: gitk:2071 +#: gitk:2085 msgid "Reread re&ferences" -msgstr "Наново прочитане на настройките" +msgstr "&Наново прочитане на настройките" -#: gitk:2072 +#: gitk:2086 msgid "&List references" -msgstr "Изброяване на указателите" +msgstr "&Изброяване на указателите" -#: gitk:2074 +#: gitk:2088 msgid "Start git &gui" -msgstr "Стартиране на „git gui“" +msgstr "&Стартиране на „git gui“" -#: gitk:2076 +#: gitk:2090 msgid "&Quit" -msgstr "Спиране на програмата" +msgstr "&Спиране на програмата" -#: gitk:2068 +#: gitk:2082 msgid "&File" -msgstr "Файл" +msgstr "&Файл" -#: gitk:2080 +#: gitk:2094 msgid "&Preferences" -msgstr "Настройки" +msgstr "&Настройки" -#: gitk:2079 +#: gitk:2093 msgid "&Edit" -msgstr "Редактиране" +msgstr "&Редактиране" -#: gitk:2084 +#: gitk:2098 msgid "&New view..." -msgstr "Нов изглед…" +msgstr "&Нов изглед…" -#: gitk:2085 +#: gitk:2099 msgid "&Edit view..." -msgstr "Редактиране на изгледа…" +msgstr "&Редактиране на изгледа…" -#: gitk:2086 +#: gitk:2100 msgid "&Delete view" -msgstr "Изтриване на изгледа" +msgstr "&Изтриване на изгледа" -#: gitk:2088 gitk:4043 +#: gitk:2102 msgid "&All files" -msgstr "Всички файлове" +msgstr "&Всички файлове" -#: gitk:2083 gitk:4067 +#: gitk:2097 msgid "&View" -msgstr "Изглед" +msgstr "&Изглед" -#: gitk:2093 gitk:2103 gitk:3012 +#: gitk:2107 gitk:2117 msgid "&About gitk" -msgstr "Относно gitk" +msgstr "&Относно gitk" -#: gitk:2094 gitk:2108 +#: gitk:2108 gitk:2122 msgid "&Key bindings" -msgstr "Клавишни комбинации" +msgstr "&Клавишни комбинации" -#: gitk:2092 gitk:2107 +#: gitk:2106 gitk:2121 msgid "&Help" -msgstr "Помощ" +msgstr "Помо&щ" -#: gitk:2185 gitk:8652 +#: gitk:2199 gitk:8671 msgid "SHA1 ID:" msgstr "SHA1:" -#: gitk:2229 +#: gitk:2243 msgid "Row" msgstr "Ред" -#: gitk:2267 +#: gitk:2281 msgid "Find" msgstr "Търсене" -#: gitk:2295 +#: gitk:2309 msgid "commit" msgstr "подаване" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 +#: gitk:6931 msgid "containing:" msgstr "съдържащо:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 msgid "touching paths:" msgstr "засягащо пътищата:" -#: gitk:2303 gitk:4777 +#: gitk:2317 gitk:4796 msgid "adding/removing string:" msgstr "добавящо/премахващо низ" -#: gitk:2304 gitk:4779 +#: gitk:2318 gitk:4798 msgid "changing lines matching:" msgstr "променящо редове напасващи:" -#: gitk:2313 gitk:2315 gitk:4766 +#: gitk:2327 gitk:2329 gitk:4785 msgid "Exact" msgstr "Точно" -#: gitk:2315 gitk:4854 gitk:6723 +#: gitk:2329 gitk:4873 gitk:6742 msgid "IgnCase" msgstr "Без регистър" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 msgid "Regexp" msgstr "Рег. израз" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 msgid "All fields" msgstr "Всички полета" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 msgid "Headline" msgstr "Първи ред" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 msgid "Comments" msgstr "Коментари" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 +#: gitk:8864 msgid "Author" msgstr "Автор" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 msgid "Committer" msgstr "Подаващ" -#: gitk:2350 +#: gitk:2367 msgid "Search" msgstr "Търсене" -#: gitk:2358 +#: gitk:2375 msgid "Diff" msgstr "Разлики" -#: gitk:2360 +#: gitk:2377 msgid "Old version" msgstr "Стара версия" -#: gitk:2362 +#: gitk:2379 msgid "New version" msgstr "Нова версия" -#: gitk:2364 +#: gitk:2382 msgid "Lines of context" msgstr "Контекст в редове" -#: gitk:2374 +#: gitk:2392 msgid "Ignore space change" msgstr "Празните знаци без значение" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 msgid "Line diff" msgstr "Поредови разлики" -#: gitk:2445 +#: gitk:2463 msgid "Patch" msgstr "Кръпка" -#: gitk:2447 +#: gitk:2465 msgid "Tree" msgstr "Дърво" -#: gitk:2617 gitk:2637 +#: gitk:2635 gitk:2656 msgid "Diff this -> selected" msgstr "Разлики между това и избраното" -#: gitk:2618 gitk:2638 +#: gitk:2636 gitk:2657 msgid "Diff selected -> this" msgstr "Разлики между избраното и това" -#: gitk:2619 gitk:2639 +#: gitk:2637 gitk:2658 msgid "Make patch" msgstr "Създаване на кръпка" -#: gitk:2620 gitk:9254 +#: gitk:2638 gitk:9273 msgid "Create tag" msgstr "Създаване на етикет" -#: gitk:2621 gitk:9371 +#: gitk:2639 +msgid "Copy commit summary" +msgstr "Копиране на информацията за подаване" + +#: gitk:2640 gitk:9404 msgid "Write commit to file" msgstr "Запазване на подаването във файл" -#: gitk:2622 gitk:9428 +#: gitk:2641 gitk:9461 msgid "Create new branch" msgstr "Създаване на нов клон" -#: gitk:2623 +#: gitk:2642 msgid "Cherry-pick this commit" msgstr "Отбиране на това подаване" -#: gitk:2624 +#: gitk:2643 msgid "Reset HEAD branch to here" msgstr "Привеждане на върха на клона към текущото подаване" -#: gitk:2625 +#: gitk:2644 msgid "Mark this commit" msgstr "Отбелязване на това подаване" -#: gitk:2626 +#: gitk:2645 msgid "Return to mark" msgstr "Връщане към отбелязаното подаване" -#: gitk:2627 +#: gitk:2646 msgid "Find descendant of this and mark" msgstr "Откриване и отбелязване на наследниците" -#: gitk:2628 +#: gitk:2647 msgid "Compare with marked commit" msgstr "Сравнение с отбелязаното подаване" -#: gitk:2629 gitk:2640 +#: gitk:2648 gitk:2659 msgid "Diff this -> marked commit" msgstr "Разлики между това и отбелязаното" -#: gitk:2630 gitk:2641 +#: gitk:2649 gitk:2660 msgid "Diff marked commit -> this" msgstr "Разлики между отбелязаното и това" -#: gitk:2631 +#: gitk:2650 msgid "Revert this commit" msgstr "Отмяна на това подаване" -#: gitk:2647 +#: gitk:2666 msgid "Check out this branch" msgstr "Изтегляне на този клон" -#: gitk:2648 +#: gitk:2667 msgid "Remove this branch" msgstr "Изтриване на този клон" -#: gitk:2649 +#: gitk:2668 msgid "Copy branch name" msgstr "Копиране на името на клона" -#: gitk:2656 +#: gitk:2675 msgid "Highlight this too" msgstr "Отбелязване и на това" -#: gitk:2657 +#: gitk:2676 msgid "Highlight this only" msgstr "Отбелязване само на това" -#: gitk:2658 +#: gitk:2677 msgid "External diff" msgstr "Външна програма за разлики" -#: gitk:2659 +#: gitk:2678 msgid "Blame parent commit" msgstr "Анотиране на родителското подаване" -#: gitk:2660 +#: gitk:2679 msgid "Copy path" msgstr "Копиране на пътя" -#: gitk:2667 +#: gitk:2686 msgid "Show origin of this line" msgstr "Показване на произхода на този ред" -#: gitk:2668 +#: gitk:2687 msgid "Run git gui blame on this line" msgstr "Изпълнение на „git gui blame“ върху този ред" -#: gitk:3014 +#: gitk:3031 +msgid "About gitk" +msgstr "Относно gitk" + +#: gitk:3033 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -374,316 +382,324 @@ msgstr "" "\n" "Използвайте и разпространявайте при условията на ОПЛ на ГНУ" -#: gitk:3022 gitk:3089 gitk:9857 +#: gitk:3041 gitk:3108 gitk:9890 msgid "Close" msgstr "Затваряне" -#: gitk:3043 +#: gitk:3062 msgid "Gitk key bindings" msgstr "Клавишни комбинации" -#: gitk:3046 +#: gitk:3065 msgid "Gitk key bindings:" msgstr "Клавишни комбинации:" -#: gitk:3048 +#: gitk:3067 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tСпиране на програмата" -#: gitk:3049 +#: gitk:3068 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tЗатваряне на прозореца" -#: gitk:3050 +#: gitk:3069 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tКъм първото подаване" -#: gitk:3051 +#: gitk:3070 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tКъм последното подаване" -#: gitk:3052 +#: gitk:3071 msgid "<Up>, p, k\tMove up one commit" msgstr "<Up>, p, k\tЕдно подаване нагоре" -#: gitk:3053 +#: gitk:3072 msgid "<Down>, n, j\tMove down one commit" msgstr "<Down>, n, j\tЕдно подаване надолу" -#: gitk:3054 +#: gitk:3073 msgid "<Left>, z, h\tGo back in history list" msgstr "<Left>, z, h\tНазад в историята" -#: gitk:3055 +#: gitk:3074 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\tНапред в историята" -#: gitk:3056 +#: gitk:3075 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята" -#: gitk:3057 +#: gitk:3076 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tСтраница нагоре в списъка с подаванията" -#: gitk:3058 +#: gitk:3077 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tСтраница надолу в списъка с подаванията" -#: gitk:3059 +#: gitk:3078 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tКъм началото на списъка с подаванията" -#: gitk:3060 +#: gitk:3079 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tКъм края на списъка с подаванията" -#: gitk:3061 +#: gitk:3080 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tРед нагоре в списъка с подавания" -#: gitk:3062 +#: gitk:3081 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tРед надолу в списъка с подавания" -#: gitk:3063 +#: gitk:3082 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания" -#: gitk:3064 +#: gitk:3083 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания" -#: gitk:3065 +#: gitk:3084 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\tТърсене назад (визуално нагоре, исторически — последващи)" -#: gitk:3066 +#: gitk:3085 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "" "<Shift-Down>\tТърсене напред (визуално надолу, исторически — предхождащи)" -#: gitk:3067 +#: gitk:3086 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tСтраница нагоре в изгледа за разлики" -#: gitk:3068 +#: gitk:3087 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tСтраница надолу в изгледа за разлики" -#: gitk:3069 +#: gitk:3088 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tСтраница надолу в изгледа за разлики" -#: gitk:3070 +#: gitk:3089 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 реда нагоре в изгледа за разлики" -#: gitk:3071 +#: gitk:3090 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 реда надолу в изгледа за разлики" -#: gitk:3072 +#: gitk:3091 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tТърсене" -#: gitk:3073 +#: gitk:3092 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tКъм следващата поява" -#: gitk:3074 +#: gitk:3093 msgid "<Return>\tMove to next find hit" msgstr "<Return>\tКъм следващата поява" -#: gitk:3075 +#: gitk:3094 msgid "g\t\tGo to commit" msgstr "g\t\tКъм последното подаване" -#: gitk:3076 +#: gitk:3095 msgid "/\t\tFocus the search box" msgstr "/\t\tФокус върху полето за търсене" -#: gitk:3077 +#: gitk:3096 msgid "?\t\tMove to previous find hit" msgstr "?\t\tКъм предишната поява" -#: gitk:3078 +#: gitk:3097 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tСледващ файл в изгледа за разлики" -#: gitk:3079 +#: gitk:3098 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики" -#: gitk:3080 +#: gitk:3099 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики" -#: gitk:3081 +#: gitk:3100 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tПо-голям размер на шрифта" -#: gitk:3082 +#: gitk:3101 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tПо-голям размер на шрифта" -#: gitk:3083 +#: gitk:3102 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tПо-малък размер на шрифта" -#: gitk:3084 +#: gitk:3103 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tПо-малък размер на шрифта" -#: gitk:3085 +#: gitk:3104 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tОбновяване" -#: gitk:3550 gitk:3559 +#: gitk:3569 gitk:3578 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Грешка при създаването на временната директория „%s“:" -#: gitk:3572 +#: gitk:3591 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Грешка при получаването на „%s“ от %s:" -#: gitk:3635 +#: gitk:3654 msgid "command failed:" msgstr "неуспешно изпълнение на команда:" -#: gitk:3784 +#: gitk:3803 msgid "No such commit" msgstr "Такова подаване няма" -#: gitk:3798 +#: gitk:3817 msgid "git gui blame: command failed:" msgstr "„git gui blame“: неуспешно изпълнение на команда:" -#: gitk:3829 +#: gitk:3848 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Върхът за сливане не може да бъде прочетен: %s" -#: gitk:3837 +#: gitk:3856 #, tcl-format msgid "Error reading index: %s" msgstr "Грешка при прочитане на индекса: %s" -#: gitk:3862 +#: gitk:3881 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Командата „git blame“ не може да бъде стартирана: %s" -#: gitk:3865 gitk:6754 +#: gitk:3884 gitk:6773 msgid "Searching" msgstr "Търсене" -#: gitk:3897 +#: gitk:3916 #, tcl-format msgid "Error running git blame: %s" msgstr "Грешка при изпълнението на „git blame“: %s" -#: gitk:3925 +#: gitk:3944 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Този ред идва от подаването %s, което не е в изгледа" -#: gitk:3939 +#: gitk:3958 msgid "External diff viewer failed:" msgstr "Неуспешно изпълнение на външната програма за разлики:" -#: gitk:4070 +#: gitk:4062 +msgid "All files" +msgstr "Всички файлове" + +#: gitk:4086 +msgid "View" +msgstr "Изглед" + +#: gitk:4089 msgid "Gitk view definition" msgstr "Дефиниция на изглед в Gitk" -#: gitk:4074 +#: gitk:4093 msgid "Remember this view" msgstr "Запазване на този изглед" -#: gitk:4075 +#: gitk:4094 msgid "References (space separated list):" msgstr "Указатели (списък с разделител интервал):" -#: gitk:4076 +#: gitk:4095 msgid "Branches & tags:" msgstr "Клони и етикети:" -#: gitk:4077 +#: gitk:4096 msgid "All refs" msgstr "Всички указатели" -#: gitk:4078 +#: gitk:4097 msgid "All (local) branches" msgstr "Всички (локални) клони" -#: gitk:4079 +#: gitk:4098 msgid "All tags" msgstr "Всички етикети" -#: gitk:4080 +#: gitk:4099 msgid "All remote-tracking branches" msgstr "Всички следящи клони" -#: gitk:4081 +#: gitk:4100 msgid "Commit Info (regular expressions):" msgstr "Информация за подаване (рег. изр.):" -#: gitk:4082 +#: gitk:4101 msgid "Author:" msgstr "Автор:" -#: gitk:4083 +#: gitk:4102 msgid "Committer:" msgstr "Подал:" -#: gitk:4084 +#: gitk:4103 msgid "Commit Message:" msgstr "Съобщение при подаване:" -#: gitk:4085 +#: gitk:4104 msgid "Matches all Commit Info criteria" msgstr "Съвпадение по всички характеристики на подаването" -#: gitk:4086 +#: gitk:4105 msgid "Matches no Commit Info criteria" msgstr "Не съвпада по никоя от характеристиките на подаването" -#: gitk:4087 +#: gitk:4106 msgid "Changes to Files:" msgstr "Промени по файловете:" -#: gitk:4088 +#: gitk:4107 msgid "Fixed String" msgstr "Дословен низ" -#: gitk:4089 +#: gitk:4108 msgid "Regular Expression" msgstr "Регулярен израз" -#: gitk:4090 +#: gitk:4109 msgid "Search string:" msgstr "Низ за търсене:" -#: gitk:4091 +#: gitk:4110 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -691,204 +707,204 @@ msgstr "" "Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, " "„March 17, 2009 15:27:38“):" -#: gitk:4092 +#: gitk:4111 msgid "Since:" msgstr "От:" -#: gitk:4093 +#: gitk:4112 msgid "Until:" msgstr "До:" -#: gitk:4094 +#: gitk:4113 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "" "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло " "число):" -#: gitk:4095 +#: gitk:4114 msgid "Number to show:" msgstr "Брой показани:" -#: gitk:4096 +#: gitk:4115 msgid "Number to skip:" msgstr "Брой прескочени:" -#: gitk:4097 +#: gitk:4116 msgid "Miscellaneous options:" msgstr "Разни:" -#: gitk:4098 +#: gitk:4117 msgid "Strictly sort by date" msgstr "Подреждане по дата" -#: gitk:4099 +#: gitk:4118 msgid "Mark branch sides" msgstr "Отбелязване на страните по клона" -#: gitk:4100 +#: gitk:4119 msgid "Limit to first parent" msgstr "Само първия родител" -#: gitk:4101 +#: gitk:4120 msgid "Simple history" msgstr "Опростена история" -#: gitk:4102 +#: gitk:4121 msgid "Additional arguments to git log:" msgstr "Допълнителни аргументи към „git log“:" -#: gitk:4103 +#: gitk:4122 msgid "Enter files and directories to include, one per line:" msgstr "Въведете файловете и директориите за включване, по елемент на ред" -#: gitk:4104 +#: gitk:4123 msgid "Command to generate more commits to include:" msgstr "" "Команда за генерирането на допълнителни подавания, които да бъдат включени:" -#: gitk:4228 +#: gitk:4247 msgid "Gitk: edit view" msgstr "Gitk: редактиране на изглед" -#: gitk:4236 +#: gitk:4255 msgid "-- criteria for selecting revisions" msgstr "— критерии за избор на версии" -#: gitk:4241 +#: gitk:4260 msgid "View Name" msgstr "Име на изглед" -#: gitk:4316 +#: gitk:4335 msgid "Apply (F5)" msgstr "Прилагане (F5)" -#: gitk:4354 +#: gitk:4373 msgid "Error in commit selection arguments:" msgstr "Грешка в аргументите за избор на подавания:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 msgid "None" msgstr "Няма" -#: gitk:5021 gitk:5026 +#: gitk:5040 gitk:5045 msgid "Descendant" msgstr "Наследник" -#: gitk:5022 +#: gitk:5041 msgid "Not descendant" msgstr "Не е наследник" -#: gitk:5029 gitk:5034 +#: gitk:5048 gitk:5053 msgid "Ancestor" msgstr "Предшественик" -#: gitk:5030 +#: gitk:5049 msgid "Not ancestor" msgstr "Не е предшественик" -#: gitk:5324 +#: gitk:5343 msgid "Local changes checked in to index but not committed" msgstr "Локални промени добавени към индекса, но неподадени" -#: gitk:5360 +#: gitk:5379 msgid "Local uncommitted changes, not checked in to index" msgstr "Локални промени извън индекса" -#: gitk:7134 +#: gitk:7153 msgid "and many more" msgstr "и още много" -#: gitk:7137 +#: gitk:7156 msgid "many" msgstr "много" -#: gitk:7328 +#: gitk:7347 msgid "Tags:" msgstr "Етикети:" -#: gitk:7345 gitk:7351 gitk:8825 +#: gitk:7364 gitk:7370 gitk:8844 msgid "Parent" msgstr "Родител" -#: gitk:7356 +#: gitk:7375 msgid "Child" msgstr "Дете" -#: gitk:7365 +#: gitk:7384 msgid "Branch" msgstr "Клон" -#: gitk:7368 +#: gitk:7387 msgid "Follows" msgstr "Следва" -#: gitk:7371 +#: gitk:7390 msgid "Precedes" msgstr "Предшества" -#: gitk:7966 +#: gitk:7985 #, tcl-format msgid "Error getting diffs: %s" msgstr "Грешка при получаването на разликите: %s" -#: gitk:8650 +#: gitk:8669 msgid "Goto:" msgstr "Към ред:" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Съкратената сума по SHA1 %s не е еднозначна" -#: gitk:8678 +#: gitk:8697 #, tcl-format msgid "Revision %s is not known" msgstr "Непозната версия %s" -#: gitk:8688 +#: gitk:8707 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Непозната сума по SHA1 %s" -#: gitk:8690 +#: gitk:8709 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Версия %s не е в текущия изглед" -#: gitk:8832 gitk:8847 +#: gitk:8851 gitk:8866 msgid "Date" msgstr "Дата" -#: gitk:8835 +#: gitk:8854 msgid "Children" msgstr "Деца" -#: gitk:8898 +#: gitk:8917 #, tcl-format msgid "Reset %s branch to here" msgstr "Зануляване на клона „%s“ към текущото подаване" -#: gitk:8900 +#: gitk:8919 msgid "Detached head: can't reset" msgstr "Несвързан връх: невъзможно зануляване" -#: gitk:9005 gitk:9011 +#: gitk:9024 gitk:9030 msgid "Skipping merge commit " msgstr "Пропускане на подаването на сливането" -#: gitk:9020 gitk:9025 +#: gitk:9039 gitk:9044 msgid "Error getting patch ID for " msgstr "Грешка при получаването на идентификатора на " -#: gitk:9021 gitk:9026 +#: gitk:9040 gitk:9045 msgid " - stopping\n" msgstr " — спиране\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 msgid "Commit " msgstr "Подаване" -#: gitk:9035 +#: gitk:9054 msgid "" " is the same patch as\n" " " @@ -896,7 +912,7 @@ msgstr "" " е същата кръпка като\n" " " -#: gitk:9043 +#: gitk:9062 msgid "" " differs from\n" " " @@ -904,7 +920,7 @@ msgstr "" " се различава от\n" " " -#: gitk:9045 +#: gitk:9064 msgid "" "Diff of commits:\n" "\n" @@ -912,130 +928,130 @@ msgstr "" "Разлика между подаванията:\n" "\n" -#: gitk:9057 gitk:9066 +#: gitk:9076 gitk:9085 #, tcl-format msgid " has %s children - stopping\n" msgstr " има %s деца — спиране\n" -#: gitk:9085 +#: gitk:9104 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Грешка при запазването на подаването във файл: %s" -#: gitk:9091 +#: gitk:9110 #, tcl-format msgid "Error diffing commits: %s" msgstr "Грешка при изчисляването на разликите между подаванията: %s" -#: gitk:9137 +#: gitk:9156 msgid "Top" msgstr "Най-горе" -#: gitk:9138 +#: gitk:9157 msgid "From" msgstr "От" -#: gitk:9143 +#: gitk:9162 msgid "To" msgstr "До" -#: gitk:9167 +#: gitk:9186 msgid "Generate patch" msgstr "Генериране на кръпка" -#: gitk:9169 +#: gitk:9188 msgid "From:" msgstr "От:" -#: gitk:9178 +#: gitk:9197 msgid "To:" msgstr "До:" -#: gitk:9187 +#: gitk:9206 msgid "Reverse" msgstr "Обръщане" -#: gitk:9189 gitk:9385 +#: gitk:9208 gitk:9418 msgid "Output file:" msgstr "Запазване във файла:" -#: gitk:9195 +#: gitk:9214 msgid "Generate" msgstr "Генериране" -#: gitk:9233 +#: gitk:9252 msgid "Error creating patch:" msgstr "Грешка при създаването на кръпка:" -#: gitk:9256 gitk:9373 gitk:9430 +#: gitk:9275 gitk:9406 gitk:9463 msgid "ID:" msgstr "Идентификатор:" -#: gitk:9265 +#: gitk:9284 msgid "Tag name:" msgstr "Име на етикет:" -#: gitk:9268 +#: gitk:9287 msgid "Tag message is optional" msgstr "Съобщението за етикет е незадължително" -#: gitk:9270 +#: gitk:9289 msgid "Tag message:" msgstr "Съобщение за етикет:" -#: gitk:9274 gitk:9439 +#: gitk:9293 gitk:9472 msgid "Create" msgstr "Създаване" -#: gitk:9292 +#: gitk:9311 msgid "No tag name specified" msgstr "Липсва име на етикет" -#: gitk:9296 +#: gitk:9315 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Етикетът „%s“ вече съществува" -#: gitk:9306 +#: gitk:9325 msgid "Error creating tag:" msgstr "Грешка при създаването на етикет:" -#: gitk:9382 +#: gitk:9415 msgid "Command:" msgstr "Команда:" -#: gitk:9390 +#: gitk:9423 msgid "Write" msgstr "Запазване" -#: gitk:9408 +#: gitk:9441 msgid "Error writing commit:" msgstr "Грешка при запазването на подаването:" -#: gitk:9435 +#: gitk:9468 msgid "Name:" msgstr "Име:" -#: gitk:9458 +#: gitk:9491 msgid "Please specify a name for the new branch" msgstr "Укажете име за новия клон" -#: gitk:9463 +#: gitk:9496 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?" -#: gitk:9530 +#: gitk:9563 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" -#: gitk:9535 +#: gitk:9568 msgid "Cherry-picking" msgstr "Отбиране" -#: gitk:9544 +#: gitk:9577 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1044,7 +1060,7 @@ msgstr "" "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги скатайте и пробвайте отново." -#: gitk:9550 +#: gitk:9583 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1052,20 +1068,20 @@ msgstr "" "Неуспешно отбиране поради конфликти при сливане.\n" "Искате ли да ги коригирате чрез „git citool“?" -#: gitk:9566 gitk:9624 +#: gitk:9599 gitk:9657 msgid "No changes committed" msgstr "Не са подадени промени" -#: gitk:9593 +#: gitk:9626 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" -#: gitk:9598 +#: gitk:9631 msgid "Reverting" msgstr "Отмяна" -#: gitk:9606 +#: gitk:9639 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1074,7 +1090,7 @@ msgstr "" "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги скатайте и пробвайте отново.<" -#: gitk:9610 +#: gitk:9643 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1082,28 +1098,28 @@ msgstr "" "Неуспешно отмяна поради конфликти при сливане.\n" "Искате ли да ги коригирате чрез „git citool“?" -#: gitk:9653 +#: gitk:9686 msgid "Confirm reset" msgstr "Потвърждаване на зануляването" -#: gitk:9655 +#: gitk:9688 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Да се занули ли клонът „%s“ към „%s“?" -#: gitk:9657 +#: gitk:9690 msgid "Reset type:" msgstr "Вид зануляване:" -#: gitk:9660 +#: gitk:9693 msgid "Soft: Leave working tree and index untouched" msgstr "Слабо: работното дърво и индекса остават същите" -#: gitk:9663 +#: gitk:9696 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Смесено: работното дърво остава същото, индексът се занулява" -#: gitk:9666 +#: gitk:9699 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1111,19 +1127,19 @@ msgstr "" "Силно: зануляване и на работното дърво, и на индекса\n" "(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" -#: gitk:9683 +#: gitk:9716 msgid "Resetting" msgstr "Зануляване" -#: gitk:9743 +#: gitk:9776 msgid "Checking out" msgstr "Изтегляне" -#: gitk:9796 +#: gitk:9829 msgid "Cannot delete the currently checked-out branch" msgstr "Текущо изтегленият клон не може да бъде изтрит" -#: gitk:9802 +#: gitk:9835 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1132,16 +1148,16 @@ msgstr "" "Подаванията на клона „%s“ не са на никой друг клон.\n" "Наистина ли да се изтрие клонът „%s“?" -#: gitk:9833 +#: gitk:9866 #, tcl-format msgid "Tags and heads: %s" msgstr "Етикети и върхове: %s" -#: gitk:9850 +#: gitk:9883 msgid "Filter" msgstr "Филтриране" -#: gitk:10146 +#: gitk:10179 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1149,201 +1165,201 @@ msgstr "" "Грешка при прочитането на топологията на подаванията. Информацията за клона " "и предшестващите/следващите етикети ще е непълна." -#: gitk:11123 +#: gitk:11156 msgid "Tag" msgstr "Етикет" -#: gitk:11127 +#: gitk:11160 msgid "Id" msgstr "Идентификатор" -#: gitk:11210 +#: gitk:11243 msgid "Gitk font chooser" msgstr "Избор на шрифт за Gitk" -#: gitk:11227 +#: gitk:11260 msgid "B" msgstr "Ч" -#: gitk:11230 +#: gitk:11263 msgid "I" msgstr "К" -#: gitk:11348 +#: gitk:11381 msgid "Commit list display options" msgstr "Настройки на списъка с подавания" -#: gitk:11351 +#: gitk:11384 msgid "Maximum graph width (lines)" msgstr "Максимална широчина на графа (в редове)" -#: gitk:11355 +#: gitk:11388 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Максимална широчина на графа (% от панела)" -#: gitk:11358 +#: gitk:11391 msgid "Show local changes" msgstr "Показване на локалните промени" -#: gitk:11361 +#: gitk:11394 msgid "Auto-select SHA1 (length)" msgstr "Автоматично избиране на SHA1 (дължина)" -#: gitk:11365 +#: gitk:11398 msgid "Hide remote refs" msgstr "Скриване на отдалечените указатели" -#: gitk:11369 +#: gitk:11402 msgid "Diff display options" msgstr "Настройки на показването на разликите" -#: gitk:11371 +#: gitk:11404 msgid "Tab spacing" msgstr "Широчина на табулатора" -#: gitk:11374 +#: gitk:11407 msgid "Display nearby tags/heads" msgstr "Извеждане на близките етикети и върхове" -#: gitk:11377 +#: gitk:11410 msgid "Maximum # tags/heads to show" msgstr "Максимален брой етикети/върхове за показване" -#: gitk:11380 +#: gitk:11413 msgid "Limit diffs to listed paths" msgstr "Разлика само в избраните пътища" -#: gitk:11383 +#: gitk:11416 msgid "Support per-file encodings" msgstr "Поддръжка на различни кодирания за всеки файл" -#: gitk:11389 gitk:11536 +#: gitk:11422 gitk:11569 msgid "External diff tool" msgstr "Външен инструмент за разлики" -#: gitk:11390 +#: gitk:11423 msgid "Choose..." msgstr "Избор…" -#: gitk:11395 +#: gitk:11428 msgid "General options" msgstr "Общи настройки" -#: gitk:11398 +#: gitk:11431 msgid "Use themed widgets" msgstr "Използване на тема за графичните обекти" -#: gitk:11400 +#: gitk:11433 msgid "(change requires restart)" msgstr "(промяната изисква рестартиране на Gitk)" -#: gitk:11402 +#: gitk:11435 msgid "(currently unavailable)" msgstr "(в момента недостъпно)" -#: gitk:11413 +#: gitk:11446 msgid "Colors: press to choose" msgstr "Цветове: избира се с натискане" -#: gitk:11416 +#: gitk:11449 msgid "Interface" msgstr "Интерфейс" -#: gitk:11417 +#: gitk:11450 msgid "interface" msgstr "интерфейс" -#: gitk:11420 +#: gitk:11453 msgid "Background" msgstr "Фон" -#: gitk:11421 gitk:11451 +#: gitk:11454 gitk:11484 msgid "background" msgstr "фон" -#: gitk:11424 +#: gitk:11457 msgid "Foreground" msgstr "Знаци" -#: gitk:11425 +#: gitk:11458 msgid "foreground" msgstr "знаци" -#: gitk:11428 +#: gitk:11461 msgid "Diff: old lines" msgstr "Разлика: стари редове" -#: gitk:11429 +#: gitk:11462 msgid "diff old lines" msgstr "разлика, стари редове" -#: gitk:11433 +#: gitk:11466 msgid "Diff: new lines" msgstr "Разлика: нови редове" -#: gitk:11434 +#: gitk:11467 msgid "diff new lines" msgstr "разлика, нови редове" -#: gitk:11438 +#: gitk:11471 msgid "Diff: hunk header" msgstr "Разлика: начало на парче" -#: gitk:11440 +#: gitk:11473 msgid "diff hunk header" msgstr "разлика, начало на парче" -#: gitk:11444 +#: gitk:11477 msgid "Marked line bg" msgstr "Фон на отбелязан ред" -#: gitk:11446 +#: gitk:11479 msgid "marked line background" msgstr "фон на отбелязан ред" -#: gitk:11450 +#: gitk:11483 msgid "Select bg" msgstr "Избор на фон" -#: gitk:11459 +#: gitk:11492 msgid "Fonts: press to choose" msgstr "Шрифтове: избира се с натискане" -#: gitk:11461 +#: gitk:11494 msgid "Main font" msgstr "Основен шрифт" -#: gitk:11462 +#: gitk:11495 msgid "Diff display font" msgstr "Шрифт за разликите" -#: gitk:11463 +#: gitk:11496 msgid "User interface font" msgstr "Шрифт на интерфейса" -#: gitk:11485 +#: gitk:11518 msgid "Gitk preferences" msgstr "Настройки на Gitk" -#: gitk:11494 +#: gitk:11527 msgid "General" msgstr "Общи" -#: gitk:11495 +#: gitk:11528 msgid "Colors" msgstr "Цветове" -#: gitk:11496 +#: gitk:11529 msgid "Fonts" msgstr "Шрифтове" -#: gitk:11546 +#: gitk:11579 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: избор на цвят на „%s“" -#: gitk:12059 +#: gitk:12092 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1351,15 +1367,15 @@ msgstr "" "Тази версия на Tcl/Tk не се поддържа от Gitk.\n" " Необходима ви е поне Tcl/Tk 8.4." -#: gitk:12269 +#: gitk:12302 msgid "Cannot find a git repository here." msgstr "Тук липсва хранилище на Git." -#: gitk:12316 +#: gitk:12349 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл" -#: gitk:12328 +#: gitk:12361 msgid "Bad arguments to gitk:" msgstr "Неправилни аргументи на gitk:" diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po index d9ba4052e2..bde749ed8a 100644 --- a/gitk-git/po/de.po +++ b/gitk-git/po/de.po @@ -23,11 +23,11 @@ msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" #: gitk:212 gitk:2381 msgid "Color words" -msgstr "" +msgstr "Wörter einfärben" #: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" -msgstr "" +msgstr "Wörter kennzeichnen" #: gitk:324 msgid "Error parsing revisions:" @@ -187,7 +187,7 @@ msgstr "Änderungen:" #: gitk:2304 gitk:4779 msgid "changing lines matching:" -msgstr "" +msgstr "Geänderte Zeilen entsprechen:" #: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" @@ -248,7 +248,7 @@ msgstr "Leerzeichenänderungen ignorieren" #: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" -msgstr "" +msgstr "Zeilenunterschied" #: gitk:2445 msgid "Patch" @@ -307,19 +307,16 @@ msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" #: gitk:2629 gitk:2640 -#, fuzzy msgid "Diff this -> marked commit" -msgstr "Vergleich: diese -> gewählte" +msgstr "Vergleich: diese -> gewählte Version" #: gitk:2630 gitk:2641 -#, fuzzy msgid "Diff marked commit -> this" -msgstr "Vergleich: gewählte -> diese" +msgstr "Vergleich: gewählte -> diese Version" #: gitk:2631 -#, fuzzy msgid "Revert this commit" -msgstr "Lesezeichen setzen" +msgstr "Version umkehren" #: gitk:2647 msgid "Check out this branch" @@ -331,7 +328,7 @@ msgstr "Zweig löschen" #: gitk:2649 msgid "Copy branch name" -msgstr "" +msgstr "Zweigname kopieren" #: gitk:2656 msgid "Highlight this too" @@ -351,7 +348,7 @@ msgstr "Annotieren der Elternversion" #: gitk:2660 msgid "Copy path" -msgstr "" +msgstr "Pfad kopieren" #: gitk:2667 msgid "Show origin of this line" @@ -362,7 +359,6 @@ msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" #: gitk:3014 -#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -374,7 +370,7 @@ 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" @@ -397,9 +393,9 @@ msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" #: gitk:3049 -#, fuzzy, tcl-format +#, tcl-format msgid "<%s-W>\t\tClose window" -msgstr "<%s-F>\t\tSuchen" +msgstr "<%s-F>\t\tFenster schließen" #: gitk:3050 msgid "<Home>\t\tMove to first commit" @@ -410,19 +406,16 @@ msgid "<End>\t\tMove to last commit" msgstr "<Ende>\t\tZur ältesten Version springen" #: gitk:3052 -#, fuzzy msgid "<Up>, p, k\tMove up one commit" -msgstr "<Hoch>, p, i\tNächste neuere Version" +msgstr "<Hoch>, p, k\tNächste neuere Version" #: gitk:3053 -#, fuzzy msgid "<Down>, n, j\tMove down one commit" -msgstr "<Runter>, n, k\tNächste ältere Version" +msgstr "<Runter>, n, j\tNächste ältere Version" #: gitk:3054 -#, fuzzy msgid "<Left>, z, h\tGo back in history list" -msgstr "<Links>, z, j\tEine Version zurückgehen" +msgstr "<Links>, z, h\tEine Version zurückgehen" #: gitk:3055 msgid "<Right>, x, l\tGo forward in history list" @@ -431,7 +424,7 @@ msgstr "<Rechts>, x, l\tEine Version weitergehen" #: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" +msgstr "<%s-n>\tZu n-ter Elternversion in Versionshistorie springen" #: gitk:3057 msgid "<PageUp>\tMove up one page in commit list" @@ -514,9 +507,8 @@ msgid "<Return>\tMove to next find hit" msgstr "<Eingabetaste>\tWeitersuchen" #: gitk:3075 -#, fuzzy msgid "g\t\tGo to commit" -msgstr "<Ende>\t\tZur ältesten Version springen" +msgstr "g\t\tZu Version springen" #: gitk:3076 msgid "/\t\tFocus the search box" @@ -673,9 +665,8 @@ msgid "Matches all Commit Info criteria" msgstr "Alle Versionsinformationen-Kriterien erfüllen" #: gitk:4086 -#, fuzzy msgid "Matches no Commit Info criteria" -msgstr "Alle Versionsinformationen-Kriterien erfüllen" +msgstr "keine Versionsinformationen-Kriterien erfüllen" #: gitk:4087 msgid "Changes to Files:" @@ -802,7 +793,7 @@ msgstr "Lokale Änderungen, nicht bereitgestellt" #: gitk:7134 msgid "and many more" -msgstr "" +msgstr "und weitere" #: gitk:7137 msgid "many" @@ -1066,34 +1057,31 @@ msgid "No changes committed" msgstr "Keine Änderungen eingetragen" #: gitk:9593 -#, fuzzy, tcl-format +#, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" -"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " -"eintragen?" +"Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?" #: gitk:9598 -#, fuzzy msgid "Reverting" -msgstr "Zurücksetzen" +msgstr "Umkehren" #: gitk:9606 -#, fuzzy, tcl-format +#, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." msgstr "" -"Pflücken fehlgeschlagen, da noch lokale Änderungen in Datei »%s«\n" +"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 -#, fuzzy msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" msgstr "" -"Pflücken fehlgeschlagen, da ein Zusammenführungs-Konflikt aufgetreten\n" +"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?" @@ -1206,9 +1194,8 @@ msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" #: gitk:11361 -#, fuzzy msgid "Auto-select SHA1 (length)" -msgstr "SHA1-Hashwert automatisch auswählen" +msgstr "SHA1-Hashwert (Länge) automatisch auswählen" #: gitk:11365 msgid "Hide remote refs" @@ -1223,13 +1210,12 @@ msgid "Tab spacing" msgstr "Tabulatorbreite" #: gitk:11374 -#, fuzzy msgid "Display nearby tags/heads" -msgstr "Naheliegende Markierungen anzeigen" +msgstr "Naheliegende Markierungen/Zweigspitzen anzeigen" #: gitk:11377 msgid "Maximum # tags/heads to show" -msgstr "" +msgstr "Maximale Anzahl anzuzeigender Markierungen/Zweigspitzen" #: gitk:11380 msgid "Limit diffs to listed paths" @@ -1348,17 +1334,16 @@ msgid "Gitk preferences" msgstr "Gitk-Einstellungen" #: gitk:11494 -#, fuzzy msgid "General" -msgstr "Erzeugen" +msgstr "Allgemein" #: gitk:11495 msgid "Colors" -msgstr "" +msgstr "Farben" #: gitk:11496 msgid "Fonts" -msgstr "" +msgstr "Schriftarten" #: gitk:11546 #, tcl-format @@ -1370,6 +1355,8 @@ 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." diff --git a/gitk-git/po/fr.po b/gitk-git/po/fr.po index 80f72fb453..c44f994fa5 100644 --- a/gitk-git/po/fr.po +++ b/gitk-git/po/fr.po @@ -3,14 +3,14 @@ # 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: 2015-05-17 14:32+1000\n" -"PO-Revision-Date: 2009-11-19 22:13+0100\n" -"Last-Translator: Emmanuel Trillaud <etrillaud@gmail.com>\n" +"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" @@ -23,13 +23,13 @@ msgstr "" msgid "Couldn't get list of unmerged files:" msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" -#: gitk:212 gitk:2381 +#: gitk:212 gitk:2399 msgid "Color words" -msgstr "" +msgstr "Colorier les mots différents" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +#: gitk:217 gitk:2399 gitk:8239 gitk:8272 msgid "Markup words" -msgstr "" +msgstr "Marquer les mots différents" #: gitk:324 msgid "Error parsing revisions:" @@ -47,13 +47,10 @@ msgstr "" # FIXME : améliorer la traduction de 'file limite' #: gitk:396 -#, fuzzy msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." -msgstr "" -"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné " -"n'est dans la limite des fichiers." +msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers." #: gitk:418 gitk:566 msgid "Error executing git log:" @@ -63,15 +60,15 @@ msgstr "Erreur à l'exécution de git log :" msgid "Reading" msgstr "Lecture en cours" -#: gitk:496 gitk:4525 +#: gitk:496 gitk:4544 msgid "Reading commits..." msgstr "Lecture des commits..." -#: gitk:499 gitk:1637 gitk:4528 +#: gitk:499 gitk:1637 gitk:4547 msgid "No commits selected" msgstr "Aucun commit sélectionné" -#: gitk:1445 gitk:4045 gitk:12432 +#: gitk:1445 gitk:4064 gitk:12469 msgid "Command line" msgstr "Ligne de commande" @@ -83,290 +80,294 @@ msgstr "Impossible de lire la sortie de git log :" msgid "No commit information available" msgstr "Aucune information disponible sur le commit" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 +#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 +#: gitk:11275 gitk:11555 msgid "Cancel" msgstr "Annuler" -#: gitk:2069 +#: gitk:2083 msgid "&Update" msgstr "Mise à jour" -#: gitk:2070 +#: gitk:2084 msgid "&Reload" -msgstr "Recharger" +msgstr "&Recharger" -#: gitk:2071 +#: gitk:2085 msgid "Reread re&ferences" -msgstr "Relire les références" +msgstr "Relire les ré&férences" -#: gitk:2072 +#: gitk:2086 msgid "&List references" -msgstr "Lister les références" +msgstr "&Lister les références" -#: gitk:2074 +#: gitk:2088 msgid "Start git &gui" -msgstr "Démarrer git gui" +msgstr "Démarrer git &gui" -#: gitk:2076 +#: gitk:2090 msgid "&Quit" -msgstr "Quitter" +msgstr "&Quitter" -#: gitk:2068 +#: gitk:2082 msgid "&File" -msgstr "Fichier" +msgstr "&Fichier" -#: gitk:2080 +#: gitk:2094 msgid "&Preferences" msgstr "Préférences" -#: gitk:2079 +#: gitk:2093 msgid "&Edit" -msgstr "Éditer" +msgstr "&Éditer" -#: gitk:2084 +#: gitk:2098 msgid "&New view..." -msgstr "Nouvelle vue..." +msgstr "&Nouvelle vue..." -#: gitk:2085 +#: gitk:2099 msgid "&Edit view..." -msgstr "Éditer la vue..." +msgstr "&Éditer la vue..." -#: gitk:2086 +#: gitk:2100 msgid "&Delete view" msgstr "Supprimer la vue" -#: gitk:2088 gitk:4043 +#: gitk:2102 msgid "&All files" msgstr "Tous les fichiers" -#: gitk:2083 gitk:4067 +#: gitk:2097 msgid "&View" -msgstr "Vue" +msgstr "&Vue" -#: gitk:2093 gitk:2103 gitk:3012 +#: gitk:2107 gitk:2117 msgid "&About gitk" msgstr "À propos de gitk" -#: gitk:2094 gitk:2108 +#: gitk:2108 gitk:2122 msgid "&Key bindings" msgstr "Raccourcis clavier" -#: gitk:2092 gitk:2107 +#: gitk:2106 gitk:2121 msgid "&Help" msgstr "Aide" -#: gitk:2185 gitk:8652 +#: gitk:2199 gitk:8671 msgid "SHA1 ID:" msgstr "Id SHA1 :" -#: gitk:2229 +#: gitk:2243 msgid "Row" msgstr "Colonne" -#: gitk:2267 +#: gitk:2281 msgid "Find" msgstr "Recherche" -#: gitk:2295 +#: gitk:2309 msgid "commit" msgstr "commit" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 +#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 +#: gitk:6931 msgid "containing:" msgstr "contient :" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 msgid "touching paths:" msgstr "chemins modifiés :" -#: gitk:2303 gitk:4777 +#: gitk:2317 gitk:4796 msgid "adding/removing string:" msgstr "ajoute/supprime la chaîne :" -#: gitk:2304 gitk:4779 +#: gitk:2318 gitk:4798 msgid "changing lines matching:" -msgstr "" +msgstr "modifie les lignes vérifiant :" -#: gitk:2313 gitk:2315 gitk:4766 +#: gitk:2327 gitk:2329 gitk:4785 msgid "Exact" msgstr "Exact" -#: gitk:2315 gitk:4854 gitk:6723 +#: gitk:2329 gitk:4873 gitk:6742 msgid "IgnCase" msgstr "Ignorer la casse" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 msgid "Regexp" msgstr "Expression régulière" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 msgid "All fields" msgstr "Tous les champs" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 msgid "Headline" -msgstr "Surligner" +msgstr "Titre" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 msgid "Comments" msgstr "Commentaires" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 +#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 +#: gitk:8864 msgid "Author" msgstr "Auteur" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 msgid "Committer" -msgstr "Auteur du commit" +msgstr "Validateur" -#: gitk:2350 +#: gitk:2367 msgid "Search" msgstr "Rechercher" -#: gitk:2358 +#: gitk:2375 msgid "Diff" msgstr "Diff" -#: gitk:2360 +#: gitk:2377 msgid "Old version" msgstr "Ancienne version" -#: gitk:2362 +#: gitk:2379 msgid "New version" msgstr "Nouvelle version" -#: gitk:2364 +#: gitk:2382 msgid "Lines of context" msgstr "Lignes de contexte" -#: gitk:2374 +#: gitk:2392 msgid "Ignore space change" msgstr "Ignorer les modifications d'espace" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 msgid "Line diff" -msgstr "" +msgstr "différence par ligne" -#: gitk:2445 +#: gitk:2463 msgid "Patch" msgstr "Patch" -#: gitk:2447 +#: gitk:2465 msgid "Tree" msgstr "Arbre" -#: gitk:2617 gitk:2637 +#: gitk:2635 gitk:2656 msgid "Diff this -> selected" -msgstr "Diff entre ceci et la sélection" +msgstr "Diff ceci -> la sélection" -#: gitk:2618 gitk:2638 +#: gitk:2636 gitk:2657 msgid "Diff selected -> this" -msgstr "Diff entre sélection et ceci" +msgstr "Diff sélection -> ceci" -#: gitk:2619 gitk:2639 +#: gitk:2637 gitk:2658 msgid "Make patch" msgstr "Créer patch" -#: gitk:2620 gitk:9254 +#: 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:2621 gitk:9371 +#: gitk:2640 gitk:9404 msgid "Write commit to file" msgstr "Écrire le commit dans un fichier" -#: gitk:2622 gitk:9428 +#: gitk:2641 gitk:9461 msgid "Create new branch" msgstr "Créer une nouvelle branche" -#: gitk:2623 +#: gitk:2642 msgid "Cherry-pick this commit" msgstr "Cueillir (cherry-pick) ce commit" -#: gitk:2624 +#: gitk:2643 msgid "Reset HEAD branch to here" msgstr "Réinitialiser la branche HEAD vers cet état" -#: gitk:2625 +#: gitk:2644 msgid "Mark this commit" msgstr "Marquer ce commit" -#: gitk:2626 +#: gitk:2645 msgid "Return to mark" msgstr "Retourner à la marque" -#: gitk:2627 +#: gitk:2646 msgid "Find descendant of this and mark" msgstr "Chercher le descendant de ceci et le marquer" -#: gitk:2628 +#: gitk:2647 msgid "Compare with marked commit" msgstr "Comparer avec le commit marqué" -#: gitk:2629 gitk:2640 -#, fuzzy +#: gitk:2648 gitk:2659 msgid "Diff this -> marked commit" -msgstr "Diff entre ceci et la sélection" +msgstr "Diff ceci -> sélection" -#: gitk:2630 gitk:2641 -#, fuzzy +#: gitk:2649 gitk:2660 msgid "Diff marked commit -> this" -msgstr "Diff entre sélection et ceci" +msgstr "Diff entre sélection -> ceci" -#: gitk:2631 -#, fuzzy +#: gitk:2650 msgid "Revert this commit" -msgstr "Marquer ce commit" +msgstr "Défaire ce commit" -#: gitk:2647 +#: gitk:2666 msgid "Check out this branch" msgstr "Récupérer cette branche" -#: gitk:2648 +#: gitk:2667 msgid "Remove this branch" msgstr "Supprimer cette branche" -#: gitk:2649 +#: gitk:2668 msgid "Copy branch name" -msgstr "" +msgstr "Copier la nom de la branche" -#: gitk:2656 +#: gitk:2675 msgid "Highlight this too" msgstr "Surligner également ceci" -#: gitk:2657 +#: gitk:2676 msgid "Highlight this only" msgstr "Surligner seulement ceci" -#: gitk:2658 +#: gitk:2677 msgid "External diff" msgstr "Diff externe" -#: gitk:2659 +#: gitk:2678 msgid "Blame parent commit" msgstr "Blâmer le commit parent" -#: gitk:2660 +#: gitk:2679 msgid "Copy path" -msgstr "" +msgstr "Copier le chemin" -#: gitk:2667 +#: gitk:2686 msgid "Show origin of this line" msgstr "Montrer l'origine de cette ligne" -#: gitk:2668 +#: gitk:2687 msgid "Run git gui blame on this line" msgstr "Exécuter git gui blame sur cette ligne" -#: gitk:3014 -#, fuzzy +#: gitk:3031 +msgid "About gitk" +msgstr "À propos de gitk" + +#: gitk:3033 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -378,327 +379,329 @@ 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:3022 gitk:3089 gitk:9857 +#: gitk:3041 gitk:3108 gitk:9890 msgid "Close" msgstr "Fermer" -#: gitk:3043 +#: gitk:3062 msgid "Gitk key bindings" msgstr "Raccourcis clavier de Gitk" -#: gitk:3046 +#: gitk:3065 msgid "Gitk key bindings:" msgstr "Raccourcis clavier de Gitk :" -#: gitk:3048 +#: gitk:3067 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tQuitter" -#: gitk:3049 -#, fuzzy, tcl-format +#: gitk:3068 +#, tcl-format msgid "<%s-W>\t\tClose window" -msgstr "<%s-F>\t\tRechercher" +msgstr "<%s-W>\t\tFermer la fenêtre" -#: gitk:3050 +#: gitk:3069 msgid "<Home>\t\tMove to first commit" msgstr "<Début>\t\tAller au premier commit" -#: gitk:3051 +#: gitk:3070 msgid "<End>\t\tMove to last commit" msgstr "<Fin>\t\tAller au dernier commit" -#: gitk:3052 -#, fuzzy +#: gitk:3071 msgid "<Up>, p, k\tMove up one commit" -msgstr "<Haut>, p, i\t Aller au commit suivant" +msgstr "<Haut>, p, k\t Aller au commit précédent" -#: gitk:3053 -#, fuzzy +#: gitk:3072 msgid "<Down>, n, j\tMove down one commit" -msgstr "<Bas>, n, k\t Aller au commit précédent" +msgstr "<Bas>, n, j\t Aller au commit suivant" -#: gitk:3054 -#, fuzzy +#: gitk:3073 msgid "<Left>, z, h\tGo back in history list" -msgstr "<Gauche>, z, j\tReculer dans l'historique" +msgstr "<Gauche>, z, h\tReculer dans l'historique" -#: gitk:3055 +#: gitk:3074 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Droite>, x, l\tAvancer dans l'historique" -#: gitk:3056 +#: gitk:3075 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" +msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique" -#: gitk:3057 +#: gitk:3076 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tMonter d'une page dans la liste des commits" -#: gitk:3058 +#: gitk:3077 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tDescendre d'une page dans la liste des commits" -#: gitk:3059 +#: 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:3060 +#: 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:3061 +#: 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:3062 +#: 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:3063 +#: 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:3064 +#: 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:3065 +#: 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:3066 +#: 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:3067 +#: gitk:3086 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Supprimer>, b\tMonter d'une page dans la vue des diff" -#: gitk:3068 +#: gitk:3087 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tMonter d'une page dans la vue des diff" -#: gitk:3069 +#: gitk:3088 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Espace>\t\tDescendre d'une page dans la vue des diff" -#: gitk:3070 +#: gitk:3089 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tMonter de 18 lignes dans la vue des diff" -#: gitk:3071 +#: gitk:3090 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" -#: gitk:3072 +#: gitk:3091 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tRechercher" -#: gitk:3073 +#: 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:3074 +#: gitk:3093 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tAller au résultat de recherche suivant" -#: gitk:3075 -#, fuzzy +#: gitk:3094 msgid "g\t\tGo to commit" -msgstr "<Fin>\t\tAller au dernier commit" +msgstr "g\t\tAller au commit" -#: gitk:3076 +#: gitk:3095 msgid "/\t\tFocus the search box" msgstr "/\t\tFocus sur la zone de recherche" -#: gitk:3077 +#: gitk:3096 msgid "?\t\tMove to previous find hit" msgstr "?\t\tAller au résultat de recherche précédent" -#: gitk:3078 +#: gitk:3097 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tAller au prochain fichier dans la vue des diff" -#: gitk:3079 +#: 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:3080 +#: 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:3081 +#: gitk:3100 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenter la taille de la police" -#: gitk:3082 +#: gitk:3101 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAugmenter la taille de la police" -#: gitk:3083 +#: gitk:3102 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuer la taille de la police" -#: gitk:3084 +#: gitk:3103 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDiminuer la taille de la police" -#: gitk:3085 +#: gitk:3104 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tMise à jour" -#: gitk:3550 gitk:3559 +#: 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:3572 +#: gitk:3591 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erreur en obtenant \"%s\" de %s:" -#: gitk:3635 +#: gitk:3654 msgid "command failed:" msgstr "échec de la commande :" -#: gitk:3784 +#: gitk:3803 msgid "No such commit" msgstr "Commit inexistant" -#: gitk:3798 +#: gitk:3817 msgid "git gui blame: command failed:" msgstr "git gui blame : échec de la commande :" -#: gitk:3829 +#: gitk:3848 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossible de lire le head de la fusion : %s" -#: gitk:3837 +#: gitk:3856 #, tcl-format msgid "Error reading index: %s" msgstr "Erreur à la lecture de l'index : %s" -#: gitk:3862 +#: gitk:3881 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossible de démarrer git blame : %s" -#: gitk:3865 gitk:6754 +#: gitk:3884 gitk:6773 msgid "Searching" msgstr "Recherche en cours" -#: gitk:3897 +#: gitk:3916 #, tcl-format msgid "Error running git blame: %s" msgstr "Erreur à l'exécution de git blame : %s" -#: gitk:3925 +#: 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:3939 +#: 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:4070 +#: gitk:4086 +msgid "View" +msgstr "Vue" + +#: gitk:4089 msgid "Gitk view definition" msgstr "Définition des vues de Gitk" -#: gitk:4074 +#: gitk:4093 msgid "Remember this view" msgstr "Se souvenir de cette vue" -#: gitk:4075 +#: gitk:4094 msgid "References (space separated list):" msgstr "Références (liste d'éléments séparés par des espaces) :" -#: gitk:4076 +#: gitk:4095 msgid "Branches & tags:" -msgstr "Branches & tags :" +msgstr "Branches & étiquettes :" -#: gitk:4077 +#: gitk:4096 msgid "All refs" msgstr "Toutes les références" -#: gitk:4078 +#: gitk:4097 msgid "All (local) branches" msgstr "Toutes les branches (locales)" -#: gitk:4079 +#: gitk:4098 msgid "All tags" -msgstr "Tous les tags" +msgstr "Toutes les étiquettes" -#: gitk:4080 +#: gitk:4099 msgid "All remote-tracking branches" msgstr "Toutes les branches de suivi à distance" -#: gitk:4081 +#: gitk:4100 msgid "Commit Info (regular expressions):" msgstr "Info sur les commits (expressions régulières) :" -#: gitk:4082 +#: gitk:4101 msgid "Author:" msgstr "Auteur :" -#: gitk:4083 +#: gitk:4102 msgid "Committer:" -msgstr "Commiteur :" +msgstr "Validateur :" -#: gitk:4084 +#: gitk:4103 msgid "Commit Message:" msgstr "Message de commit :" -#: gitk:4085 +#: gitk:4104 msgid "Matches all Commit Info criteria" msgstr "Correspond à tous les critères d'Info sur les commits" -#: gitk:4086 -#, fuzzy +#: gitk:4105 msgid "Matches no Commit Info criteria" -msgstr "Correspond à tous les critères d'Info sur les commits" +msgstr "Ne correspond à aucun des critères d'Info sur les commits" -#: gitk:4087 +#: gitk:4106 msgid "Changes to Files:" msgstr "Changements des fichiers :" -#: gitk:4088 +#: gitk:4107 msgid "Fixed String" msgstr "Chaîne Figée" -#: gitk:4089 +#: gitk:4108 msgid "Regular Expression" msgstr "Expression Régulière" -#: gitk:4090 +#: gitk:4109 msgid "Search string:" msgstr "Recherche de la chaîne :" -#: gitk:4091 +#: gitk:4110 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -706,204 +709,201 @@ msgstr "" "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\") :" -#: gitk:4092 +#: gitk:4111 msgid "Since:" -msgstr "De :" +msgstr "Depuis :" -#: gitk:4093 +#: gitk:4112 msgid "Until:" msgstr "Jusqu'au :" -#: gitk:4094 +#: 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:4095 +#: gitk:4114 msgid "Number to show:" msgstr "Nombre à afficher :" -#: gitk:4096 +#: gitk:4115 msgid "Number to skip:" msgstr "Nombre à sauter :" -#: gitk:4097 +#: gitk:4116 msgid "Miscellaneous options:" msgstr "Options diverses :" -#: gitk:4098 +#: gitk:4117 msgid "Strictly sort by date" msgstr "Trier par date" -# FIXME : traduction de "branch sides" -#: gitk:4099 -#, fuzzy +#: gitk:4118 msgid "Mark branch sides" -msgstr "Marquer les extrémités des branches" +msgstr "Indiquer les côtés des branches" -#: gitk:4100 +#: gitk:4119 msgid "Limit to first parent" msgstr "Limiter au premier ancêtre" -#: gitk:4101 +#: gitk:4120 msgid "Simple history" msgstr "Historique simple" -#: gitk:4102 +#: gitk:4121 msgid "Additional arguments to git log:" msgstr "Arguments supplémentaires de git log :" -#: gitk:4103 +#: gitk:4122 msgid "Enter files and directories to include, one per line:" msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" -#: gitk:4104 +#: gitk:4123 msgid "Command to generate more commits to include:" msgstr "Commande pour générer plus de commits à inclure :" -#: gitk:4228 +#: gitk:4247 msgid "Gitk: edit view" msgstr "Gitk : éditer la vue" -#: gitk:4236 +#: gitk:4255 msgid "-- criteria for selecting revisions" msgstr "-- critère pour la sélection des révisions" -#: gitk:4241 -#, fuzzy +#: gitk:4260 msgid "View Name" -msgstr "Nom de la vue :" +msgstr "Nom de la vue" -#: gitk:4316 +#: gitk:4335 msgid "Apply (F5)" msgstr "Appliquer (F5)" -#: gitk:4354 +#: gitk:4373 msgid "Error in commit selection arguments:" msgstr "Erreur dans les arguments de sélection des commits :" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 msgid "None" msgstr "Aucun" -#: gitk:5021 gitk:5026 +#: gitk:5040 gitk:5045 msgid "Descendant" msgstr "Descendant" -#: gitk:5022 +#: gitk:5041 msgid "Not descendant" msgstr "Pas un descendant" -#: gitk:5029 gitk:5034 +#: gitk:5048 gitk:5053 msgid "Ancestor" msgstr "Ancêtre" -#: gitk:5030 +#: gitk:5049 msgid "Not ancestor" msgstr "Pas un ancêtre" -#: gitk:5324 +#: 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:5360 +#: 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:7134 +#: gitk:7153 msgid "and many more" -msgstr "" +msgstr "et beaucoup plus" -#: gitk:7137 +#: gitk:7156 msgid "many" msgstr "nombreux" -#: gitk:7328 +#: gitk:7347 msgid "Tags:" -msgstr "Tags :" +msgstr "Étiquettes :" -#: gitk:7345 gitk:7351 gitk:8825 +#: gitk:7364 gitk:7370 gitk:8844 msgid "Parent" msgstr "Parent" -#: gitk:7356 +#: gitk:7375 msgid "Child" msgstr "Enfant" -#: gitk:7365 +#: gitk:7384 msgid "Branch" msgstr "Branche" -#: gitk:7368 +#: gitk:7387 msgid "Follows" msgstr "Suit" -#: gitk:7371 +#: gitk:7390 msgid "Precedes" msgstr "Précède" -#: gitk:7966 +#: gitk:7985 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erreur lors de la récupération des diff : %s" -#: gitk:8650 +#: gitk:8669 msgid "Goto:" msgstr "Aller à :" -#: gitk:8671 +#: 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:8678 +#: gitk:8697 #, tcl-format msgid "Revision %s is not known" -msgstr "Id SHA1 %s est inconnu" +msgstr "La révision %s est inconnu" -#: gitk:8688 +#: 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:8690 +#: 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:8832 gitk:8847 +#: gitk:8851 gitk:8866 msgid "Date" msgstr "Date" -#: gitk:8835 +#: gitk:8854 msgid "Children" msgstr "Enfants" -#: gitk:8898 +#: gitk:8917 #, tcl-format msgid "Reset %s branch to here" msgstr "Réinitialiser la branche %s vers cet état" -#: gitk:8900 +#: gitk:8919 msgid "Detached head: can't reset" msgstr "Head détaché : impossible de réinitialiser" -#: gitk:9005 gitk:9011 +#: gitk:9024 gitk:9030 msgid "Skipping merge commit " msgstr "Éviter le commit de la fusion " -#: gitk:9020 gitk:9025 +#: gitk:9039 gitk:9044 msgid "Error getting patch ID for " msgstr "Erreur à l'obtention de l'ID du patch pour " -#: gitk:9021 gitk:9026 +#: gitk:9040 gitk:9045 msgid " - stopping\n" msgstr " - arrêt en cours\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 msgid "Commit " msgstr "Commit " -#: gitk:9035 +#: gitk:9054 msgid "" " is the same patch as\n" " " @@ -911,7 +911,7 @@ msgstr "" "est le même patch que \n" " " -#: gitk:9043 +#: gitk:9062 msgid "" " differs from\n" " " @@ -919,240 +919,226 @@ msgstr "" " diffère de\n" " " -#: gitk:9045 +#: gitk:9064 msgid "" "Diff of commits:\n" "\n" -msgstr "" +msgstr "Diff des commits :\n\n" -#: gitk:9057 gitk:9066 +#: 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:9085 -#, fuzzy, tcl-format +#: gitk:9104 +#, tcl-format msgid "Error writing commit to file: %s" -msgstr "Erreur à l'ecriture du commit :" +msgstr "Erreur à l'écriture du commit dans le fichier : %s" -#: gitk:9091 -#, fuzzy, tcl-format +#: gitk:9110 +#, tcl-format msgid "Error diffing commits: %s" -msgstr "Erreur à l'ecriture du commit :" +msgstr "Erreur à la différence des commits : %s" -#: gitk:9137 +#: gitk:9156 msgid "Top" msgstr "Haut" -#: gitk:9138 +#: gitk:9157 msgid "From" msgstr "De" -#: gitk:9143 +#: gitk:9162 msgid "To" msgstr "À" -#: gitk:9167 +#: gitk:9186 msgid "Generate patch" msgstr "Générer le patch" -#: gitk:9169 +#: gitk:9188 msgid "From:" msgstr "De :" -#: gitk:9178 +#: gitk:9197 msgid "To:" msgstr "À :" -#: gitk:9187 +#: gitk:9206 msgid "Reverse" msgstr "Inverser" -#: gitk:9189 gitk:9385 +#: gitk:9208 gitk:9418 msgid "Output file:" msgstr "Fichier de sortie :" -#: gitk:9195 +#: gitk:9214 msgid "Generate" msgstr "Générer" -#: gitk:9233 +#: gitk:9252 msgid "Error creating patch:" msgstr "Erreur à la création du patch :" -#: gitk:9256 gitk:9373 gitk:9430 +#: gitk:9275 gitk:9406 gitk:9463 msgid "ID:" msgstr "ID :" -#: gitk:9265 +#: gitk:9284 msgid "Tag name:" -msgstr "Nom du Tag :" +msgstr "Nom de l'étiquette :" -#: gitk:9268 +#: gitk:9287 msgid "Tag message is optional" -msgstr "" +msgstr "Le message d'étiquette est optionnel" -#: gitk:9270 -#, fuzzy +#: gitk:9289 msgid "Tag message:" -msgstr "Nom du Tag :" +msgstr "Message d'étiquette :" -#: gitk:9274 gitk:9439 +#: gitk:9293 gitk:9472 msgid "Create" msgstr "Créer" -#: gitk:9292 +#: gitk:9311 msgid "No tag name specified" -msgstr "Aucun nom de tag spécifié" +msgstr "Aucun nom d'étiquette spécifié" -#: gitk:9296 +#: gitk:9315 #, tcl-format msgid "Tag \"%s\" already exists" -msgstr "Le tag \"%s\" existe déjà" +msgstr "L'étiquette \"%s\" existe déjà" -#: gitk:9306 +#: gitk:9325 msgid "Error creating tag:" -msgstr "Erreur à la création du tag :" +msgstr "Erreur à la création de l'étiquette :" -#: gitk:9382 +#: gitk:9415 msgid "Command:" msgstr "Commande :" -#: gitk:9390 +#: gitk:9423 msgid "Write" msgstr "Écrire" -#: gitk:9408 +#: gitk:9441 msgid "Error writing commit:" msgstr "Erreur à l'ecriture du commit :" -#: gitk:9435 +#: gitk:9468 msgid "Name:" msgstr "Nom :" -#: gitk:9458 +#: gitk:9491 msgid "Please specify a name for the new branch" msgstr "Veuillez spécifier un nom pour la nouvelle branche" -#: gitk:9463 +#: gitk:9496 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branche '%s' existe déjà. Écraser?" -#: gitk:9530 +#: 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:9535 +#: gitk:9568 msgid "Cherry-picking" -msgstr "Cueillir (Cherry-picking)" +msgstr "Picorer (Cherry-picking)" -#: gitk:9544 +#: 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:9550 +#: 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:9566 gitk:9624 +#: gitk:9599 gitk:9657 msgid "No changes committed" -msgstr "Aucun changement commité" +msgstr "Aucune modification validée" -#: gitk:9593 -#, fuzzy, tcl-format +#: gitk:9626 +#, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "" -"Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " -"tout?" +msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?" -#: gitk:9598 -#, fuzzy +#: gitk:9631 msgid "Reverting" -msgstr "Réinitialisation" +msgstr "Commit défait" -#: gitk:9606 -#, fuzzy, tcl-format +#: 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 "" -"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." +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:9610 -#, fuzzy +#: gitk:9643 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" msgstr "" -"La cueillette (cherry-pick) a échouée à cause d'un conflit lors d'une " -"fusion.\n" +"Échec en tentant de défaire à cause d'un conflit de fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:9653 +#: gitk:9686 msgid "Confirm reset" msgstr "Confirmer la réinitialisation" -#: gitk:9655 +#: gitk:9688 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Réinitialiser la branche %s à %s?" -#: gitk:9657 +#: gitk:9690 msgid "Reset type:" msgstr "Type de réinitialisation :" -#: gitk:9660 +#: gitk:9693 msgid "Soft: Leave working tree and index untouched" msgstr "Douce : Laisse le répertoire de travail et l'index intacts" -#: gitk:9663 +#: 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:9666 +#: 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:9683 +#: gitk:9716 msgid "Resetting" msgstr "Réinitialisation" # Fixme: Récupération est-il vraiment une mauvaise traduction? -#: gitk:9743 -#, fuzzy +#: gitk:9776 msgid "Checking out" -msgstr "Récupération" +msgstr "Extraction" -#: gitk:9796 +#: 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:9802 +#: gitk:9835 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1161,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:9833 +#: gitk:9866 #, tcl-format msgid "Tags and heads: %s" -msgstr "Tags et heads : %s" +msgstr "Étiquettes et heads : %s" -#: gitk:9850 +#: gitk:9883 msgid "Filter" msgstr "Filtrer" -#: gitk:10146 +#: gitk:10179 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1179,207 +1165,202 @@ msgstr "" "informations sur les branches et les tags précédents/suivants seront " "incomplètes." -#: gitk:11123 +#: gitk:11156 msgid "Tag" -msgstr "Tag" +msgstr "Étiquette" -#: gitk:11127 +#: gitk:11160 msgid "Id" msgstr "Id" -#: gitk:11210 +#: gitk:11243 msgid "Gitk font chooser" msgstr "Sélecteur de police de Gitk" -#: gitk:11227 +#: gitk:11260 msgid "B" msgstr "B" -#: gitk:11230 +#: gitk:11263 msgid "I" msgstr "I" -#: gitk:11348 +#: gitk:11381 msgid "Commit list display options" msgstr "Options d'affichage de la liste des commits" -#: gitk:11351 +#: gitk:11384 msgid "Maximum graph width (lines)" msgstr "Longueur maximum du graphe (lignes)" # FIXME : Traduction standard de "pane"? -#: gitk:11355 -#, fuzzy, no-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:11358 +#: gitk:11391 msgid "Show local changes" -msgstr "Montrer les changements locaux" +msgstr "Montrer les modifications locales" -#: gitk:11361 -#, fuzzy +#: gitk:11394 msgid "Auto-select SHA1 (length)" -msgstr "Sélection auto. du SHA1" +msgstr "Sélection auto. du SHA1 (longueur)" -#: gitk:11365 +#: gitk:11398 msgid "Hide remote refs" msgstr "Cacher les refs distantes" -#: gitk:11369 +#: gitk:11402 msgid "Diff display options" msgstr "Options d'affichage des diff" -#: gitk:11371 +#: gitk:11404 msgid "Tab spacing" msgstr "Taille des tabulations" -#: gitk:11374 -#, fuzzy +#: gitk:11407 msgid "Display nearby tags/heads" msgstr "Afficher les tags les plus proches" -#: gitk:11377 +#: gitk:11410 msgid "Maximum # tags/heads to show" -msgstr "" +msgstr "Nombre maximum d'étiquettes/heads à afficher" -#: gitk:11380 +#: gitk:11413 msgid "Limit diffs to listed paths" msgstr "Limiter les différences aux chemins listés" -#: gitk:11383 +#: gitk:11416 msgid "Support per-file encodings" msgstr "Support pour un encodage des caractères par fichier" -#: gitk:11389 gitk:11536 +#: gitk:11422 gitk:11569 msgid "External diff tool" msgstr "Outil diff externe" -#: gitk:11390 +#: gitk:11423 msgid "Choose..." msgstr "Choisir..." -#: gitk:11395 -#, fuzzy +#: gitk:11428 msgid "General options" -msgstr "Générer le patch" +msgstr "Options générales" -#: gitk:11398 +#: gitk:11431 msgid "Use themed widgets" -msgstr "" +msgstr "Utiliser des widgets en thème" -#: gitk:11400 +#: gitk:11433 msgid "(change requires restart)" -msgstr "" +msgstr "(la modification nécessite un redémarrage)" -#: gitk:11402 +#: gitk:11435 msgid "(currently unavailable)" -msgstr "" +msgstr "(non disponible actuellement)" -#: gitk:11413 +#: gitk:11446 msgid "Colors: press to choose" msgstr "Couleurs : cliquer pour choisir" -#: gitk:11416 +#: gitk:11449 msgid "Interface" -msgstr "" +msgstr "Interface" -#: gitk:11417 -#, fuzzy +#: gitk:11450 msgid "interface" -msgstr "Police de l'interface utilisateur" +msgstr "interface" -#: gitk:11420 +#: gitk:11453 msgid "Background" msgstr "Arrière-plan" -#: gitk:11421 gitk:11451 +#: gitk:11454 gitk:11484 msgid "background" msgstr "arrière-plan" -#: gitk:11424 +#: gitk:11457 msgid "Foreground" msgstr "Premier plan" -#: gitk:11425 +#: gitk:11458 msgid "foreground" msgstr "premier plan" -#: gitk:11428 +#: gitk:11461 msgid "Diff: old lines" msgstr "Diff : anciennes lignes" -#: gitk:11429 +#: gitk:11462 msgid "diff old lines" msgstr "diff anciennes lignes" -#: gitk:11433 +#: gitk:11466 msgid "Diff: new lines" msgstr "Diff : nouvelles lignes" -#: gitk:11434 +#: gitk:11467 msgid "diff new lines" msgstr "diff nouvelles lignes" -#: gitk:11438 +#: gitk:11471 msgid "Diff: hunk header" msgstr "Diff : entête du hunk" -#: gitk:11440 +#: gitk:11473 msgid "diff hunk header" msgstr "diff : entête du hunk" -#: gitk:11444 +#: gitk:11477 msgid "Marked line bg" -msgstr "Arrière-plan de la ligne marquée" +msgstr "Fond de la ligne marquée" -#: gitk:11446 +#: gitk:11479 msgid "marked line background" -msgstr "Arrière-plan de la ligne marquée" +msgstr "Fond de la ligne marquée" -#: gitk:11450 +#: gitk:11483 msgid "Select bg" -msgstr "Sélectionner l'arrière-plan" +msgstr "Sélectionner le fond" -#: gitk:11459 +#: gitk:11492 msgid "Fonts: press to choose" msgstr "Polices : cliquer pour choisir" -#: gitk:11461 +#: gitk:11494 msgid "Main font" msgstr "Police principale" -#: gitk:11462 +#: gitk:11495 msgid "Diff display font" msgstr "Police d'affichage des diff" -#: gitk:11463 +#: gitk:11496 msgid "User interface font" msgstr "Police de l'interface utilisateur" -#: gitk:11485 +#: gitk:11518 msgid "Gitk preferences" msgstr "Préférences de Gitk" -#: gitk:11494 -#, fuzzy +#: gitk:11527 msgid "General" -msgstr "Générer" +msgstr "Général" -#: gitk:11495 +#: gitk:11528 msgid "Colors" -msgstr "" +msgstr "Couleurs" -#: gitk:11496 +#: gitk:11529 msgid "Fonts" -msgstr "" +msgstr "Polices" -#: gitk:11546 +#: gitk:11579 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk : choisir la couleur de %s" -#: gitk:12059 +#: gitk:12092 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1387,16 +1368,16 @@ msgstr "" "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" " Gitk requiert Tcl/Tk version 8.4 ou supérieur." -#: gitk:12269 +#: gitk:12302 msgid "Cannot find a git repository here." msgstr "Impossible de trouver un dépôt git ici." -#: gitk:12316 +#: 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:12328 +#: gitk:12361 msgid "Bad arguments to gitk:" msgstr "Arguments invalides pour gitk :" diff --git a/gitk-git/po/ja.po b/gitk-git/po/ja.po index 59e42a89fd..f143753db0 100644 --- a/gitk-git/po/ja.po +++ b/gitk-git/po/ja.po @@ -1,7 +1,8 @@ # 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 "" @@ -9,10 +10,10 @@ msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" -"PO-Revision-Date: 2009-11-06 01:45+0900\n" -"Last-Translator: Mizar <mizar.jp@gmail.com>\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: \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -24,11 +25,11 @@ msgstr "マージされていないファイルのリストを取得できませ #: gitk:212 gitk:2381 msgid "Color words" -msgstr "" +msgstr "変更を着色" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +#: gitk:217 gitk:2381 gitk:8221 gitk:8254 msgid "Markup words" -msgstr "" +msgstr "変更をマークアップ" #: gitk:324 msgid "Error parsing revisions:" @@ -60,15 +61,15 @@ msgstr "git log 実行エラー:" msgid "Reading" msgstr "読み込み中" -#: gitk:496 gitk:4525 +#: gitk:496 gitk:4526 msgid "Reading commits..." msgstr "コミット読み込み中..." -#: gitk:499 gitk:1637 gitk:4528 +#: gitk:499 gitk:1637 gitk:4529 msgid "No commits selected" msgstr "コミットが選択されていません" -#: gitk:1445 gitk:4045 gitk:12432 +#: gitk:1445 gitk:4046 gitk:12447 msgid "Command line" msgstr "コマンド行" @@ -80,12 +81,12 @@ msgstr "git log の出力を解析できません:" msgid "No commit information available" msgstr "有効なコミットの情報がありません" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 +#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 +#: gitk:11257 gitk:11537 msgid "Cancel" msgstr "キャンセル" @@ -127,25 +128,25 @@ msgstr "編集(&E)" #: gitk:2084 msgid "&New view..." -msgstr "新規ビュー...(&N)" +msgstr "新規ビュー(&N)..." #: gitk:2085 msgid "&Edit view..." -msgstr "ビュー編集...(&E)" +msgstr "ビュー編集(&E)..." #: gitk:2086 msgid "&Delete view" msgstr "ビュー削除(&D)" -#: gitk:2088 gitk:4043 +#: gitk:2088 msgid "&All files" msgstr "全てのファイル(&A)" -#: gitk:2083 gitk:4067 +#: gitk:2083 msgid "&View" msgstr "ビュー(&V)" -#: gitk:2093 gitk:2103 gitk:3012 +#: gitk:2093 gitk:2103 msgid "&About gitk" msgstr "gitk について(&A)" @@ -157,7 +158,7 @@ msgstr "キーバインディング(&K)" msgid "&Help" msgstr "ヘルプ(&H)" -#: gitk:2185 gitk:8652 +#: gitk:2185 gitk:8653 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -173,53 +174,53 @@ msgstr "検索" msgid "commit" msgstr "コミット" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 +#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 +#: gitk:6913 msgid "containing:" msgstr "含む:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 msgid "touching paths:" msgstr "パスの一部:" -#: gitk:2303 gitk:4777 +#: gitk:2303 gitk:4778 msgid "adding/removing string:" -msgstr "追加/除去する文字列:" +msgstr "追加/除去される文字列:" -#: gitk:2304 gitk:4779 +#: gitk:2304 gitk:4780 msgid "changing lines matching:" -msgstr "" +msgstr "変更される文字列" -#: gitk:2313 gitk:2315 gitk:4766 +#: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" msgstr "英字の大小を区別する" -#: gitk:2315 gitk:4854 gitk:6723 +#: gitk:2315 gitk:4855 gitk:6724 msgid "IgnCase" msgstr "英字の大小を区別しない" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 msgid "Regexp" msgstr "正規表現" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 msgid "All fields" msgstr "全ての項目" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 msgid "Headline" msgstr "ヘッドライン" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 msgid "Comments" msgstr "コメント" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 +#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 +#: gitk:8846 msgid "Author" msgstr "作者" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 msgid "Committer" msgstr "コミット者" @@ -247,9 +248,9 @@ msgstr "文脈行数" msgid "Ignore space change" msgstr "空白の違いを無視" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 msgid "Line diff" -msgstr "" +msgstr "行毎のdiff" #: gitk:2445 msgid "Patch" @@ -259,111 +260,115 @@ msgstr "パッチ" msgid "Tree" msgstr "ツリー" -#: gitk:2617 gitk:2637 +#: gitk:2617 gitk:2638 msgid "Diff this -> selected" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2618 gitk:2638 +#: gitk:2618 gitk:2639 msgid "Diff selected -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2619 gitk:2639 +#: gitk:2619 gitk:2640 msgid "Make patch" msgstr "パッチ作成" -#: gitk:2620 gitk:9254 +#: gitk:2620 gitk:9255 msgid "Create tag" msgstr "タグ生成" -#: gitk:2621 gitk:9371 +#: gitk:2621 +msgid "Copy commit summary" +msgstr "コミットの要約をコピーする" + +#: gitk:2622 gitk:9386 msgid "Write commit to file" msgstr "コミットをファイルに書き出す" -#: gitk:2622 gitk:9428 +#: gitk:2623 gitk:9443 msgid "Create new branch" msgstr "新規ブランチ生成" -#: gitk:2623 +#: gitk:2624 msgid "Cherry-pick this commit" msgstr "このコミットをチェリーピックする" -#: gitk:2624 +#: gitk:2625 msgid "Reset HEAD branch to here" msgstr "ブランチのHEADをここにリセットする" -#: gitk:2625 +#: gitk:2626 msgid "Mark this commit" msgstr "このコミットにマークをつける" -#: gitk:2626 +#: gitk:2627 msgid "Return to mark" msgstr "マークを付けた所に戻る" -#: gitk:2627 +#: gitk:2628 msgid "Find descendant of this and mark" msgstr "これとマークをつけた所との子孫を見つける" -#: gitk:2628 +#: gitk:2629 msgid "Compare with marked commit" msgstr "マークを付けたコミットと比較する" -#: gitk:2629 gitk:2640 -#, fuzzy +#: gitk:2630 gitk:2641 msgid "Diff this -> marked commit" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2630 gitk:2641 -#, fuzzy +#: gitk:2631 gitk:2642 msgid "Diff marked commit -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2631 -#, fuzzy +#: gitk:2632 msgid "Revert this commit" -msgstr "このコミットにマークをつける" +msgstr "このコミットを撤回する" -#: gitk:2647 +#: gitk:2648 msgid "Check out this branch" msgstr "このブランチをチェックアウトする" -#: gitk:2648 +#: gitk:2649 msgid "Remove this branch" msgstr "このブランチを除去する" -#: gitk:2649 +#: gitk:2650 msgid "Copy branch name" -msgstr "" +msgstr "ブランチ名をコピーする" -#: gitk:2656 +#: gitk:2657 msgid "Highlight this too" msgstr "これもハイライトさせる" -#: gitk:2657 +#: gitk:2658 msgid "Highlight this only" msgstr "これだけをハイライトさせる" -#: gitk:2658 +#: gitk:2659 msgid "External diff" msgstr "外部diffツール" -#: gitk:2659 +#: gitk:2660 msgid "Blame parent commit" msgstr "親コミットから blame をかける" -#: gitk:2660 +#: gitk:2661 msgid "Copy path" -msgstr "" +msgstr "パス名をコピーする" -#: gitk:2667 +#: gitk:2668 msgid "Show origin of this line" msgstr "この行の出自を表示する" -#: gitk:2668 +#: gitk:2669 msgid "Run git gui blame on this line" msgstr "この行に git gui で blame をかける" -#: gitk:3014 -#, fuzzy +#: gitk:3013 +msgid "About gitk" +msgstr "gitk について" + +#: gitk:3015 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -375,324 +380,327 @@ 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:3022 gitk:3089 gitk:9857 +#: gitk:3023 gitk:3090 gitk:9872 msgid "Close" msgstr "閉じる" -#: gitk:3043 +#: gitk:3044 msgid "Gitk key bindings" msgstr "Gitk キーバインディング" -#: gitk:3046 +#: gitk:3047 msgid "Gitk key bindings:" msgstr "Gitk キーバインディング:" -#: gitk:3048 +#: gitk:3049 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" -#: gitk:3049 -#, fuzzy, tcl-format +#: gitk:3050 +#, tcl-format msgid "<%s-W>\t\tClose window" -msgstr "<%s-F>\t\t検索" +msgstr "<%s-W>\t\tウィンドウを閉じる" -#: gitk:3050 +#: gitk:3051 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\t最初のコミットに移動" -#: gitk:3051 +#: gitk:3052 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\t最後のコミットに移動" -#: gitk:3052 -#, fuzzy +#: gitk:3053 msgid "<Up>, p, k\tMove up one commit" -msgstr "<Up>, p, i\t一つ上のコミットに移動" +msgstr "<Up>, p, k\t一つ上のコミットに移動" -#: gitk:3053 -#, fuzzy +#: gitk:3054 msgid "<Down>, n, j\tMove down one commit" -msgstr "<Down>, n, k\t一つ下のコミットに移動" +msgstr "<Down>, n, j\t一つ下のコミットに移動" -#: gitk:3054 -#, fuzzy +#: gitk:3055 msgid "<Left>, z, h\tGo back in history list" -msgstr "<Left>, z, j\t履歴の前に戻る" +msgstr "<Left>, z, h\t履歴の前に戻る" -#: gitk:3055 +#: gitk:3056 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Right>, x, l\t履歴の次へ進む" -#: gitk:3056 +#: gitk:3057 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" +msgstr "<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動" -#: gitk:3057 +#: gitk:3058 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tコミットリストの一つ上のページに移動" -#: gitk:3058 +#: gitk:3059 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tコミットリストの一つ下のページに移動" -#: gitk:3059 +#: gitk:3060 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" -#: gitk:3060 +#: gitk:3061 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tコミットリストの一番下にスクロールする" -#: gitk:3061 +#: gitk:3062 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3062 +#: gitk:3063 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3063 +#: gitk:3064 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" -#: gitk:3064 +#: gitk:3065 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" -#: gitk:3065 +#: gitk:3066 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Shift-Up>\t後方を検索 (上方の・新しいコミット)" -#: gitk:3066 +#: gitk:3067 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Shift-Down>\t前方を検索（下方の・古いコミット）" -#: gitk:3067 +#: gitk:3068 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tdiff画面を上のページにスクロールする" -#: gitk:3068 +#: gitk:3069 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Backspace>\tdiff画面を上のページにスクロールする" -#: gitk:3069 +#: gitk:3070 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Space>\t\tdiff画面を下のページにスクロールする" -#: gitk:3070 +#: gitk:3071 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tdiff画面を上に18行スクロールする" -#: gitk:3071 +#: gitk:3072 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tdiff画面を下に18行スクロールする" -#: gitk:3072 +#: gitk:3073 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t検索" -#: gitk:3073 +#: gitk:3074 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t次を検索して移動" -#: gitk:3074 +#: gitk:3075 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t次を検索して移動" -#: gitk:3075 -#, fuzzy +#: gitk:3076 msgid "g\t\tGo to commit" -msgstr "<End>\t\t最後のコミットに移動" +msgstr "g\t\t指定してコミットに移動" -#: gitk:3076 +#: gitk:3077 msgid "/\t\tFocus the search box" msgstr "/\t\t検索ボックスにフォーカス" -#: gitk:3077 +#: gitk:3078 msgid "?\t\tMove to previous find hit" msgstr "?\t\t前を検索して移動" -#: gitk:3078 +#: gitk:3079 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t次のファイルにdiff画面をスクロールする" -#: gitk:3079 +#: gitk:3080 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tdiff画面の次を検索" -#: gitk:3080 +#: gitk:3081 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tdiff画面の前を検索" -#: gitk:3081 +#: gitk:3082 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\t文字サイズを拡大" -#: gitk:3082 +#: gitk:3083 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\t文字サイズを拡大" -#: gitk:3083 +#: gitk:3084 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\t文字サイズを縮小" -#: gitk:3084 +#: gitk:3085 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\t文字サイズを縮小" -#: gitk:3085 +#: gitk:3086 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\t更新" -#: gitk:3550 gitk:3559 +#: gitk:3551 gitk:3560 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "一時ディレクトリ %s 生成時エラー:" -#: gitk:3572 +#: gitk:3573 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "\"%s\" のエラーが %s に発生:" -#: gitk:3635 +#: gitk:3636 msgid "command failed:" msgstr "コマンド失敗:" -#: gitk:3784 +#: gitk:3785 msgid "No such commit" msgstr "そのようなコミットはありません" -#: gitk:3798 +#: gitk:3799 msgid "git gui blame: command failed:" msgstr "git gui blame: コマンド失敗:" -#: gitk:3829 +#: gitk:3830 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "マージする HEAD を読み込めません: %s" -#: gitk:3837 +#: gitk:3838 #, tcl-format msgid "Error reading index: %s" msgstr "インデックス読み込みエラー: %s" -#: gitk:3862 +#: gitk:3863 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "git blame を始められません: %s" -#: gitk:3865 gitk:6754 +#: gitk:3866 gitk:6755 msgid "Searching" msgstr "検索中" -#: gitk:3897 +#: gitk:3898 #, tcl-format msgid "Error running git blame: %s" msgstr "git blame 実行エラー: %s" -#: gitk:3925 +#: gitk:3926 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "コミット %s に由来するその行は、このビューに表示されていません" -#: gitk:3939 +#: gitk:3940 msgid "External diff viewer failed:" msgstr "外部diffビューアが失敗:" -#: gitk:4070 +#: gitk:4044 +msgid "All files" +msgstr "全てのファイル" + +#: gitk:4068 +msgid "View" +msgstr "ビュー" + +#: gitk:4071 msgid "Gitk view definition" msgstr "Gitk ビュー定義" -#: gitk:4074 +#: gitk:4075 msgid "Remember this view" msgstr "このビューを記憶する" -#: gitk:4075 +#: gitk:4076 msgid "References (space separated list):" msgstr "リファレンス（スペース区切りのリスト）:" -#: gitk:4076 +#: gitk:4077 msgid "Branches & tags:" msgstr "ブランチ＆タグ:" -#: gitk:4077 +#: gitk:4078 msgid "All refs" msgstr "全てのリファレンス" -#: gitk:4078 +#: gitk:4079 msgid "All (local) branches" msgstr "全ての（ローカルな）ブランチ" -#: gitk:4079 +#: gitk:4080 msgid "All tags" msgstr "全てのタグ" -#: gitk:4080 +#: gitk:4081 msgid "All remote-tracking branches" msgstr "全てのリモート追跡ブランチ" -#: gitk:4081 +#: gitk:4082 msgid "Commit Info (regular expressions):" msgstr "コミット情報（正規表現）:" -#: gitk:4082 +#: gitk:4083 msgid "Author:" msgstr "作者:" -#: gitk:4083 +#: gitk:4084 msgid "Committer:" msgstr "コミット者:" -#: gitk:4084 +#: gitk:4085 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: gitk:4085 +#: gitk:4086 msgid "Matches all Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:4086 -#, fuzzy +#: gitk:4087 msgid "Matches no Commit Info criteria" -msgstr "コミット情報の全ての条件に一致" +msgstr "コミット情報の全ての条件に不一致" -#: gitk:4087 +#: gitk:4088 msgid "Changes to Files:" msgstr "変更したファイル:" -#: gitk:4088 +#: gitk:4089 msgid "Fixed String" msgstr "固定文字列" -#: gitk:4089 +#: gitk:4090 msgid "Regular Expression" msgstr "正規表現" -#: gitk:4090 +#: gitk:4091 msgid "Search string:" msgstr "検索文字列:" -#: gitk:4091 +#: gitk:4092 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -700,202 +708,201 @@ msgstr "" "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4092 +#: gitk:4093 msgid "Since:" msgstr "期間の始め:" -#: gitk:4093 +#: gitk:4094 msgid "Until:" msgstr "期間の終わり:" -#: gitk:4094 +#: gitk:4095 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "制限・省略するリビジョンの数（正の整数）:" -#: gitk:4095 +#: gitk:4096 msgid "Number to show:" msgstr "表示する数:" -#: gitk:4096 +#: gitk:4097 msgid "Number to skip:" msgstr "省略する数:" -#: gitk:4097 +#: gitk:4098 msgid "Miscellaneous options:" msgstr "その他のオプション:" -#: gitk:4098 +#: gitk:4099 msgid "Strictly sort by date" msgstr "厳密に日付順で並び替え" -#: gitk:4099 +#: gitk:4100 msgid "Mark branch sides" msgstr "側枝マーク" -#: gitk:4100 +#: gitk:4101 msgid "Limit to first parent" msgstr "最初の親に制限" -#: gitk:4101 +#: gitk:4102 msgid "Simple history" msgstr "簡易な履歴" -#: gitk:4102 +#: gitk:4103 msgid "Additional arguments to git log:" msgstr "git log への追加の引数:" -#: gitk:4103 +#: gitk:4104 msgid "Enter files and directories to include, one per line:" msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" -#: gitk:4104 +#: gitk:4105 msgid "Command to generate more commits to include:" msgstr "コミット追加コマンド:" -#: gitk:4228 +#: gitk:4229 msgid "Gitk: edit view" msgstr "Gitk: ビュー編集" -#: gitk:4236 +#: gitk:4237 msgid "-- criteria for selecting revisions" msgstr "― リビジョンの選択条件" -#: gitk:4241 -#, fuzzy +#: gitk:4242 msgid "View Name" msgstr "ビュー名:" -#: gitk:4316 +#: gitk:4317 msgid "Apply (F5)" msgstr "適用 (F5)" -#: gitk:4354 +#: gitk:4355 msgid "Error in commit selection arguments:" msgstr "コミット選択引数のエラー:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 msgid "None" msgstr "無し" -#: gitk:5021 gitk:5026 +#: gitk:5022 gitk:5027 msgid "Descendant" msgstr "子孫" -#: gitk:5022 +#: gitk:5023 msgid "Not descendant" msgstr "非子孫" -#: gitk:5029 gitk:5034 +#: gitk:5030 gitk:5035 msgid "Ancestor" msgstr "祖先" -#: gitk:5030 +#: gitk:5031 msgid "Not ancestor" msgstr "非祖先" -#: gitk:5324 +#: gitk:5325 msgid "Local changes checked in to index but not committed" msgstr "ステージされた、コミット前のローカルな変更" -#: gitk:5360 +#: gitk:5361 msgid "Local uncommitted changes, not checked in to index" msgstr "ステージされていない、コミット前のローカルな変更" -#: gitk:7134 +#: gitk:7135 msgid "and many more" -msgstr "" +msgstr "他多数" -#: gitk:7137 +#: gitk:7138 msgid "many" msgstr "多数" -#: gitk:7328 +#: gitk:7329 msgid "Tags:" msgstr "タグ:" -#: gitk:7345 gitk:7351 gitk:8825 +#: gitk:7346 gitk:7352 gitk:8826 msgid "Parent" msgstr "親" -#: gitk:7356 +#: gitk:7357 msgid "Child" msgstr "子" -#: gitk:7365 +#: gitk:7366 msgid "Branch" msgstr "ブランチ" -#: gitk:7368 +#: gitk:7369 msgid "Follows" msgstr "下位" -#: gitk:7371 +#: gitk:7372 msgid "Precedes" msgstr "上位" -#: gitk:7966 +#: gitk:7967 #, tcl-format msgid "Error getting diffs: %s" msgstr "diff取得エラー: %s" -#: gitk:8650 +#: gitk:8651 msgid "Goto:" msgstr "Goto:" -#: gitk:8671 +#: gitk:8672 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "%s を含む SHA1 ID は複数存在します" -#: gitk:8678 +#: gitk:8679 #, tcl-format msgid "Revision %s is not known" msgstr "リビジョン %s は不明です" -#: gitk:8688 +#: gitk:8689 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s は不明です" -#: gitk:8690 +#: gitk:8691 #, tcl-format msgid "Revision %s is not in the current view" msgstr "リビジョン %s は現在のビューにはありません" -#: gitk:8832 gitk:8847 +#: gitk:8833 gitk:8848 msgid "Date" msgstr "日付" -#: gitk:8835 +#: gitk:8836 msgid "Children" msgstr "子" -#: gitk:8898 +#: gitk:8899 #, tcl-format msgid "Reset %s branch to here" msgstr "%s ブランチをここにリセットする" -#: gitk:8900 +#: gitk:8901 msgid "Detached head: can't reset" msgstr "切り離されたHEAD: リセットできません" -#: gitk:9005 gitk:9011 +#: gitk:9006 gitk:9012 msgid "Skipping merge commit " msgstr "コミットマージをスキップ: " -#: gitk:9020 gitk:9025 +#: gitk:9021 gitk:9026 msgid "Error getting patch ID for " msgstr "パッチ取得エラー: ID " -#: gitk:9021 gitk:9026 +#: gitk:9022 gitk:9027 msgid " - stopping\n" msgstr " - 停止\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 msgid "Commit " msgstr "コミット " -#: gitk:9035 +#: gitk:9036 msgid "" " is the same patch as\n" " " @@ -903,7 +910,7 @@ msgstr "" " は下記のパッチと同等\n" " " -#: gitk:9043 +#: gitk:9044 msgid "" " differs from\n" " " @@ -911,7 +918,7 @@ msgstr "" " 下記からのdiff\n" " " -#: gitk:9045 +#: gitk:9046 msgid "" "Diff of commits:\n" "\n" @@ -919,131 +926,130 @@ msgstr "" "コミットのdiff:\n" "\n" -#: gitk:9057 gitk:9066 +#: gitk:9058 gitk:9067 #, tcl-format msgid " has %s children - stopping\n" msgstr " には %s の子があります - 停止\n" -#: gitk:9085 +#: gitk:9086 #, tcl-format msgid "Error writing commit to file: %s" msgstr "ファイルへのコミット書き出しエラー: %s" -#: gitk:9091 +#: gitk:9092 #, tcl-format msgid "Error diffing commits: %s" msgstr "コミットのdiff実行エラー: %s" -#: gitk:9137 +#: gitk:9138 msgid "Top" msgstr "Top" -#: gitk:9138 +#: gitk:9139 msgid "From" msgstr "From" -#: gitk:9143 +#: gitk:9144 msgid "To" msgstr "To" -#: gitk:9167 +#: gitk:9168 msgid "Generate patch" msgstr "パッチ生成" -#: gitk:9169 +#: gitk:9170 msgid "From:" msgstr "From:" -#: gitk:9178 +#: gitk:9179 msgid "To:" msgstr "To:" -#: gitk:9187 +#: gitk:9188 msgid "Reverse" msgstr "逆" -#: gitk:9189 gitk:9385 +#: gitk:9190 gitk:9400 msgid "Output file:" msgstr "出力ファイル:" -#: gitk:9195 +#: gitk:9196 msgid "Generate" msgstr "生成" -#: gitk:9233 +#: gitk:9234 msgid "Error creating patch:" msgstr "パッチ生成エラー:" -#: gitk:9256 gitk:9373 gitk:9430 +#: gitk:9257 gitk:9388 gitk:9445 msgid "ID:" msgstr "ID:" -#: gitk:9265 +#: gitk:9266 msgid "Tag name:" msgstr "タグ名:" -#: gitk:9268 +#: gitk:9269 msgid "Tag message is optional" -msgstr "" +msgstr "タグメッセージを付ける事も出来ます" -#: gitk:9270 -#, fuzzy +#: gitk:9271 msgid "Tag message:" -msgstr "タグ名:" +msgstr "タグメッセージ:" -#: gitk:9274 gitk:9439 +#: gitk:9275 gitk:9454 msgid "Create" msgstr "生成" -#: gitk:9292 +#: gitk:9293 msgid "No tag name specified" msgstr "タグの名称が指定されていません" -#: gitk:9296 +#: gitk:9297 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "タグ \"%s\" は既に存在します" -#: gitk:9306 +#: gitk:9307 msgid "Error creating tag:" msgstr "タグ生成エラー:" -#: gitk:9382 +#: gitk:9397 msgid "Command:" msgstr "コマンド:" -#: gitk:9390 +#: gitk:9405 msgid "Write" msgstr "書き出し" -#: gitk:9408 +#: gitk:9423 msgid "Error writing commit:" msgstr "コミット書き出しエラー:" -#: gitk:9435 +#: gitk:9450 msgid "Name:" msgstr "名前:" -#: gitk:9458 +#: gitk:9473 msgid "Please specify a name for the new branch" msgstr "新しいブランチの名前を指定してください" -#: gitk:9463 +#: gitk:9478 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "ブランチ '%s' は既に存在します。上書きしますか？" -#: gitk:9530 +#: gitk:9545 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:9535 +#: gitk:9550 msgid "Cherry-picking" msgstr "チェリーピック中" -#: gitk:9544 +#: gitk:9559 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1053,7 +1059,7 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:9550 +#: gitk:9565 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1061,62 +1067,56 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9566 gitk:9624 +#: gitk:9581 gitk:9639 msgid "No changes committed" msgstr "何の変更もコミットされていません" -#: gitk:9593 -#, fuzzy, tcl-format +#: gitk:9608 +#, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "" -"コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" +msgstr "コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか？" -#: gitk:9598 -#, fuzzy +#: gitk:9613 msgid "Reverting" -msgstr "リセット中" +msgstr "撤回中" -#: gitk:9606 -#, fuzzy, tcl-format +#: 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' のローカルな変更のためにチェリーピックは失敗しました。\n" -"あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" -"い。" +msgstr "ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に commit, reset, stash のいずれかを行ってからやり直してください。" -#: gitk:9610 -#, fuzzy +#: gitk:9625 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" msgstr "" -"マージの衝突によってチェリーピックは失敗しました。\n" +"マージの衝突によって撤回は失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9653 +#: gitk:9668 msgid "Confirm reset" msgstr "確認を取り消す" -#: gitk:9655 +#: gitk:9670 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ブランチ %s を %s にリセットしますか？" -#: gitk:9657 +#: gitk:9672 msgid "Reset type:" msgstr "Reset タイプ:" -#: gitk:9660 +#: gitk:9675 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作業ツリーもインデックスもそのままにする" -#: gitk:9663 +#: gitk:9678 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" -#: gitk:9666 +#: gitk:9681 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1124,19 +1124,19 @@ msgstr "" "Hard: 作業ツリーやインデックスをリセット\n" "（「全ての」ローカルな変更を破棄）" -#: gitk:9683 +#: gitk:9698 msgid "Resetting" msgstr "リセット中" -#: gitk:9743 +#: gitk:9758 msgid "Checking out" msgstr "チェックアウト" -#: gitk:9796 +#: gitk:9811 msgid "Cannot delete the currently checked-out branch" msgstr "現在チェックアウトされているブランチを削除することはできません" -#: gitk:9802 +#: gitk:9817 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1145,16 +1145,16 @@ msgstr "" "ブランチ %s には他のブランチに存在しないコミットがあります。\n" "本当にブランチ %s を削除しますか？" -#: gitk:9833 +#: gitk:9848 #, tcl-format msgid "Tags and heads: %s" msgstr "タグとHEAD: %s" -#: gitk:9850 +#: gitk:9865 msgid "Filter" msgstr "フィルター" -#: gitk:10146 +#: gitk:10161 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1162,237 +1162,217 @@ msgstr "" "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" "ようです。" -#: gitk:11123 +#: gitk:11138 msgid "Tag" msgstr "タグ" -#: gitk:11127 +#: gitk:11142 msgid "Id" msgstr "ID" -#: gitk:11210 +#: gitk:11225 msgid "Gitk font chooser" msgstr "Gitk フォント選択" -#: gitk:11227 +#: gitk:11242 msgid "B" msgstr "B" -#: gitk:11230 +#: gitk:11245 msgid "I" msgstr "I" -#: gitk:11348 +#: gitk:11363 msgid "Commit list display options" msgstr "コミットリスト表示オプション" -#: gitk:11351 +#: gitk:11366 msgid "Maximum graph width (lines)" msgstr "最大グラフ幅（線の本数）" -#: gitk:11355 +#: gitk:11370 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大グラフ幅（ペインに対する％）" -#: gitk:11358 +#: gitk:11373 msgid "Show local changes" msgstr "ローカルな変更を表示" -#: gitk:11361 -#, fuzzy +#: gitk:11376 msgid "Auto-select SHA1 (length)" -msgstr "SHA1 の自動選択" +msgstr "SHA1 の自動選択 (選択文字数指定)" -#: gitk:11365 +#: gitk:11380 msgid "Hide remote refs" msgstr "リモートリファレンスを隠す" -#: gitk:11369 +#: gitk:11384 msgid "Diff display options" msgstr "diff表示オプション" -#: gitk:11371 +#: gitk:11386 msgid "Tab spacing" msgstr "タブ空白幅" -#: gitk:11374 -#, fuzzy +#: gitk:11389 msgid "Display nearby tags/heads" -msgstr "近くのタグを表示する" +msgstr "近くの タグ/head を表示する" -#: gitk:11377 +#: gitk:11392 msgid "Maximum # tags/heads to show" -msgstr "" +msgstr "タグ/head の最大表示数" -#: gitk:11380 +#: gitk:11395 msgid "Limit diffs to listed paths" msgstr "diff をリストのパスに制限" -#: gitk:11383 +#: gitk:11398 msgid "Support per-file encodings" msgstr "ファイルごとのエンコーディングのサポート" -#: gitk:11389 gitk:11536 +#: gitk:11404 gitk:11551 msgid "External diff tool" msgstr "外部diffツール" -#: gitk:11390 +#: gitk:11405 msgid "Choose..." msgstr "選択..." -#: gitk:11395 -#, fuzzy +#: gitk:11410 msgid "General options" -msgstr "パッチ生成" +msgstr "全体設定" -#: gitk:11398 +#: gitk:11413 msgid "Use themed widgets" -msgstr "" +msgstr "テーマウィジェットを使用する" -#: gitk:11400 +#: gitk:11415 msgid "(change requires restart)" -msgstr "" +msgstr "(変更には再起動が必要です)" -#: gitk:11402 +#: gitk:11417 msgid "(currently unavailable)" -msgstr "" +msgstr "(現在は使用出来ません)" -#: gitk:11413 +#: gitk:11428 msgid "Colors: press to choose" msgstr "色: ボタンを押して選択" -#: gitk:11416 +#: gitk:11431 msgid "Interface" msgstr "インターフェイス" -#: gitk:11417 +#: gitk:11432 msgid "interface" msgstr "インターフェイス" -#: gitk:11420 +#: gitk:11435 msgid "Background" msgstr "背景" -#: gitk:11421 gitk:11451 +#: gitk:11436 gitk:11466 msgid "background" msgstr "背景" -#: gitk:11424 +#: gitk:11439 msgid "Foreground" msgstr "前景" -#: gitk:11425 +#: gitk:11440 msgid "foreground" msgstr "前景" -#: gitk:11428 +#: gitk:11443 msgid "Diff: old lines" msgstr "Diff: 旧バージョン" -#: gitk:11429 +#: gitk:11444 msgid "diff old lines" msgstr "diff 旧バージョン" -#: gitk:11433 +#: gitk:11448 msgid "Diff: new lines" msgstr "Diff: 新バージョン" -#: gitk:11434 +#: gitk:11449 msgid "diff new lines" msgstr "diff 新バージョン" -#: gitk:11438 +#: gitk:11453 msgid "Diff: hunk header" msgstr "Diff: hunkヘッダ" -#: gitk:11440 +#: gitk:11455 msgid "diff hunk header" msgstr "diff hunkヘッダ" -#: gitk:11444 +#: gitk:11459 msgid "Marked line bg" msgstr "マーク行の背景" -#: gitk:11446 +#: gitk:11461 msgid "marked line background" msgstr "マーク行の背景" -#: gitk:11450 +#: gitk:11465 msgid "Select bg" msgstr "選択の背景" -#: gitk:11459 +#: gitk:11474 msgid "Fonts: press to choose" msgstr "フォント: ボタンを押して選択" -#: gitk:11461 +#: gitk:11476 msgid "Main font" msgstr "主フォント" -#: gitk:11462 +#: gitk:11477 msgid "Diff display font" msgstr "Diff表示用フォント" -#: gitk:11463 +#: gitk:11478 msgid "User interface font" msgstr "UI用フォント" -#: gitk:11485 +#: gitk:11500 msgid "Gitk preferences" msgstr "Gitk 設定" -#: gitk:11494 -#, fuzzy +#: gitk:11509 msgid "General" -msgstr "生成" +msgstr "一般" -#: gitk:11495 +#: gitk:11510 msgid "Colors" -msgstr "" +msgstr "色" -#: gitk:11496 +#: gitk:11511 msgid "Fonts" -msgstr "" +msgstr "フォント" -#: gitk:11546 +#: gitk:11561 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: 「%s」 の色を選択" -#: gitk:12059 +#: 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:12269 +#: gitk:12284 msgid "Cannot find a git repository here." msgstr "ここにはgitリポジトリがありません。" -#: gitk:12316 +#: gitk:12331 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" -#: gitk:12328 +#: gitk:12343 msgid "Bad arguments to gitk:" msgstr "gitkへの不正な引数:" - -#~ msgid "mc" -#~ msgstr "mc" - -#~ msgid "SHA1 ID: " -#~ msgstr "SHA1 ID: " - -#~ msgid "next" -#~ msgstr "次" - -#~ msgid "prev" -#~ msgstr "前" - -#~ msgid "CDate" -#~ msgstr "作成日" - -#~ msgid "Cannot find the git directory \"%s\"." -#~ msgstr "gitディレクトリ \"%s\" を見つけられません。" diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po index 75317f4396..d9d4e87a44 100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@ -1,5 +1,5 @@ # 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. @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-17 14:32+1000\n" -"PO-Revision-Date: 2015-03-27 10:31+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" @@ -28,7 +28,7 @@ msgstr "Kunde inte hämta lista över ej sammanslagna filer:" msgid "Color words" msgstr "Färga ord" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 +#: gitk:217 gitk:2381 gitk:8221 gitk:8254 msgid "Markup words" msgstr "Märk upp ord" @@ -62,15 +62,15 @@ msgstr "Fel vid körning av git log:" msgid "Reading" msgstr "Läser" -#: gitk:496 gitk:4525 +#: gitk:496 gitk:4526 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:499 gitk:1637 gitk:4528 +#: gitk:499 gitk:1637 gitk:4529 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1445 gitk:4045 gitk:12432 +#: gitk:1445 gitk:4046 gitk:12447 msgid "Command line" msgstr "Kommandorad" @@ -82,84 +82,84 @@ msgstr "Kan inte tolka utdata från git log:" msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 +#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 +#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 +#: gitk:11257 gitk:11537 msgid "Cancel" msgstr "Avbryt" #: gitk:2069 msgid "&Update" -msgstr "Uppdatera" +msgstr "&Uppdatera" #: gitk:2070 msgid "&Reload" -msgstr "Ladda om" +msgstr "Läs &om" #: gitk:2071 msgid "Reread re&ferences" -msgstr "Läs om referenser" +msgstr "Läs om &referenser" #: gitk:2072 msgid "&List references" -msgstr "Visa referenser" +msgstr "&Visa referenser" #: gitk:2074 msgid "Start git &gui" -msgstr "Starta git gui" +msgstr "Starta git &gui" #: gitk:2076 msgid "&Quit" -msgstr "Avsluta" +msgstr "&Avsluta" #: gitk:2068 msgid "&File" -msgstr "Arkiv" +msgstr "&Arkiv" #: gitk:2080 msgid "&Preferences" -msgstr "Inställningar" +msgstr "&Inställningar" #: gitk:2079 msgid "&Edit" -msgstr "Redigera" +msgstr "&Redigera" #: gitk:2084 msgid "&New view..." -msgstr "Ny vy..." +msgstr "&Ny vy..." #: gitk:2085 msgid "&Edit view..." -msgstr "Ändra vy..." +msgstr "&Ändra vy..." #: gitk:2086 msgid "&Delete view" -msgstr "Ta bort vy" +msgstr "&Ta bort vy" -#: gitk:2088 gitk:4043 +#: gitk:2088 msgid "&All files" -msgstr "Alla filer" +msgstr "&Alla filer" -#: gitk:2083 gitk:4067 +#: gitk:2083 msgid "&View" -msgstr "Visa" +msgstr "&Visa" -#: gitk:2093 gitk:2103 gitk:3012 +#: gitk:2093 gitk:2103 msgid "&About gitk" -msgstr "Om gitk" +msgstr "&Om gitk" #: gitk:2094 gitk:2108 msgid "&Key bindings" -msgstr "Tangentbordsbindningar" +msgstr "&Tangentbordsbindningar" #: gitk:2092 gitk:2107 msgid "&Help" -msgstr "Hjälp" +msgstr "&Hjälp" -#: gitk:2185 gitk:8652 +#: gitk:2185 gitk:8653 msgid "SHA1 ID:" msgstr "SHA1-id:" @@ -175,53 +175,53 @@ msgstr "Sök" msgid "commit" msgstr "incheckning" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 +#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 +#: gitk:6913 msgid "containing:" msgstr "som innehåller:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 +#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2303 gitk:4777 +#: gitk:2303 gitk:4778 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2304 gitk:4779 +#: gitk:2304 gitk:4780 msgid "changing lines matching:" msgstr "ändrar rader som matchar:" -#: gitk:2313 gitk:2315 gitk:4766 +#: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" msgstr "Exakt" -#: gitk:2315 gitk:4854 gitk:6723 +#: gitk:2315 gitk:4855 gitk:6724 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 +#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 +#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 msgid "All fields" msgstr "Alla fält" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 +#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 msgid "Headline" msgstr "Rubrik" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 +#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 msgid "Comments" msgstr "Kommentarer" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 +#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 +#: gitk:8846 msgid "Author" msgstr "Författare" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 +#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 msgid "Committer" msgstr "Incheckare" @@ -249,7 +249,7 @@ msgstr "Rader sammanhang" msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 +#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 msgid "Line diff" msgstr "Rad-diff" @@ -261,107 +261,115 @@ msgstr "Patch" msgid "Tree" msgstr "Träd" -#: gitk:2617 gitk:2637 +#: gitk:2617 gitk:2638 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2618 gitk:2638 +#: gitk:2618 gitk:2639 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2619 gitk:2639 +#: gitk:2619 gitk:2640 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2620 gitk:9254 +#: gitk:2620 gitk:9255 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2621 gitk:9371 +#: gitk:2621 +msgid "Copy commit summary" +msgstr "Kopiera incheckningssammanfattning" + +#: gitk:2622 gitk:9386 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2622 gitk:9428 +#: gitk:2623 gitk:9443 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2623 +#: gitk:2624 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2624 +#: gitk:2625 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2625 +#: gitk:2626 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2626 +#: gitk:2627 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2627 +#: gitk:2628 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2628 +#: gitk:2629 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 msgid "Diff this -> marked commit" msgstr "Diff denna -> markerad incheckning" -#: gitk:2630 gitk:2641 +#: gitk:2631 gitk:2642 msgid "Diff marked commit -> this" msgstr "Diff markerad incheckning -> denna" -#: gitk:2631 +#: gitk:2632 msgid "Revert this commit" msgstr "Ångra denna incheckning" -#: gitk:2647 +#: gitk:2648 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2648 +#: gitk:2649 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2649 +#: gitk:2650 msgid "Copy branch name" -msgstr "" +msgstr "Kopiera namn på gren" -#: gitk:2656 +#: gitk:2657 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2657 +#: gitk:2658 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2658 +#: gitk:2659 msgid "External diff" msgstr "Extern diff" -#: gitk:2659 +#: gitk:2660 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2660 +#: gitk:2661 msgid "Copy path" -msgstr "" +msgstr "Kopiera sökväg" -#: gitk:2667 +#: gitk:2668 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2668 +#: gitk:2669 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:3014 +#: gitk:3013 +msgid "About gitk" +msgstr "Om gitk" + +#: gitk:3015 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -377,317 +385,323 @@ msgstr "" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:3022 gitk:3089 gitk:9857 +#: gitk:3023 gitk:3090 gitk:9872 msgid "Close" msgstr "Stäng" -#: gitk:3043 +#: gitk:3044 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:3046 +#: gitk:3047 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:3048 +#: gitk:3049 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:3049 +#: gitk:3050 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tStäng fönster" -#: gitk:3050 +#: gitk:3051 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tGå till första incheckning" -#: gitk:3051 +#: gitk:3052 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tGå till sista incheckning" -#: gitk:3052 +#: gitk:3053 msgid "<Up>, p, k\tMove up one commit" msgstr "<Upp>, p, k\tGå en incheckning upp" -#: gitk:3053 +#: gitk:3054 msgid "<Down>, n, j\tMove down one commit" msgstr "<Ned>, n, j\tGå en incheckning ned" -#: gitk:3054 +#: gitk:3055 msgid "<Left>, z, h\tGo back in history list" msgstr "<Vänster>, z, h\tGå bakåt i historiken" -#: gitk:3055 +#: gitk:3056 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Höger>, x, l\tGå framåt i historiken" -#: gitk:3056 +#: 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:3057 +#: gitk:3058 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tGå upp en sida i incheckningslistan" -#: gitk:3058 +#: gitk:3059 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tGå ned en sida i incheckningslistan" -#: gitk:3059 +#: gitk:3060 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:3060 +#: gitk:3061 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:3061 +#: gitk:3062 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:3062 +#: gitk:3063 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:3063 +#: gitk:3064 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:3064 +#: gitk:3065 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:3065 +#: gitk:3066 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:3066 +#: gitk:3067 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:3067 +#: gitk:3068 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRulla diffvisningen upp en sida" -#: gitk:3068 +#: gitk:3069 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Baksteg>\tRulla diffvisningen upp en sida" -#: gitk:3069 +#: gitk:3070 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" -#: gitk:3070 +#: gitk:3071 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:3071 +#: gitk:3072 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:3072 +#: gitk:3073 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:3073 +#: 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:3074 +#: gitk:3075 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tGå till nästa sökträff" -#: gitk:3075 -#, fuzzy +#: gitk:3076 msgid "g\t\tGo to commit" -msgstr "<End>\t\tGå till sista incheckning" +msgstr "g\t\tGå till incheckning" -#: gitk:3076 +#: gitk:3077 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:3077 +#: gitk:3078 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:3078 +#: gitk:3079 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:3079 +#: 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:3080 +#: 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:3081 +#: gitk:3082 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:3082 +#: gitk:3083 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:3083 +#: gitk:3084 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:3084 +#: gitk:3085 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:3085 +#: gitk:3086 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tUppdatera" -#: gitk:3550 gitk:3559 +#: gitk:3551 gitk:3560 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3572 +#: gitk:3573 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fel vid hämtning av \"%s\" från %s:" -#: gitk:3635 +#: gitk:3636 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3784 +#: gitk:3785 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3798 +#: gitk:3799 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3829 +#: gitk:3830 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3837 +#: gitk:3838 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3862 +#: gitk:3863 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3865 gitk:6754 +#: gitk:3866 gitk:6755 msgid "Searching" msgstr "Söker" -#: gitk:3897 +#: gitk:3898 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3925 +#: 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:3939 +#: gitk:3940 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:4070 +#: 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:4074 +#: gitk:4075 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:4075 +#: gitk:4076 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:4076 +#: gitk:4077 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:4077 +#: gitk:4078 msgid "All refs" msgstr "Alla referenser" -#: gitk:4078 +#: gitk:4079 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:4079 +#: gitk:4080 msgid "All tags" msgstr "Alla taggar" -#: gitk:4080 +#: gitk:4081 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:4081 +#: gitk:4082 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:4082 +#: gitk:4083 msgid "Author:" msgstr "Författare:" -#: gitk:4083 +#: gitk:4084 msgid "Committer:" msgstr "Incheckare:" -#: gitk:4084 +#: gitk:4085 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:4085 +#: gitk:4086 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:4086 -#, fuzzy +#: gitk:4087 msgid "Matches no Commit Info criteria" msgstr "Motsvarar inga kriterier för incheckningsinfo" -#: gitk:4087 +#: gitk:4088 msgid "Changes to Files:" msgstr "Ändringar av filer:" -#: gitk:4088 +#: gitk:4089 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:4089 +#: gitk:4090 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:4090 +#: gitk:4091 msgid "Search string:" msgstr "Söksträng:" -#: gitk:4091 +#: gitk:4092 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -695,201 +709,201 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4092 +#: gitk:4093 msgid "Since:" msgstr "Från:" -#: gitk:4093 +#: gitk:4094 msgid "Until:" msgstr "Till:" -#: gitk:4094 +#: 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:4095 +#: gitk:4096 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:4096 +#: gitk:4097 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:4097 +#: gitk:4098 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:4098 +#: gitk:4099 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:4099 +#: gitk:4100 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:4100 +#: gitk:4101 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:4101 +#: gitk:4102 msgid "Simple history" msgstr "Enkel historik" -#: gitk:4102 +#: gitk:4103 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:4103 +#: gitk:4104 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:4104 +#: gitk:4105 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:4228 +#: gitk:4229 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:4236 +#: gitk:4237 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:4241 +#: gitk:4242 msgid "View Name" msgstr "Namn på vy" -#: gitk:4316 +#: gitk:4317 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:4354 +#: gitk:4355 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 +#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 msgid "None" msgstr "Inget" -#: gitk:5021 gitk:5026 +#: gitk:5022 gitk:5027 msgid "Descendant" msgstr "Avkomling" -#: gitk:5022 +#: gitk:5023 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:5029 gitk:5034 +#: gitk:5030 gitk:5035 msgid "Ancestor" msgstr "Förfader" -#: gitk:5030 +#: gitk:5031 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:5324 +#: gitk:5325 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:5360 +#: gitk:5361 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:7134 +#: gitk:7135 msgid "and many more" msgstr "med många flera" -#: gitk:7137 +#: gitk:7138 msgid "many" msgstr "många" -#: gitk:7328 +#: gitk:7329 msgid "Tags:" msgstr "Taggar:" -#: gitk:7345 gitk:7351 gitk:8825 +#: gitk:7346 gitk:7352 gitk:8826 msgid "Parent" msgstr "Förälder" -#: gitk:7356 +#: gitk:7357 msgid "Child" msgstr "Barn" -#: gitk:7365 +#: gitk:7366 msgid "Branch" msgstr "Gren" -#: gitk:7368 +#: gitk:7369 msgid "Follows" msgstr "Följer" -#: gitk:7371 +#: gitk:7372 msgid "Precedes" msgstr "Föregår" -#: gitk:7966 +#: gitk:7967 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:8650 +#: gitk:8651 msgid "Goto:" msgstr "Gå till:" -#: gitk:8671 +#: gitk:8672 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:8678 +#: gitk:8679 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:8688 +#: gitk:8689 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:8690 +#: gitk:8691 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8832 gitk:8847 +#: gitk:8833 gitk:8848 msgid "Date" msgstr "Datum" -#: gitk:8835 +#: gitk:8836 msgid "Children" msgstr "Barn" -#: gitk:8898 +#: gitk:8899 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8900 +#: gitk:8901 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:9005 gitk:9011 +#: gitk:9006 gitk:9012 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:9020 gitk:9025 +#: gitk:9021 gitk:9026 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:9021 gitk:9026 +#: gitk:9022 gitk:9027 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 +#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 msgid "Commit " msgstr "Incheckning " -#: gitk:9035 +#: gitk:9036 msgid "" " is the same patch as\n" " " @@ -897,7 +911,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:9043 +#: gitk:9044 msgid "" " differs from\n" " " @@ -905,7 +919,7 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:9045 +#: gitk:9046 msgid "" "Diff of commits:\n" "\n" @@ -913,131 +927,131 @@ msgstr "" "Skillnad mellan incheckningar:\n" "\n" -#: gitk:9057 gitk:9066 +#: gitk:9058 gitk:9067 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:9085 +#: gitk:9086 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fel vid skrivning av incheckning till fil: %s" -#: gitk:9091 +#: gitk:9092 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fel vid jämförelse av incheckningar: %s" -#: gitk:9137 +#: gitk:9138 msgid "Top" msgstr "Topp" -#: gitk:9138 +#: gitk:9139 msgid "From" msgstr "Från" -#: gitk:9143 +#: gitk:9144 msgid "To" msgstr "Till" -#: gitk:9167 +#: gitk:9168 msgid "Generate patch" msgstr "Generera patch" -#: gitk:9169 +#: gitk:9170 msgid "From:" msgstr "Från:" -#: gitk:9178 +#: gitk:9179 msgid "To:" msgstr "Till:" -#: gitk:9187 +#: gitk:9188 msgid "Reverse" msgstr "Vänd" -#: gitk:9189 gitk:9385 +#: gitk:9190 gitk:9400 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:9195 +#: gitk:9196 msgid "Generate" msgstr "Generera" -#: gitk:9233 +#: gitk:9234 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:9256 gitk:9373 gitk:9430 +#: gitk:9257 gitk:9388 gitk:9445 msgid "ID:" msgstr "Id:" -#: gitk:9265 +#: gitk:9266 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:9268 +#: gitk:9269 msgid "Tag message is optional" msgstr "Taggmeddelandet är valfritt" -#: gitk:9270 +#: gitk:9271 msgid "Tag message:" msgstr "Taggmeddelande:" -#: gitk:9274 gitk:9439 +#: gitk:9275 gitk:9454 msgid "Create" msgstr "Skapa" -#: gitk:9292 +#: gitk:9293 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:9296 +#: gitk:9297 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:9306 +#: gitk:9307 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:9382 +#: gitk:9397 msgid "Command:" msgstr "Kommando:" -#: gitk:9390 +#: gitk:9405 msgid "Write" msgstr "Skriv" -#: gitk:9408 +#: gitk:9423 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:9435 +#: gitk:9450 msgid "Name:" msgstr "Namn:" -#: gitk:9458 +#: gitk:9473 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:9463 +#: gitk:9478 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:9530 +#: 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:9535 +#: gitk:9550 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:9544 +#: gitk:9559 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1047,7 +1061,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9550 +#: gitk:9565 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1055,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:9566 gitk:9624 +#: gitk:9581 gitk:9639 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:9593 +#: 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:9598 +#: gitk:9613 msgid "Reverting" msgstr "Ångrar" -#: gitk:9606 +#: gitk:9621 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1078,7 +1092,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9610 +#: gitk:9625 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1086,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:9653 +#: gitk:9668 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:9655 +#: gitk:9670 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:9657 +#: gitk:9672 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:9660 +#: gitk:9675 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:9663 +#: gitk:9678 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:9666 +#: gitk:9681 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1115,19 +1129,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:9683 +#: gitk:9698 msgid "Resetting" msgstr "Återställer" -#: gitk:9743 +#: gitk:9758 msgid "Checking out" msgstr "Checkar ut" -#: gitk:9796 +#: gitk:9811 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:9802 +#: gitk:9817 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1136,16 +1150,16 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:9833 +#: gitk:9848 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:9850 +#: gitk:9865 msgid "Filter" msgstr "Filter" -#: gitk:10146 +#: gitk:10161 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1153,201 +1167,201 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:11123 +#: gitk:11138 msgid "Tag" msgstr "Tagg" -#: gitk:11127 +#: gitk:11142 msgid "Id" msgstr "Id" -#: gitk:11210 +#: gitk:11225 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:11227 +#: gitk:11242 msgid "B" msgstr "F" -#: gitk:11230 +#: gitk:11245 msgid "I" msgstr "K" -#: gitk:11348 +#: gitk:11363 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:11351 +#: gitk:11366 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:11355 +#: gitk:11370 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:11358 +#: gitk:11373 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:11361 +#: gitk:11376 msgid "Auto-select SHA1 (length)" msgstr "Välj SHA1 (längd) automatiskt" -#: gitk:11365 +#: gitk:11380 msgid "Hide remote refs" msgstr "Dölj fjärr-referenser" -#: gitk:11369 +#: gitk:11384 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:11371 +#: gitk:11386 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:11374 +#: gitk:11389 msgid "Display nearby tags/heads" msgstr "Visa närliggande taggar/huvuden" -#: gitk:11377 +#: gitk:11392 msgid "Maximum # tags/heads to show" msgstr "Maximalt antal taggar/huvuden att visa" -#: gitk:11380 +#: gitk:11395 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:11383 +#: gitk:11398 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:11389 gitk:11536 +#: gitk:11404 gitk:11551 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:11390 +#: gitk:11405 msgid "Choose..." msgstr "Välj..." -#: gitk:11395 +#: gitk:11410 msgid "General options" msgstr "Allmänna inställningar" -#: gitk:11398 +#: gitk:11413 msgid "Use themed widgets" msgstr "Använd tema på fönsterelement" -#: gitk:11400 +#: gitk:11415 msgid "(change requires restart)" msgstr "(ändringen kräver omstart)" -#: gitk:11402 +#: gitk:11417 msgid "(currently unavailable)" msgstr "(för närvarande inte tillgängligt)" -#: gitk:11413 +#: gitk:11428 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:11416 +#: gitk:11431 msgid "Interface" msgstr "Gränssnitt" -#: gitk:11417 +#: gitk:11432 msgid "interface" msgstr "gränssnitt" -#: gitk:11420 +#: gitk:11435 msgid "Background" msgstr "Bakgrund" -#: gitk:11421 gitk:11451 +#: gitk:11436 gitk:11466 msgid "background" msgstr "bakgrund" -#: gitk:11424 +#: gitk:11439 msgid "Foreground" msgstr "Förgrund" -#: gitk:11425 +#: gitk:11440 msgid "foreground" msgstr "förgrund" -#: gitk:11428 +#: gitk:11443 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:11429 +#: gitk:11444 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:11433 +#: gitk:11448 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:11434 +#: gitk:11449 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:11438 +#: gitk:11453 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:11440 +#: gitk:11455 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:11444 +#: gitk:11459 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:11446 +#: gitk:11461 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:11450 +#: gitk:11465 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:11459 +#: gitk:11474 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:11461 +#: gitk:11476 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:11462 +#: gitk:11477 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:11463 +#: gitk:11478 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:11485 +#: gitk:11500 msgid "Gitk preferences" msgstr "Inställningar för Gitk" -#: gitk:11494 +#: gitk:11509 msgid "General" msgstr "Allmänt" -#: gitk:11495 +#: gitk:11510 msgid "Colors" msgstr "Färger" -#: gitk:11496 +#: gitk:11511 msgid "Fonts" msgstr "Teckensnitt" -#: gitk:11546 +#: gitk:11561 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:12059 +#: gitk:12074 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1355,16 +1369,16 @@ msgstr "" "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" " Gitk kräver åtminstone Tcl/Tk 8.4." -#: gitk:12269 +#: gitk:12284 msgid "Cannot find a git repository here." msgstr "Hittar inget git-arkiv här." -#: gitk:12316 +#: gitk:12331 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": både revision och filnamn" -#: gitk:12328 +#: gitk:12343 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" |