|
|
29.
|
|
|
Requires merge resolution
|
|
|
|
|
Требуется разрешение конфликта при слиянии
|
|
Translated by
Remove Me
|
|
|
|
Located in
git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
git-gui.sh:2118 git-gui.sh:2119
|
|
|
30.
|
|
|
Starting gitk... please wait...
|
|
|
|
|
Запускается gitk… Подождите, пожалуйста…
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
git-gui.sh:1972
|
|
|
31.
|
|
|
Couldn't find gitk in PATH
|
|
|
|
|
gitk не найден в PATH.
|
|
Translated by
Remove Me
|
|
|
|
Located in
git-gui.sh:2164
|
|
|
32.
|
|
|
Couldn't find git gui in PATH
|
|
|
|
|
git gui не найден в PATH.
|
|
Translated by
Alex Riesen
|
|
|
|
Located in
git-gui.sh:2224
|
|
|
33.
|
|
|
Repository
|
|
|
|
|
Репозиторий
|
|
Translated by
Remove Me
|
|
|
|
Located in
git-gui.sh:2726 lib/choose_repository.tcl:53
|
|
|
34.
|
|
|
Edit
|
|
|
|
|
Правка
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
git-gui.sh:2727
|
|
|
35.
|
|
|
Branch
|
|
|
|
|
Ветка
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
git-gui.sh:2729 lib/choose_rev.tcl:567
|
|
|
36.
|
|
|
Commit@@noun
|
|
|
|
|
Коммит
|
|
Translated by
Dimitriy Ryazantcev
|
|
|
|
Located in
git-gui.sh:2732 lib/choose_rev.tcl:554
|
|
|
37.
|
|
|
Merge
|
|
|
|
|
Слияние
|
|
Translated by
Remove Me
|
|
|
|
Located in
git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
|
|
|
38.
|
|
|
Remote
|
|
|
|
|
Внешние репозитории
|
|
Translated by
Remove Me
|
|
|
|
Located in
git-gui.sh:2736 lib/choose_rev.tcl:563
|
