# Translation of git-gui to Chinese # Copyright (C) 2007 Shawn Pearce # This file is distributed under the same license as the git-gui package. # Xudong Guan <xudong.guan@gmail.com>, 2007. # # Please use the following translation throughout the file for consistence: # # repository 版本库 # commit æ交 # revision 版本 # branch 分支 # tag æ ‡ç¾ # annotation æ ‡æ³¨ # merge åˆå¹¶ # fast forward 快速åˆå¹¶(??) # stage ç¼“å˜ (译自 index/cache) # amend ä¿®æ£ # reset å¤ä½ # # 2008-01-06 Eric Miao <eric.y.miao@gmail.com> # FIXME: checkout çš„æ ‡å‡†ç¿»è¯‘ # #, fuzzy msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-03-14 07:18+0100\n" "PO-Revision-Date: 2007-07-21 01:23-0700\n" "Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n" "Language-Team: Chinese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744 #: git-gui.sh:763 msgid "git-gui: fatal error" msgstr "git-gui: 致命错误" #: git-gui.sh:593 #, tcl-format msgid "Invalid font specified in %s:" msgstr "%s ä¸æŒ‡å®šçš„å—ä½“æ— æ•ˆ:" #: git-gui.sh:620 msgid "Main Font" msgstr "主è¦å—体" #: git-gui.sh:621 msgid "Diff/Console Font" msgstr "Diff/控制终端å—体" #: git-gui.sh:635 msgid "Cannot find git in PATH." msgstr "PATH ä¸æ²¡æœ‰æ‰¾åˆ° git" #: git-gui.sh:662 msgid "Cannot parse Git version string:" msgstr "æ— æ³•è§£æž Git 的版本信æ¯:" #: git-gui.sh:680 #, tcl-format msgid "" "Git version cannot be determined.\n" "\n" "%s claims it is version '%s'.\n" "\n" "%s requires at least Git 1.5.0 or later.\n" "\n" "Assume '%s' is version 1.5.0?\n" msgstr "" "æ— æ³•ç¡®å®š Git 的版本.\n" "\n" "%s 声明其版本为 '%s'.\n" "\n" "而 %s éœ€è¦ 1.5.0 或这以åŽçš„ Git 版本.\n" "\n" "是å¦å‡å®š '%s' 为版本 1.5.0?\n" #: git-gui.sh:918 msgid "Git directory not found:" msgstr "Git ç›®å½•æ— æ³•æ‰¾åˆ°:" #: git-gui.sh:925 msgid "Cannot move to top of working directory:" msgstr "æ— æ³•ç§»åŠ¨åˆ°å·¥ä½œæ ¹ç›®å½•:" #: git-gui.sh:932 msgid "Cannot use funny .git directory:" msgstr "æ— æ³•ä½¿ç”¨ .git 目录:" #: git-gui.sh:937 msgid "No working directory" msgstr "没有工作目录" #: git-gui.sh:1084 lib/checkout_op.tcl:283 msgid "Refreshing file status..." msgstr "更新文件状æ€..." #: git-gui.sh:1149 msgid "Scanning for modified files ..." msgstr "扫æ修改过的文件 ..." #: git-gui.sh:1324 lib/browser.tcl:246 msgid "Ready." msgstr "就绪" #: git-gui.sh:1590 msgid "Unmodified" msgstr "未修改" #: git-gui.sh:1592 msgid "Modified, not staged" msgstr "修改但未缓å˜" #: git-gui.sh:1593 git-gui.sh:1598 msgid "Staged for commit" msgstr "缓å˜ä¸ºæ交" #: git-gui.sh:1594 git-gui.sh:1599 msgid "Portions staged for commit" msgstr "部分缓å˜ä¸ºæ交" #: git-gui.sh:1595 git-gui.sh:1600 msgid "Staged for commit, missing" msgstr "缓å˜ä¸ºæ交, ä¸å˜åœ¨" #: git-gui.sh:1597 msgid "Untracked, not staged" msgstr "未跟踪, 未缓å˜" #: git-gui.sh:1602 msgid "Missing" msgstr "ä¸å˜åœ¨" #: git-gui.sh:1603 msgid "Staged for removal" msgstr "缓å˜ä¸ºåˆ 除" #: git-gui.sh:1604 msgid "Staged for removal, still present" msgstr "缓å˜ä¸ºåˆ 除, 但ä»å˜åœ¨" #: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609 msgid "Requires merge resolution" msgstr "需è¦è§£å†³åˆå¹¶å†²çª" #: git-gui.sh:1644 msgid "Starting gitk... please wait..." msgstr "å¯åŠ¨ gitk... 请ç‰å¾…..." #: git-gui.sh:1653 #, tcl-format msgid "" "Unable to start gitk:\n" "\n" "%s does not exist" msgstr "" "æ— æ³•å¯åŠ¨ gitk:\n" "\n" "%s ä¸å˜åœ¨" #: git-gui.sh:1860 lib/choose_repository.tcl:36 msgid "Repository" msgstr "版本库(repository)" #: git-gui.sh:1861 msgid "Edit" msgstr "编辑" #: git-gui.sh:1863 lib/choose_rev.tcl:561 msgid "Branch" msgstr "分支(branch)" #: git-gui.sh:1866 lib/choose_rev.tcl:548 msgid "Commit@@noun" msgstr "æ交(commit)" #: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167 msgid "Merge" msgstr "åˆå¹¶(merge)" #: git-gui.sh:1870 lib/choose_rev.tcl:557 msgid "Remote" msgstr "远端(remote)" #: git-gui.sh:1879 msgid "Browse Current Branch's Files" msgstr "æµè§ˆå½“å‰åˆ†æ”¯ä¸Šçš„文件" #: git-gui.sh:1883 msgid "Browse Branch Files..." msgstr "æµè§ˆåˆ†æ”¯ä¸Šçš„文件..." #: git-gui.sh:1888 msgid "Visualize Current Branch's History" msgstr "图示当å‰åˆ†æ”¯çš„历å²" #: git-gui.sh:1892 msgid "Visualize All Branch History" msgstr "图示所有分支的历å²" #: git-gui.sh:1899 #, tcl-format msgid "Browse %s's Files" msgstr "æµè§ˆ %s 上的文件" #: git-gui.sh:1901 #, tcl-format msgid "Visualize %s's History" msgstr "图示 %s 分支的历å²" #: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67 msgid "Database Statistics" msgstr "æ•°æ®åº“统计信æ¯" #: git-gui.sh:1909 lib/database.tcl:34 msgid "Compress Database" msgstr "压缩数æ®åº“" #: git-gui.sh:1912 msgid "Verify Database" msgstr "验è¯æ•°æ®åº“" #: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71 msgid "Create Desktop Icon" msgstr "创建桌é¢å›¾æ ‡" #: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185 msgid "Quit" msgstr "退出" #: git-gui.sh:1939 msgid "Undo" msgstr "撤销" #: git-gui.sh:1942 msgid "Redo" msgstr "é‡åš" #: git-gui.sh:1946 git-gui.sh:2443 msgid "Cut" msgstr "剪切" #: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614 #: lib/console.tcl:69 msgid "Copy" msgstr "å¤åˆ¶" #: git-gui.sh:1952 git-gui.sh:2449 msgid "Paste" msgstr "粘贴" #: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26 #: lib/remote_branch_delete.tcl:38 msgid "Delete" msgstr "åˆ é™¤" #: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71 msgid "Select All" msgstr "全选" #: git-gui.sh:1968 msgid "Create..." msgstr "新建..." #: git-gui.sh:1974 msgid "Checkout..." msgstr "Checkout..." #: git-gui.sh:1980 msgid "Rename..." msgstr "æ›´å..." #: git-gui.sh:1985 git-gui.sh:2085 msgid "Delete..." msgstr "åˆ é™¤..." #: git-gui.sh:1990 msgid "Reset..." msgstr "å¤ä½(Reset)..." #: git-gui.sh:2002 git-gui.sh:2389 msgid "New Commit" msgstr "新建æ交" #: git-gui.sh:2010 git-gui.sh:2396 msgid "Amend Last Commit" msgstr "ä¿®æ£ä¸Šæ¬¡æ交" #: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99 msgid "Rescan" msgstr "é‡æ–°æ‰«æ" #: git-gui.sh:2025 msgid "Stage To Commit" msgstr "缓å˜ä¸ºæ交" #: git-gui.sh:2031 msgid "Stage Changed Files To Commit" msgstr "缓å˜ä¿®æ”¹çš„文件为æ交" #: git-gui.sh:2037 msgid "Unstage From Commit" msgstr "从本次æ交撤除" #: git-gui.sh:2042 lib/index.tcl:395 msgid "Revert Changes" msgstr "撤销修改" #: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467 msgid "Sign Off" msgstr "ç¾å(Sign Off)" #: git-gui.sh:2053 git-gui.sh:2372 msgid "Commit@@verb" msgstr "æ交" #: git-gui.sh:2064 msgid "Local Merge..." msgstr "本地åˆå¹¶..." #: git-gui.sh:2069 msgid "Abort Merge..." msgstr "ä¸æ¢åˆå¹¶..." #: git-gui.sh:2081 msgid "Push..." msgstr "ä¸Šä¼ ..." #: git-gui.sh:2092 lib/choose_repository.tcl:41 msgid "Apple" msgstr "苹果" #: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14 #: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50 #, tcl-format msgid "About %s" msgstr "关于 %s" #: git-gui.sh:2099 msgid "Preferences..." msgstr "首选项..." #: git-gui.sh:2107 git-gui.sh:2639 msgid "Options..." msgstr "选项..." #: git-gui.sh:2113 lib/choose_repository.tcl:47 msgid "Help" msgstr "帮助" #: git-gui.sh:2154 msgid "Online Documentation" msgstr "在线文档" #: git-gui.sh:2238 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "致命错误: æ— æ³•èŽ·å–路径 %s çš„ä¿¡æ¯: 该文件或目录ä¸å˜åœ¨" #: git-gui.sh:2271 msgid "Current Branch:" msgstr "当å‰åˆ†æ”¯:" #: git-gui.sh:2292 msgid "Staged Changes (Will Commit)" msgstr "已缓å˜çš„改动 (将被æ交)" #: git-gui.sh:2312 msgid "Unstaged Changes" msgstr "未缓å˜çš„改动" #: git-gui.sh:2362 msgid "Stage Changed" msgstr "缓å˜æ”¹åŠ¨" #: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182 msgid "Push" msgstr "ä¸Šä¼ " #: git-gui.sh:2408 msgid "Initial Commit Message:" msgstr "åˆå§‹çš„æ交æè¿°:" #: git-gui.sh:2409 msgid "Amended Commit Message:" msgstr "ä¿®æ£çš„æ交æè¿°:" #: git-gui.sh:2410 msgid "Amended Initial Commit Message:" msgstr "ä¿®æ£çš„åˆå§‹æ交æè¿°:" #: git-gui.sh:2411 msgid "Amended Merge Commit Message:" msgstr "ä¿®æ£çš„åˆå¹¶æ交æè¿°:" #: git-gui.sh:2412 msgid "Merge Commit Message:" msgstr "åˆå¹¶æ交æè¿°:" #: git-gui.sh:2413 msgid "Commit Message:" msgstr "æ交æè¿°:" #: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73 msgid "Copy All" msgstr "全部å¤åˆ¶" #: git-gui.sh:2483 lib/blame.tcl:107 msgid "File:" msgstr "文件:" #: git-gui.sh:2589 msgid "Apply/Reverse Hunk" msgstr "应用/撤消æ¤ä¿®æ”¹å—" #: git-gui.sh:2595 msgid "Show Less Context" msgstr "显示更少上下文" #: git-gui.sh:2602 msgid "Show More Context" msgstr "显示更多上下文" #: git-gui.sh:2610 msgid "Refresh" msgstr "刷新" #: git-gui.sh:2631 msgid "Decrease Font Size" msgstr "缩å°å—体" #: git-gui.sh:2635 msgid "Increase Font Size" msgstr "放大å—体" #: git-gui.sh:2646 msgid "Unstage Hunk From Commit" msgstr "从æ交ä¸æ’¤é™¤ä¿®æ”¹å—" #: git-gui.sh:2648 msgid "Stage Hunk For Commit" msgstr "缓å˜ä¿®æ”¹å—为æ交" #: git-gui.sh:2667 msgid "Initializing..." msgstr "åˆå§‹åŒ–..." #: git-gui.sh:2762 #, tcl-format msgid "" "Possible environment issues exist.\n" "\n" "The following environment variables are probably\n" "going to be ignored by any Git subprocess run\n" "by %s:\n" "\n" msgstr "" "å¯èƒ½å˜åœ¨çŽ¯å¢ƒå˜é‡çš„问题.\n" "\n" "ç”± %s 执行的 Git å进程å¯èƒ½å¿½ç•¥ä¸‹åˆ—环境å˜é‡:\n" "\n" #: git-gui.sh:2792 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "" "\n" "这是由 Cygwin å‘布的 Tcl 代ç ä¸ä¸€ä¸ª\n" "已知问题所引起." #: git-gui.sh:2797 #, tcl-format msgid "" "\n" "\n" "A good replacement for %s\n" "is placing values for the user.name and\n" "user.email settings into your personal\n" "~/.gitconfig file.\n" msgstr "" "\n" "\n" "%s 的一个很好的替代方案是将 user.name 以åŠ\n" "user.email è®¾ç½®æ”¾åœ¨ä½ çš„ä¸ªäºº ~/.gitconfig 文件ä¸.\n" #: lib/about.tcl:26 msgid "git-gui - a graphical user interface for Git." msgstr "git-gui - Git 的图形化用户界é¢" #: lib/blame.tcl:77 msgid "File Viewer" msgstr "文件查看器" #: lib/blame.tcl:81 msgid "Commit:" msgstr "æ交:" #: lib/blame.tcl:264 msgid "Copy Commit" msgstr "å¤åˆ¶æ交" #: lib/blame.tcl:384 #, tcl-format msgid "Reading %s..." msgstr "è¯»å– %s..." #: lib/blame.tcl:488 msgid "Loading copy/move tracking annotations..." msgstr "装载å¤åˆ¶/ç§»åŠ¨è·Ÿè¸ªæ ‡æ³¨..." #: lib/blame.tcl:508 msgid "lines annotated" msgstr "æ ‡æ³¨è¡Œ" #: lib/blame.tcl:689 msgid "Loading original location annotations..." msgstr "装载原始ä½ç½®æ ‡æ³¨..." #: lib/blame.tcl:692 msgid "Annotation complete." msgstr "æ ‡æ³¨å®Œæˆ." #: lib/blame.tcl:746 msgid "Loading annotation..." msgstr "è£è¼‰æ ‡æ³¨..." #: lib/blame.tcl:802 msgid "Author:" msgstr "作者:" #: lib/blame.tcl:806 msgid "Committer:" msgstr "æ交者:" #: lib/blame.tcl:811 msgid "Original File:" msgstr "原始文件:" #: lib/blame.tcl:925 msgid "Originally By:" msgstr "最åˆç”±:" #: lib/blame.tcl:931 msgid "In File:" msgstr "在文件:" #: lib/blame.tcl:936 msgid "Copied Or Moved Here By:" msgstr "ç”±å¤åˆ¶æˆ–移动至æ¤:" #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 msgid "Checkout Branch" msgstr "Checkout 分支" #: lib/branch_checkout.tcl:23 msgid "Checkout" msgstr "Checkout" #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171 #: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97 msgid "Cancel" msgstr "å–消" #: lib/branch_checkout.tcl:32 lib/browser.tcl:287 msgid "Revision" msgstr "版本" #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242 msgid "Options" msgstr "选项..." #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 msgid "Fetch Tracking Branch" msgstr "获å–跟踪分支" #: lib/branch_checkout.tcl:44 msgid "Detach From Local Branch" msgstr "从本地分支脱离" #: lib/branch_create.tcl:22 msgid "Create Branch" msgstr "创建分支" #: lib/branch_create.tcl:27 msgid "Create New Branch" msgstr "新建分支" #: lib/branch_create.tcl:31 lib/choose_repository.tcl:371 msgid "Create" msgstr "新建" #: lib/branch_create.tcl:40 msgid "Branch Name" msgstr "分支å" #: lib/branch_create.tcl:43 msgid "Name:" msgstr "åå—:" #: lib/branch_create.tcl:58 msgid "Match Tracking Branch Name" msgstr "匹é…跟踪分支åå—" #: lib/branch_create.tcl:66 msgid "Starting Revision" msgstr "起始版本" #: lib/branch_create.tcl:72 msgid "Update Existing Branch:" msgstr "更新已有分支:" #: lib/branch_create.tcl:75 msgid "No" msgstr "å·ç " #: lib/branch_create.tcl:80 msgid "Fast Forward Only" msgstr "仅快速åˆå¹¶" #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514 msgid "Reset" msgstr "å¤ä½" #: lib/branch_create.tcl:97 msgid "Checkout After Creation" msgstr "在创建åŽCheckout" #: lib/branch_create.tcl:131 msgid "Please select a tracking branch." msgstr "请选择æŸä¸ªè·Ÿè¸ªåˆ†æ”¯." #: lib/branch_create.tcl:140 #, tcl-format msgid "Tracking branch %s is not a branch in the remote repository." msgstr "跟踪分支 %s 并ä¸æ˜¯è¿œç«¯ç‰ˆæœ¬åº“ä¸çš„一个分支" #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 msgid "Please supply a branch name." msgstr "请æ供分支åå—." #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 #, tcl-format msgid "'%s' is not an acceptable branch name." msgstr "'%s'ä¸æ˜¯ä¸€ä¸ªå¯æŽ¥å—的分支å." #: lib/branch_delete.tcl:15 msgid "Delete Branch" msgstr "åˆ é™¤åˆ†æ”¯" #: lib/branch_delete.tcl:20 msgid "Delete Local Branch" msgstr "åˆ é™¤æœ¬åœ°åˆ†æ”¯" #: lib/branch_delete.tcl:37 msgid "Local Branches" msgstr "本地分支" #: lib/branch_delete.tcl:52 msgid "Delete Only If Merged Into" msgstr "仅在åˆå¹¶åŽåˆ 除" #: lib/branch_delete.tcl:54 msgid "Always (Do not perform merge test.)" msgstr "总是åˆå¹¶ (ä¸ä½œåˆå¹¶æµ‹è¯•.)" #: lib/branch_delete.tcl:103 #, tcl-format msgid "The following branches are not completely merged into %s:" msgstr "下列分支没有完全被åˆå¹¶åˆ° %s:" #: lib/branch_delete.tcl:141 #, tcl-format msgid "" "Failed to delete branches:\n" "%s" msgstr "" "æ— æ³•åˆ é™¤åˆ†æ”¯:\n" "%s" #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 msgid "Rename Branch" msgstr "更改分支å:" #: lib/branch_rename.tcl:26 msgid "Rename" msgstr "æ›´å..." #: lib/branch_rename.tcl:36 msgid "Branch:" msgstr "分支:" #: lib/branch_rename.tcl:39 msgid "New Name:" msgstr "æ–°åå—:" #: lib/branch_rename.tcl:75 msgid "Please select a branch to rename." msgstr "请选择分支更å." #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179 #, tcl-format msgid "Branch '%s' already exists." msgstr "分支 '%s' å·²ç»å˜åœ¨." #: lib/branch_rename.tcl:117 #, tcl-format msgid "Failed to rename '%s'." msgstr "æ— æ³•æ›´å '%s'." #: lib/browser.tcl:17 msgid "Starting..." msgstr "开始..." #: lib/browser.tcl:26 msgid "File Browser" msgstr "文件æµè§ˆå™¨" #: lib/browser.tcl:126 lib/browser.tcl:143 #, tcl-format msgid "Loading %s..." msgstr "装载 %s..." #: lib/browser.tcl:187 msgid "[Up To Parent]" msgstr "[上层目录]" #: lib/browser.tcl:267 lib/browser.tcl:273 msgid "Browse Branch Files" msgstr "æµè§ˆåˆ†æ”¯æ–‡ä»¶" #: lib/browser.tcl:278 lib/choose_repository.tcl:387 #: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484 #: lib/choose_repository.tcl:987 msgid "Browse" msgstr "æµè§ˆ" #: lib/checkout_op.tcl:79 #, tcl-format msgid "Fetching %s from %s" msgstr "èŽ·å– %s 自 %s" #: lib/checkout_op.tcl:127 #, tcl-format msgid "fatal: Cannot resolve %s" msgstr "致命错误: æ— æ³•è§£å†³ %s" #: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31 msgid "Close" msgstr "å…³é—" #: lib/checkout_op.tcl:169 #, tcl-format msgid "Branch '%s' does not exist." msgstr "分支 '%s' 并ä¸å˜åœ¨." #: lib/checkout_op.tcl:206 #, tcl-format msgid "" "Branch '%s' already exists.\n" "\n" "It cannot fast-forward to %s.\n" "A merge is required." msgstr "" "分支 '%s' å·²ç»å˜åœ¨.\n" "\n" "æ— æ³•å¿«é€Ÿåˆå¹¶åˆ° %s.\n" "需è¦æ™®é€šåˆå¹¶." #: lib/checkout_op.tcl:220 #, tcl-format msgid "Merge strategy '%s' not supported." msgstr "åˆå¹¶ç–ç•¥ '%s' ä¸æ”¯æŒ." #: lib/checkout_op.tcl:239 #, tcl-format msgid "Failed to update '%s'." msgstr "æ— æ³•æ›´æ–° '%s'." #: lib/checkout_op.tcl:251 msgid "Staging area (index) is already locked." msgstr "缓å˜åŒºåŸŸ (index) 已被é”定." #: lib/checkout_op.tcl:266 msgid "" "Last scanned state does not match repository state.\n" "\n" "Another Git program has modified this repository since the last scan. A " "rescan must be performed before the current branch can be changed.\n" "\n" "The rescan will be automatically started now.\n" msgstr "" "最åŽä¸€æ¬¡æ‰«æ的状æ€å’Œå½“å‰ç‰ˆæœ¬åº“状æ€ä¸ç¬¦.\n" "\n" "å¦ä¸€ Git 程åºè‡ªä¸Šæ¬¡æ‰«æåŽä¿®æ”¹äº†æœ¬ç‰ˆæœ¬åº“. 在修改当å‰åˆ†æ”¯ä¹‹å‰éœ€è¦é‡æ–°åšä¸€æ¬¡æ‰«" "æ.\n" "\n" "é‡æ–°æ‰«æ将自动开始.\n" #: lib/checkout_op.tcl:322 #, tcl-format msgid "Updating working directory to '%s'..." msgstr "更新工作目录到 '%s'..." #: lib/checkout_op.tcl:323 msgid "files checked out" msgstr "" #: lib/checkout_op.tcl:353 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "ä¸æ¢ '%s' çš„ checkout æ“作 (需è¦åšæ–‡ä»¶çº§åˆå¹¶)." #: lib/checkout_op.tcl:354 msgid "File level merge required." msgstr "需è¦æ–‡ä»¶çº§åˆå¹¶." #: lib/checkout_op.tcl:358 #, tcl-format msgid "Staying on branch '%s'." msgstr "åœç•™åœ¨åˆ†æ”¯ '%s'." #: lib/checkout_op.tcl:429 msgid "" "You are no longer on a local branch.\n" "\n" "If you wanted to be on a branch, create one now starting from 'This Detached " "Checkout'." msgstr "" "ä½ ä¸åœ¨æŸä¸ªæœ¬åœ°åˆ†æ”¯ä¸Š.\n" "\n" "å¦‚æžœä½ æƒ³ä½äºŽæŸåˆ†æ”¯ä¸Š, 从当å‰è„±èŠ‚çš„Checkoutä¸åˆ›å»ºä¸€ä¸ªæ–°åˆ†æ”¯." #: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450 #, tcl-format msgid "Checked out '%s'." msgstr "'%s' 已被 checkout" #: lib/checkout_op.tcl:478 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "å¤ä½ '%s' 到 '%s' 将导致下列æ交的丢失:" #: lib/checkout_op.tcl:500 msgid "Recovering lost commits may not be easy." msgstr "æ¢å¤ä¸¢å¤±çš„æ交是比较困难的." #: lib/checkout_op.tcl:505 #, tcl-format msgid "Reset '%s'?" msgstr "å¤ä½ '%s'?" #: lib/checkout_op.tcl:510 lib/merge.tcl:163 msgid "Visualize" msgstr "图示" #: lib/checkout_op.tcl:578 #, tcl-format msgid "" "Failed to set current branch.\n" "\n" "This working directory is only partially switched. We successfully updated " "your files, but failed to update an internal Git file.\n" "\n" "This should not have occurred. %s will now close and give up." msgstr "" "æ— æ³•è®¾å®šå½“å‰åˆ†æ”¯.\n" "\n" "当å‰å·¥ä½œç›®å½•ä»…有部分被切æ¢å‡º, 我们已æˆåŠŸçš„æ›´æ–°äº†æ‚¨çš„æ–‡ä»¶ä½†æ˜¯æ— æ³•æ›´æ–°æŸä¸ªå†…部" "çš„Git文件.\n" "\n" "这本ä¸è¯¥å‘生, %s 将关é—并放弃." #: lib/choose_font.tcl:39 msgid "Select" msgstr "选择" #: lib/choose_font.tcl:53 msgid "Font Family" msgstr "å—体æ—" #: lib/choose_font.tcl:74 msgid "Font Size" msgstr "å—体大å°" #: lib/choose_font.tcl:91 msgid "Font Example" msgstr "å—ä½“æ ·ä¾‹" #: lib/choose_font.tcl:103 msgid "" "This is example text.\n" "If you like this text, it can be your font." msgstr "" "è¿™æ˜¯æ ·ä¾‹æ–‡æœ¬.\n" "å¦‚æžœä½ å–œæ¬¢, ä½ å¯ä»¥è®¾ç½®è¯¥å—体." #: lib/choose_repository.tcl:28 msgid "Git Gui" msgstr "Git Gui" #: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376 msgid "Create New Repository" msgstr "创建新的版本库" #: lib/choose_repository.tcl:87 msgid "New..." msgstr "新建..." #: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460 msgid "Clone Existing Repository" msgstr "克隆已有版本库" #: lib/choose_repository.tcl:100 msgid "Clone..." msgstr "克隆..." #: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976 msgid "Open Existing Repository" msgstr "打开已有版本库" #: lib/choose_repository.tcl:113 msgid "Open..." msgstr "打开..." #: lib/choose_repository.tcl:126 msgid "Recent Repositories" msgstr "最近版本库" #: lib/choose_repository.tcl:132 msgid "Open Recent Repository:" msgstr "打开最近版本库" #: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303 #: lib/choose_repository.tcl:310 #, tcl-format msgid "Failed to create repository %s:" msgstr "æ— æ³•åˆ›å»ºç‰ˆæœ¬åº“ %s:" #: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478 msgid "Directory:" msgstr "目录:" #: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537 #: lib/choose_repository.tcl:1011 msgid "Git Repository" msgstr "Git 版本库" #: lib/choose_repository.tcl:437 #, tcl-format msgid "Directory %s already exists." msgstr "目录 %s å·²ç»å˜åœ¨." #: lib/choose_repository.tcl:441 #, tcl-format msgid "File %s already exists." msgstr "文件 %s å·²ç»å˜åœ¨." #: lib/choose_repository.tcl:455 msgid "Clone" msgstr "克隆" #: lib/choose_repository.tcl:468 msgid "URL:" msgstr "URL:" #: lib/choose_repository.tcl:489 msgid "Clone Type:" msgstr "克隆类型:" #: lib/choose_repository.tcl:495 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "æ ‡å‡†æ–¹å¼ (快速, 部分备份, 作硬连接)" #: lib/choose_repository.tcl:501 msgid "Full Copy (Slower, Redundant Backup)" msgstr "全部å¤åˆ¶ (较慢, åšå¤‡ä»½)" #: lib/choose_repository.tcl:507 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "å…±äº«æ–¹å¼ (最快, ä¸æŽ¨è, ä¸åšå¤‡ä»½)" #: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590 #: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806 #: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025 #, tcl-format msgid "Not a Git repository: %s" msgstr "ä¸æ˜¯ä¸€ä¸ª Git 版本库: %s" #: lib/choose_repository.tcl:579 msgid "Standard only available for local repository." msgstr "æ ‡å‡†æ–¹å¼ä»…当是本地版本库时有效." #: lib/choose_repository.tcl:583 msgid "Shared only available for local repository." msgstr "共享方å¼ä»…当是本地版本库时有效." #: lib/choose_repository.tcl:604 #, tcl-format msgid "Location %s already exists." msgstr "ä½ç½® %s å·²ç»å˜åœ¨." #: lib/choose_repository.tcl:615 msgid "Failed to configure origin" msgstr "æ— æ³•é…ç½® origin" #: lib/choose_repository.tcl:627 msgid "Counting objects" msgstr "清点对象" #: lib/choose_repository.tcl:628 #, fuzzy msgid "buckets" msgstr "水桶??" #: lib/choose_repository.tcl:652 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" msgstr "æ— æ³•å¤åˆ¶ objects/info/alternates: %s" #: lib/choose_repository.tcl:688 #, tcl-format msgid "Nothing to clone from %s." msgstr "没有东西å¯ä»Ž %s 克隆." #: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904 #: lib/choose_repository.tcl:916 msgid "The 'master' branch has not been initialized." msgstr "'master'分支尚未åˆå§‹åŒ–." #: lib/choose_repository.tcl:703 msgid "Hardlinks are unavailable. Falling back to copying." msgstr "硬连接ä¸å¯ç”¨. 使用å¤åˆ¶." #: lib/choose_repository.tcl:715 #, tcl-format msgid "Cloning from %s" msgstr "从 %s 克隆" #: lib/choose_repository.tcl:746 msgid "Copying objects" msgstr "å¤åˆ¶ objects" #: lib/choose_repository.tcl:747 msgid "KiB" msgstr "KiB" #: lib/choose_repository.tcl:771 #, tcl-format msgid "Unable to copy object: %s" msgstr "æ— æ³•å¤åˆ¶ object: %s" #: lib/choose_repository.tcl:781 msgid "Linking objects" msgstr "链接 objects" #: lib/choose_repository.tcl:782 msgid "objects" msgstr "objects" #: lib/choose_repository.tcl:790 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "æ— æ³•ç¡¬é“¾æŽ¥ object: %s" #: lib/choose_repository.tcl:845 msgid "Cannot fetch branches and objects. See console output for details." msgstr "æ— æ³•èŽ·å–分支和对象. 请查看控制终端的输出." #: lib/choose_repository.tcl:856 msgid "Cannot fetch tags. See console output for details." msgstr "æ— æ³•èŽ·å–æ ‡ç¾. 请查看控制终端的输出." #: lib/choose_repository.tcl:880 msgid "Cannot determine HEAD. See console output for details." msgstr "æ— æ³•ç¡®å®š HEAD. 请查看控制终端的输出." #: lib/choose_repository.tcl:889 #, tcl-format msgid "Unable to cleanup %s" msgstr "æ— æ³•æ¸…ç† %s" #: lib/choose_repository.tcl:895 msgid "Clone failed." msgstr "克隆失败." #: lib/choose_repository.tcl:902 msgid "No default branch obtained." msgstr "没有获å–缺çœåˆ†æ”¯" #: lib/choose_repository.tcl:913 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "æ— æ³•è§£æž %s 为æ交." #: lib/choose_repository.tcl:925 msgid "Creating working directory" msgstr "创建工作目录" #: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127 #: lib/index.tcl:193 msgid "files" msgstr "文件" #: lib/choose_repository.tcl:955 msgid "Initial file checkout failed." msgstr "åˆå§‹çš„文件checkout失败" #: lib/choose_repository.tcl:971 msgid "Open" msgstr "打开" #: lib/choose_repository.tcl:981 msgid "Repository:" msgstr "版本库" #: lib/choose_repository.tcl:1031 #, tcl-format msgid "Failed to open repository %s:" msgstr "æ— æ³•æ‰“å¼€ç‰ˆæœ¬åº“ %s:" #: lib/choose_rev.tcl:53 msgid "This Detached Checkout" msgstr "该脱节的Checkout" #: lib/choose_rev.tcl:60 msgid "Revision Expression:" msgstr "版本表达å¼:" #: lib/choose_rev.tcl:74 msgid "Local Branch" msgstr "本地分支" #: lib/choose_rev.tcl:79 msgid "Tracking Branch" msgstr "跟踪分支:" #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 msgid "Tag" msgstr "æ ‡ç¾" #: lib/choose_rev.tcl:317 #, tcl-format msgid "Invalid revision: %s" msgstr "æ— æ•ˆç‰ˆæœ¬: %s" #: lib/choose_rev.tcl:338 msgid "No revision selected." msgstr "没有选择版本." #: lib/choose_rev.tcl:346 msgid "Revision expression is empty." msgstr "版本表达å¼ä¸ºç©º." #: lib/choose_rev.tcl:531 msgid "Updated" msgstr "已更新" #: lib/choose_rev.tcl:559 msgid "URL" msgstr "URL" #: lib/commit.tcl:9 msgid "" "There is nothing to amend.\n" "\n" "You are about to create the initial commit. There is no commit before this " "to amend.\n" msgstr "" "没有改动需è¦ä¿®æ£.\n" "\n" "ä½ æ£åœ¨åˆ›å»ºæœ€åˆçš„æ交. 在æ¤ä¹‹å‰æ²¡æœ‰æ交å¯ä»¥ä¿®æ£.\n" #: lib/commit.tcl:18 msgid "" "Cannot amend while merging.\n" "\n" "You are currently in the middle of a merge that has not been fully " "completed. You cannot amend the prior commit unless you first abort the " "current merge activity.\n" msgstr "" "在åˆå¹¶æ—¶æ— 法修æ£.\n" "\n" "ä½ å½“å‰æ£åœ¨ä¸€æ¬¡å°šæœªå®Œæˆçš„åˆå¹¶æ“作过程ä¸. 除éžä¸æ¢å½“å‰åˆå¹¶æ´»åŠ¨,\n" "å¦åˆ™æ— 法修æ£ä¹‹å‰çš„æ交.\n" #: lib/commit.tcl:49 msgid "Error loading commit data for amend:" msgstr "为修æ£è£…è½½æ交数æ®å‡ºé”™:" #: lib/commit.tcl:76 msgid "Unable to obtain your identity:" msgstr "æ— æ³•èŽ·çŸ¥ä½ çš„èº«ä»½:" #: lib/commit.tcl:81 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "æ— æ•ˆçš„ GIT_COMMITTER_IDENT" #: lib/commit.tcl:133 msgid "" "Last scanned state does not match repository state.\n" "\n" "Another Git program has modified this repository since the last scan. A " "rescan must be performed before another commit can be created.\n" "\n" "The rescan will be automatically started now.\n" msgstr "" "最åŽä¸€æ¬¡æ‰«æ的状æ€å’Œå½“å‰ç‰ˆæœ¬åº“状æ€ä¸ç¬¦.\n" "\n" "å¦ä¸€ Git 程åºè‡ªä¸Šæ¬¡æ‰«æåŽä¿®æ”¹äº†æœ¬ç‰ˆæœ¬åº“. 在修改当å‰åˆ†æ”¯ä¹‹å‰éœ€è¦é‡æ–°åšä¸€æ¬¡æ‰«" "æ.\n" "\n" "é‡æ–°æ‰«æ将自动开始.\n" #: lib/commit.tcl:154 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" "\n" "File %s has merge conflicts. You must resolve them and stage the file " "before committing.\n" msgstr "" "尚未åˆå¹¶çš„文件没有办法æ交.\n" "\n" "文件 %s 有åˆå¹¶å†²çª, ä½ å¿…é¡»è§£å†³è¿™äº›å†²çªå¹¶ç¼“å˜è¯¥æ–‡ä»¶ä½œæ交.\n" #: lib/commit.tcl:162 #, tcl-format msgid "" "Unknown file state %s detected.\n" "\n" "File %s cannot be committed by this program.\n" msgstr "" "æ£€æµ‹åˆ°æœªçŸ¥æ–‡ä»¶çŠ¶æ€ %s.\n" "\n" "文件 %s æ— æ³•ç”±è¯¥ç¨‹åºæ交.\n" #: lib/commit.tcl:170 msgid "" "No changes to commit.\n" "\n" "You must stage at least 1 file before you can commit.\n" msgstr "" "没有需è¦æ交的å˜åŠ¨.\n" "\n" "æ交å‰ä½ 必须首先缓å˜è‡³å°‘一个文件.\n" #: lib/commit.tcl:183 msgid "" "Please supply a commit message.\n" "\n" "A good commit message has the following format:\n" "\n" "- First line: Describe in one sentence what you did.\n" "- Second line: Blank\n" "- Remaining lines: Describe why this change is good.\n" msgstr "" "请æ供一æ¡æ交信æ¯.\n" "\n" "一æ¡å¥½çš„æ交信æ¯æœ‰ä¸‹åˆ—æ ¼å¼:\n" "\n" "- 第一行: 一å¥è¯æ¦‚æ‹¬ä½ åšçš„修改.\n" "- 第二行: 空行\n" "- 剩余行: 请æè¿°ä¸ºä»€ä¹ˆä½ åšçš„这些改动是好的.\n" #: lib/commit.tcl:207 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." msgstr "è¦å‘Š: Tcl ä¸æ”¯æŒç¼–ç æ–¹å¼ '%s'." #: lib/commit.tcl:221 msgid "Calling pre-commit hook..." msgstr "" #: lib/commit.tcl:236 msgid "Commit declined by pre-commit hook." msgstr "" #: lib/commit.tcl:259 msgid "Calling commit-msg hook..." msgstr "" #: lib/commit.tcl:274 msgid "Commit declined by commit-msg hook." msgstr "" #: lib/commit.tcl:287 msgid "Committing changes..." msgstr "" #: lib/commit.tcl:303 msgid "write-tree failed:" msgstr "write-tree 失败:" #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368 #, fuzzy msgid "Commit failed." msgstr "克隆失败." #: lib/commit.tcl:321 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "æ交 %s 似乎已æŸå" #: lib/commit.tcl:326 msgid "" "No changes to commit.\n" "\n" "No files were modified by this commit and it was not a merge commit.\n" "\n" "A rescan will be automatically started now.\n" msgstr "" "没有改动æ交.\n" "\n" "该æ交没有改动任何文件也ä¸æ˜¯ä¸€ä¸ªåˆå¹¶æ交.\n" "\n" "é‡æ–°æ‰«æ将自动开始.\n" #: lib/commit.tcl:333 msgid "No changes to commit." msgstr "没有改动è¦æ交." #: lib/commit.tcl:347 msgid "commit-tree failed:" msgstr "commit-tree 失败:" #: lib/commit.tcl:367 msgid "update-ref failed:" msgstr "update-ref 失败:" #: lib/commit.tcl:454 #, tcl-format msgid "Created commit %s: %s" msgstr "创建了 commit %s: %s" #: lib/console.tcl:59 msgid "Working... please wait..." msgstr "工作ä¸... 请ç‰å¾…..." #: lib/console.tcl:186 msgid "Success" msgstr "æˆåŠŸ" #: lib/console.tcl:200 msgid "Error: Command Failed" msgstr "错误: 命令失败" #: lib/database.tcl:43 msgid "Number of loose objects" msgstr "æ¾æ•£å¯¹è±¡çš„æ•°é‡" #: lib/database.tcl:44 msgid "Disk space used by loose objects" msgstr "æ¾æ•£å¯¹è±¡æ‰€ä½¿ç”¨çš„ç£ç›˜ç©ºé—´" #: lib/database.tcl:45 msgid "Number of packed objects" msgstr "压缩对象数é‡" #: lib/database.tcl:46 msgid "Number of packs" msgstr "压缩包数é‡" #: lib/database.tcl:47 msgid "Disk space used by packed objects" msgstr "压缩对象所使用的ç£ç›˜ç©ºé—´" #: lib/database.tcl:48 msgid "Packed objects waiting for pruning" msgstr "压缩对象ç‰å¾…清ç†" #: lib/database.tcl:49 msgid "Garbage files" msgstr "垃圾文件" #: lib/database.tcl:72 msgid "Compressing the object database" msgstr "压缩对象数æ®åº“" #: lib/database.tcl:83 msgid "Verifying the object database with fsck-objects" msgstr "使用 fsck-objects 验è¯å¯¹è±¡æ•°æ®åº“" #: lib/database.tcl:108 #, tcl-format msgid "" "This repository currently has approximately %i loose objects.\n" "\n" "To maintain optimal performance it is strongly recommended that you compress " "the database when more than %i loose objects exist.\n" "\n" "Compress the database now?" msgstr "" "该版本库当å‰çº¦æœ‰ %i 个æ¾æ•£å¯¹è±¡.\n" "\n" "ä¸ºè¾¾åˆ°è¾ƒä¼˜çš„æ€§èƒ½ï¼Œå¼ºçƒˆå»ºè®®ä½ åœ¨æ¾æ•£å¯¹è±¡å¤šäºŽ %i 时压缩数æ®åº“.\n" "\n" "现在就压缩数æ®åº“么?" #: lib/date.tcl:25 #, tcl-format msgid "Invalid date from Git: %s" msgstr "æ— æ•ˆçš„æ—¥æœŸ: %s" #: lib/diff.tcl:42 #, tcl-format msgid "" "No differences detected.\n" "\n" "%s has no changes.\n" "\n" "The modification date of this file was updated by another application, but " "the content within the file was not changed.\n" "\n" "A rescan will be automatically started to find other files which may have " "the same state." msgstr "" "未检测到改动.\n" "\n" "该文件的修改日期被å¦ä¸€ä¸ªç¨‹åºæ‰€æ›´æ–°, 但其内容并没有å˜åŒ–.\n" "\n" "对于类似情况的其他文件的é‡æ–°æ‰«æ将自动开始." #: lib/diff.tcl:81 #, fuzzy, tcl-format msgid "Loading diff of %s..." msgstr "装载 %s çš„ diff ..." #: lib/diff.tcl:114 lib/diff.tcl:184 #, tcl-format msgid "Unable to display %s" msgstr "æ— æ³•æ˜¾ç¤º %s" #: lib/diff.tcl:115 msgid "Error loading file:" msgstr "装载文件出错:" #: lib/diff.tcl:122 msgid "Git Repository (subproject)" msgstr "Git 版本库 (å项目)" #: lib/diff.tcl:134 msgid "* Binary file (not showing content)." msgstr "* 二进制文件 (ä¸æ˜¾ç¤ºå†…容)." #: lib/diff.tcl:185 msgid "Error loading diff:" msgstr "装载 diff 错误:" #: lib/diff.tcl:303 msgid "Failed to unstage selected hunk." msgstr "æ— æ³•å°†é€‰æ‹©çš„ä»£ç 段从缓å˜ä¸åˆ 除." #: lib/diff.tcl:310 msgid "Failed to stage selected hunk." msgstr "æ— æ³•ç¼“å˜æ‰€é€‰ä»£ç 段." #: lib/error.tcl:20 lib/error.tcl:114 msgid "error" msgstr "错误" #: lib/error.tcl:36 msgid "warning" msgstr "è¦å‘Š" #: lib/error.tcl:94 msgid "You must correct the above errors before committing." msgstr "ä½ å¿…é¡»åœ¨æ交å‰ä¿®æ£ä¸Šè¿°é”™è¯¯." #: lib/index.tcl:6 msgid "Unable to unlock the index." msgstr "æ— æ³•è§£é”ç¼“å˜ (index)" #: lib/index.tcl:15 msgid "Index Error" msgstr "缓å˜(Index)错误" #: lib/index.tcl:21 msgid "" "Updating the Git index failed. A rescan will be automatically started to " "resynchronize git-gui." msgstr "æ›´æ–° Git 缓å˜(Index)失败, é‡æ–°æ‰«æ将自动开始以é‡æ–°åŒæ¥ git-gui." #: lib/index.tcl:27 msgid "Continue" msgstr "继ç»" #: lib/index.tcl:31 msgid "Unlock Index" msgstr "è§£é” Index" #: lib/index.tcl:282 #, tcl-format msgid "Unstaging %s from commit" msgstr "从æ交缓å˜ä¸åˆ 除 %s" #: lib/index.tcl:313 #, fuzzy msgid "Ready to commit." msgstr "缓å˜ä¸ºæ交" #: lib/index.tcl:326 #, tcl-format msgid "Adding %s" msgstr "æ·»åŠ %s" #: lib/index.tcl:381 #, tcl-format msgid "Revert changes in file %s?" msgstr "撤销文件 %s ä¸çš„改动?" #: lib/index.tcl:383 #, tcl-format msgid "Revert changes in these %i files?" msgstr "撤销这些 (%i个) 文件的改动?" #: lib/index.tcl:391 msgid "Any unstaged changes will be permanently lost by the revert." msgstr "任何未缓å˜çš„改动将在这次撤销ä¸æ°¸ä¹…丢失." #: lib/index.tcl:394 msgid "Do Nothing" msgstr "ä¸åšæ“作" #: lib/merge.tcl:13 msgid "" "Cannot merge while amending.\n" "\n" "You must finish amending this commit before starting any type of merge.\n" msgstr "" "ä¿®æ£æ—¶æ— 法åšåˆå¹¶.\n" "\n" "ä½ å¿…é¡»å®Œæˆå¯¹è¯¥æ交的修æ£æ‰èƒ½ç»§ç»ä»»ä½•ç±»åž‹çš„åˆå¹¶æ“作.\n" #: lib/merge.tcl:27 msgid "" "Last scanned state does not match repository state.\n" "\n" "Another Git program has modified this repository since the last scan. A " "rescan must be performed before a merge can be performed.\n" "\n" "The rescan will be automatically started now.\n" msgstr "" "最åŽä¸€æ¬¡æ‰«æ的状æ€å’Œå½“å‰ç‰ˆæœ¬åº“状æ€ä¸ç¬¦.\n" "\n" "å¦ä¸€ Git 程åºè‡ªä¸Šæ¬¡æ‰«æåŽä¿®æ”¹äº†æœ¬ç‰ˆæœ¬åº“. 在修改当å‰åˆ†æ”¯ä¹‹å‰éœ€è¦é‡æ–°åšä¸€æ¬¡æ‰«" "æ.\n" "\n" "é‡æ–°æ‰«æ将自动开始.\n" #: lib/merge.tcl:44 #, tcl-format msgid "" "You are in the middle of a conflicted merge.\n" "\n" "File %s has merge conflicts.\n" "\n" "You must resolve them, stage the file, and commit to complete the current " "merge. Only then can you begin another merge.\n" msgstr "" "ä½ æ£å¤„在一个有冲çªçš„åˆå¹¶æ“作ä¸.\n" "\n" "文件 %s 有åˆå¹¶å†²çª.\n" "\n" "ä½ å¿…é¡»è§£å†³è¿™äº›å†²çª, 缓å˜è¯¥æ–‡ä»¶, 并æ交æ¥å®Œæˆå½“å‰çš„åˆå¹¶.ä»…å½“è¿™æ ·åŽæ‰èƒ½å¼€å§‹ä¸‹ä¸€" "个åˆå¹¶æ“作.\n" #: lib/merge.tcl:54 #, tcl-format msgid "" "You are in the middle of a change.\n" "\n" "File %s is modified.\n" "\n" "You should complete the current commit before starting a merge. Doing so " "will help you abort a failed merge, should the need arise.\n" msgstr "" "ä½ æ£å¤„在一个改动当ä¸.\n" "\n" "文件 %s 已被修改.\n" "\n" "ä½ å¿…é¡»å®Œæˆå½“å‰çš„æ交åŽæ‰èƒ½å¼€å§‹åˆå¹¶. 如果需è¦, 这么åšå°†æœ‰åŠ©äºŽä¸æ¢ä¸€æ¬¡å¤±è´¥çš„åˆ" "并.\n" #: lib/merge.tcl:106 #, tcl-format msgid "%s of %s" msgstr "" #: lib/merge.tcl:119 #, fuzzy, tcl-format msgid "Merging %s and %s..." msgstr "åˆå¹¶ %s å’Œ %s" #: lib/merge.tcl:130 msgid "Merge completed successfully." msgstr "åˆå¹¶æˆåŠŸå®Œæˆ." #: lib/merge.tcl:132 msgid "Merge failed. Conflict resolution is required." msgstr "åˆå¹¶å¤±è´¥. 需è¦è§£å†³å†²çª." #: lib/merge.tcl:157 #, tcl-format msgid "Merge Into %s" msgstr "åˆå¹¶åˆ° %s" #: lib/merge.tcl:176 msgid "Revision To Merge" msgstr "è¦åˆå¹¶çš„版本" #: lib/merge.tcl:211 msgid "" "Cannot abort while amending.\n" "\n" "You must finish amending this commit.\n" msgstr "" "ä¿®æ£æ“作ä¸æ— 法ä¸æ¢.\n" "\n" "ä½ å¿…é¡»å…ˆå®Œæˆæœ¬æ¬¡ä¿®æ£æ“作.\n" #: lib/merge.tcl:221 msgid "" "Abort merge?\n" "\n" "Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n" "\n" "Continue with aborting the current merge?" msgstr "" "ä¸æ¢åˆå¹¶?\n" "\n" "ä¸æ¢å½“å‰çš„åˆå¹¶æ“作将导致 *所有* 尚未æ交的改动丢失.\n" "\n" "是å¦è¦ç»§ç»ä¸æ¢å½“å‰çš„åˆå¹¶æ“作?" #: lib/merge.tcl:227 msgid "" "Reset changes?\n" "\n" "Resetting the changes will cause *ALL* uncommitted changes to be lost.\n" "\n" "Continue with resetting the current changes?" msgstr "" "是å¦å¤ä½å½“å‰æ”¹åŠ¨?\n" "\n" "å¤ä½å½“å‰çš„改动将导致 *所有* 未æ交的改动丢失.\n" "\n" "是å¦è¦ç»§ç»å¤ä½å½“å‰çš„改动?" #: lib/merge.tcl:238 msgid "Aborting" msgstr "ä¸æ¢" #: lib/merge.tcl:238 #, fuzzy msgid "files reset" msgstr "文件" #: lib/merge.tcl:265 msgid "Abort failed." msgstr "ä¸æ¢å¤±è´¥" #: lib/merge.tcl:267 msgid "Abort completed. Ready." msgstr "ä¸æ¢å®Œæˆ. 就绪." #: lib/option.tcl:95 msgid "Restore Defaults" msgstr "æ¢å¤é»˜è®¤å€¼" #: lib/option.tcl:99 msgid "Save" msgstr "ä¿å˜" #: lib/option.tcl:109 #, tcl-format msgid "%s Repository" msgstr "%s 版本库" #: lib/option.tcl:110 msgid "Global (All Repositories)" msgstr "全局 (所有版本库)" #: lib/option.tcl:116 msgid "User Name" msgstr "用户å" #: lib/option.tcl:117 msgid "Email Address" msgstr "Email 地å€" #: lib/option.tcl:119 msgid "Summarize Merge Commits" msgstr "概述åˆå¹¶æ交:" #: lib/option.tcl:120 msgid "Merge Verbosity" msgstr "åˆå¹¶å†—余度" #: lib/option.tcl:121 msgid "Show Diffstat After Merge" msgstr "在åˆå¹¶åŽæ˜¾ç¤º Diffstat" #: lib/option.tcl:123 msgid "Trust File Modification Timestamps" msgstr "相信文件的改动时间" #: lib/option.tcl:124 msgid "Prune Tracking Branches During Fetch" msgstr "获å–时清除跟踪分支" #: lib/option.tcl:125 msgid "Match Tracking Branches" msgstr "匹é…跟踪分支" #: lib/option.tcl:126 msgid "Number of Diff Context Lines" msgstr "Diff 上下文行数" #: lib/option.tcl:127 #, fuzzy msgid "Commit Message Text Width" msgstr "æ交æè¿°:" #: lib/option.tcl:128 msgid "New Branch Name Template" msgstr "新建分支命å模æ¿" #: lib/option.tcl:192 msgid "Spelling Dictionary:" msgstr "" #: lib/option.tcl:216 msgid "Change Font" msgstr "更改å—体" #: lib/option.tcl:220 #, tcl-format msgid "Choose %s" msgstr "选择 %s" #: lib/option.tcl:226 msgid "pt." msgstr "磅" #: lib/option.tcl:240 msgid "Preferences" msgstr "首选项" #: lib/option.tcl:275 msgid "Failed to completely save options:" msgstr "æ— æ³•å®Œå…¨ä¿å˜é€‰é¡¹:" #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 msgid "Delete Remote Branch" msgstr "åˆ é™¤è¿œç«¯åˆ†æ”¯" #: lib/remote_branch_delete.tcl:47 msgid "From Repository" msgstr "从版本库" #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123 msgid "Remote:" msgstr "Remote:" #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138 msgid "Arbitrary URL:" msgstr "ä»»æ„ URL:" #: lib/remote_branch_delete.tcl:84 msgid "Branches" msgstr "分支" #: lib/remote_branch_delete.tcl:109 msgid "Delete Only If" msgstr "åˆ é™¤ä»…å½“" #: lib/remote_branch_delete.tcl:111 msgid "Merged Into:" msgstr "åˆå¹¶åˆ°" #: lib/remote_branch_delete.tcl:119 msgid "Always (Do not perform merge checks)" msgstr "总是åˆå¹¶ (ä¸ä½œåˆå¹¶æ£€æŸ¥)" #: lib/remote_branch_delete.tcl:152 msgid "A branch is required for 'Merged Into'." msgstr "'åˆå¹¶åˆ°' 需è¦æŒ‡å®šæŸä¸ªåˆ†æ”¯" #: lib/remote_branch_delete.tcl:184 #, tcl-format msgid "" "The following branches are not completely merged into %s:\n" "\n" " - %s" msgstr "" "下列分支没有被全部åˆå¹¶åˆ° %s ä¸:\n" "\n" " - %s" #: lib/remote_branch_delete.tcl:189 #, tcl-format msgid "" "One or more of the merge tests failed because you have not fetched the " "necessary commits. Try fetching from %s first." msgstr "" "由于没有获å–到必è¦çš„æ交,一个或多个åˆå¹¶æµ‹è¯•å¤±è´¥ã€‚请å°è¯•ä»Ž %s 处先获å–。" #: lib/remote_branch_delete.tcl:207 msgid "Please select one or more branches to delete." msgstr "请选择æŸä¸ªæˆ–多个分支æ¥åˆ 除" #: lib/remote_branch_delete.tcl:216 msgid "" "Recovering deleted branches is difficult.\n" "\n" "Delete the selected branches?" msgstr "" "æ¢å¤è¢«åˆ 除的分支éžå¸¸å›°éš¾.\n" "\n" "是å¦è¦åˆ 除所选分支?" #: lib/remote_branch_delete.tcl:226 #, tcl-format msgid "Deleting branches from %s" msgstr "从 %s ä¸åˆ 除分支" #: lib/remote_branch_delete.tcl:286 msgid "No repository selected." msgstr "没有选择版本库" #: lib/remote_branch_delete.tcl:291 #, tcl-format msgid "Scanning %s..." msgstr "æ£åœ¨æ‰«æ %s..." #: lib/remote.tcl:165 msgid "Prune from" msgstr "从..清除(prune)" #: lib/remote.tcl:170 msgid "Fetch from" msgstr "从..获å–(fetch)" #: lib/remote.tcl:213 msgid "Push to" msgstr "ä¸Šä¼ åˆ°(push)" #: lib/shortcut.tcl:20 lib/shortcut.tcl:61 msgid "Cannot write shortcut:" msgstr "æ— æ³•ä¿®æ”¹å¿«æ·æ–¹å¼:" #: lib/shortcut.tcl:136 msgid "Cannot write icon:" msgstr "æ— æ³•ä¿®æ”¹å›¾æ ‡:" #: lib/spellcheck.tcl:57 msgid "Unsupported spell checker" msgstr "" #: lib/spellcheck.tcl:65 msgid "Spell checking is unavailable" msgstr "" #: lib/spellcheck.tcl:68 msgid "Invalid spell checking configuration" msgstr "" #: lib/spellcheck.tcl:70 #, tcl-format msgid "Reverting dictionary to %s." msgstr "" #: lib/spellcheck.tcl:73 msgid "Spell checker silently failed on startup" msgstr "" #: lib/spellcheck.tcl:80 msgid "Unrecognized spell checker" msgstr "" #: lib/spellcheck.tcl:180 msgid "No Suggestions" msgstr "" #: lib/spellcheck.tcl:381 msgid "Unexpected EOF from spell checker" msgstr "" #: lib/spellcheck.tcl:385 msgid "Spell Checker Failed" msgstr "" #: lib/status_bar.tcl:83 #, tcl-format msgid "%s ... %*i of %*i %s (%3i%%)" msgstr "%s ... %*i of %*i %s (%3i%%)" #: lib/transport.tcl:6 #, tcl-format msgid "fetch %s" msgstr "获å–(fetch)" #: lib/transport.tcl:7 #, tcl-format msgid "Fetching new changes from %s" msgstr "从 %s 处获å–新的改动" #: lib/transport.tcl:18 #, tcl-format msgid "remote prune %s" msgstr "清除远端 %s" #: lib/transport.tcl:19 #, tcl-format msgid "Pruning tracking branches deleted from %s" msgstr "清除" #: lib/transport.tcl:25 lib/transport.tcl:71 #, tcl-format msgid "push %s" msgstr "ä¸Šä¼ %s" #: lib/transport.tcl:26 #, tcl-format msgid "Pushing changes to %s" msgstr "ä¸Šä¼ æ”¹åŠ¨åˆ° %s" #: lib/transport.tcl:72 #, tcl-format msgid "Pushing %s %s to %s" msgstr "ä¸Šä¼ %s %s 到 %s" #: lib/transport.tcl:89 msgid "Push Branches" msgstr "ä¸Šä¼ åˆ†æ”¯" #: lib/transport.tcl:103 msgid "Source Branches" msgstr "æºç«¯åˆ†æ”¯:" #: lib/transport.tcl:120 msgid "Destination Repository" msgstr "ç›®æ ‡ç‰ˆæœ¬åº“" #: lib/transport.tcl:158 msgid "Transfer Options" msgstr "ä¼ è¾“é€‰é¡¹" #: lib/transport.tcl:160 msgid "Force overwrite existing branch (may discard changes)" msgstr "强制覆盖已有的分支 (å¯èƒ½ä¼šä¸¢å¤±æ”¹åŠ¨)" #: lib/transport.tcl:164 msgid "Use thin pack (for slow network connections)" msgstr "使用 thin pack (适用于低速网络连接)" #: lib/transport.tcl:168 msgid "Include tags" msgstr "包å«æ ‡ç¾"