@matheusbsbs / matheus-bagliano / commits / 312fd92b06
Fork 0

git-gui: translate the remaining messages in zh_cn.po to chinese

'make' shows: MSGFMT po/zh_cn.msg 368 translated, 2 fuzzy, 1 untranslated message. 1. update the zh_cn.po and translate the remaining messages in chinese 2. correct some of the previously mis-translated messages 3. add a list of word interpretation in the head as a guideline for subsequent updatings and translations Signed-off-by: eric miao <eric.miao@marvell.com> Acked-by: Xudong Guan <xudong.guan@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

eric miao committed Jan 6, 2008 at 17:47 UTC 312fd92b069d26dce20f53e8fa4efea04b12e009
1 file changed +673 -550
po/zh_cn.po
+673 -550
@@ -3,46 +3,63 @@
3 # This file is distributed under the same license as the git-gui package.
4 # Xudong Guan <xudong.guan@gmail.com>, 2007.
5 #
6 +# Please use the following translation throughout the file for consistence:
7 +#
8 +# repository 版本库
9 +# commit 提交
10 +# revision 版本
11 +# branch 分支
12 +# tag 标签
13 +# annotation 标注
14 +# merge 合并
15 +# fast forward 快速合并(??)
16 +# stage 缓存 (译自 index/cache)
17 +# amend 修正
18 +# reset 复位
19 +#
20 +# 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
21 +# FIXME: checkout 的标准翻译
22 +#
23 #, fuzzy
24 msgid ""
25 msgstr ""
26 "Project-Id-Version: git-gui\n"
27 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2007-10-10 04:04-0400\n"
28 +"POT-Creation-Date: 2007-11-24 10:36+0100\n"
29 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
13 -"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
30 +"Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n"
31 "Language-Team: Chinese\n"
32 "MIME-Version: 1.0\n"
33 "Content-Type: text/plain; charset=UTF-8\n"
34 "Content-Transfer-Encoding: 8bit\n"
35
19 -#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
20 -#: git-gui.sh:763
36 +#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
37 +#: git-gui.sh:733
38 msgid "git-gui: fatal error"
22 -msgstr ""
39 +msgstr "git-gui: 致命错误"
40
24 -#: git-gui.sh:595
41 +#: git-gui.sh:565
42 #, tcl-format
43 msgid "Invalid font specified in %s:"
27 -msgstr ""
44 +msgstr "%s 中指定的字体无效:"
45
29 -#: git-gui.sh:620
46 +#: git-gui.sh:590
47 msgid "Main Font"
31 -msgstr ""
48 +msgstr "主要字体"
49
33 -#: git-gui.sh:621
50 +#: git-gui.sh:591
51 msgid "Diff/Console Font"
35 -msgstr ""
52 +msgstr "Diff/控制终端字体"
53
37 -#: git-gui.sh:635
54 +#: git-gui.sh:605
55 msgid "Cannot find git in PATH."
39 -msgstr ""
56 +msgstr "PATH 中没有找到 git"
57
41 -#: git-gui.sh:662
58 +#: git-gui.sh:632
59 msgid "Cannot parse Git version string:"
43 -msgstr ""
60 +msgstr "无法解析 Git 的版本信息:"
61
45 -#: git-gui.sh:680
62 +#: git-gui.sh:650
63 #, tcl-format
64 msgid ""
65 "Git version cannot be determined.\n"
@@ -53,388 +70,386 @@ msgid ""
70 "\n"
71 "Assume '%s' is version 1.5.0?\n"
72 msgstr ""
73 +"无法确定 Git 的版本.\n"
74 +"\n"
75 +"%s 声明其版本为 '%s'.\n"
76 +"\n"
77 +"而 %s 需要 1.5.0 或这以后的 Git 版本.\n"
78 +"\n"
79 +"是否假定 '%s' 为版本 1.5.0?\n"
80
57 -#: git-gui.sh:853
81 +#: git-gui.sh:888
82 msgid "Git directory not found:"
59 -msgstr ""
83 +msgstr "Git 目录无法找到:"
84
61 -#: git-gui.sh:860
85 +#: git-gui.sh:895
86 msgid "Cannot move to top of working directory:"
63 -msgstr ""
87 +msgstr "无法移动到工作根目录:"
88
65 -#: git-gui.sh:867
89 +#: git-gui.sh:902
90 msgid "Cannot use funny .git directory:"
67 -msgstr ""
91 +msgstr "无法使用 .git 目录:"
92
69 -#: git-gui.sh:872
93 +#: git-gui.sh:907
94 msgid "No working directory"
71 -msgstr ""
95 +msgstr "没有工作目录"
96
73 -#: git-gui.sh:1019
97 +#: git-gui.sh:1054
98 msgid "Refreshing file status..."
75 -msgstr ""
99 +msgstr "更新文件状态..."
100
77 -#: git-gui.sh:1084
101 +#: git-gui.sh:1119
102 msgid "Scanning for modified files ..."
79 -msgstr ""
103 +msgstr "扫描修改过的文件 ..."
104
81 -#: git-gui.sh:1259 lib/browser.tcl:245
82 -#, fuzzy
105 +#: git-gui.sh:1294 lib/browser.tcl:245
106 msgid "Ready."
84 -msgstr "重做"
107 +msgstr "就绪"
108
86 -#: git-gui.sh:1525
109 +#: git-gui.sh:1560
110 msgid "Unmodified"
88 -msgstr ""
111 +msgstr "未修改"
112
90 -#: git-gui.sh:1527
113 +#: git-gui.sh:1562
114 msgid "Modified, not staged"
92 -msgstr ""
115 +msgstr "修改但未缓存"
116
94 -#: git-gui.sh:1528 git-gui.sh:1533
95 -#, fuzzy
117 +#: git-gui.sh:1563 git-gui.sh:1568
118 msgid "Staged for commit"
97 -msgstr "从本次提交移除"
119 +msgstr "缓存为提交"
120
99 -#: git-gui.sh:1529 git-gui.sh:1534
100 -#, fuzzy
121 +#: git-gui.sh:1564 git-gui.sh:1569
122 msgid "Portions staged for commit"
102 -msgstr "从本次提交移除"
123 +msgstr "部分缓存为提交"
124
104 -#: git-gui.sh:1530 git-gui.sh:1535
125 +#: git-gui.sh:1565 git-gui.sh:1570
126 msgid "Staged for commit, missing"
106 -msgstr ""
127 +msgstr "缓存为提交, 不存在"
128
108 -#: git-gui.sh:1532
129 +#: git-gui.sh:1567
130 msgid "Untracked, not staged"
110 -msgstr ""
131 +msgstr "未跟踪, 未缓存"
132
112 -#: git-gui.sh:1537
133 +#: git-gui.sh:1572
134 msgid "Missing"
114 -msgstr ""
135 +msgstr "不存在"
136
116 -#: git-gui.sh:1538
137 +#: git-gui.sh:1573
138 msgid "Staged for removal"
118 -msgstr ""
139 +msgstr "缓存为删除"
140
120 -#: git-gui.sh:1539
141 +#: git-gui.sh:1574
142 msgid "Staged for removal, still present"
122 -msgstr ""
143 +msgstr "缓存为删除, 但仍存在"
144
124 -#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
145 +#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
146 msgid "Requires merge resolution"
126 -msgstr ""
147 +msgstr "需要解决合并冲突"
148
128 -#: git-gui.sh:1579
149 +#: git-gui.sh:1614
150 msgid "Starting gitk... please wait..."
130 -msgstr ""
151 +msgstr "启动 gitk... 请等待..."
152
132 -#: git-gui.sh:1588
153 +#: git-gui.sh:1623
154 #, tcl-format
155 msgid ""
156 "Unable to start gitk:\n"
157 "\n"
158 "%s does not exist"
159 msgstr ""
160 +"无法启动 gitk:\n"
161 +"\n"
162 +"%s 不存在"
163
140 -#: git-gui.sh:1788 lib/choose_repository.tcl:32
164 +#: git-gui.sh:1823 lib/choose_repository.tcl:35
165 msgid "Repository"
142 -msgstr "版本树"
166 +msgstr "版本库(repository)"
167
144 -#: git-gui.sh:1789
168 +#: git-gui.sh:1824
169 msgid "Edit"
170 msgstr "编辑"
171
148 -#: git-gui.sh:1791 lib/choose_rev.tcl:560
172 +#: git-gui.sh:1826 lib/choose_rev.tcl:560
173 msgid "Branch"
150 -msgstr "分支"
174 +msgstr "分支(branch)"
175
152 -#: git-gui.sh:1794 lib/choose_rev.tcl:547
153 -#, fuzzy
176 +#: git-gui.sh:1829 lib/choose_rev.tcl:547
177 msgid "Commit@@noun"
155 -msgstr "提交"
178 +msgstr "提交(commit)"
179
157 -#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
180 +#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
181 msgid "Merge"
159 -msgstr "合并"
182 +msgstr "合并(merge)"
183
161 -#: git-gui.sh:1798 lib/choose_rev.tcl:556
162 -#, fuzzy
184 +#: git-gui.sh:1833 lib/choose_rev.tcl:556
185 msgid "Remote"
164 -msgstr "改名..."
186 +msgstr "远端(remote)"
187
166 -#: git-gui.sh:1807
188 +#: git-gui.sh:1842
189 msgid "Browse Current Branch's Files"
168 -msgstr "浏览当前分支文件"
190 +msgstr "浏览当前分支上的文件"
191
170 -#: git-gui.sh:1811
171 -#, fuzzy
192 +#: git-gui.sh:1846
193 msgid "Browse Branch Files..."
173 -msgstr "浏览当前分支文件"
194 +msgstr "浏览分支上的文件..."
195
175 -#: git-gui.sh:1816
196 +#: git-gui.sh:1851
197 msgid "Visualize Current Branch's History"
177 -msgstr "调用gitk显示当前分支"
198 +msgstr "图示当前分支的历史"
199
179 -#: git-gui.sh:1820
200 +#: git-gui.sh:1855
201 msgid "Visualize All Branch History"
181 -msgstr "调用gitk显示所有分支"
202 +msgstr "图示所有分支的历史"
203
183 -#: git-gui.sh:1827
184 -#, fuzzy, tcl-format
204 +#: git-gui.sh:1862
205 +#, tcl-format
206 msgid "Browse %s's Files"
186 -msgstr "浏览当前分支文件"
207 +msgstr "浏览 %s 上的文件"
208
188 -#: git-gui.sh:1829
189 -#, fuzzy, tcl-format
209 +#: git-gui.sh:1864
210 +#, tcl-format
211 msgid "Visualize %s's History"
191 -msgstr "调用gitk显示所有分支"
212 +msgstr "图示 %s 分支的历史"
213
193 -#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
214 +#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
215 msgid "Database Statistics"
195 -msgstr "数据库统计数据"
216 +msgstr "数据库统计信息"
217
197 -#: git-gui.sh:1837 lib/database.tcl:34
218 +#: git-gui.sh:1872 lib/database.tcl:34
219 msgid "Compress Database"
220 msgstr "压缩数据库"
221
201 -#: git-gui.sh:1840
222 +#: git-gui.sh:1875
223 msgid "Verify Database"
224 msgstr "验证数据库"
225
205 -#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
206 -#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
226 +#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
227 +#: lib/shortcut.tcl:39 lib/shortcut.tcl:71
228 msgid "Create Desktop Icon"
229 msgstr "创建桌面图标"
230
210 -#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
231 +#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
232 msgid "Quit"
233 msgstr "退出"
234
214 -#: git-gui.sh:1867
235 +#: git-gui.sh:1902
236 msgid "Undo"
237 msgstr "撤销"
238
218 -#: git-gui.sh:1870
239 +#: git-gui.sh:1905
240 msgid "Redo"
241 msgstr "重做"
242
222 -#: git-gui.sh:1874 git-gui.sh:2366
243 +#: git-gui.sh:1909 git-gui.sh:2403
244 msgid "Cut"
245 msgstr "剪切"
246
226 -#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
247 +#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
248 #: lib/console.tcl:67
249 msgid "Copy"
250 msgstr "复制"
251
231 -#: git-gui.sh:1880 git-gui.sh:2372
252 +#: git-gui.sh:1915 git-gui.sh:2409
253 msgid "Paste"
254 msgstr "粘贴"
255
235 -#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
256 +#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
257 #: lib/remote_branch_delete.tcl:38
258 msgid "Delete"
259 msgstr "删除"
260
240 -#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
261 +#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
262 msgid "Select All"
263 msgstr "全选"
264
244 -#: git-gui.sh:1896
265 +#: git-gui.sh:1931
266 msgid "Create..."
267 msgstr "新建..."
268
248 -#: git-gui.sh:1902
269 +#: git-gui.sh:1937
270 msgid "Checkout..."
250 -msgstr "切换..."
271 +msgstr "Checkout..."
272
252 -#: git-gui.sh:1908
273 +#: git-gui.sh:1943
274 msgid "Rename..."
254 -msgstr "改名..."
275 +msgstr "更名..."
276
256 -#: git-gui.sh:1913 git-gui.sh:2012
277 +#: git-gui.sh:1948 git-gui.sh:2048
278 msgid "Delete..."
279 msgstr "删除..."
280
260 -#: git-gui.sh:1918
281 +#: git-gui.sh:1953
282 msgid "Reset..."
262 -msgstr "重置所有修动..."
283 +msgstr "复位(Reset)..."
284
264 -#: git-gui.sh:1930 git-gui.sh:2313
285 +#: git-gui.sh:1965 git-gui.sh:2350
286 msgid "New Commit"
266 -msgstr "新提交"
287 +msgstr "新建提交"
288
268 -#: git-gui.sh:1938 git-gui.sh:2320
289 +#: git-gui.sh:1973 git-gui.sh:2357
290 msgid "Amend Last Commit"
270 -msgstr "修订上次提交"
291 +msgstr "修正上次提交"
292
272 -#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
293 +#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
294 msgid "Rescan"
295 msgstr "重新扫描"
296
276 -#: git-gui.sh:1953
277 -#, fuzzy
297 +#: git-gui.sh:1988
298 msgid "Stage To Commit"
279 -msgstr "从本次提交移除"
299 +msgstr "缓存为提交"
300
281 -#: git-gui.sh:1958
282 -#, fuzzy
301 +#: git-gui.sh:1994
302 msgid "Stage Changed Files To Commit"
284 -msgstr "将被提交的修改"
303 +msgstr "缓存修改的文件为提交"
304
286 -#: git-gui.sh:1964
305 +#: git-gui.sh:2000
306 msgid "Unstage From Commit"
288 -msgstr "从本次提交移除"
307 +msgstr "从本次提交撤除"
308
290 -#: git-gui.sh:1969 lib/index.tcl:352
309 +#: git-gui.sh:2005 lib/index.tcl:393
310 msgid "Revert Changes"
292 -msgstr "恢复修改"
311 +msgstr "撤销修改"
312
294 -#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
313 +#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
314 msgid "Sign Off"
296 -msgstr "签名"
315 +msgstr "签名(Sign Off)"
316
298 -#: git-gui.sh:1980 git-gui.sh:2296
299 -#, fuzzy
317 +#: git-gui.sh:2016 git-gui.sh:2333
318 msgid "Commit@@verb"
319 msgstr "提交"
320
303 -#: git-gui.sh:1991
321 +#: git-gui.sh:2027
322 msgid "Local Merge..."
323 msgstr "本地合并..."
324
307 -#: git-gui.sh:1996
325 +#: git-gui.sh:2032
326 msgid "Abort Merge..."
309 -msgstr "取消合并..."
327 +msgstr "中止合并..."
328
311 -#: git-gui.sh:2008
329 +#: git-gui.sh:2044
330 msgid "Push..."
331 msgstr "上传..."
332
315 -#: git-gui.sh:2019 lib/choose_repository.tcl:41
333 +#: git-gui.sh:2055 lib/choose_repository.tcl:40
334 msgid "Apple"
335 msgstr "苹果"
336
319 -#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
320 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
337 +#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
338 +#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
339 #, tcl-format
340 msgid "About %s"
323 -msgstr "关于%s"
341 +msgstr "关于 %s"
342
325 -#: git-gui.sh:2026
343 +#: git-gui.sh:2062
344 msgid "Preferences..."
327 -msgstr ""
345 +msgstr "首选项..."
346
329 -#: git-gui.sh:2034 git-gui.sh:2558
347 +#: git-gui.sh:2070 git-gui.sh:2595
348 msgid "Options..."
349 msgstr "选项..."
350
333 -#: git-gui.sh:2040 lib/choose_repository.tcl:47
351 +#: git-gui.sh:2076 lib/choose_repository.tcl:46
352 msgid "Help"
353 msgstr "帮助"
354
337 -#: git-gui.sh:2081
355 +#: git-gui.sh:2117
356 msgid "Online Documentation"
357 msgstr "在线文档"
358
341 -#: git-gui.sh:2165
359 +#: git-gui.sh:2201
360 #, tcl-format
361 msgid "fatal: cannot stat path %s: No such file or directory"
344 -msgstr ""
362 +msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
363
346 -#: git-gui.sh:2198
364 +#: git-gui.sh:2234
365 msgid "Current Branch:"
366 msgstr "当前分支:"
367
350 -#: git-gui.sh:2219
351 -#, fuzzy
368 +#: git-gui.sh:2255
369 msgid "Staged Changes (Will Commit)"
353 -msgstr "将被提交的修改"
370 +msgstr "已缓存的改动 (将被提交)"
371
355 -#: git-gui.sh:2239
372 +#: git-gui.sh:2274
373 msgid "Unstaged Changes"
357 -msgstr ""
374 +msgstr "未缓存的改动"
375
359 -#: git-gui.sh:2286
376 +#: git-gui.sh:2323
377 msgid "Stage Changed"
361 -msgstr ""
378 +msgstr "缓存改动"
379
363 -#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
380 +#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
381 msgid "Push"
382 msgstr "上传"
383
367 -#: git-gui.sh:2332
384 +#: git-gui.sh:2369
385 msgid "Initial Commit Message:"
369 -msgstr "初始提交描述:"
386 +msgstr "初始的提交描述:"
387
371 -#: git-gui.sh:2333
388 +#: git-gui.sh:2370
389 msgid "Amended Commit Message:"
373 -msgstr "修订提交描述:"
390 +msgstr "修正的提交描述:"
391
375 -#: git-gui.sh:2334
392 +#: git-gui.sh:2371
393 msgid "Amended Initial Commit Message:"
377 -msgstr "修订初始提交描述:"
394 +msgstr "修正的初始提交描述:"
395
379 -#: git-gui.sh:2335
396 +#: git-gui.sh:2372
397 msgid "Amended Merge Commit Message:"
381 -msgstr "修订合并提交描述:"
398 +msgstr "修正的合并提交描述:"
399
383 -#: git-gui.sh:2336
400 +#: git-gui.sh:2373
401 msgid "Merge Commit Message:"
402 msgstr "合并提交描述:"
403
387 -#: git-gui.sh:2337
404 +#: git-gui.sh:2374
405 msgid "Commit Message:"
406 msgstr "提交描述:"
407
391 -#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
408 +#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
409 msgid "Copy All"
410 msgstr "全部复制"
411
395 -#: git-gui.sh:2406 lib/blame.tcl:104
412 +#: git-gui.sh:2443 lib/blame.tcl:104
413 msgid "File:"
397 -msgstr ""
414 +msgstr "文件:"
415
399 -#: git-gui.sh:2508
416 +#: git-gui.sh:2545
417 msgid "Refresh"
418 msgstr "刷新"
419
403 -#: git-gui.sh:2529
420 +#: git-gui.sh:2566
421 msgid "Apply/Reverse Hunk"
422 msgstr "应用/撤消此修改块"
423
407 -#: git-gui.sh:2535
424 +#: git-gui.sh:2572
425 msgid "Decrease Font Size"
426 msgstr "缩小字体"
427
411 -#: git-gui.sh:2539
428 +#: git-gui.sh:2576
429 msgid "Increase Font Size"
430 msgstr "放大字体"
431
415 -#: git-gui.sh:2544
432 +#: git-gui.sh:2581
433 msgid "Show Less Context"
417 -msgstr "显示更多diff上下文"
434 +msgstr "显示更少上下文"
435
419 -#: git-gui.sh:2551
436 +#: git-gui.sh:2588
437 msgid "Show More Context"
421 -msgstr "显示更少diff上下文"
438 +msgstr "显示更多上下文"
439
423 -#: git-gui.sh:2565
424 -#, fuzzy
440 +#: git-gui.sh:2602
441 msgid "Unstage Hunk From Commit"
426 -msgstr "从本次提交移除"
442 +msgstr "从提交中撤除修改块"
443
428 -#: git-gui.sh:2567
429 -#, fuzzy
444 +#: git-gui.sh:2604
445 msgid "Stage Hunk For Commit"
431 -msgstr "从本次提交移除"
446 +msgstr "缓存修改块为提交"
447
433 -#: git-gui.sh:2586
448 +#: git-gui.sh:2623
449 msgid "Initializing..."
435 -msgstr ""
450 +msgstr "初始化..."
451
437 -#: git-gui.sh:2677
452 +#: git-gui.sh:2718
453 #, tcl-format
454 msgid ""
455 "Possible environment issues exist.\n"
@@ -444,15 +459,22 @@ msgid ""
459 "by %s:\n"
460 "\n"
461 msgstr ""
462 +"可能存在环境变量的问题.\n"
463 +"\n"
464 +"由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
465 +"\n"
466
448 -#: git-gui.sh:2707
467 +#: git-gui.sh:2748
468 msgid ""
469 "\n"
470 "This is due to a known issue with the\n"
471 "Tcl binary distributed by Cygwin."
472 msgstr ""
473 +"\n"
474 +"这是由 Cygwin 发布的 Tcl 代码中一个\n"
475 +"已知问题所引起."
476
455 -#: git-gui.sh:2712
477 +#: git-gui.sh:2753
478 #, tcl-format
479 msgid ""
480 "\n"
@@ -462,206 +484,197 @@ msgid ""
484 "user.email settings into your personal\n"
485 "~/.gitconfig file.\n"
486 msgstr ""
487 +"\n"
488 +"\n"
489 +"%s 的一个很好的替代方案是将 user.name 以及\n"
490 +"user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
491
492 #: lib/about.tcl:25
493 msgid "git-gui - a graphical user interface for Git."
468 -msgstr ""
494 +msgstr "git-gui - Git 的图形化用户界面"
495
496 #: lib/blame.tcl:77
497 msgid "File Viewer"
472 -msgstr ""
498 +msgstr "文件查看器"
499
500 #: lib/blame.tcl:81
475 -#, fuzzy
501 msgid "Commit:"
477 -msgstr "提交"
502 +msgstr "提交:"
503
504 #: lib/blame.tcl:249
480 -#, fuzzy
505 msgid "Copy Commit"
482 -msgstr "提交"
506 +msgstr "复制提交"
507
508 #: lib/blame.tcl:369
509 #, tcl-format
510 msgid "Reading %s..."
487 -msgstr ""
511 +msgstr "读取 %s..."
512
513 #: lib/blame.tcl:473
514 msgid "Loading copy/move tracking annotations..."
491 -msgstr ""
515 +msgstr "装载复制/移动跟踪标注..."
516
517 #: lib/blame.tcl:493
518 msgid "lines annotated"
495 -msgstr ""
519 +msgstr "标注行"
520
521 #: lib/blame.tcl:674
522 msgid "Loading original location annotations..."
499 -msgstr ""
523 +msgstr "装载原始位置标注..."
524
525 #: lib/blame.tcl:677
526 msgid "Annotation complete."
503 -msgstr ""
527 +msgstr "标注完成."
528
529 #: lib/blame.tcl:731
530 msgid "Loading annotation..."
507 -msgstr ""
531 +msgstr "裝載标注..."
532
533 #: lib/blame.tcl:787
534 msgid "Author:"
511 -msgstr ""
535 +msgstr "作者:"
536
537 #: lib/blame.tcl:791
514 -#, fuzzy
538 msgid "Committer:"
516 -msgstr "提交"
539 +msgstr "提交者:"
540
541 #: lib/blame.tcl:796
542 msgid "Original File:"
520 -msgstr ""
543 +msgstr "原始文件:"
544
545 #: lib/blame.tcl:910
546 msgid "Originally By:"
524 -msgstr ""
547 +msgstr "最初由:"
548
549 #: lib/blame.tcl:916
550 msgid "In File:"
528 -msgstr ""
551 +msgstr "在文件:"
552
553 #: lib/blame.tcl:921
554 msgid "Copied Or Moved Here By:"
532 -msgstr ""
555 +msgstr "由复制或移动至此:"
556
557 #: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
535 -#, fuzzy
558 msgid "Checkout Branch"
537 -msgstr "当前分支:"
559 +msgstr "Checkout 分支"
560
561 #: lib/branch_checkout.tcl:23
540 -#, fuzzy
562 msgid "Checkout"
542 -msgstr "切换..."
563 +msgstr "Checkout"
564
565 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
566 #: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
567 #: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
568 #: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
569 msgid "Cancel"
549 -msgstr ""
570 +msgstr "取消"
571
572 #: lib/branch_checkout.tcl:32 lib/browser.tcl:286
573 msgid "Revision"
553 -msgstr ""
574 +msgstr "版本"
575
576 #: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
556 -#, fuzzy
577 msgid "Options"
578 msgstr "选项..."
579
580 #: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
581 msgid "Fetch Tracking Branch"
562 -msgstr ""
582 +msgstr "获取跟踪分支"
583
584 #: lib/branch_checkout.tcl:44
585 msgid "Detach From Local Branch"
566 -msgstr ""
586 +msgstr "从本地分支脱离"
587
588 #: lib/branch_create.tcl:22
569 -#, fuzzy
589 msgid "Create Branch"
571 -msgstr "当前分支:"
590 +msgstr "创建分支"
591
592 #: lib/branch_create.tcl:27
574 -#, fuzzy
593 msgid "Create New Branch"
576 -msgstr "当前分支:"
594 +msgstr "新建分支"
595
578 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
579 -#, fuzzy
596 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
597 msgid "Create"
581 -msgstr "新建..."
598 +msgstr "新建"
599
600 #: lib/branch_create.tcl:40
584 -#, fuzzy
601 msgid "Branch Name"
586 -msgstr "分支"
602 +msgstr "分支名"
603
604 #: lib/branch_create.tcl:43
605 msgid "Name:"
590 -msgstr ""
606 +msgstr "名字:"
607
608 #: lib/branch_create.tcl:58
609 msgid "Match Tracking Branch Name"
594 -msgstr ""
610 +msgstr "匹配跟踪分支名字"
611
612 #: lib/branch_create.tcl:66
613 msgid "Starting Revision"
598 -msgstr ""
614 +msgstr "起始版本"
615
616 #: lib/branch_create.tcl:72
617 msgid "Update Existing Branch:"
602 -msgstr ""
618 +msgstr "更新已有分支:"
619
620 #: lib/branch_create.tcl:75
621 msgid "No"
606 -msgstr ""
622 +msgstr "号码"
623
624 #: lib/branch_create.tcl:80
625 msgid "Fast Forward Only"
610 -msgstr ""
626 +msgstr "仅快速合并"
627
628 #: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
613 -#, fuzzy
629 msgid "Reset"
615 -msgstr "重置所有修动..."
630 +msgstr "复位"
631
632 #: lib/branch_create.tcl:97
633 msgid "Checkout After Creation"
619 -msgstr ""
634 +msgstr "在创建后Checkout"
635
636 #: lib/branch_create.tcl:131
637 msgid "Please select a tracking branch."
623 -msgstr ""
638 +msgstr "请选择某个跟踪分支."
639
640 #: lib/branch_create.tcl:140
641 #, tcl-format
642 msgid "Tracking branch %s is not a branch in the remote repository."
628 -msgstr ""
643 +msgstr "跟踪分支 %s 并不是远端版本库中的一个分支"
644
645 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
646 msgid "Please supply a branch name."
632 -msgstr ""
647 +msgstr "请提供分支名字."
648
649 #: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
650 #, tcl-format
651 msgid "'%s' is not an acceptable branch name."
637 -msgstr ""
652 +msgstr "'%s'不是一个可接受的分支名."
653
654 #: lib/branch_delete.tcl:15
640 -#, fuzzy
655 msgid "Delete Branch"
642 -msgstr "当前分支:"
656 +msgstr "删除分支"
657
658 #: lib/branch_delete.tcl:20
659 msgid "Delete Local Branch"
646 -msgstr ""
660 +msgstr "删除本地分支"
661
662 #: lib/branch_delete.tcl:37
649 -#, fuzzy
663 msgid "Local Branches"
651 -msgstr "分支"
664 +msgstr "本地分支"
665
666 #: lib/branch_delete.tcl:52
667 msgid "Delete Only If Merged Into"
655 -msgstr ""
668 +msgstr "仅在合并后删除"
669
670 #: lib/branch_delete.tcl:54
671 msgid "Always (Do not perform merge test.)"
659 -msgstr ""
672 +msgstr "总是合并 (不作合并测试.)"
673
674 #: lib/branch_delete.tcl:103
675 #, tcl-format
676 msgid "The following branches are not completely merged into %s:"
664 -msgstr ""
677 +msgstr "下列分支没有完全被合并到 %s:"
678
679 #: lib/branch_delete.tcl:115
680 msgid ""
@@ -669,6 +682,9 @@ msgid ""
682 "\n"
683 " Delete the selected branches?"
684 msgstr ""
685 +"恢复被删除的分支非常困难.\n"
686 +"\n"
687 +"是否要删除所选分支?"
688
689 #: lib/branch_delete.tcl:141
690 #, tcl-format
@@ -676,86 +692,84 @@ msgid ""
692 "Failed to delete branches:\n"
693 "%s"
694 msgstr ""
695 +"无法删除分支:\n"
696 +"%s"
697
698 #: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
681 -#, fuzzy
699 msgid "Rename Branch"
683 -msgstr "当前分支:"
700 +msgstr "更改分支名:"
701
702 #: lib/branch_rename.tcl:26
686 -#, fuzzy
703 msgid "Rename"
688 -msgstr "改名..."
704 +msgstr "更名..."
705
706 #: lib/branch_rename.tcl:36
691 -#, fuzzy
707 msgid "Branch:"
693 -msgstr "分支"
708 +msgstr "分支:"
709
710 #: lib/branch_rename.tcl:39
711 msgid "New Name:"
697 -msgstr ""
712 +msgstr "新名字:"
713
714 #: lib/branch_rename.tcl:75
715 msgid "Please select a branch to rename."
701 -msgstr ""
716 +msgstr "请选择分支更名."
717
718 #: lib/branch_rename.tcl:96 lib/checkout_op.tcl:179
719 #, tcl-format
720 msgid "Branch '%s' already exists."
706 -msgstr ""
721 +msgstr "分支 '%s' 已经存在."
722
723 #: lib/branch_rename.tcl:117
724 #, tcl-format
725 msgid "Failed to rename '%s'."
711 -msgstr ""
726 +msgstr "无法更名 '%s'."
727
728 #: lib/browser.tcl:17
729 msgid "Starting..."
715 -msgstr ""
730 +msgstr "开始..."
731
732 #: lib/browser.tcl:26
733 msgid "File Browser"
719 -msgstr ""
734 +msgstr "文件浏览器"
735
736 #: lib/browser.tcl:125 lib/browser.tcl:142
737 #, tcl-format
738 msgid "Loading %s..."
724 -msgstr ""
739 +msgstr "装载 %s..."
740
741 #: lib/browser.tcl:186
742 msgid "[Up To Parent]"
728 -msgstr ""
743 +msgstr "[上层目录]"
744
745 #: lib/browser.tcl:266 lib/browser.tcl:272
731 -#, fuzzy
746 msgid "Browse Branch Files"
733 -msgstr "浏览当前分支文件"
747 +msgstr "浏览分支文件"
748
735 -#: lib/browser.tcl:277 lib/choose_repository.tcl:215
736 -#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
737 -#: lib/choose_repository.tcl:811
749 +#: lib/browser.tcl:277 lib/choose_repository.tcl:391
750 +#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
751 +#: lib/choose_repository.tcl:989
752 msgid "Browse"
739 -msgstr ""
753 +msgstr "浏览"
754
755 #: lib/checkout_op.tcl:79
756 #, tcl-format
757 msgid "Fetching %s from %s"
744 -msgstr ""
758 +msgstr "获取 %s 自 %s"
759
760 #: lib/checkout_op.tcl:127
761 #, tcl-format
762 msgid "fatal: Cannot resolve %s"
749 -msgstr ""
763 +msgstr "致命错误: 无法解决 %s"
764
765 #: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
766 msgid "Close"
753 -msgstr ""
767 +msgstr "关闭"
768
769 #: lib/checkout_op.tcl:169
770 #, tcl-format
771 msgid "Branch '%s' does not exist."
758 -msgstr ""
772 +msgstr "分支 '%s' 并不存在."
773
774 #: lib/checkout_op.tcl:206
775 #, tcl-format
@@ -765,20 +779,24 @@ msgid ""
779 "It cannot fast-forward to %s.\n"
780 "A merge is required."
781 msgstr ""
782 +"分支 '%s' 已经存在.\n"
783 +"\n"
784 +"无法快速合并到 %s.\n"
785 +"需要普通合并."
786
787 #: lib/checkout_op.tcl:220
788 #, tcl-format
789 msgid "Merge strategy '%s' not supported."
772 -msgstr ""
790 +msgstr "合并策略 '%s' 不支持."
791
792 #: lib/checkout_op.tcl:239
793 #, tcl-format
794 msgid "Failed to update '%s'."
777 -msgstr ""
795 +msgstr "无法更新 '%s'."
796
797 #: lib/checkout_op.tcl:251
798 msgid "Staging area (index) is already locked."
781 -msgstr ""
799 +msgstr "缓存区域 (index) 已被锁定."
800
801 #: lib/checkout_op.tcl:266
802 msgid ""
@@ -789,25 +807,31 @@ msgid ""
807 "\n"
808 "The rescan will be automatically started now.\n"
809 msgstr ""
810 +"最后一次扫描的状态和当前版本库状态不符.\n"
811 +"\n"
812 +"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
813 +"描.\n"
814 +"\n"
815 +"重新扫描将自动开始.\n"
816
817 #: lib/checkout_op.tcl:322
818 #, tcl-format
819 msgid "Updating working directory to '%s'..."
796 -msgstr ""
820 +msgstr "更新工作目录到 '%s'..."
821
822 #: lib/checkout_op.tcl:353
823 #, tcl-format
824 msgid "Aborted checkout of '%s' (file level merging is required)."
801 -msgstr ""
825 +msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
826
827 #: lib/checkout_op.tcl:354
828 msgid "File level merge required."
805 -msgstr ""
829 +msgstr "需要文件级合并."
830
831 #: lib/checkout_op.tcl:358
832 #, tcl-format
833 msgid "Staying on branch '%s'."
810 -msgstr ""
834 +msgstr "停留在分支 '%s'."
835
836 #: lib/checkout_op.tcl:429
837 msgid ""
@@ -816,29 +840,32 @@ msgid ""
840 "If you wanted to be on a branch, create one now starting from 'This Detached "
841 "Checkout'."
842 msgstr ""
843 +"你不在某个本地分支上.\n"
844 +"\n"
845 +"如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
846
847 #: lib/checkout_op.tcl:446
821 -#, fuzzy, tcl-format
848 +#, tcl-format
849 msgid "Checked out '%s'."
823 -msgstr "切换..."
850 +msgstr "'%s' 已被 checkout"
851
852 #: lib/checkout_op.tcl:478
853 #, tcl-format
854 msgid "Resetting '%s' to '%s' will lose the following commits:"
828 -msgstr ""
855 +msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
856
857 #: lib/checkout_op.tcl:500
858 msgid "Recovering lost commits may not be easy."
832 -msgstr ""
859 +msgstr "恢复丢失的提交是比较困难的."
860
861 #: lib/checkout_op.tcl:505
862 #, tcl-format
863 msgid "Reset '%s'?"
837 -msgstr ""
864 +msgstr "复位 '%s'?"
865
866 #: lib/checkout_op.tcl:510 lib/merge.tcl:164
867 msgid "Visualize"
841 -msgstr ""
868 +msgstr "图示"
869
870 #: lib/checkout_op.tcl:578
871 #, tcl-format
@@ -850,286 +877,301 @@ msgid ""
877 "\n"
878 "This should not have occurred. %s will now close and give up."
879 msgstr ""
880 +"无法设定当前分支.\n"
881 +"\n"
882 +"当前工作目录仅有部分被切换出, 我们已成功的更新了您的文件但是无法更新某个内部"
883 +"的Git文件.\n"
884 +"\n"
885 +"这本不该发生, %s 将关闭并放弃."
886
887 #: lib/choose_font.tcl:39
855 -#, fuzzy
888 msgid "Select"
857 -msgstr "全选"
889 +msgstr "选择"
890
891 #: lib/choose_font.tcl:53
892 msgid "Font Family"
861 -msgstr ""
893 +msgstr "字体族"
894
895 #: lib/choose_font.tcl:73
864 -#, fuzzy
896 msgid "Font Size"
866 -msgstr "缩小字体"
897 +msgstr "字体大小"
898
899 #: lib/choose_font.tcl:90
900 msgid "Font Example"
870 -msgstr ""
901 +msgstr "字体样例"
902
903 #: lib/choose_font.tcl:101
904 msgid ""
905 "This is example text.\n"
906 "If you like this text, it can be your font."
907 msgstr ""
908 +"这是样例文本.\n"
909 +"如果你喜欢, 你可以设置该字体."
910
878 -#: lib/choose_repository.tcl:25
911 +#: lib/choose_repository.tcl:27
912 msgid "Git Gui"
880 -msgstr ""
913 +msgstr "Git Gui"
914
882 -#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
883 -#, fuzzy
915 +#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
916 msgid "Create New Repository"
885 -msgstr "版本树"
917 +msgstr "创建新的版本库"
918
887 -#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
888 -#, fuzzy
919 +#: lib/choose_repository.tcl:86
920 +msgid "New..."
921 +msgstr "新建..."
922 +
923 +#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
924 msgid "Clone Existing Repository"
890 -msgstr "版本树"
925 +msgstr "克隆已有版本库"
926
892 -#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
893 -#, fuzzy
927 +#: lib/choose_repository.tcl:99
928 +msgid "Clone..."
929 +msgstr "克隆..."
930 +
931 +#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
932 msgid "Open Existing Repository"
895 -msgstr "版本树"
933 +msgstr "打开已有版本库"
934
897 -#: lib/choose_repository.tcl:91
898 -msgid "Next >"
899 -msgstr ""
935 +#: lib/choose_repository.tcl:112
936 +msgid "Open..."
937 +msgstr "打开..."
938
901 -#: lib/choose_repository.tcl:152
939 +#: lib/choose_repository.tcl:125
940 +msgid "Recent Repositories"
941 +msgstr "最近版本库"
942 +
943 +#: lib/choose_repository.tcl:131
944 +msgid "Open Recent Repository:"
945 +msgstr "打开最近版本库"
946 +
947 +#: lib/choose_repository.tcl:294
948 #, tcl-format
949 msgid "Location %s already exists."
904 -msgstr ""
950 +msgstr "位置 %s 已经存在."
951
906 -#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
907 -#: lib/choose_repository.tcl:172
952 +#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
953 +#: lib/choose_repository.tcl:314
954 #, tcl-format
955 msgid "Failed to create repository %s:"
910 -msgstr ""
956 +msgstr "无法创建版本库 %s:"
957
912 -#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
958 +#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
959 msgid "Directory:"
914 -msgstr ""
960 +msgstr "目录:"
961
916 -#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
917 -#: lib/choose_repository.tcl:834
918 -#, fuzzy
962 +#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
963 +#: lib/choose_repository.tcl:1013
964 msgid "Git Repository"
920 -msgstr "版本树"
965 +msgstr "Git 版本库"
966
922 -#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
967 +#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
968 #, tcl-format
969 msgid "Directory %s already exists."
925 -msgstr ""
970 +msgstr "目录 %s 已经存在."
971
927 -#: lib/choose_repository.tcl:265
972 +#: lib/choose_repository.tcl:442
973 #, tcl-format
974 msgid "File %s already exists."
930 -msgstr ""
975 +msgstr "文件 %s 已经存在."
976
932 -#: lib/choose_repository.tcl:286
977 +#: lib/choose_repository.tcl:463
978 msgid "Clone"
934 -msgstr ""
979 +msgstr "克隆"
980
936 -#: lib/choose_repository.tcl:299
981 +#: lib/choose_repository.tcl:476
982 msgid "URL:"
938 -msgstr ""
983 +msgstr "URL:"
984
940 -#: lib/choose_repository.tcl:319
985 +#: lib/choose_repository.tcl:496
986 msgid "Clone Type:"
942 -msgstr ""
987 +msgstr "克隆类型:"
988
944 -#: lib/choose_repository.tcl:325
989 +#: lib/choose_repository.tcl:502
990 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
946 -msgstr ""
991 +msgstr "标准方式 (快速, 部分备份, 作硬连接)"
992
948 -#: lib/choose_repository.tcl:331
993 +#: lib/choose_repository.tcl:508
994 msgid "Full Copy (Slower, Redundant Backup)"
950 -msgstr ""
995 +msgstr "全部复制 (较慢, 做备份)"
996
952 -#: lib/choose_repository.tcl:337
997 +#: lib/choose_repository.tcl:514
998 msgid "Shared (Fastest, Not Recommended, No Backup)"
954 -msgstr ""
999 +msgstr "共享方式 (最快, 不推荐, 不做备份)"
1000
956 -#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
957 -#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
958 -#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
1001 +#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
1002 +#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
1003 +#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
1004 #, tcl-format
1005 msgid "Not a Git repository: %s"
961 -msgstr ""
1006 +msgstr "不是一个 Git 版本库: %s"
1007
963 -#: lib/choose_repository.tcl:405
1008 +#: lib/choose_repository.tcl:586
1009 msgid "Standard only available for local repository."
965 -msgstr ""
1010 +msgstr "标准方式仅当是本地版本库时有效."
1011
967 -#: lib/choose_repository.tcl:409
1012 +#: lib/choose_repository.tcl:590
1013 msgid "Shared only available for local repository."
969 -msgstr ""
1014 +msgstr "共享方式仅当是本地版本库时有效."
1015
971 -#: lib/choose_repository.tcl:439
1016 +#: lib/choose_repository.tcl:617
1017 msgid "Failed to configure origin"
973 -msgstr ""
1018 +msgstr "无法配置 origin"
1019
975 -#: lib/choose_repository.tcl:451
1020 +#: lib/choose_repository.tcl:629
1021 msgid "Counting objects"
977 -msgstr ""
1022 +msgstr "清点对象"
1023
979 -#: lib/choose_repository.tcl:452
1024 +#: lib/choose_repository.tcl:630
1025 +#, fuzzy
1026 msgid "buckets"
981 -msgstr ""
1027 +msgstr "水桶??"
1028
983 -#: lib/choose_repository.tcl:476
1029 +#: lib/choose_repository.tcl:654
1030 #, tcl-format
1031 msgid "Unable to copy objects/info/alternates: %s"
986 -msgstr ""
1032 +msgstr "无法复制 objects/info/alternates: %s"
1033
988 -#: lib/choose_repository.tcl:512
1034 +#: lib/choose_repository.tcl:690
1035 #, tcl-format
1036 msgid "Nothing to clone from %s."
991 -msgstr ""
1037 +msgstr "没有东西可从 %s 克隆."
1038
993 -#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
994 -#: lib/choose_repository.tcl:740
1039 +#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1040 +#: lib/choose_repository.tcl:918
1041 msgid "The 'master' branch has not been initialized."
996 -msgstr ""
1042 +msgstr "'master'分支尚未初始化."
1043
998 -#: lib/choose_repository.tcl:527
1044 +#: lib/choose_repository.tcl:705
1045 msgid "Hardlinks are unavailable. Falling back to copying."
1000 -msgstr ""
1046 +msgstr "硬连接不可用. 使用复制."
1047
1002 -#: lib/choose_repository.tcl:539
1048 +#: lib/choose_repository.tcl:717
1049 #, tcl-format
1050 msgid "Cloning from %s"
1005 -msgstr ""
1051 +msgstr "从 %s 克隆"
1052
1007 -#: lib/choose_repository.tcl:570
1008 -#, fuzzy
1053 +#: lib/choose_repository.tcl:748
1054 msgid "Copying objects"
1010 -msgstr "压缩数据库"
1055 +msgstr "复制 objects"
1056
1012 -#: lib/choose_repository.tcl:571
1057 +#: lib/choose_repository.tcl:749
1058 msgid "KiB"
1014 -msgstr ""
1059 +msgstr "KiB"
1060
1016 -#: lib/choose_repository.tcl:595
1061 +#: lib/choose_repository.tcl:773
1062 #, tcl-format
1063 msgid "Unable to copy object: %s"
1019 -msgstr ""
1064 +msgstr "无法复制 object: %s"
1065
1021 -#: lib/choose_repository.tcl:605
1066 +#: lib/choose_repository.tcl:783
1067 msgid "Linking objects"
1023 -msgstr ""
1068 +msgstr "链接 objects"
1069
1025 -#: lib/choose_repository.tcl:606
1070 +#: lib/choose_repository.tcl:784
1071 msgid "objects"
1027 -msgstr ""
1072 +msgstr "objects"
1073
1029 -#: lib/choose_repository.tcl:614
1074 +#: lib/choose_repository.tcl:792
1075 #, tcl-format
1076 msgid "Unable to hardlink object: %s"
1032 -msgstr ""
1077 +msgstr "无法硬链接 object: %s"
1078
1034 -#: lib/choose_repository.tcl:669
1079 +#: lib/choose_repository.tcl:847
1080 msgid "Cannot fetch branches and objects. See console output for details."
1036 -msgstr ""
1081 +msgstr "无法获取分支和对象. 请查看控制终端的输出."
1082
1038 -#: lib/choose_repository.tcl:680
1083 +#: lib/choose_repository.tcl:858
1084 msgid "Cannot fetch tags. See console output for details."
1040 -msgstr ""
1085 +msgstr "无法获取标签. 请查看控制终端的输出."
1086
1042 -#: lib/choose_repository.tcl:704
1087 +#: lib/choose_repository.tcl:882
1088 msgid "Cannot determine HEAD. See console output for details."
1044 -msgstr ""
1089 +msgstr "无法确定 HEAD. 请查看控制终端的输出."
1090
1046 -#: lib/choose_repository.tcl:713
1091 +#: lib/choose_repository.tcl:891
1092 #, tcl-format
1093 msgid "Unable to cleanup %s"
1049 -msgstr ""
1094 +msgstr "无法清理 %s"
1095
1051 -#: lib/choose_repository.tcl:719
1096 +#: lib/choose_repository.tcl:897
1097 msgid "Clone failed."
1053 -msgstr ""
1098 +msgstr "克隆失败."
1099
1055 -#: lib/choose_repository.tcl:726
1100 +#: lib/choose_repository.tcl:904
1101 msgid "No default branch obtained."
1057 -msgstr ""
1102 +msgstr "没有获取缺省分支"
1103
1059 -#: lib/choose_repository.tcl:737
1104 +#: lib/choose_repository.tcl:915
1105 #, tcl-format
1106 msgid "Cannot resolve %s as a commit."
1062 -msgstr ""
1107 +msgstr "无法解析 %s 为提交."
1108
1064 -#: lib/choose_repository.tcl:749
1109 +#: lib/choose_repository.tcl:927
1110 msgid "Creating working directory"
1066 -msgstr ""
1111 +msgstr "创建工作目录"
1112
1068 -#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1069 -#: lib/index.tcl:149
1113 +#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1114 +#: lib/index.tcl:193
1115 msgid "files"
1071 -msgstr ""
1116 +msgstr "文件"
1117
1073 -#: lib/choose_repository.tcl:779
1118 +#: lib/choose_repository.tcl:957
1119 msgid "Initial file checkout failed."
1075 -msgstr ""
1120 +msgstr "初始的文件checkout失败"
1121
1077 -#: lib/choose_repository.tcl:795
1122 +#: lib/choose_repository.tcl:973
1123 msgid "Open"
1079 -msgstr ""
1124 +msgstr "打开"
1125
1081 -#: lib/choose_repository.tcl:805
1082 -#, fuzzy
1126 +#: lib/choose_repository.tcl:983
1127 msgid "Repository:"
1084 -msgstr "版本树"
1128 +msgstr "版本库"
1129
1086 -#: lib/choose_repository.tcl:854
1130 +#: lib/choose_repository.tcl:1033
1131 #, tcl-format
1132 msgid "Failed to open repository %s:"
1089 -msgstr ""
1133 +msgstr "无法打开版本库 %s:"
1134
1135 #: lib/choose_rev.tcl:53
1136 msgid "This Detached Checkout"
1093 -msgstr ""
1137 +msgstr "该脱节的Checkout"
1138
1139 #: lib/choose_rev.tcl:60
1140 msgid "Revision Expression:"
1097 -msgstr ""
1141 +msgstr "版本表达式:"
1142
1143 #: lib/choose_rev.tcl:74
1100 -#, fuzzy
1144 msgid "Local Branch"
1102 -msgstr "分支"
1145 +msgstr "本地分支"
1146
1147 #: lib/choose_rev.tcl:79
1105 -#, fuzzy
1148 msgid "Tracking Branch"
1107 -msgstr "当前分支:"
1149 +msgstr "跟踪分支:"
1150
1151 #: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1152 msgid "Tag"
1111 -msgstr ""
1153 +msgstr "标签"
1154
1155 #: lib/choose_rev.tcl:317
1156 #, tcl-format
1157 msgid "Invalid revision: %s"
1116 -msgstr ""
1158 +msgstr "无效版本: %s"
1159
1160 #: lib/choose_rev.tcl:338
1161 msgid "No revision selected."
1120 -msgstr ""
1162 +msgstr "没有选择版本."
1163
1164 #: lib/choose_rev.tcl:346
1165 msgid "Revision expression is empty."
1124 -msgstr ""
1166 +msgstr "版本表达式为空."
1167
1168 #: lib/choose_rev.tcl:530
1169 msgid "Updated"
1128 -msgstr ""
1170 +msgstr "已更新"
1171
1172 #: lib/choose_rev.tcl:558
1173 msgid "URL"
1132 -msgstr ""
1174 +msgstr "URL"
1175
1176 #: lib/commit.tcl:9
1177 msgid ""
@@ -1138,6 +1180,9 @@ msgid ""
1180 "You are about to create the initial commit. There is no commit before this "
1181 "to amend.\n"
1182 msgstr ""
1183 +"没有改动需要修正.\n"
1184 +"\n"
1185 +"你正在创建最初的提交. 在此之前没有提交可以修正.\n"
1186
1187 #: lib/commit.tcl:18
1188 msgid ""
@@ -1147,18 +1192,22 @@ msgid ""
1192 "completed. You cannot amend the prior commit unless you first abort the "
1193 "current merge activity.\n"
1194 msgstr ""
1195 +"在合并时无法修正.\n"
1196 +"\n"
1197 +"你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
1198 +"否则无法修正之前的提交.\n"
1199
1200 #: lib/commit.tcl:49
1201 msgid "Error loading commit data for amend:"
1153 -msgstr ""
1202 +msgstr "为修正装载提交数据出错:"
1203
1204 #: lib/commit.tcl:76
1205 msgid "Unable to obtain your identity:"
1157 -msgstr ""
1206 +msgstr "无法获知你的身份:"
1207
1208 #: lib/commit.tcl:81
1209 msgid "Invalid GIT_COMMITTER_IDENT:"
1161 -msgstr ""
1210 +msgstr "无效的 GIT_COMMITTER_IDENT"
1211
1212 #: lib/commit.tcl:133
1213 msgid ""
@@ -1169,6 +1218,12 @@ msgid ""
1218 "\n"
1219 "The rescan will be automatically started now.\n"
1220 msgstr ""
1221 +"最后一次扫描的状态和当前版本库状态不符.\n"
1222 +"\n"
1223 +"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1224 +"描.\n"
1225 +"\n"
1226 +"重新扫描将自动开始.\n"
1227
1228 #: lib/commit.tcl:154
1229 #, tcl-format
@@ -1178,6 +1233,9 @@ msgid ""
1233 "File %s has merge conflicts. You must resolve them and stage the file "
1234 "before committing.\n"
1235 msgstr ""
1236 +"尚未合并的文件没有办法提交.\n"
1237 +"\n"
1238 +"文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
1239
1240 #: lib/commit.tcl:162
1241 #, tcl-format
@@ -1186,6 +1244,9 @@ msgid ""
1244 "\n"
1245 "File %s cannot be committed by this program.\n"
1246 msgstr ""
1247 +"检测到未知文件状态 %s.\n"
1248 +"\n"
1249 +"文件 %s 无法由该程序提交.\n"
1250
1251 #: lib/commit.tcl:170
1252 msgid ""
@@ -1193,6 +1254,9 @@ msgid ""
1254 "\n"
1255 "You must stage at least 1 file before you can commit.\n"
1256 msgstr ""
1257 +"没有需要提交的变动.\n"
1258 +"\n"
1259 +"提交前你必须首先缓存至少一个文件.\n"
1260
1261 #: lib/commit.tcl:183
1262 msgid ""
@@ -1200,19 +1264,26 @@ msgid ""
1264 "\n"
1265 "A good commit message has the following format:\n"
1266 "\n"
1203 -"- First line: Describe in one sentance what you did.\n"
1267 +"- First line: Describe in one sentence what you did.\n"
1268 "- Second line: Blank\n"
1269 "- Remaining lines: Describe why this change is good.\n"
1270 msgstr ""
1271 +"请提供一条提交信息.\n"
1272 +"\n"
1273 +"一条好的提交信息有下列格式:\n"
1274 +"\n"
1275 +"- 第一行: 一句话概括你做的修改.\n"
1276 +"- 第二行: 空行\n"
1277 +"- 剩余行: 请描述为什么你做的这些改动是好的.\n"
1278
1279 #: lib/commit.tcl:257
1280 msgid "write-tree failed:"
1210 -msgstr ""
1281 +msgstr "write-tree 失败:"
1282
1283 #: lib/commit.tcl:275
1284 #, tcl-format
1285 msgid "Commit %s appears to be corrupt"
1215 -msgstr ""
1286 +msgstr "提交 %s 似乎已损坏"
1287
1288 #: lib/commit.tcl:279
1289 msgid ""
@@ -1222,77 +1293,81 @@ msgid ""
1293 "\n"
1294 "A rescan will be automatically started now.\n"
1295 msgstr ""
1296 +"没有改动提交.\n"
1297 +"\n"
1298 +"该提交没有改动任何文件也不是一个合并提交.\n"
1299 +"\n"
1300 +"重新扫描将自动开始.\n"
1301
1302 #: lib/commit.tcl:286
1303 msgid "No changes to commit."
1228 -msgstr ""
1304 +msgstr "没有改动要提交."
1305
1306 #: lib/commit.tcl:303
1307 #, tcl-format
1308 msgid "warning: Tcl does not support encoding '%s'."
1233 -msgstr ""
1309 +msgstr "警告: Tcl 不支持编码方式 '%s'."
1310
1311 #: lib/commit.tcl:317
1312 msgid "commit-tree failed:"
1237 -msgstr ""
1313 +msgstr "commit-tree 失败:"
1314
1315 #: lib/commit.tcl:339
1316 msgid "update-ref failed:"
1241 -msgstr ""
1317 +msgstr "update-ref 失败:"
1318
1319 #: lib/commit.tcl:430
1320 #, tcl-format
1321 msgid "Created commit %s: %s"
1246 -msgstr ""
1322 +msgstr "创建了 commit %s: %s"
1323
1324 #: lib/console.tcl:57
1325 msgid "Working... please wait..."
1250 -msgstr ""
1326 +msgstr "工作中... 请等待..."
1327
1328 #: lib/console.tcl:183
1329 msgid "Success"
1254 -msgstr ""
1330 +msgstr "成功"
1331
1332 #: lib/console.tcl:196
1333 msgid "Error: Command Failed"
1258 -msgstr ""
1334 +msgstr "错误: 命令失败"
1335
1336 #: lib/database.tcl:43
1337 msgid "Number of loose objects"
1262 -msgstr ""
1338 +msgstr "松散对象的数量"
1339
1340 #: lib/database.tcl:44
1341 msgid "Disk space used by loose objects"
1266 -msgstr ""
1342 +msgstr "松散对象所使用的磁盘空间"
1343
1344 #: lib/database.tcl:45
1345 msgid "Number of packed objects"
1270 -msgstr ""
1346 +msgstr "压缩对象数量"
1347
1348 #: lib/database.tcl:46
1349 msgid "Number of packs"
1274 -msgstr ""
1350 +msgstr "压缩包数量"
1351
1352 #: lib/database.tcl:47
1353 msgid "Disk space used by packed objects"
1278 -msgstr ""
1354 +msgstr "压缩对象所使用的磁盘空间"
1355
1356 #: lib/database.tcl:48
1357 msgid "Packed objects waiting for pruning"
1282 -msgstr ""
1358 +msgstr "压缩对象等待清理"
1359
1360 #: lib/database.tcl:49
1361 msgid "Garbage files"
1286 -msgstr ""
1362 +msgstr "垃圾文件"
1363
1364 #: lib/database.tcl:72
1289 -#, fuzzy
1365 msgid "Compressing the object database"
1291 -msgstr "压缩数据库"
1366 +msgstr "压缩对象数据库"
1367
1368 #: lib/database.tcl:83
1369 msgid "Verifying the object database with fsck-objects"
1295 -msgstr ""
1370 +msgstr "使用 fsck-objects 验证对象数据库"
1371
1372 #: lib/database.tcl:108
1373 #, tcl-format
@@ -1304,11 +1379,16 @@ msgid ""
1379 "\n"
1380 "Compress the database now?"
1381 msgstr ""
1382 +"该版本库当前约有 %i 个松散对象.\n"
1383 +"\n"
1384 +"为达到较优的性能，强烈建议你在松散对象多于 %i 时压缩数据库.\n"
1385 +"\n"
1386 +"现在就压缩数据库么?"
1387
1388 #: lib/date.tcl:25
1389 #, tcl-format
1390 msgid "Invalid date from Git: %s"
1311 -msgstr ""
1391 +msgstr "无效的日期: %s"
1392
1393 #: lib/diff.tcl:42
1394 #, tcl-format
@@ -1323,80 +1403,107 @@ msgid ""
1403 "A rescan will be automatically started to find other files which may have "
1404 "the same state."
1405 msgstr ""
1406 +"未检测到改动.\n"
1407 +"\n"
1408 +"该文件的修改日期被另一个程序所更新, 但其内容并没有变化.\n"
1409 +"\n"
1410 +"对于类似情况的其他文件的重新扫描将自动开始."
1411
1412 #: lib/diff.tcl:81
1328 -#, tcl-format
1413 +#, fuzzy, tcl-format
1414 msgid "Loading diff of %s..."
1330 -msgstr ""
1415 +msgstr "装载 %s 的 diff ..."
1416
1417 #: lib/diff.tcl:114 lib/diff.tcl:184
1418 #, tcl-format
1419 msgid "Unable to display %s"
1335 -msgstr ""
1420 +msgstr "无法显示 %s"
1421
1422 #: lib/diff.tcl:115
1423 msgid "Error loading file:"
1339 -msgstr ""
1424 +msgstr "装载文件出错:"
1425
1426 #: lib/diff.tcl:122
1427 msgid "Git Repository (subproject)"
1343 -msgstr ""
1428 +msgstr "Git 版本库 (子项目)"
1429
1430 #: lib/diff.tcl:134
1431 msgid "* Binary file (not showing content)."
1347 -msgstr ""
1432 +msgstr "* 二进制文件 (不显示内容)."
1433
1434 #: lib/diff.tcl:185
1435 msgid "Error loading diff:"
1351 -msgstr ""
1436 +msgstr "装载 diff 错误:"
1437
1438 #: lib/diff.tcl:302
1439 msgid "Failed to unstage selected hunk."
1355 -msgstr ""
1440 +msgstr "无法将选择的代码段从缓存中删除."
1441
1442 #: lib/diff.tcl:309
1443 msgid "Failed to stage selected hunk."
1359 -msgstr ""
1444 +msgstr "无法缓存所选代码段."
1445
1446 #: lib/error.tcl:12 lib/error.tcl:102
1447 msgid "error"
1363 -msgstr ""
1448 +msgstr "错误"
1449
1450 #: lib/error.tcl:28
1451 msgid "warning"
1367 -msgstr ""
1452 +msgstr "警告"
1453
1454 #: lib/error.tcl:81
1455 msgid "You must correct the above errors before committing."
1371 -msgstr ""
1456 +msgstr "你必须在提交前修正上述错误."
1457
1373 -#: lib/index.tcl:241
1374 -#, fuzzy, tcl-format
1458 +#: lib/index.tcl:6
1459 +msgid "Unable to unlock the index."
1460 +msgstr "无法解锁缓存 (index)"
1461 +
1462 +#: lib/index.tcl:15
1463 +msgid "Index Error"
1464 +msgstr "缓存(Index)错误"
1465 +
1466 +#: lib/index.tcl:21
1467 +msgid ""
1468 +"Updating the Git index failed. A rescan will be automatically started to "
1469 +"resynchronize git-gui."
1470 +msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
1471 +
1472 +#: lib/index.tcl:27
1473 +msgid "Continue"
1474 +msgstr "继续"
1475 +
1476 +#: lib/index.tcl:31
1477 +msgid "Unlock Index"
1478 +msgstr "解锁 Index"
1479 +
1480 +#: lib/index.tcl:282
1481 +#, tcl-format
1482 msgid "Unstaging %s from commit"
1376 -msgstr "从本次提交移除"
1483 +msgstr "从提交缓存中删除 %s"
1484
1378 -#: lib/index.tcl:285
1485 +#: lib/index.tcl:326
1486 #, tcl-format
1487 msgid "Adding %s"
1381 -msgstr ""
1488 +msgstr "添加 %s"
1489
1383 -#: lib/index.tcl:340
1384 -#, fuzzy, tcl-format
1490 +#: lib/index.tcl:381
1491 +#, tcl-format
1492 msgid "Revert changes in file %s?"
1386 -msgstr "恢复修改"
1493 +msgstr "撤销文件 %s 中的改动?"
1494
1388 -#: lib/index.tcl:342
1495 +#: lib/index.tcl:383
1496 #, tcl-format
1497 msgid "Revert changes in these %i files?"
1391 -msgstr ""
1498 +msgstr "撤销这些 (%i个) 文件的改动?"
1499
1393 -#: lib/index.tcl:348
1500 +#: lib/index.tcl:389
1501 msgid "Any unstaged changes will be permanently lost by the revert."
1395 -msgstr ""
1502 +msgstr "任何未缓存的改动将在这次撤销中永久丢失."
1503
1397 -#: lib/index.tcl:351
1504 +#: lib/index.tcl:392
1505 msgid "Do Nothing"
1399 -msgstr ""
1506 +msgstr "不做操作"
1507
1508 #: lib/merge.tcl:13
1509 msgid ""
@@ -1404,6 +1511,9 @@ msgid ""
1511 "\n"
1512 "You must finish amending this commit before starting any type of merge.\n"
1513 msgstr ""
1514 +"修正时无法做合并.\n"
1515 +"\n"
1516 +"你必须完成对该提交的修正才能继续任何类型的合并操作.\n"
1517
1518 #: lib/merge.tcl:27
1519 msgid ""
@@ -1414,6 +1524,12 @@ msgid ""
1524 "\n"
1525 "The rescan will be automatically started now.\n"
1526 msgstr ""
1527 +"最后一次扫描的状态和当前版本库状态不符.\n"
1528 +"\n"
1529 +"另一 Git 程序自上次扫描后修改了本版本库. 在修改当前分支之前需要重新做一次扫"
1530 +"描.\n"
1531 +"\n"
1532 +"重新扫描将自动开始.\n"
1533
1534 #: lib/merge.tcl:44
1535 #, tcl-format
@@ -1425,6 +1541,12 @@ msgid ""
1541 "You must resolve them, stage the file, and commit to complete the current "
1542 "merge. Only then can you begin another merge.\n"
1543 msgstr ""
1544 +"你正处在一个有冲突的合并操作中.\n"
1545 +"\n"
1546 +"文件 %s 有合并冲突.\n"
1547 +"\n"
1548 +"你必须解决这些冲突, 缓存该文件, 并提交来完成当前的合并.仅当这样后才能开始下一"
1549 +"个合并操作.\n"
1550
1551 #: lib/merge.tcl:54
1552 #, tcl-format
@@ -1436,6 +1558,12 @@ msgid ""
1558 "You should complete the current commit before starting a merge. Doing so "
1559 "will help you abort a failed merge, should the need arise.\n"
1560 msgstr ""
1561 +"你正处在一个改动当中.\n"
1562 +"\n"
1563 +"文件 %s 已被修改.\n"
1564 +"\n"
1565 +"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于"
1566 +"中止一次失败的合并.\n"
1567
1568 #: lib/merge.tcl:106
1569 #, tcl-format
@@ -1445,24 +1573,24 @@ msgstr ""
1573 #: lib/merge.tcl:119
1574 #, tcl-format
1575 msgid "Merging %s and %s"
1448 -msgstr ""
1576 +msgstr "合并 %s 和 %s"
1577
1578 #: lib/merge.tcl:131
1579 msgid "Merge completed successfully."
1452 -msgstr ""
1580 +msgstr "合并成功完成."
1581
1582 #: lib/merge.tcl:133
1583 msgid "Merge failed. Conflict resolution is required."
1456 -msgstr ""
1584 +msgstr "合并失败. 需要解决冲突."
1585
1586 #: lib/merge.tcl:158
1587 #, tcl-format
1588 msgid "Merge Into %s"
1461 -msgstr ""
1589 +msgstr "合并到 %s"
1590
1591 #: lib/merge.tcl:177
1592 msgid "Revision To Merge"
1465 -msgstr ""
1593 +msgstr "要合并的版本"
1594
1595 #: lib/merge.tcl:212
1596 msgid ""
@@ -1470,6 +1598,9 @@ msgid ""
1598 "\n"
1599 "You must finish amending this commit.\n"
1600 msgstr ""
1601 +"修正操作中无法中止.\n"
1602 +"\n"
1603 +"你必须先完成本次修正操作.\n"
1604
1605 #: lib/merge.tcl:222
1606 msgid ""
@@ -1479,6 +1610,11 @@ msgid ""
1610 "\n"
1611 "Continue with aborting the current merge?"
1612 msgstr ""
1613 +"中止合并?\n"
1614 +"\n"
1615 +"中止当前的合并操作将导致 *所有* 尚未提交的改动丢失.\n"
1616 +"\n"
1617 +"是否要继续中止当前的合并操作?"
1618
1619 #: lib/merge.tcl:228
1620 msgid ""
@@ -1488,150 +1624,137 @@ msgid ""
1624 "\n"
1625 "Continue with resetting the current changes?"
1626 msgstr ""
1627 +"是否复位当前改动?\n"
1628 +"\n"
1629 +"复位当前的改动将导致 *所有* 未提交的改动丢失.\n"
1630 +"\n"
1631 +"是否要继续复位当前的改动?"
1632
1633 #: lib/merge.tcl:239
1634 msgid "Aborting"
1494 -msgstr ""
1635 +msgstr "中止"
1636
1637 #: lib/merge.tcl:266
1638 msgid "Abort failed."
1498 -msgstr ""
1639 +msgstr "中止失败"
1640
1641 #: lib/merge.tcl:268
1642 msgid "Abort completed. Ready."
1502 -msgstr ""
1643 +msgstr "中止完成. 就绪."
1644
1645 #: lib/option.tcl:82
1646 msgid "Restore Defaults"
1506 -msgstr ""
1647 +msgstr "恢复默认值"
1648
1649 #: lib/option.tcl:86
1650 msgid "Save"
1510 -msgstr ""
1651 +msgstr "保存"
1652
1653 #: lib/option.tcl:96
1513 -#, fuzzy, tcl-format
1654 +#, tcl-format
1655 msgid "%s Repository"
1515 -msgstr "版本树"
1656 +msgstr "%s 版本库"
1657
1658 #: lib/option.tcl:97
1659 msgid "Global (All Repositories)"
1519 -msgstr ""
1660 +msgstr "全局 (所有版本库)"
1661
1662 #: lib/option.tcl:103
1663 msgid "User Name"
1523 -msgstr ""
1664 +msgstr "用户名"
1665
1666 #: lib/option.tcl:104
1667 msgid "Email Address"
1527 -msgstr ""
1668 +msgstr "Email 地址"
1669
1670 #: lib/option.tcl:106
1530 -#, fuzzy
1671 msgid "Summarize Merge Commits"
1532 -msgstr "修订合并提交描述:"
1672 +msgstr "概述合并提交:"
1673
1674 #: lib/option.tcl:107
1675 msgid "Merge Verbosity"
1536 -msgstr ""
1676 +msgstr "合并冗余度"
1677
1678 #: lib/option.tcl:108
1679 msgid "Show Diffstat After Merge"
1540 -msgstr ""
1680 +msgstr "在合并后显示 Diffstat"
1681
1682 #: lib/option.tcl:110
1683 msgid "Trust File Modification Timestamps"
1544 -msgstr ""
1684 +msgstr "相信文件的改动时间"
1685
1686 #: lib/option.tcl:111
1687 msgid "Prune Tracking Branches During Fetch"
1548 -msgstr ""
1688 +msgstr "获取时清除跟踪分支"
1689
1690 #: lib/option.tcl:112
1691 msgid "Match Tracking Branches"
1552 -msgstr ""
1692 +msgstr "匹配跟踪分支"
1693
1694 #: lib/option.tcl:113
1695 msgid "Number of Diff Context Lines"
1556 -msgstr ""
1696 +msgstr "Diff 上下文行数"
1697
1698 #: lib/option.tcl:114
1699 msgid "New Branch Name Template"
1560 -msgstr ""
1700 +msgstr "新建分支命名模板"
1701
1702 #: lib/option.tcl:176
1703 msgid "Change Font"
1564 -msgstr ""
1704 +msgstr "更改字体"
1705
1706 #: lib/option.tcl:180
1707 #, tcl-format
1708 msgid "Choose %s"
1569 -msgstr ""
1709 +msgstr "选择 %s"
1710
1711 #: lib/option.tcl:186
1712 msgid "pt."
1573 -msgstr ""
1713 +msgstr "磅"
1714
1715 #: lib/option.tcl:200
1716 msgid "Preferences"
1577 -msgstr ""
1717 +msgstr "首选项"
1718
1719 #: lib/option.tcl:235
1720 msgid "Failed to completely save options:"
1581 -msgstr ""
1582 -
1583 -#: lib/remote.tcl:165
1584 -msgid "Prune from"
1585 -msgstr ""
1586 -
1587 -#: lib/remote.tcl:170
1588 -#, fuzzy
1589 -msgid "Fetch from"
1590 -msgstr "导入"
1591 -
1592 -#: lib/remote.tcl:213
1593 -#, fuzzy
1594 -msgid "Push to"
1595 -msgstr "上传"
1721 +msgstr "无法完全保存选项:"
1722
1723 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1724 msgid "Delete Remote Branch"
1599 -msgstr ""
1725 +msgstr "删除远端分支"
1726
1727 #: lib/remote_branch_delete.tcl:47
1602 -#, fuzzy
1728 msgid "From Repository"
1604 -msgstr "版本树"
1729 +msgstr "从版本库"
1730
1731 #: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1732 msgid "Remote:"
1608 -msgstr ""
1733 +msgstr "Remote:"
1734
1735 #: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1736 msgid "Arbitrary URL:"
1612 -msgstr ""
1737 +msgstr "任意 URL:"
1738
1739 #: lib/remote_branch_delete.tcl:84
1615 -#, fuzzy
1740 msgid "Branches"
1741 msgstr "分支"
1742
1743 #: lib/remote_branch_delete.tcl:109
1620 -#, fuzzy
1744 msgid "Delete Only If"
1622 -msgstr "删除"
1745 +msgstr "删除仅当"
1746
1747 #: lib/remote_branch_delete.tcl:111
1748 msgid "Merged Into:"
1626 -msgstr ""
1749 +msgstr "合并到"
1750
1751 #: lib/remote_branch_delete.tcl:119
1752 msgid "Always (Do not perform merge checks)"
1630 -msgstr ""
1753 +msgstr "总是合并 (不作合并检查)"
1754
1755 #: lib/remote_branch_delete.tcl:152
1756 msgid "A branch is required for 'Merged Into'."
1634 -msgstr ""
1757 +msgstr "'合并到' 需要指定某个分支"
1758
1759 #: lib/remote_branch_delete.tcl:184
1760 #, tcl-format
@@ -1640,6 +1763,9 @@ msgid ""
1763 "\n"
1764 " - %s"
1765 msgstr ""
1766 +"下列分支没有被全部合并到 %s 中:\n"
1767 +"\n"
1768 +" - %s"
1769
1770 #: lib/remote_branch_delete.tcl:189
1771 #, tcl-format
@@ -1647,10 +1773,11 @@ msgid ""
1773 "One or more of the merge tests failed because you have not fetched the "
1774 "necessary commits. Try fetching from %s first."
1775 msgstr ""
1776 +"由于没有获取到必要的提交，一个或多个合并测试失败。请尝试从 %s 处先获取。"
1777
1778 #: lib/remote_branch_delete.tcl:207
1779 msgid "Please select one or more branches to delete."
1653 -msgstr ""
1780 +msgstr "请选择某个或多个分支来删除"
1781
1782 #: lib/remote_branch_delete.tcl:216
1783 msgid ""
@@ -1658,112 +1785,108 @@ msgid ""
1785 "\n"
1786 "Delete the selected branches?"
1787 msgstr ""
1788 +"恢复被删除的分支非常困难.\n"
1789 +"\n"
1790 +"是否要删除所选分支?"
1791
1792 #: lib/remote_branch_delete.tcl:226
1793 #, tcl-format
1794 msgid "Deleting branches from %s"
1665 -msgstr ""
1795 +msgstr "从 %s 中删除分支"
1796
1797 #: lib/remote_branch_delete.tcl:286
1798 msgid "No repository selected."
1669 -msgstr ""
1799 +msgstr "没有选择版本库"
1800
1801 #: lib/remote_branch_delete.tcl:291
1802 #, tcl-format
1803 msgid "Scanning %s..."
1674 -msgstr ""
1804 +msgstr "正在扫描 %s..."
1805
1676 -#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1677 -msgid "Cannot write script:"
1678 -msgstr ""
1806 +#: lib/remote.tcl:165
1807 +msgid "Prune from"
1808 +msgstr "从..清除(prune)"
1809 +
1810 +#: lib/remote.tcl:170
1811 +msgid "Fetch from"
1812 +msgstr "从..获取(fetch)"
1813 +
1814 +#: lib/remote.tcl:213
1815 +msgid "Push to"
1816 +msgstr "上传到(push)"
1817 +
1818 +#: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1819 +msgid "Cannot write shortcut:"
1820 +msgstr "无法修改快捷方式:"
1821
1680 -#: lib/shortcut.tcl:149
1822 +#: lib/shortcut.tcl:136
1823 msgid "Cannot write icon:"
1682 -msgstr ""
1824 +msgstr "无法修改图标:"
1825
1826 #: lib/status_bar.tcl:83
1827 #, tcl-format
1828 msgid "%s ... %*i of %*i %s (%3i%%)"
1687 -msgstr ""
1829 +msgstr "%s ... %*i of %*i %s (%3i%%)"
1830
1831 #: lib/transport.tcl:6
1690 -#, fuzzy, tcl-format
1832 +#, tcl-format
1833 msgid "fetch %s"
1692 -msgstr "导入"
1834 +msgstr "获取(fetch)"
1835
1836 #: lib/transport.tcl:7
1837 #, tcl-format
1838 msgid "Fetching new changes from %s"
1697 -msgstr ""
1839 +msgstr "从 %s 处获取新的改动"
1840
1841 #: lib/transport.tcl:18
1842 #, tcl-format
1843 msgid "remote prune %s"
1702 -msgstr ""
1844 +msgstr "清除远端 %s"
1845
1846 #: lib/transport.tcl:19
1847 #, tcl-format
1848 msgid "Pruning tracking branches deleted from %s"
1707 -msgstr ""
1849 +msgstr "清除"
1850
1851 #: lib/transport.tcl:25 lib/transport.tcl:71
1852 #, tcl-format
1853 msgid "push %s"
1712 -msgstr ""
1854 +msgstr "上传 %s"
1855
1856 #: lib/transport.tcl:26
1857 #, tcl-format
1858 msgid "Pushing changes to %s"
1717 -msgstr ""
1859 +msgstr "上传改动到 %s"
1860
1861 #: lib/transport.tcl:72
1862 #, tcl-format
1863 msgid "Pushing %s %s to %s"
1722 -msgstr ""
1864 +msgstr "上传 %s %s 到 %s"
1865
1866 #: lib/transport.tcl:89
1725 -#, fuzzy
1867 msgid "Push Branches"
1727 -msgstr "分支"
1868 +msgstr "上传分支"
1869
1870 #: lib/transport.tcl:103
1730 -#, fuzzy
1871 msgid "Source Branches"
1732 -msgstr "当前分支:"
1872 +msgstr "源端分支:"
1873
1874 #: lib/transport.tcl:120
1735 -#, fuzzy
1875 msgid "Destination Repository"
1737 -msgstr "版本树"
1876 +msgstr "目标版本库"
1877
1878 #: lib/transport.tcl:158
1879 msgid "Transfer Options"
1741 -msgstr ""
1880 +msgstr "传输选项"
1881
1882 #: lib/transport.tcl:160
1883 msgid "Force overwrite existing branch (may discard changes)"
1745 -msgstr ""
1884 +msgstr "强制覆盖已有的分支 (可能会丢失改动)"
1885
1886 #: lib/transport.tcl:164
1887 msgid "Use thin pack (for slow network connections)"
1749 -msgstr ""
1888 +msgstr "使用 thin pack (适用于低速网络连接)"
1889
1890 #: lib/transport.tcl:168
1891 msgid "Include tags"
1753 -msgstr ""
1754 -
1755 -#~ msgid "Add To Commit"
1756 -#~ msgstr "添加到本次提交"
1757 -
1758 -#~ msgid "Add Existing To Commit"
1759 -#~ msgstr "添加默认修改文件"
1760 -
1761 -#~ msgid "Unstaged Changes (Will Not Be Committed)"
1762 -#~ msgstr "不被提交的修改"
1763 -
1764 -#~ msgid "Add Existing"
1765 -#~ msgstr "添加默认修改文件"
1766 -
1767 -#, fuzzy
1768 -#~ msgid "Push to %s..."
1769 -#~ msgstr "上传..."
1892 +msgstr "包含标签"