@matheusbsbs / matheus-bagliano / commits / 0212242d66
Fork 0

git-gui: Regenerated po template and merged translations with it

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

Peter Karlsson committed Mar 14, 2008 at 02:36 UTC 0212242d6697d9e0fd076d7c633b90ecea7691c6
8 files changed +2311 -1841
po/de.po
+281 -250
@@ -7,7 +7,7 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git-gui\n"
9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2008-02-16 21:24+0100\n"
10 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
11 "PO-Revision-Date: 2008-02-16 21:52+0100\n"
12 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
13 "Language-Team: German\n"
@@ -15,33 +15,33 @@ msgstr ""
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17
18 -#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
19 -#: git-gui.sh:733
18 +#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
19 +#: git-gui.sh:763
20 msgid "git-gui: fatal error"
21 msgstr "git-gui: Programmfehler"
22
23 -#: git-gui.sh:565
23 +#: git-gui.sh:593
24 #, tcl-format
25 msgid "Invalid font specified in %s:"
26 msgstr "Ungültige Zeichensatz-Angabe in %s:"
27
28 -#: git-gui.sh:590
28 +#: git-gui.sh:620
29 msgid "Main Font"
30 msgstr "Programmschriftart"
31
32 -#: git-gui.sh:591
32 +#: git-gui.sh:621
33 msgid "Diff/Console Font"
34 msgstr "Vergleich-Schriftart"
35
36 -#: git-gui.sh:605
36 +#: git-gui.sh:635
37 msgid "Cannot find git in PATH."
38 msgstr "Git kann im PATH nicht gefunden werden."
39
40 -#: git-gui.sh:632
40 +#: git-gui.sh:662
41 msgid "Cannot parse Git version string:"
42 msgstr "Git Versionsangabe kann nicht erkannt werden:"
43
44 -#: git-gui.sh:650
44 +#: git-gui.sh:680
45 #, tcl-format
46 msgid ""
47 "Git version cannot be determined.\n"
@@ -60,81 +60,81 @@ msgstr ""
60 "\n"
61 "Soll angenommen werden, »%s« sei Version 1.5.0?\n"
62
63 -#: git-gui.sh:888
63 +#: git-gui.sh:918
64 msgid "Git directory not found:"
65 msgstr "Git-Verzeichnis nicht gefunden:"
66
67 -#: git-gui.sh:895
67 +#: git-gui.sh:925
68 msgid "Cannot move to top of working directory:"
69 msgstr ""
70 "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
71 "werden:"
72
73 -#: git-gui.sh:902
73 +#: git-gui.sh:932
74 msgid "Cannot use funny .git directory:"
75 msgstr "Unerwartete Struktur des .git Verzeichnis:"
76
77 -#: git-gui.sh:907
77 +#: git-gui.sh:937
78 msgid "No working directory"
79 msgstr "Kein Arbeitsverzeichnis"
80
81 -#: git-gui.sh:1054
81 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
82 msgid "Refreshing file status..."
83 msgstr "Dateistatus aktualisieren..."
84
85 -#: git-gui.sh:1119
85 +#: git-gui.sh:1149
86 msgid "Scanning for modified files ..."
87 msgstr "Nach geänderten Dateien suchen..."
88
89 -#: git-gui.sh:1294 lib/browser.tcl:245
89 +#: git-gui.sh:1324 lib/browser.tcl:246
90 msgid "Ready."
91 msgstr "Bereit."
92
93 -#: git-gui.sh:1560
93 +#: git-gui.sh:1590
94 msgid "Unmodified"
95 msgstr "Unverändert"
96
97 -#: git-gui.sh:1562
97 +#: git-gui.sh:1592
98 msgid "Modified, not staged"
99 msgstr "Verändert, nicht bereitgestellt"
100
101 -#: git-gui.sh:1563 git-gui.sh:1568
101 +#: git-gui.sh:1593 git-gui.sh:1598
102 msgid "Staged for commit"
103 msgstr "Bereitgestellt zum Eintragen"
104
105 -#: git-gui.sh:1564 git-gui.sh:1569
105 +#: git-gui.sh:1594 git-gui.sh:1599
106 msgid "Portions staged for commit"
107 msgstr "Teilweise bereitgestellt zum Eintragen"
108
109 -#: git-gui.sh:1565 git-gui.sh:1570
109 +#: git-gui.sh:1595 git-gui.sh:1600
110 msgid "Staged for commit, missing"
111 msgstr "Bereitgestellt zum Eintragen, fehlend"
112
113 -#: git-gui.sh:1567
113 +#: git-gui.sh:1597
114 msgid "Untracked, not staged"
115 msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
116
117 -#: git-gui.sh:1572
117 +#: git-gui.sh:1602
118 msgid "Missing"
119 msgstr "Fehlend"
120
121 -#: git-gui.sh:1573
121 +#: git-gui.sh:1603
122 msgid "Staged for removal"
123 msgstr "Bereitgestellt zum Löschen"
124
125 -#: git-gui.sh:1574
125 +#: git-gui.sh:1604
126 msgid "Staged for removal, still present"
127 msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
128
129 -#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
129 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
130 msgid "Requires merge resolution"
131 msgstr "Konfliktauflösung nötig"
132
133 -#: git-gui.sh:1614
133 +#: git-gui.sh:1644
134 msgid "Starting gitk... please wait..."
135 msgstr "Gitk wird gestartet... bitte warten."
136
137 -#: git-gui.sh:1623
137 +#: git-gui.sh:1653
138 #, tcl-format
139 msgid ""
140 "Unable to start gitk:\n"
@@ -145,297 +145,297 @@ msgstr ""
145 "\n"
146 "%s existiert nicht"
147
148 -#: git-gui.sh:1823 lib/choose_repository.tcl:35
148 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
149 msgid "Repository"
150 msgstr "Projektarchiv"
151
152 -#: git-gui.sh:1824
152 +#: git-gui.sh:1861
153 msgid "Edit"
154 msgstr "Bearbeiten"
155
156 -#: git-gui.sh:1826 lib/choose_rev.tcl:560
156 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
157 msgid "Branch"
158 msgstr "Zweig"
159
160 -#: git-gui.sh:1829 lib/choose_rev.tcl:547
160 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
161 msgid "Commit@@noun"
162 msgstr "Version"
163
164 -#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
164 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
165 msgid "Merge"
166 msgstr "Zusammenführen"
167
168 -#: git-gui.sh:1833 lib/choose_rev.tcl:556
168 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
169 msgid "Remote"
170 msgstr "Andere Archive"
171
172 -#: git-gui.sh:1842
172 +#: git-gui.sh:1879
173 msgid "Browse Current Branch's Files"
174 msgstr "Aktuellen Zweig durchblättern"
175
176 -#: git-gui.sh:1846
176 +#: git-gui.sh:1883
177 msgid "Browse Branch Files..."
178 msgstr "Einen Zweig durchblättern..."
179
180 -#: git-gui.sh:1851
180 +#: git-gui.sh:1888
181 msgid "Visualize Current Branch's History"
182 msgstr "Aktuellen Zweig darstellen"
183
184 -#: git-gui.sh:1855
184 +#: git-gui.sh:1892
185 msgid "Visualize All Branch History"
186 msgstr "Alle Zweige darstellen"
187
188 -#: git-gui.sh:1862
188 +#: git-gui.sh:1899
189 #, tcl-format
190 msgid "Browse %s's Files"
191 msgstr "Zweig »%s« durchblättern"
192
193 -#: git-gui.sh:1864
193 +#: git-gui.sh:1901
194 #, tcl-format
195 msgid "Visualize %s's History"
196 msgstr "Historie von »%s« darstellen"
197
198 -#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
198 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
199 msgid "Database Statistics"
200 msgstr "Datenbankstatistik"
201
202 -#: git-gui.sh:1872 lib/database.tcl:34
202 +#: git-gui.sh:1909 lib/database.tcl:34
203 msgid "Compress Database"
204 msgstr "Datenbank komprimieren"
205
206 -#: git-gui.sh:1875
206 +#: git-gui.sh:1912
207 msgid "Verify Database"
208 msgstr "Datenbank überprüfen"
209
210 -#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
210 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
211 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
212 msgid "Create Desktop Icon"
213 msgstr "Desktop-Icon erstellen"
214
215 -#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
215 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
216 msgid "Quit"
217 msgstr "Beenden"
218
219 -#: git-gui.sh:1902
219 +#: git-gui.sh:1939
220 msgid "Undo"
221 msgstr "Rückgängig"
222
223 -#: git-gui.sh:1905
223 +#: git-gui.sh:1942
224 msgid "Redo"
225 msgstr "Wiederholen"
226
227 -#: git-gui.sh:1909 git-gui.sh:2403
227 +#: git-gui.sh:1946 git-gui.sh:2443
228 msgid "Cut"
229 msgstr "Ausschneiden"
230
231 -#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
232 -#: lib/console.tcl:67
231 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
232 +#: lib/console.tcl:69
233 msgid "Copy"
234 msgstr "Kopieren"
235
236 -#: git-gui.sh:1915 git-gui.sh:2409
236 +#: git-gui.sh:1952 git-gui.sh:2449
237 msgid "Paste"
238 msgstr "Einfügen"
239
240 -#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
240 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
241 #: lib/remote_branch_delete.tcl:38
242 msgid "Delete"
243 msgstr "Löschen"
244
245 -#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
245 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
246 msgid "Select All"
247 msgstr "Alle auswählen"
248
249 -#: git-gui.sh:1931
249 +#: git-gui.sh:1968
250 msgid "Create..."
251 msgstr "Erstellen..."
252
253 -#: git-gui.sh:1937
253 +#: git-gui.sh:1974
254 msgid "Checkout..."
255 msgstr "Umstellen..."
256
257 -#: git-gui.sh:1943
257 +#: git-gui.sh:1980
258 msgid "Rename..."
259 msgstr "Umbenennen..."
260
261 -#: git-gui.sh:1948 git-gui.sh:2048
261 +#: git-gui.sh:1985 git-gui.sh:2085
262 msgid "Delete..."
263 msgstr "Löschen..."
264
265 -#: git-gui.sh:1953
265 +#: git-gui.sh:1990
266 msgid "Reset..."
267 msgstr "Zurücksetzen..."
268
269 -#: git-gui.sh:1965 git-gui.sh:2350
269 +#: git-gui.sh:2002 git-gui.sh:2389
270 msgid "New Commit"
271 msgstr "Neue Version"
272
273 -#: git-gui.sh:1973 git-gui.sh:2357
273 +#: git-gui.sh:2010 git-gui.sh:2396
274 msgid "Amend Last Commit"
275 msgstr "Letzte nachbessern"
276
277 -#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
277 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
278 msgid "Rescan"
279 msgstr "Neu laden"
280
281 -#: git-gui.sh:1988
281 +#: git-gui.sh:2025
282 msgid "Stage To Commit"
283 msgstr "Zum Eintragen bereitstellen"
284
285 -#: git-gui.sh:1994
285 +#: git-gui.sh:2031
286 msgid "Stage Changed Files To Commit"
287 msgstr "Geänderte Dateien bereitstellen"
288
289 -#: git-gui.sh:2000
289 +#: git-gui.sh:2037
290 msgid "Unstage From Commit"
291 msgstr "Aus der Bereitstellung herausnehmen"
292
293 -#: git-gui.sh:2005 lib/index.tcl:393
293 +#: git-gui.sh:2042 lib/index.tcl:395
294 msgid "Revert Changes"
295 msgstr "Änderungen verwerfen"
296
297 -#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
297 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
298 msgid "Sign Off"
299 msgstr "Abzeichnen"
300
301 -#: git-gui.sh:2016 git-gui.sh:2333
301 +#: git-gui.sh:2053 git-gui.sh:2372
302 msgid "Commit@@verb"
303 msgstr "Eintragen"
304
305 -#: git-gui.sh:2027
305 +#: git-gui.sh:2064
306 msgid "Local Merge..."
307 msgstr "Lokales Zusammenführen..."
308
309 -#: git-gui.sh:2032
309 +#: git-gui.sh:2069
310 msgid "Abort Merge..."
311 msgstr "Zusammenführen abbrechen..."
312
313 -#: git-gui.sh:2044
313 +#: git-gui.sh:2081
314 msgid "Push..."
315 msgstr "Versenden..."
316
317 -#: git-gui.sh:2055 lib/choose_repository.tcl:40
317 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
318 msgid "Apple"
319 msgstr "Apple"
320
321 -#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
322 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
321 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
322 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
323 #, tcl-format
324 msgid "About %s"
325 msgstr "Über %s"
326
327 -#: git-gui.sh:2062
327 +#: git-gui.sh:2099
328 msgid "Preferences..."
329 msgstr "Einstellungen..."
330
331 -#: git-gui.sh:2070 git-gui.sh:2595
331 +#: git-gui.sh:2107 git-gui.sh:2639
332 msgid "Options..."
333 msgstr "Optionen..."
334
335 -#: git-gui.sh:2076 lib/choose_repository.tcl:46
335 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
336 msgid "Help"
337 msgstr "Hilfe"
338
339 -#: git-gui.sh:2117
339 +#: git-gui.sh:2154
340 msgid "Online Documentation"
341 msgstr "Online-Dokumentation"
342
343 -#: git-gui.sh:2201
343 +#: git-gui.sh:2238
344 #, tcl-format
345 msgid "fatal: cannot stat path %s: No such file or directory"
346 msgstr ""
347 "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
348 "nicht gefunden"
349
350 -#: git-gui.sh:2234
350 +#: git-gui.sh:2271
351 msgid "Current Branch:"
352 msgstr "Aktueller Zweig:"
353
354 -#: git-gui.sh:2255
354 +#: git-gui.sh:2292
355 msgid "Staged Changes (Will Commit)"
356 msgstr "Bereitstellung (zum Eintragen)"
357
358 -#: git-gui.sh:2274
358 +#: git-gui.sh:2312
359 msgid "Unstaged Changes"
360 msgstr "Nicht bereitgestellte Änderungen"
361
362 -#: git-gui.sh:2323
362 +#: git-gui.sh:2362
363 msgid "Stage Changed"
364 msgstr "Alles bereitstellen"
365
366 -#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
366 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
367 msgid "Push"
368 msgstr "Versenden"
369
370 -#: git-gui.sh:2369
370 +#: git-gui.sh:2408
371 msgid "Initial Commit Message:"
372 msgstr "Erste Versionsbeschreibung:"
373
374 -#: git-gui.sh:2370
374 +#: git-gui.sh:2409
375 msgid "Amended Commit Message:"
376 msgstr "Nachgebesserte Beschreibung:"
377
378 -#: git-gui.sh:2371
378 +#: git-gui.sh:2410
379 msgid "Amended Initial Commit Message:"
380 msgstr "Nachgebesserte erste Beschreibung:"
381
382 -#: git-gui.sh:2372
382 +#: git-gui.sh:2411
383 msgid "Amended Merge Commit Message:"
384 msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
385
386 -#: git-gui.sh:2373
386 +#: git-gui.sh:2412
387 msgid "Merge Commit Message:"
388 msgstr "Zusammenführungs-Beschreibung:"
389
390 -#: git-gui.sh:2374
390 +#: git-gui.sh:2413
391 msgid "Commit Message:"
392 msgstr "Versionsbeschreibung:"
393
394 -#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
394 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
395 msgid "Copy All"
396 msgstr "Alle kopieren"
397
398 -#: git-gui.sh:2443 lib/blame.tcl:104
398 +#: git-gui.sh:2483 lib/blame.tcl:107
399 msgid "File:"
400 msgstr "Datei:"
401
402 -#: git-gui.sh:2573
402 +#: git-gui.sh:2589
403 msgid "Apply/Reverse Hunk"
404 msgstr "Kontext anwenden/umkehren"
405
406 -#: git-gui.sh:2579
406 +#: git-gui.sh:2595
407 msgid "Show Less Context"
408 msgstr "Weniger Zeilen anzeigen"
409
410 -#: git-gui.sh:2586
410 +#: git-gui.sh:2602
411 msgid "Show More Context"
412 msgstr "Mehr Zeilen anzeigen"
413
414 -#: git-gui.sh:2594
414 +#: git-gui.sh:2610
415 msgid "Refresh"
416 msgstr "Aktualisieren"
417
418 -#: git-gui.sh:2615
418 +#: git-gui.sh:2631
419 msgid "Decrease Font Size"
420 msgstr "Schriftgröße verkleinern"
421
422 -#: git-gui.sh:2619
422 +#: git-gui.sh:2635
423 msgid "Increase Font Size"
424 msgstr "Schriftgröße vergrößern"
425
426 -#: git-gui.sh:2630
426 +#: git-gui.sh:2646
427 msgid "Unstage Hunk From Commit"
428 msgstr "Kontext aus Bereitstellung herausnehmen"
429
430 -#: git-gui.sh:2604
430 +#: git-gui.sh:2648
431 msgid "Stage Hunk For Commit"
432 msgstr "Kontext zur Bereitstellung hinzufügen"
433
434 -#: git-gui.sh:2623
434 +#: git-gui.sh:2667
435 msgid "Initializing..."
436 msgstr "Initialisieren..."
437
438 -#: git-gui.sh:2718
438 +#: git-gui.sh:2762
439 #, tcl-format
440 msgid ""
441 "Possible environment issues exist.\n"
@@ -451,7 +451,7 @@ msgstr ""
451 "von %s an Git weitergegeben werden:\n"
452 "\n"
453
454 -#: git-gui.sh:2748
454 +#: git-gui.sh:2792
455 msgid ""
456 "\n"
457 "This is due to a known issue with the\n"
@@ -461,7 +461,7 @@ msgstr ""
461 "Dies ist ein bekanntes Problem der Tcl-Version, die\n"
462 "in Cygwin mitgeliefert wird."
463
464 -#: git-gui.sh:2753
464 +#: git-gui.sh:2797
465 #, tcl-format
466 msgid ""
467 "\n"
@@ -477,7 +477,7 @@ msgstr ""
477 "gewünschten Werte für die Einstellung user.name und \n"
478 "user.email in Ihre Datei ~/.gitconfig einfügen.\n"
479
480 -#: lib/about.tcl:25
480 +#: lib/about.tcl:26
481 msgid "git-gui - a graphical user interface for Git."
482 msgstr "git-gui - eine grafische Oberfläche für Git."
483
@@ -489,56 +489,56 @@ msgstr "Datei-Browser"
489 msgid "Commit:"
490 msgstr "Version:"
491
492 -#: lib/blame.tcl:249
492 +#: lib/blame.tcl:264
493 msgid "Copy Commit"
494 msgstr "Version kopieren"
495
496 -#: lib/blame.tcl:369
496 +#: lib/blame.tcl:384
497 #, tcl-format
498 msgid "Reading %s..."
499 msgstr "%s lesen..."
500
501 -#: lib/blame.tcl:473
501 +#: lib/blame.tcl:488
502 msgid "Loading copy/move tracking annotations..."
503 msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
504
505 -#: lib/blame.tcl:493
505 +#: lib/blame.tcl:508
506 msgid "lines annotated"
507 msgstr "Zeilen annotiert"
508
509 -#: lib/blame.tcl:674
509 +#: lib/blame.tcl:689
510 msgid "Loading original location annotations..."
511 msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
512
513 -#: lib/blame.tcl:677
513 +#: lib/blame.tcl:692
514 msgid "Annotation complete."
515 msgstr "Annotierung vollständig."
516
517 -#: lib/blame.tcl:731
517 +#: lib/blame.tcl:746
518 msgid "Loading annotation..."
519 msgstr "Annotierung laden..."
520
521 -#: lib/blame.tcl:787
521 +#: lib/blame.tcl:802
522 msgid "Author:"
523 msgstr "Autor:"
524
525 -#: lib/blame.tcl:791
525 +#: lib/blame.tcl:806
526 msgid "Committer:"
527 msgstr "Eintragender:"
528
529 -#: lib/blame.tcl:796
529 +#: lib/blame.tcl:811
530 msgid "Original File:"
531 msgstr "Ursprüngliche Datei:"
532
533 -#: lib/blame.tcl:910
533 +#: lib/blame.tcl:925
534 msgid "Originally By:"
535 msgstr "Ursprünglich von:"
536
537 -#: lib/blame.tcl:916
537 +#: lib/blame.tcl:931
538 msgid "In File:"
539 msgstr "In Datei:"
540
541 -#: lib/blame.tcl:921
541 +#: lib/blame.tcl:936
542 msgid "Copied Or Moved Here By:"
543 msgstr "Kopiert oder verschoben durch:"
544
@@ -551,17 +551,17 @@ msgid "Checkout"
551 msgstr "Umstellen"
552
553 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
554 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
555 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
556 -#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
554 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
555 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
556 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
557 msgid "Cancel"
558 msgstr "Abbrechen"
559
560 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
560 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
561 msgid "Revision"
562 msgstr "Version"
563
564 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
564 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
565 msgid "Options"
566 msgstr "Optionen"
567
@@ -581,7 +581,7 @@ msgstr "Zweig erstellen"
581 msgid "Create New Branch"
582 msgstr "Neuen Zweig erstellen"
583
584 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
584 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
585 msgid "Create"
586 msgstr "Erstellen"
587
@@ -721,22 +721,22 @@ msgstr "Starten..."
721 msgid "File Browser"
722 msgstr "Datei-Browser"
723
724 -#: lib/browser.tcl:125 lib/browser.tcl:142
724 +#: lib/browser.tcl:126 lib/browser.tcl:143
725 #, tcl-format
726 msgid "Loading %s..."
727 msgstr "%s laden..."
728
729 -#: lib/browser.tcl:186
729 +#: lib/browser.tcl:187
730 msgid "[Up To Parent]"
731 msgstr "[Nach oben]"
732
733 -#: lib/browser.tcl:266 lib/browser.tcl:272
733 +#: lib/browser.tcl:267 lib/browser.tcl:273
734 msgid "Browse Branch Files"
735 msgstr "Dateien des Zweigs durchblättern"
736
737 -#: lib/browser.tcl:277 lib/choose_repository.tcl:391
738 -#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
739 -#: lib/choose_repository.tcl:989
737 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
738 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
739 +#: lib/choose_repository.tcl:987
740 msgid "Browse"
741 msgstr "Blättern"
742
@@ -750,7 +750,7 @@ msgstr "Änderungen »%s« von »%s« anfordern"
750 msgid "fatal: Cannot resolve %s"
751 msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
752
753 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
753 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
754 msgid "Close"
755 msgstr "Schließen"
756
@@ -839,7 +839,7 @@ msgstr ""
839 "Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
840 "Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
841
842 -#: lib/checkout_op.tcl:446
842 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
843 #, tcl-format
844 msgid "Checked out '%s'."
845 msgstr "Umgestellt auf »%s«."
@@ -860,7 +860,7 @@ msgstr ""
860 msgid "Reset '%s'?"
861 msgstr "»%s« zurücksetzen?"
862
863 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
863 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
864 msgid "Visualize"
865 msgstr "Darstellen"
866
@@ -890,15 +890,15 @@ msgstr "Auswählen"
890 msgid "Font Family"
891 msgstr "Schriftfamilie"
892
893 -#: lib/choose_font.tcl:73
893 +#: lib/choose_font.tcl:74
894 msgid "Font Size"
895 msgstr "Schriftgröße"
896
897 -#: lib/choose_font.tcl:90
897 +#: lib/choose_font.tcl:91
898 msgid "Font Example"
899 msgstr "Schriftbeispiel"
900
901 -#: lib/choose_font.tcl:101
901 +#: lib/choose_font.tcl:103
902 msgid ""
903 "This is example text.\n"
904 "If you like this text, it can be your font."
@@ -906,231 +906,231 @@ msgstr ""
906 "Dies ist ein Beispieltext.\n"
907 "Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
908
909 -#: lib/choose_repository.tcl:27
909 +#: lib/choose_repository.tcl:28
910 msgid "Git Gui"
911 msgstr "Git Gui"
912
913 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
913 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
914 msgid "Create New Repository"
915 msgstr "Neues Projektarchiv"
916
917 -#: lib/choose_repository.tcl:86
917 +#: lib/choose_repository.tcl:87
918 msgid "New..."
919 msgstr "Neu..."
920
921 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
921 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
922 msgid "Clone Existing Repository"
923 msgstr "Projektarchiv klonen"
924
925 -#: lib/choose_repository.tcl:99
925 +#: lib/choose_repository.tcl:100
926 msgid "Clone..."
927 msgstr "Klonen..."
928
929 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
929 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
930 msgid "Open Existing Repository"
931 msgstr "Projektarchiv öffnen"
932
933 -#: lib/choose_repository.tcl:112
933 +#: lib/choose_repository.tcl:113
934 msgid "Open..."
935 msgstr "Öffnen..."
936
937 -#: lib/choose_repository.tcl:125
937 +#: lib/choose_repository.tcl:126
938 msgid "Recent Repositories"
939 msgstr "Zuletzt benutzte Projektarchive"
940
941 -#: lib/choose_repository.tcl:131
941 +#: lib/choose_repository.tcl:132
942 msgid "Open Recent Repository:"
943 msgstr "Zuletzt benutztes Projektarchiv öffnen:"
944
945 -#: lib/choose_repository.tcl:294
946 -#, tcl-format
947 -msgid "Location %s already exists."
948 -msgstr "Projektarchiv »%s« existiert bereits."
949 -
950 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
951 -#: lib/choose_repository.tcl:314
945 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
946 +#: lib/choose_repository.tcl:310
947 #, tcl-format
948 msgid "Failed to create repository %s:"
949 msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
950
956 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
951 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
952 msgid "Directory:"
953 msgstr "Verzeichnis:"
954
960 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
961 -#: lib/choose_repository.tcl:1013
955 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
956 +#: lib/choose_repository.tcl:1011
957 msgid "Git Repository"
958 msgstr "Git Projektarchiv"
959
965 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
960 +#: lib/choose_repository.tcl:437
961 #, tcl-format
962 msgid "Directory %s already exists."
963 msgstr "Verzeichnis »%s« existiert bereits."
964
970 -#: lib/choose_repository.tcl:442
965 +#: lib/choose_repository.tcl:441
966 #, tcl-format
967 msgid "File %s already exists."
968 msgstr "Datei »%s« existiert bereits."
969
975 -#: lib/choose_repository.tcl:463
970 +#: lib/choose_repository.tcl:455
971 msgid "Clone"
972 msgstr "Klonen"
973
979 -#: lib/choose_repository.tcl:476
974 +#: lib/choose_repository.tcl:468
975 msgid "URL:"
976 msgstr "URL:"
977
983 -#: lib/choose_repository.tcl:496
978 +#: lib/choose_repository.tcl:489
979 msgid "Clone Type:"
980 msgstr "Art des Klonens:"
981
987 -#: lib/choose_repository.tcl:502
982 +#: lib/choose_repository.tcl:495
983 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
984 msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
985
991 -#: lib/choose_repository.tcl:508
986 +#: lib/choose_repository.tcl:501
987 msgid "Full Copy (Slower, Redundant Backup)"
988 msgstr "Alles kopieren (langsamer, volle Redundanz)"
989
995 -#: lib/choose_repository.tcl:514
990 +#: lib/choose_repository.tcl:507
991 msgid "Shared (Fastest, Not Recommended, No Backup)"
992 msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
993
999 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
1000 -#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
1001 -#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
994 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
995 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
996 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
997 #, tcl-format
998 msgid "Not a Git repository: %s"
999 msgstr "Kein Git-Projektarchiv in »%s« gefunden."
1000
1006 -#: lib/choose_repository.tcl:586
1001 +#: lib/choose_repository.tcl:579
1002 msgid "Standard only available for local repository."
1003 msgstr "Standard ist nur für lokale Projektarchive verfügbar."
1004
1010 -#: lib/choose_repository.tcl:590
1005 +#: lib/choose_repository.tcl:583
1006 msgid "Shared only available for local repository."
1007 msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
1008
1014 -#: lib/choose_repository.tcl:617
1009 +#: lib/choose_repository.tcl:604
1010 +#, tcl-format
1011 +msgid "Location %s already exists."
1012 +msgstr "Projektarchiv »%s« existiert bereits."
1013 +
1014 +#: lib/choose_repository.tcl:615
1015 msgid "Failed to configure origin"
1016 msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
1017
1018 -#: lib/choose_repository.tcl:629
1018 +#: lib/choose_repository.tcl:627
1019 msgid "Counting objects"
1020 msgstr "Objekte werden gezählt"
1021
1022 -#: lib/choose_repository.tcl:630
1022 +#: lib/choose_repository.tcl:628
1023 msgid "buckets"
1024 msgstr "Buckets"
1025
1026 -#: lib/choose_repository.tcl:654
1026 +#: lib/choose_repository.tcl:652
1027 #, tcl-format
1028 msgid "Unable to copy objects/info/alternates: %s"
1029 msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
1030
1031 -#: lib/choose_repository.tcl:690
1031 +#: lib/choose_repository.tcl:688
1032 #, tcl-format
1033 msgid "Nothing to clone from %s."
1034 msgstr "Von »%s« konnte nichts geklont werden."
1035
1036 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1037 -#: lib/choose_repository.tcl:918
1036 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1037 +#: lib/choose_repository.tcl:916
1038 msgid "The 'master' branch has not been initialized."
1039 msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
1040
1041 -#: lib/choose_repository.tcl:705
1041 +#: lib/choose_repository.tcl:703
1042 msgid "Hardlinks are unavailable. Falling back to copying."
1043 msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
1044
1045 -#: lib/choose_repository.tcl:717
1045 +#: lib/choose_repository.tcl:715
1046 #, tcl-format
1047 msgid "Cloning from %s"
1048 msgstr "Kopieren von »%s«"
1049
1050 -#: lib/choose_repository.tcl:748
1050 +#: lib/choose_repository.tcl:746
1051 msgid "Copying objects"
1052 msgstr "Objektdatenbank kopieren"
1053
1054 -#: lib/choose_repository.tcl:749
1054 +#: lib/choose_repository.tcl:747
1055 msgid "KiB"
1056 msgstr "KB"
1057
1058 -#: lib/choose_repository.tcl:773
1058 +#: lib/choose_repository.tcl:771
1059 #, tcl-format
1060 msgid "Unable to copy object: %s"
1061 msgstr "Objekt kann nicht kopiert werden: %s"
1062
1063 -#: lib/choose_repository.tcl:783
1063 +#: lib/choose_repository.tcl:781
1064 msgid "Linking objects"
1065 msgstr "Objekte verlinken"
1066
1067 -#: lib/choose_repository.tcl:784
1067 +#: lib/choose_repository.tcl:782
1068 msgid "objects"
1069 msgstr "Objekte"
1070
1071 -#: lib/choose_repository.tcl:792
1071 +#: lib/choose_repository.tcl:790
1072 #, tcl-format
1073 msgid "Unable to hardlink object: %s"
1074 msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
1075
1076 -#: lib/choose_repository.tcl:847
1076 +#: lib/choose_repository.tcl:845
1077 msgid "Cannot fetch branches and objects. See console output for details."
1078 msgstr ""
1079 "Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die "
1080 "Ausgaben auf der Konsole für weitere Angaben."
1081
1082 -#: lib/choose_repository.tcl:858
1082 +#: lib/choose_repository.tcl:856
1083 msgid "Cannot fetch tags. See console output for details."
1084 msgstr ""
1085 "Markierungen konnten nicht angefordert werden. Kontrollieren Sie die "
1086 "Ausgaben auf der Konsole für weitere Angaben."
1087
1088 -#: lib/choose_repository.tcl:882
1088 +#: lib/choose_repository.tcl:880
1089 msgid "Cannot determine HEAD. See console output for details."
1090 msgstr ""
1091 "Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die "
1092 "Ausgaben auf der Konsole für weitere Angaben."
1093
1094 -#: lib/choose_repository.tcl:891
1094 +#: lib/choose_repository.tcl:889
1095 #, tcl-format
1096 msgid "Unable to cleanup %s"
1097 msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
1098
1099 -#: lib/choose_repository.tcl:897
1099 +#: lib/choose_repository.tcl:895
1100 msgid "Clone failed."
1101 msgstr "Klonen fehlgeschlagen."
1102
1103 -#: lib/choose_repository.tcl:904
1103 +#: lib/choose_repository.tcl:902
1104 msgid "No default branch obtained."
1105 msgstr "Kein voreingestellter Zweig gefunden."
1106
1107 -#: lib/choose_repository.tcl:915
1107 +#: lib/choose_repository.tcl:913
1108 #, tcl-format
1109 msgid "Cannot resolve %s as a commit."
1110 msgstr "»%s« wurde nicht als Version gefunden."
1111
1112 -#: lib/choose_repository.tcl:927
1112 +#: lib/choose_repository.tcl:925
1113 msgid "Creating working directory"
1114 msgstr "Arbeitskopie erstellen"
1115
1116 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1116 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1117 #: lib/index.tcl:193
1118 msgid "files"
1119 msgstr "Dateien"
1120
1121 -#: lib/choose_repository.tcl:957
1121 +#: lib/choose_repository.tcl:955
1122 msgid "Initial file checkout failed."
1123 msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
1124
1125 -#: lib/choose_repository.tcl:973
1125 +#: lib/choose_repository.tcl:971
1126 msgid "Open"
1127 msgstr "Öffnen"
1128
1129 -#: lib/choose_repository.tcl:983
1129 +#: lib/choose_repository.tcl:981
1130 msgid "Repository:"
1131 msgstr "Projektarchiv:"
1132
1133 -#: lib/choose_repository.tcl:1033
1133 +#: lib/choose_repository.tcl:1031
1134 #, tcl-format
1135 msgid "Failed to open repository %s:"
1136 msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
@@ -1151,7 +1151,7 @@ msgstr "Lokaler Zweig"
1151 msgid "Tracking Branch"
1152 msgstr "Übernahmezweig"
1153
1154 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1154 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1155 msgid "Tag"
1156 msgstr "Markierung"
1157
@@ -1168,11 +1168,11 @@ msgstr "Keine Version ausgewählt."
1168 msgid "Revision expression is empty."
1169 msgstr "Versions-Ausdruck ist leer."
1170
1171 -#: lib/choose_rev.tcl:530
1171 +#: lib/choose_rev.tcl:531
1172 msgid "Updated"
1173 msgstr "Aktualisiert"
1174
1175 -#: lib/choose_rev.tcl:558
1175 +#: lib/choose_rev.tcl:559
1176 msgid "URL"
1177 msgstr "URL"
1178
@@ -1304,7 +1304,9 @@ msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle..."
1304
1305 #: lib/commit.tcl:274
1306 msgid "Commit declined by commit-msg hook."
1307 -msgstr "Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message hook«)."
1307 +msgstr ""
1308 +"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
1309 +"hook«)."
1310
1311 #: lib/commit.tcl:287
1312 msgid "Committing changes..."
@@ -1323,7 +1325,7 @@ msgstr "Eintragen fehlgeschlagen."
1325 msgid "Commit %s appears to be corrupt"
1326 msgstr "Version »%s« scheint beschädigt zu sein"
1327
1326 -#: lib/commit.tcl:279
1328 +#: lib/commit.tcl:326
1329 msgid ""
1330 "No changes to commit.\n"
1331 "\n"
@@ -1338,7 +1340,7 @@ msgstr ""
1340 "\n"
1341 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
1342
1341 -#: lib/commit.tcl:286
1343 +#: lib/commit.tcl:333
1344 msgid "No changes to commit."
1345 msgstr "Keine Änderungen, die eingetragen werden können."
1346
@@ -1346,24 +1348,24 @@ msgstr "Keine Änderungen, die eingetragen werden können."
1348 msgid "commit-tree failed:"
1349 msgstr "commit-tree fehlgeschlagen:"
1350
1349 -#: lib/commit.tcl:339
1351 +#: lib/commit.tcl:367
1352 msgid "update-ref failed:"
1353 msgstr "update-ref fehlgeschlagen:"
1354
1353 -#: lib/commit.tcl:430
1355 +#: lib/commit.tcl:454
1356 #, tcl-format
1357 msgid "Created commit %s: %s"
1358 msgstr "Version %s übertragen: %s"
1359
1358 -#: lib/console.tcl:57
1360 +#: lib/console.tcl:59
1361 msgid "Working... please wait..."
1362 msgstr "Verarbeitung. Bitte warten..."
1363
1362 -#: lib/console.tcl:183
1364 +#: lib/console.tcl:186
1365 msgid "Success"
1366 msgstr "Erfolgreich"
1367
1366 -#: lib/console.tcl:196
1368 +#: lib/console.tcl:200
1369 msgid "Error: Command Failed"
1370 msgstr "Fehler: Kommando fehlgeschlagen"
1371
@@ -1474,24 +1476,24 @@ msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
1476 msgid "Error loading diff:"
1477 msgstr "Fehler beim Laden des Vergleichs:"
1478
1477 -#: lib/diff.tcl:302
1479 +#: lib/diff.tcl:303
1480 msgid "Failed to unstage selected hunk."
1481 msgstr ""
1482 "Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
1483
1482 -#: lib/diff.tcl:309
1484 +#: lib/diff.tcl:310
1485 msgid "Failed to stage selected hunk."
1486 msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
1487
1486 -#: lib/error.tcl:12 lib/error.tcl:102
1488 +#: lib/error.tcl:20 lib/error.tcl:114
1489 msgid "error"
1490 msgstr "Fehler"
1491
1490 -#: lib/error.tcl:28
1492 +#: lib/error.tcl:36
1493 msgid "warning"
1494 msgstr "Warnung"
1495
1494 -#: lib/error.tcl:81
1496 +#: lib/error.tcl:94
1497 msgid "You must correct the above errors before committing."
1498 msgstr ""
1499 "Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
@@ -1545,12 +1547,12 @@ msgstr "Änderungen in Datei »%s« verwerfen?"
1547 msgid "Revert changes in these %i files?"
1548 msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
1549
1548 -#: lib/index.tcl:389
1550 +#: lib/index.tcl:391
1551 msgid "Any unstaged changes will be permanently lost by the revert."
1552 msgstr ""
1553 "Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
1554
1553 -#: lib/index.tcl:392
1555 +#: lib/index.tcl:394
1556 msgid "Do Nothing"
1557 msgstr "Nichts tun"
1558
@@ -1629,20 +1631,20 @@ msgstr "Zusammenführen von %s und %s..."
1631 msgid "Merge completed successfully."
1632 msgstr "Zusammenführen erfolgreich abgeschlossen."
1633
1632 -#: lib/merge.tcl:133
1634 +#: lib/merge.tcl:132
1635 msgid "Merge failed. Conflict resolution is required."
1636 msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
1637
1636 -#: lib/merge.tcl:158
1638 +#: lib/merge.tcl:157
1639 #, tcl-format
1640 msgid "Merge Into %s"
1641 msgstr "Zusammenführen in »%s«"
1642
1641 -#: lib/merge.tcl:177
1643 +#: lib/merge.tcl:176
1644 msgid "Revision To Merge"
1645 msgstr "Zusammenzuführende Version"
1646
1645 -#: lib/merge.tcl:212
1647 +#: lib/merge.tcl:211
1648 msgid ""
1649 "Cannot abort while amending.\n"
1650 "\n"
@@ -1652,7 +1654,7 @@ msgstr ""
1654 "\n"
1655 "Sie müssen die Nachbesserung der Version abschließen.\n"
1656
1655 -#: lib/merge.tcl:222
1657 +#: lib/merge.tcl:221
1658 msgid ""
1659 "Abort merge?\n"
1660 "\n"
@@ -1667,7 +1669,7 @@ msgstr ""
1669 "\n"
1670 "Zusammenführen jetzt abbrechen?"
1671
1670 -#: lib/merge.tcl:228
1672 +#: lib/merge.tcl:227
1673 msgid ""
1674 "Reset changes?\n"
1675 "\n"
@@ -1682,7 +1684,7 @@ msgstr ""
1684 "\n"
1685 "Änderungen jetzt zurücksetzen?"
1686
1685 -#: lib/merge.tcl:239
1687 +#: lib/merge.tcl:238
1688 msgid "Aborting"
1689 msgstr "Abbruch"
1690
@@ -1694,89 +1696,94 @@ msgstr "Dateien zurückgesetzt"
1696 msgid "Abort failed."
1697 msgstr "Abbruch fehlgeschlagen."
1698
1697 -#: lib/merge.tcl:268
1699 +#: lib/merge.tcl:267
1700 msgid "Abort completed. Ready."
1701 msgstr "Abbruch durchgeführt. Bereit."
1702
1701 -#: lib/option.tcl:82
1703 +#: lib/option.tcl:95
1704 msgid "Restore Defaults"
1705 msgstr "Voreinstellungen wiederherstellen"
1706
1705 -#: lib/option.tcl:86
1707 +#: lib/option.tcl:99
1708 msgid "Save"
1709 msgstr "Speichern"
1710
1709 -#: lib/option.tcl:96
1711 +#: lib/option.tcl:109
1712 #, tcl-format
1713 msgid "%s Repository"
1714 msgstr "Projektarchiv %s"
1715
1714 -#: lib/option.tcl:97
1716 +#: lib/option.tcl:110
1717 msgid "Global (All Repositories)"
1718 msgstr "Global (Alle Projektarchive)"
1719
1718 -#: lib/option.tcl:103
1720 +#: lib/option.tcl:116
1721 msgid "User Name"
1722 msgstr "Benutzername"
1723
1722 -#: lib/option.tcl:104
1724 +#: lib/option.tcl:117
1725 msgid "Email Address"
1726 msgstr "E-Mail-Adresse"
1727
1726 -#: lib/option.tcl:106
1728 +#: lib/option.tcl:119
1729 msgid "Summarize Merge Commits"
1730 msgstr "Zusammenführungs-Versionen zusammenfassen"
1731
1730 -#: lib/option.tcl:107
1732 +#: lib/option.tcl:120
1733 msgid "Merge Verbosity"
1734 msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
1735
1734 -#: lib/option.tcl:108
1736 +#: lib/option.tcl:121
1737 msgid "Show Diffstat After Merge"
1738 msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
1739
1738 -#: lib/option.tcl:110
1740 +#: lib/option.tcl:123
1741 msgid "Trust File Modification Timestamps"
1742 msgstr "Auf Dateiänderungsdatum verlassen"
1743
1742 -#: lib/option.tcl:111
1744 +#: lib/option.tcl:124
1745 msgid "Prune Tracking Branches During Fetch"
1746 msgstr "Übernahmezweige aufräumen während Anforderung"
1747
1746 -#: lib/option.tcl:112
1748 +#: lib/option.tcl:125
1749 msgid "Match Tracking Branches"
1750 msgstr "Passend zu Übernahmezweig"
1751
1750 -#: lib/option.tcl:113
1752 +#: lib/option.tcl:126
1753 msgid "Number of Diff Context Lines"
1754 msgstr "Anzahl der Kontextzeilen beim Vergleich"
1755
1754 -#: lib/option.tcl:114
1756 +#: lib/option.tcl:127
1757 +#, fuzzy
1758 +msgid "Commit Message Text Width"
1759 +msgstr "Versionsbeschreibung:"
1760 +
1761 +#: lib/option.tcl:128
1762 msgid "New Branch Name Template"
1763 msgstr "Namensvorschlag für neue Zweige"
1764
1758 -#: lib/option.tcl:191
1765 +#: lib/option.tcl:192
1766 msgid "Spelling Dictionary:"
1767 msgstr "Wörterbuch Rechtschreibprüfung:"
1768
1762 -#: lib/option.tcl:215
1769 +#: lib/option.tcl:216
1770 msgid "Change Font"
1771 msgstr "Schriftart ändern"
1772
1766 -#: lib/option.tcl:180
1773 +#: lib/option.tcl:220
1774 #, tcl-format
1775 msgid "Choose %s"
1776 msgstr "%s wählen"
1777
1771 -#: lib/option.tcl:186
1778 +#: lib/option.tcl:226
1779 msgid "pt."
1780 msgstr "pt."
1781
1775 -#: lib/option.tcl:200
1782 +#: lib/option.tcl:240
1783 msgid "Preferences"
1784 msgstr "Einstellungen"
1785
1779 -#: lib/option.tcl:235
1786 +#: lib/option.tcl:275
1787 msgid "Failed to completely save options:"
1788 msgstr "Optionen konnten nicht gespeichert werden:"
1789
@@ -1886,23 +1893,44 @@ msgstr "Fehler beim Schreiben der Verknüpfung:"
1893 msgid "Cannot write icon:"
1894 msgstr "Fehler beim Erstellen des Icons:"
1895
1889 -#: lib/spellcheck.tcl:37
1890 -msgid "Not connected to aspell"
1891 -msgstr "Keine Verbindung zu »aspell«"
1896 +#: lib/spellcheck.tcl:57
1897 +msgid "Unsupported spell checker"
1898 +msgstr ""
1899 +
1900 +#: lib/spellcheck.tcl:65
1901 +#, fuzzy
1902 +msgid "Spell checking is unavailable"
1903 +msgstr "Rechtschreibprüfung fehlgeschlagen"
1904 +
1905 +#: lib/spellcheck.tcl:68
1906 +msgid "Invalid spell checking configuration"
1907 +msgstr ""
1908 +
1909 +#: lib/spellcheck.tcl:70
1910 +#, tcl-format
1911 +msgid "Reverting dictionary to %s."
1912 +msgstr ""
1913 +
1914 +#: lib/spellcheck.tcl:73
1915 +#, fuzzy
1916 +msgid "Spell checker silently failed on startup"
1917 +msgstr "Rechtschreibprüfung fehlgeschlagen"
1918
1893 -#: lib/spellcheck.tcl:41
1894 -msgid "Unrecognized aspell version"
1919 +#: lib/spellcheck.tcl:80
1920 +#, fuzzy
1921 +msgid "Unrecognized spell checker"
1922 msgstr "Unbekannte Version von »aspell«"
1923
1897 -#: lib/spellcheck.tcl:135
1924 +#: lib/spellcheck.tcl:180
1925 msgid "No Suggestions"
1926 msgstr "Keine Vorschläge"
1927
1901 -#: lib/spellcheck.tcl:336
1902 -msgid "Unexpected EOF from aspell"
1928 +#: lib/spellcheck.tcl:381
1929 +#, fuzzy
1930 +msgid "Unexpected EOF from spell checker"
1931 msgstr "Unerwartetes EOF von »aspell«"
1932
1905 -#: lib/spellcheck.tcl:340
1933 +#: lib/spellcheck.tcl:385
1934 msgid "Spell Checker Failed"
1935 msgstr "Rechtschreibprüfung fehlgeschlagen"
1936
@@ -1974,3 +2002,6 @@ msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
2002 #: lib/transport.tcl:168
2003 msgid "Include tags"
2004 msgstr "Mit Markierungen übertragen"
2005 +
2006 +#~ msgid "Not connected to aspell"
2007 +#~ msgstr "Keine Verbindung zu »aspell«"
po/fr.po
+423 -294
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: fr\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
11 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
12 "PO-Revision-Date: 2008-01-14 21:08+0100\n"
13 "Last-Translator: Christian Couder <chriscool@tuxfamily.org>\n"
14 "Language-Team: French\n"
@@ -18,33 +18,33 @@ msgstr ""
18 "X-Generator: KBabel 1.11.4\n"
19 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
20
21 -#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
22 -#: git-gui.sh:733
21 +#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
22 +#: git-gui.sh:763
23 msgid "git-gui: fatal error"
24 msgstr "git-gui: erreur fatale"
25
26 -#: git-gui.sh:565
26 +#: git-gui.sh:593
27 #, tcl-format
28 msgid "Invalid font specified in %s:"
29 msgstr "Invalide fonte spécifiée dans %s :"
30
31 -#: git-gui.sh:590
31 +#: git-gui.sh:620
32 msgid "Main Font"
33 msgstr "Fonte principale"
34
35 -#: git-gui.sh:591
35 +#: git-gui.sh:621
36 msgid "Diff/Console Font"
37 msgstr "Fonte diff/console"
38
39 -#: git-gui.sh:605
39 +#: git-gui.sh:635
40 msgid "Cannot find git in PATH."
41 msgstr "Impossible de trouver git dans PATH."
42
43 -#: git-gui.sh:632
43 +#: git-gui.sh:662
44 msgid "Cannot parse Git version string:"
45 msgstr "Impossible de parser la version de Git :"
46
47 -#: git-gui.sh:650
47 +#: git-gui.sh:680
48 #, tcl-format
49 msgid ""
50 "Git version cannot be determined.\n"
@@ -63,79 +63,79 @@ msgstr ""
63 "\n"
64 "Peut'on considérer que '%s' est en version 1.5.0 ?\n"
65
66 -#: git-gui.sh:888
66 +#: git-gui.sh:918
67 msgid "Git directory not found:"
68 msgstr "Impossible de trouver le répertoire de Git :"
69
70 -#: git-gui.sh:895
70 +#: git-gui.sh:925
71 msgid "Cannot move to top of working directory:"
72 msgstr "Impossible d'aller à la racine du répertoire de travail :"
73
74 -#: git-gui.sh:902
74 +#: git-gui.sh:932
75 msgid "Cannot use funny .git directory:"
76 msgstr "Impossible d'utiliser un drôle de répertoire git :"
77
78 -#: git-gui.sh:907
78 +#: git-gui.sh:937
79 msgid "No working directory"
80 msgstr "Pas de répertoire de travail"
81
82 -#: git-gui.sh:1054
82 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
83 msgid "Refreshing file status..."
84 msgstr "Rafraichissement du status des fichiers..."
85
86 -#: git-gui.sh:1119
86 +#: git-gui.sh:1149
87 msgid "Scanning for modified files ..."
88 msgstr "Recherche de fichiers modifiés..."
89
90 -#: git-gui.sh:1294 lib/browser.tcl:245
90 +#: git-gui.sh:1324 lib/browser.tcl:246
91 msgid "Ready."
92 msgstr "Prêt."
93
94 -#: git-gui.sh:1560
94 +#: git-gui.sh:1590
95 msgid "Unmodified"
96 msgstr "Non modifié"
97
98 -#: git-gui.sh:1562
98 +#: git-gui.sh:1592
99 msgid "Modified, not staged"
100 msgstr "Modifié, non pré-commité"
101
102 -#: git-gui.sh:1563 git-gui.sh:1568
102 +#: git-gui.sh:1593 git-gui.sh:1598
103 msgid "Staged for commit"
104 msgstr "Pré-commité"
105
106 -#: git-gui.sh:1564 git-gui.sh:1569
106 +#: git-gui.sh:1594 git-gui.sh:1599
107 msgid "Portions staged for commit"
108 msgstr "En partie pré-commité"
109
110 -#: git-gui.sh:1565 git-gui.sh:1570
110 +#: git-gui.sh:1595 git-gui.sh:1600
111 msgid "Staged for commit, missing"
112 msgstr "Pré-commité, manquant"
113
114 -#: git-gui.sh:1567
114 +#: git-gui.sh:1597
115 msgid "Untracked, not staged"
116 msgstr "Non suivi, non pré-commité"
117
118 -#: git-gui.sh:1572
118 +#: git-gui.sh:1602
119 msgid "Missing"
120 msgstr "Manquant"
121
122 -#: git-gui.sh:1573
122 +#: git-gui.sh:1603
123 msgid "Staged for removal"
124 msgstr "Pré-commité pour suppression"
125
126 -#: git-gui.sh:1574
126 +#: git-gui.sh:1604
127 msgid "Staged for removal, still present"
128 msgstr "Pré-commité pour suppression, toujours présent"
129
130 -#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
130 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
131 msgid "Requires merge resolution"
132 msgstr "Nécessite la résolution d'une fusion"
133
134 -#: git-gui.sh:1614
134 +#: git-gui.sh:1644
135 msgid "Starting gitk... please wait..."
136 msgstr "Lancement de gitk... merci de patienter..."
137
138 -#: git-gui.sh:1623
138 +#: git-gui.sh:1653
139 #, tcl-format
140 msgid ""
141 "Unable to start gitk:\n"
@@ -146,295 +146,296 @@ msgstr ""
146 "\n"
147 "%s inexistant"
148
149 -#: git-gui.sh:1823 lib/choose_repository.tcl:35
149 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
150 msgid "Repository"
151 msgstr "Référentiel"
152
153 -#: git-gui.sh:1824
153 +#: git-gui.sh:1861
154 msgid "Edit"
155 msgstr "Editer"
156
157 -#: git-gui.sh:1826 lib/choose_rev.tcl:560
157 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
158 msgid "Branch"
159 msgstr "Branche"
160
161 -#: git-gui.sh:1829 lib/choose_rev.tcl:547
161 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
162 msgid "Commit@@noun"
163 msgstr "Commit"
164
165 -#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
165 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
166 msgid "Merge"
167 msgstr "Fusionner"
168
169 -#: git-gui.sh:1833 lib/choose_rev.tcl:556
169 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
170 msgid "Remote"
171 msgstr "Référentiel distant"
172
173 -#: git-gui.sh:1842
173 +#: git-gui.sh:1879
174 msgid "Browse Current Branch's Files"
175 msgstr "Visionner fichiers dans branche courante"
176
177 -#: git-gui.sh:1846
177 +#: git-gui.sh:1883
178 msgid "Browse Branch Files..."
179 msgstr "Visionner fichiers de branche"
180
181 -#: git-gui.sh:1851
181 +#: git-gui.sh:1888
182 msgid "Visualize Current Branch's History"
183 msgstr "Visualiser historique branche courante"
184
185 -#: git-gui.sh:1855
185 +#: git-gui.sh:1892
186 msgid "Visualize All Branch History"
187 msgstr "Visualiser historique toutes branches"
188
189 -#: git-gui.sh:1862
189 +#: git-gui.sh:1899
190 #, tcl-format
191 msgid "Browse %s's Files"
192 msgstr "Visionner fichiers de %s"
193
194 -#: git-gui.sh:1864
194 +#: git-gui.sh:1901
195 #, tcl-format
196 msgid "Visualize %s's History"
197 msgstr "Visualiser historique de %s"
198
199 -#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
199 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
200 msgid "Database Statistics"
201 msgstr "Statistiques base de donnée"
202
203 -#: git-gui.sh:1872 lib/database.tcl:34
203 +#: git-gui.sh:1909 lib/database.tcl:34
204 msgid "Compress Database"
205 msgstr "Comprimer base de donnée"
206
207 -#: git-gui.sh:1875
207 +#: git-gui.sh:1912
208 msgid "Verify Database"
209 msgstr "Vérifier base de donnée"
210
211 -#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
211 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
212 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
213 msgid "Create Desktop Icon"
214 msgstr "Créer icône sur bureau"
215
216 -#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
216 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
217 msgid "Quit"
218 msgstr "Quitter"
219
220 -#: git-gui.sh:1902
220 +#: git-gui.sh:1939
221 msgid "Undo"
222 msgstr "Défaire"
223
224 -#: git-gui.sh:1905
224 +#: git-gui.sh:1942
225 msgid "Redo"
226 msgstr "Refaire"
227
228 -#: git-gui.sh:1909 git-gui.sh:2403
228 +#: git-gui.sh:1946 git-gui.sh:2443
229 msgid "Cut"
230 msgstr "Couper"
231
232 -#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
233 -#: lib/console.tcl:67
232 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
233 +#: lib/console.tcl:69
234 msgid "Copy"
235 msgstr "Copier"
236
237 -#: git-gui.sh:1915 git-gui.sh:2409
237 +#: git-gui.sh:1952 git-gui.sh:2449
238 msgid "Paste"
239 msgstr "Coller"
240
241 -#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
241 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
242 #: lib/remote_branch_delete.tcl:38
243 msgid "Delete"
244 msgstr "Supprimer"
245
246 -#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
246 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
247 msgid "Select All"
248 msgstr "Tout sélectionner"
249
250 -#: git-gui.sh:1931
250 +#: git-gui.sh:1968
251 msgid "Create..."
252 msgstr "Créer..."
253
254 -#: git-gui.sh:1937
254 +#: git-gui.sh:1974
255 msgid "Checkout..."
256 msgstr "Emprunter... "
257
258 -#: git-gui.sh:1943
258 +#: git-gui.sh:1980
259 msgid "Rename..."
260 msgstr "Renommer..."
261
262 -#: git-gui.sh:1948 git-gui.sh:2048
262 +#: git-gui.sh:1985 git-gui.sh:2085
263 msgid "Delete..."
264 msgstr "Supprimer..."
265
266 -#: git-gui.sh:1953
266 +#: git-gui.sh:1990
267 msgid "Reset..."
268 msgstr "Réinitialiser..."
269
270 -#: git-gui.sh:1965 git-gui.sh:2350
270 +#: git-gui.sh:2002 git-gui.sh:2389
271 msgid "New Commit"
272 msgstr "Nouveau commit"
273
274 -#: git-gui.sh:1973 git-gui.sh:2357
274 +#: git-gui.sh:2010 git-gui.sh:2396
275 msgid "Amend Last Commit"
276 msgstr "Corriger dernier commit"
277
278 -#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
278 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
279 msgid "Rescan"
280 msgstr "Resynchroniser"
281
282 -#: git-gui.sh:1988
282 +#: git-gui.sh:2025
283 msgid "Stage To Commit"
284 msgstr "Commiter un pré-commit"
285
286 -#: git-gui.sh:1994
286 +#: git-gui.sh:2031
287 msgid "Stage Changed Files To Commit"
288 msgstr "Commiter fichiers modifiés dans pré-commit"
289
290 -#: git-gui.sh:2000
290 +#: git-gui.sh:2037
291 msgid "Unstage From Commit"
292 msgstr "Commit vers pré-commit"
293
294 -#: git-gui.sh:2005 lib/index.tcl:393
294 +#: git-gui.sh:2042 lib/index.tcl:395
295 msgid "Revert Changes"
296 msgstr "Inverser modification"
297
298 -#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
298 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
299 msgid "Sign Off"
300 msgstr "Se désinscrire"
301
302 -#: git-gui.sh:2016 git-gui.sh:2333
302 +#: git-gui.sh:2053 git-gui.sh:2372
303 msgid "Commit@@verb"
304 msgstr "Commiter"
305
306 -#: git-gui.sh:2027
306 +#: git-gui.sh:2064
307 msgid "Local Merge..."
308 msgstr "Fusion locale..."
309
310 -#: git-gui.sh:2032
310 +#: git-gui.sh:2069
311 msgid "Abort Merge..."
312 msgstr "Abandonner fusion..."
313
314 -#: git-gui.sh:2044
314 +#: git-gui.sh:2081
315 msgid "Push..."
316 msgstr "Pousser..."
317
318 -#: git-gui.sh:2055 lib/choose_repository.tcl:40
318 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
319 msgid "Apple"
320 msgstr "Pomme"
321
322 -#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
323 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
322 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
323 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
324 #, tcl-format
325 msgid "About %s"
326 msgstr "A propos de %s"
327
328 -#: git-gui.sh:2062
328 +#: git-gui.sh:2099
329 msgid "Preferences..."
330 msgstr "Préférences..."
331
332 -#: git-gui.sh:2070 git-gui.sh:2595
332 +#: git-gui.sh:2107 git-gui.sh:2639
333 msgid "Options..."
334 msgstr "Options..."
335
336 -#: git-gui.sh:2076 lib/choose_repository.tcl:46
336 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
337 msgid "Help"
338 msgstr "Aide"
339
340 -#: git-gui.sh:2117
340 +#: git-gui.sh:2154
341 msgid "Online Documentation"
342 msgstr "Documentation en ligne"
343
344 -#: git-gui.sh:2201
344 +#: git-gui.sh:2238
345 #, tcl-format
346 msgid "fatal: cannot stat path %s: No such file or directory"
347 -msgstr "fatale : pas d'infos sur le chemin %s : Fichier ou répertoire inexistant"
347 +msgstr ""
348 +"fatale : pas d'infos sur le chemin %s : Fichier ou répertoire inexistant"
349
349 -#: git-gui.sh:2234
350 +#: git-gui.sh:2271
351 msgid "Current Branch:"
352 msgstr "Branche courante :"
353
353 -#: git-gui.sh:2255
354 +#: git-gui.sh:2292
355 msgid "Staged Changes (Will Commit)"
356 msgstr "Modifications pré-commitées"
357
357 -#: git-gui.sh:2274
358 +#: git-gui.sh:2312
359 msgid "Unstaged Changes"
360 msgstr "Modifications non pré-commitées"
361
361 -#: git-gui.sh:2323
362 +#: git-gui.sh:2362
363 msgid "Stage Changed"
364 msgstr "Pré-commit modifié"
365
365 -#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
366 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
367 msgid "Push"
368 msgstr "Pousser"
369
369 -#: git-gui.sh:2369
370 +#: git-gui.sh:2408
371 msgid "Initial Commit Message:"
372 msgstr "Message de commit initial :"
373
373 -#: git-gui.sh:2370
374 +#: git-gui.sh:2409
375 msgid "Amended Commit Message:"
376 msgstr "Message de commit corrigé :"
377
377 -#: git-gui.sh:2371
378 +#: git-gui.sh:2410
379 msgid "Amended Initial Commit Message:"
380 msgstr "Message de commit initial corrigé :"
381
381 -#: git-gui.sh:2372
382 +#: git-gui.sh:2411
383 msgid "Amended Merge Commit Message:"
384 msgstr "Message de commit de fusion corrigé :"
385
385 -#: git-gui.sh:2373
386 +#: git-gui.sh:2412
387 msgid "Merge Commit Message:"
388 msgstr "Message de commit de fusion :"
389
389 -#: git-gui.sh:2374
390 +#: git-gui.sh:2413
391 msgid "Commit Message:"
392 msgstr "Message de commit :"
393
393 -#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
394 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
395 msgid "Copy All"
396 msgstr "Copier tout"
397
397 -#: git-gui.sh:2443 lib/blame.tcl:104
398 +#: git-gui.sh:2483 lib/blame.tcl:107
399 msgid "File:"
400 msgstr "Fichier :"
401
401 -#: git-gui.sh:2545
402 -msgid "Refresh"
403 -msgstr "Rafraichir"
404 -
405 -#: git-gui.sh:2566
402 +#: git-gui.sh:2589
403 msgid "Apply/Reverse Hunk"
404 msgstr "Appliquer/Inverser section"
405
409 -#: git-gui.sh:2572
410 -msgid "Decrease Font Size"
411 -msgstr "Réduire fonte"
412 -
413 -#: git-gui.sh:2576
414 -msgid "Increase Font Size"
415 -msgstr "Agrandir fonte"
416 -
417 -#: git-gui.sh:2581
406 +#: git-gui.sh:2595
407 msgid "Show Less Context"
408 msgstr "Montrer moins de contexte"
409
421 -#: git-gui.sh:2588
410 +#: git-gui.sh:2602
411 msgid "Show More Context"
412 msgstr "Montrer plus de contexte"
413
425 -#: git-gui.sh:2602
414 +#: git-gui.sh:2610
415 +msgid "Refresh"
416 +msgstr "Rafraichir"
417 +
418 +#: git-gui.sh:2631
419 +msgid "Decrease Font Size"
420 +msgstr "Réduire fonte"
421 +
422 +#: git-gui.sh:2635
423 +msgid "Increase Font Size"
424 +msgstr "Agrandir fonte"
425 +
426 +#: git-gui.sh:2646
427 msgid "Unstage Hunk From Commit"
428 msgstr "Enlever section pré-commitée"
429
429 -#: git-gui.sh:2604
430 +#: git-gui.sh:2648
431 msgid "Stage Hunk For Commit"
432 msgstr "Pré-commiter section"
433
433 -#: git-gui.sh:2623
434 +#: git-gui.sh:2667
435 msgid "Initializing..."
436 msgstr "Initialisation..."
437
437 -#: git-gui.sh:2718
438 +#: git-gui.sh:2762
439 #, tcl-format
440 msgid ""
441 "Possible environment issues exist.\n"
@@ -451,7 +452,7 @@ msgstr ""
452 "sous-processus de Git lancés par %s\n"
453 "\n"
454
454 -#: git-gui.sh:2748
455 +#: git-gui.sh:2792
456 msgid ""
457 "\n"
458 "This is due to a known issue with the\n"
@@ -461,7 +462,7 @@ msgstr ""
462 "Ceci est du à un problème connu avec\n"
463 "le binaire Tcl distribué par Cygwin."
464
464 -#: git-gui.sh:2753
465 +#: git-gui.sh:2797
466 #, tcl-format
467 msgid ""
468 "\n"
@@ -478,7 +479,7 @@ msgstr ""
479 "de l'utilisateur) et 'user.email' (addresse email\n"
480 "de l'utilisateur) dans votre fichier '~/.gitconfig'.\n"
481
481 -#: lib/about.tcl:25
482 +#: lib/about.tcl:26
483 msgid "git-gui - a graphical user interface for Git."
484 msgstr "git-gui - une interface graphique utilisateur pour Git"
485
@@ -490,56 +491,56 @@ msgstr "Visionneur de fichier"
491 msgid "Commit:"
492 msgstr "Commit :"
493
493 -#: lib/blame.tcl:249
494 +#: lib/blame.tcl:264
495 msgid "Copy Commit"
496 msgstr "Copier commit"
497
497 -#: lib/blame.tcl:369
498 +#: lib/blame.tcl:384
499 #, tcl-format
500 msgid "Reading %s..."
501 msgstr "Lecture de %s..."
502
502 -#: lib/blame.tcl:473
503 +#: lib/blame.tcl:488
504 msgid "Loading copy/move tracking annotations..."
505 msgstr "Chargement des annotations de suivi des copies/déplacements..."
506
506 -#: lib/blame.tcl:493
507 +#: lib/blame.tcl:508
508 msgid "lines annotated"
509 msgstr "lignes annotées"
510
510 -#: lib/blame.tcl:674
511 +#: lib/blame.tcl:689
512 msgid "Loading original location annotations..."
513 msgstr "Chargement des annotations d'emplacement original"
514
514 -#: lib/blame.tcl:677
515 +#: lib/blame.tcl:692
516 msgid "Annotation complete."
517 msgstr "Annotation terminée."
518
518 -#: lib/blame.tcl:731
519 +#: lib/blame.tcl:746
520 msgid "Loading annotation..."
521 msgstr "Chargement des annotations..."
522
522 -#: lib/blame.tcl:787
523 +#: lib/blame.tcl:802
524 msgid "Author:"
525 msgstr "Auteur :"
526
526 -#: lib/blame.tcl:791
527 +#: lib/blame.tcl:806
528 msgid "Committer:"
529 msgstr "Commiteur :"
530
530 -#: lib/blame.tcl:796
531 +#: lib/blame.tcl:811
532 msgid "Original File:"
533 msgstr "Fichier original :"
534
534 -#: lib/blame.tcl:910
535 +#: lib/blame.tcl:925
536 msgid "Originally By:"
537 msgstr "A l'origine par :"
538
538 -#: lib/blame.tcl:916
539 +#: lib/blame.tcl:931
540 msgid "In File:"
541 msgstr "Dans le fichier :"
542
542 -#: lib/blame.tcl:921
543 +#: lib/blame.tcl:936
544 msgid "Copied Or Moved Here By:"
545 msgstr "Copié ou déplacé ici par :"
546
@@ -552,17 +553,17 @@ msgid "Checkout"
553 msgstr "Emprunter"
554
555 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
555 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
556 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
557 -#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
556 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
557 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
558 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
559 msgid "Cancel"
560 msgstr "Annuler"
561
561 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
562 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
563 msgid "Revision"
564 msgstr "Révision"
565
565 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
566 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
567 msgid "Options"
568 msgstr "Options"
569
@@ -582,7 +583,7 @@ msgstr "Créer branche"
583 msgid "Create New Branch"
584 msgstr "Créer nouvelle branche"
585
585 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
586 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
587 msgid "Create"
588 msgstr "Créer"
589
@@ -629,7 +630,8 @@ msgstr "Merci de choisir une branche de suivi"
630 #: lib/branch_create.tcl:140
631 #, tcl-format
632 msgid "Tracking branch %s is not a branch in the remote repository."
632 -msgstr "La branche de suivi %s n'est pas une branche dans le référentiel distant."
633 +msgstr ""
634 +"La branche de suivi %s n'est pas une branche dans le référentiel distant."
635
636 #: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
637 msgid "Please supply a branch name."
@@ -722,22 +724,22 @@ msgstr "Lancement..."
724 msgid "File Browser"
725 msgstr "Visionneur de fichier"
726
725 -#: lib/browser.tcl:125 lib/browser.tcl:142
727 +#: lib/browser.tcl:126 lib/browser.tcl:143
728 #, tcl-format
729 msgid "Loading %s..."
730 msgstr "Chargement de %s..."
731
730 -#: lib/browser.tcl:186
732 +#: lib/browser.tcl:187
733 msgid "[Up To Parent]"
734 msgstr "[Jusqu'au parent]"
735
734 -#: lib/browser.tcl:266 lib/browser.tcl:272
736 +#: lib/browser.tcl:267 lib/browser.tcl:273
737 msgid "Browse Branch Files"
738 msgstr "Visionner fichiers de branches"
739
738 -#: lib/browser.tcl:277 lib/choose_repository.tcl:391
739 -#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
740 -#: lib/choose_repository.tcl:989
740 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
741 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
742 +#: lib/choose_repository.tcl:987
743 msgid "Browse"
744 msgstr "Visionner"
745
@@ -751,7 +753,7 @@ msgstr "Récupération de %s à partir de %s"
753 msgid "fatal: Cannot resolve %s"
754 msgstr "Erreur fatale : Impossible de résoudre %s"
755
754 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
756 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
757 msgid "Close"
758 msgstr "Fermer"
759
@@ -796,9 +798,12 @@ msgid ""
798 "\n"
799 "The rescan will be automatically started now.\n"
800 msgstr ""
799 -"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
801 +"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
802 +"référentiel.\n"
803 "\n"
801 -"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynchronisation doit être effectuée avant de pouvoir modifier la branche courante.\n"
804 +"Un autre programme Git a modifié ce référentiel depuis la dernière "
805 +"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
806 +"modifier la branche courante.\n"
807 "\n"
808 "Cela va être fait tout de suite automatiquement.\n"
809
@@ -807,10 +812,15 @@ msgstr ""
812 msgid "Updating working directory to '%s'..."
813 msgstr "Mise à jour du répertoire courant avec '%s'..."
814
815 +#: lib/checkout_op.tcl:323
816 +msgid "files checked out"
817 +msgstr ""
818 +
819 #: lib/checkout_op.tcl:353
820 #, tcl-format
821 msgid "Aborted checkout of '%s' (file level merging is required)."
813 -msgstr "Emprunt de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"
822 +msgstr ""
823 +"Emprunt de '%s' abandonné. (Il est nécessaire de fusionner des fichiers.)"
824
825 #: lib/checkout_op.tcl:354
826 msgid "File level merge required."
@@ -830,9 +840,10 @@ msgid ""
840 msgstr ""
841 "Vous n'êtes plus ur une branche locale.\n"
842 "\n"
833 -"Si vous vouliez être sur une branche, créez en une maintenant en partant de 'Cet emprunt détaché'."
843 +"Si vous vouliez être sur une branche, créez en une maintenant en partant de "
844 +"'Cet emprunt détaché'."
845
835 -#: lib/checkout_op.tcl:446
846 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
847 #, tcl-format
848 msgid "Checked out '%s'."
849 msgstr "'%s' emprunté."
@@ -851,7 +862,7 @@ msgstr "Récupérer les commits perdus ne sera peut être pas facile."
862 msgid "Reset '%s'?"
863 msgstr "Réinitialiser '%s' ?"
864
854 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
865 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
866 msgid "Visualize"
867 msgstr "Visualiser"
868
@@ -867,7 +878,9 @@ msgid ""
878 msgstr ""
879 "Le changement de la branche courante a échoué.\n"
880 "\n"
870 -"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a échouée.\n"
881 +"Le répertoire courant n'est que partiellement modifié. Les fichiers ont été "
882 +"mis à jour avec succès, mais la mise à jour d'un fichier interne à Git a "
883 +"échouée.\n"
884 "\n"
885 "Cela n'aurait pas du se produire. %s va abandonner et se terminer."
886
@@ -879,15 +892,15 @@ msgstr "Sélectionner"
892 msgid "Font Family"
893 msgstr "Famille de fonte"
894
882 -#: lib/choose_font.tcl:73
895 +#: lib/choose_font.tcl:74
896 msgid "Font Size"
897 msgstr "Taille de fonte"
898
886 -#: lib/choose_font.tcl:90
899 +#: lib/choose_font.tcl:91
900 msgid "Font Example"
901 msgstr "Exemple de fonte"
902
890 -#: lib/choose_font.tcl:101
903 +#: lib/choose_font.tcl:103
904 msgid ""
905 "This is example text.\n"
906 "If you like this text, it can be your font."
@@ -895,225 +908,230 @@ msgstr ""
908 "C'est un texte d'exemple.\n"
909 "Si vous aimez ce texte, vous pouvez choisir cette fonte."
910
898 -#: lib/choose_repository.tcl:27
911 +#: lib/choose_repository.tcl:28
912 msgid "Git Gui"
913 msgstr "Git Gui"
914
902 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
915 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
916 msgid "Create New Repository"
917 msgstr "Créer nouveau référentiel"
918
906 -#: lib/choose_repository.tcl:86
919 +#: lib/choose_repository.tcl:87
920 msgid "New..."
921 msgstr "Nouveau..."
922
910 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
923 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
924 msgid "Clone Existing Repository"
925 msgstr "Cloner référentiel existant"
926
914 -#: lib/choose_repository.tcl:99
927 +#: lib/choose_repository.tcl:100
928 msgid "Clone..."
929 msgstr "Cloner..."
930
918 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
931 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
932 msgid "Open Existing Repository"
933 msgstr "Ouvrir référentiel existant"
934
922 -#: lib/choose_repository.tcl:112
935 +#: lib/choose_repository.tcl:113
936 msgid "Open..."
937 msgstr "Ouvrir..."
938
926 -#: lib/choose_repository.tcl:125
939 +#: lib/choose_repository.tcl:126
940 msgid "Recent Repositories"
941 msgstr "Référentiels récents"
942
930 -#: lib/choose_repository.tcl:131
943 +#: lib/choose_repository.tcl:132
944 msgid "Open Recent Repository:"
945 msgstr "Ouvrir référentiel récent :"
946
934 -#: lib/choose_repository.tcl:294
935 -#, tcl-format
936 -msgid "Location %s already exists."
937 -msgstr "L'emplacement %s existe déjà."
938 -
939 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
940 -#: lib/choose_repository.tcl:314
947 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
948 +#: lib/choose_repository.tcl:310
949 #, tcl-format
950 msgid "Failed to create repository %s:"
951 msgstr "La création du référentiel %s a échouée :"
952
945 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
953 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
954 msgid "Directory:"
955 msgstr "Répertoire :"
956
949 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
950 -#: lib/choose_repository.tcl:1013
957 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
958 +#: lib/choose_repository.tcl:1011
959 msgid "Git Repository"
960 msgstr "Référentiel Git"
961
954 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
962 +#: lib/choose_repository.tcl:437
963 #, tcl-format
964 msgid "Directory %s already exists."
965 msgstr "Le répertoire %s existe déjà."
966
959 -#: lib/choose_repository.tcl:442
967 +#: lib/choose_repository.tcl:441
968 #, tcl-format
969 msgid "File %s already exists."
970 msgstr "Le fichier %s existe déjà."
971
964 -#: lib/choose_repository.tcl:463
972 +#: lib/choose_repository.tcl:455
973 msgid "Clone"
974 msgstr "Cloner"
975
968 -#: lib/choose_repository.tcl:476
976 +#: lib/choose_repository.tcl:468
977 msgid "URL:"
978 msgstr "URL :"
979
972 -#: lib/choose_repository.tcl:496
980 +#: lib/choose_repository.tcl:489
981 msgid "Clone Type:"
982 msgstr "Type de clonage :"
983
976 -#: lib/choose_repository.tcl:502
984 +#: lib/choose_repository.tcl:495
985 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
986 msgstr "Standard (rapide, semi-redondant, liens durs)"
987
980 -#: lib/choose_repository.tcl:508
988 +#: lib/choose_repository.tcl:501
989 msgid "Full Copy (Slower, Redundant Backup)"
990 msgstr "Copy complète (plus lent, sauvegarde redondante)"
991
984 -#: lib/choose_repository.tcl:514
992 +#: lib/choose_repository.tcl:507
993 msgid "Shared (Fastest, Not Recommended, No Backup)"
994 msgstr "Partagé (le plus rapide, non recommandé, pas de sauvegarde)"
995
988 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
989 -#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
990 -#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
996 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
997 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
998 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
999 #, tcl-format
1000 msgid "Not a Git repository: %s"
1001 msgstr "'%s' n'est pas un référentiel Git."
1002
995 -#: lib/choose_repository.tcl:586
1003 +#: lib/choose_repository.tcl:579
1004 msgid "Standard only available for local repository."
1005 msgstr "Standard n'est disponible que pour un référentiel local."
1006
999 -#: lib/choose_repository.tcl:590
1007 +#: lib/choose_repository.tcl:583
1008 msgid "Shared only available for local repository."
1009 msgstr "Partagé n'est disponible que pour un référentiel local."
1010
1003 -#: lib/choose_repository.tcl:617
1011 +#: lib/choose_repository.tcl:604
1012 +#, tcl-format
1013 +msgid "Location %s already exists."
1014 +msgstr "L'emplacement %s existe déjà."
1015 +
1016 +#: lib/choose_repository.tcl:615
1017 msgid "Failed to configure origin"
1018 msgstr "La configuration de l'origine a échouée."
1019
1007 -#: lib/choose_repository.tcl:629
1020 +#: lib/choose_repository.tcl:627
1021 msgid "Counting objects"
1022 msgstr "Comptage des objets"
1023
1011 -#: lib/choose_repository.tcl:630
1024 +#: lib/choose_repository.tcl:628
1025 msgid "buckets"
1026 msgstr "paniers"
1027
1015 -#: lib/choose_repository.tcl:654
1028 +#: lib/choose_repository.tcl:652
1029 #, tcl-format
1030 msgid "Unable to copy objects/info/alternates: %s"
1031 msgstr "Impossible de copier 'objects/info/alternates' : %s"
1032
1020 -#: lib/choose_repository.tcl:690
1033 +#: lib/choose_repository.tcl:688
1034 #, tcl-format
1035 msgid "Nothing to clone from %s."
1036 msgstr "Il n'y a rien à cloner depuis %s."
1037
1025 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1026 -#: lib/choose_repository.tcl:918
1038 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1039 +#: lib/choose_repository.tcl:916
1040 msgid "The 'master' branch has not been initialized."
1041 msgstr "Cette branche 'master' n'a pas été initialisée."
1042
1030 -#: lib/choose_repository.tcl:705
1043 +#: lib/choose_repository.tcl:703
1044 msgid "Hardlinks are unavailable. Falling back to copying."
1045 msgstr "Les liens durs ne sont pas disponibles. On se résoud à copier."
1046
1034 -#: lib/choose_repository.tcl:717
1047 +#: lib/choose_repository.tcl:715
1048 #, tcl-format
1049 msgid "Cloning from %s"
1050 msgstr "Clonage depuis %s"
1051
1039 -#: lib/choose_repository.tcl:748
1052 +#: lib/choose_repository.tcl:746
1053 msgid "Copying objects"
1054 msgstr "Copie des objets"
1055
1043 -#: lib/choose_repository.tcl:749
1056 +#: lib/choose_repository.tcl:747
1057 msgid "KiB"
1058 msgstr "KiB"
1059
1047 -#: lib/choose_repository.tcl:773
1060 +#: lib/choose_repository.tcl:771
1061 #, tcl-format
1062 msgid "Unable to copy object: %s"
1063 msgstr "Impossible de copier l'objet : %s"
1064
1052 -#: lib/choose_repository.tcl:783
1065 +#: lib/choose_repository.tcl:781
1066 msgid "Linking objects"
1067 msgstr "Liaison des objets"
1068
1056 -#: lib/choose_repository.tcl:784
1069 +#: lib/choose_repository.tcl:782
1070 msgid "objects"
1071 msgstr "objets"
1072
1060 -#: lib/choose_repository.tcl:792
1073 +#: lib/choose_repository.tcl:790
1074 #, tcl-format
1075 msgid "Unable to hardlink object: %s"
1076 msgstr "Impossible créer un lien dur pour l'objet : %s"
1077
1065 -#: lib/choose_repository.tcl:847
1078 +#: lib/choose_repository.tcl:845
1079 msgid "Cannot fetch branches and objects. See console output for details."
1067 -msgstr "Impossible de récupérer les branches et objets. Voir la sortie console pour plus de détails."
1080 +msgstr ""
1081 +"Impossible de récupérer les branches et objets. Voir la sortie console pour "
1082 +"plus de détails."
1083
1069 -#: lib/choose_repository.tcl:858
1084 +#: lib/choose_repository.tcl:856
1085 msgid "Cannot fetch tags. See console output for details."
1071 -msgstr "Impossible de récupérer les marques. Voir la sortie console pour plus de détails."
1086 +msgstr ""
1087 +"Impossible de récupérer les marques. Voir la sortie console pour plus de "
1088 +"détails."
1089
1073 -#: lib/choose_repository.tcl:882
1090 +#: lib/choose_repository.tcl:880
1091 msgid "Cannot determine HEAD. See console output for details."
1075 -msgstr "Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."
1092 +msgstr ""
1093 +"Impossible de déterminer HEAD. Voir la sortie console pour plus de détails."
1094
1077 -#: lib/choose_repository.tcl:891
1095 +#: lib/choose_repository.tcl:889
1096 #, tcl-format
1097 msgid "Unable to cleanup %s"
1098 msgstr "Impossible de nettoyer %s"
1099
1082 -#: lib/choose_repository.tcl:897
1100 +#: lib/choose_repository.tcl:895
1101 msgid "Clone failed."
1102 msgstr "Le clonage a échoué."
1103
1086 -#: lib/choose_repository.tcl:904
1104 +#: lib/choose_repository.tcl:902
1105 msgid "No default branch obtained."
1106 msgstr "Aucune branche par défaut n'a été obtenue."
1107
1090 -#: lib/choose_repository.tcl:915
1108 +#: lib/choose_repository.tcl:913
1109 #, tcl-format
1110 msgid "Cannot resolve %s as a commit."
1111 msgstr "Impossible de résoudre %s comme commit."
1112
1095 -#: lib/choose_repository.tcl:927
1113 +#: lib/choose_repository.tcl:925
1114 msgid "Creating working directory"
1115 msgstr "Création du répertoire de travail"
1116
1099 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1117 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1118 #: lib/index.tcl:193
1119 msgid "files"
1120 msgstr "fichiers"
1121
1104 -#: lib/choose_repository.tcl:957
1122 +#: lib/choose_repository.tcl:955
1123 msgid "Initial file checkout failed."
1124 msgstr "L'emprunt initial de fichier a échoué."
1125
1108 -#: lib/choose_repository.tcl:973
1126 +#: lib/choose_repository.tcl:971
1127 msgid "Open"
1128 msgstr "Ouvrir"
1129
1112 -#: lib/choose_repository.tcl:983
1130 +#: lib/choose_repository.tcl:981
1131 msgid "Repository:"
1132 msgstr "Référentiel :"
1133
1116 -#: lib/choose_repository.tcl:1033
1134 +#: lib/choose_repository.tcl:1031
1135 #, tcl-format
1136 msgid "Failed to open repository %s:"
1137 msgstr "Impossible d'ouvrir le référentiel %s :"
@@ -1134,7 +1152,7 @@ msgstr "Branche locale"
1152 msgid "Tracking Branch"
1153 msgstr "Suivi de branche"
1154
1137 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1155 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1156 msgid "Tag"
1157 msgstr "Marque"
1158
@@ -1151,11 +1169,11 @@ msgstr "Pas de révision selectionnée."
1169 msgid "Revision expression is empty."
1170 msgstr "L'expression de révision est vide."
1171
1154 -#: lib/choose_rev.tcl:530
1172 +#: lib/choose_rev.tcl:531
1173 msgid "Updated"
1174 msgstr "Misa à jour"
1175
1158 -#: lib/choose_rev.tcl:558
1176 +#: lib/choose_rev.tcl:559
1177 msgid "URL"
1178 msgstr "URL"
1179
@@ -1168,7 +1186,8 @@ msgid ""
1186 msgstr ""
1187 "Il n'y a rien à corriger.\n"
1188 "\n"
1171 -"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à corriger.\n"
1189 +"Vous allez créer le commit initial. Il n'y a pas de commit avant celui-ci à "
1190 +"corriger.\n"
1191
1192 #: lib/commit.tcl:18
1193 msgid ""
@@ -1180,7 +1199,9 @@ msgid ""
1199 msgstr ""
1200 "Impossible de corriger pendant une fusion.\n"
1201 "\n"
1183 -"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous abandonnez la fusion courante.\n"
1202 +"Vous êtes actuellement au milieu d'une fusion qui n'a pas été completement "
1203 +"terminée. Vous ne pouvez pas corriger le commit précédant sauf si vous "
1204 +"abandonnez la fusion courante.\n"
1205
1206 #: lib/commit.tcl:49
1207 msgid "Error loading commit data for amend:"
@@ -1203,9 +1224,12 @@ msgid ""
1224 "\n"
1225 "The rescan will be automatically started now.\n"
1226 msgstr ""
1206 -"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
1227 +"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
1228 +"référentiel.\n"
1229 "\n"
1208 -"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynshronisation doit être effectuée avant de pouvoir créer un nouveau commit.\n"
1230 +"Un autre programme Git a modifié ce référentiel depuis la dernière "
1231 +"synchronisation. Une resynshronisation doit être effectuée avant de pouvoir "
1232 +"créer un nouveau commit.\n"
1233 "\n"
1234 "Cela va être fait tout de suite automatiquement.\n"
1235
@@ -1219,7 +1243,8 @@ msgid ""
1243 msgstr ""
1244 "Des fichiers non fusionnés ne peuvent être commités.\n"
1245 "\n"
1222 -"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-commiter le fichier avant de pouvoir commiter.\n"
1246 +"Le fichier %s a des conflicts de fusion. Vous devez les résoudre et pré-"
1247 +"commiter le fichier avant de pouvoir commiter.\n"
1248
1249 #: lib/commit.tcl:162
1250 #, tcl-format
@@ -1260,16 +1285,46 @@ msgstr ""
1285 "- Deuxième ligne : rien.\n"
1286 "- Lignes suivantes : Décrire pourquoi ces modifications sont bonnes.\n"
1287
1263 -#: lib/commit.tcl:257
1288 +#: lib/commit.tcl:207
1289 +#, tcl-format
1290 +msgid "warning: Tcl does not support encoding '%s'."
1291 +msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
1292 +
1293 +#: lib/commit.tcl:221
1294 +msgid "Calling pre-commit hook..."
1295 +msgstr ""
1296 +
1297 +#: lib/commit.tcl:236
1298 +msgid "Commit declined by pre-commit hook."
1299 +msgstr ""
1300 +
1301 +#: lib/commit.tcl:259
1302 +msgid "Calling commit-msg hook..."
1303 +msgstr ""
1304 +
1305 +#: lib/commit.tcl:274
1306 +msgid "Commit declined by commit-msg hook."
1307 +msgstr ""
1308 +
1309 +#: lib/commit.tcl:287
1310 +msgid "Committing changes..."
1311 +msgstr ""
1312 +
1313 +#: lib/commit.tcl:303
1314 msgid "write-tree failed:"
1315 msgstr "write-tree a échoué :"
1316
1267 -#: lib/commit.tcl:275
1317 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1318 +#, fuzzy
1319 +msgid "Commit failed."
1320 +msgstr "Le clonage a échoué."
1321 +
1322 +#: lib/commit.tcl:321
1323 #, tcl-format
1324 msgid "Commit %s appears to be corrupt"
1325 msgstr "Le commit %s semble être corrompu"
1326
1272 -#: lib/commit.tcl:279
1327 +#: lib/commit.tcl:326
1328 msgid ""
1329 "No changes to commit.\n"
1330 "\n"
@@ -1279,41 +1334,37 @@ msgid ""
1334 msgstr ""
1335 "Pas de modification à commiter.\n"
1336 "\n"
1282 -"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit de fusion.\n"
1337 +"Aucun fichier n'a été modifié par ce commit et il ne s'agit pas d'un commit "
1338 +"de fusion.\n"
1339 "\n"
1340 "Une resynchronisation va être lancée tout de suite automatiquement.\n"
1341
1286 -#: lib/commit.tcl:286
1342 +#: lib/commit.tcl:333
1343 msgid "No changes to commit."
1344 msgstr "Pas de modifications à commiter."
1345
1290 -#: lib/commit.tcl:303
1291 -#, tcl-format
1292 -msgid "warning: Tcl does not support encoding '%s'."
1293 -msgstr "attention : Tcl ne supporte pas l'encodage '%s'."
1294 -
1295 -#: lib/commit.tcl:317
1346 +#: lib/commit.tcl:347
1347 msgid "commit-tree failed:"
1348 msgstr "commit-tree a échoué :"
1349
1299 -#: lib/commit.tcl:339
1350 +#: lib/commit.tcl:367
1351 msgid "update-ref failed:"
1352 msgstr "update-ref a échoué"
1353
1303 -#: lib/commit.tcl:430
1354 +#: lib/commit.tcl:454
1355 #, tcl-format
1356 msgid "Created commit %s: %s"
1357 msgstr "Commit créé %s : %s"
1358
1308 -#: lib/console.tcl:57
1359 +#: lib/console.tcl:59
1360 msgid "Working... please wait..."
1361 msgstr "Travail en cours... merci de patienter..."
1362
1312 -#: lib/console.tcl:183
1363 +#: lib/console.tcl:186
1364 msgid "Success"
1365 msgstr "Succès"
1366
1316 -#: lib/console.tcl:196
1367 +#: lib/console.tcl:200
1368 msgid "Error: Command Failed"
1369 msgstr "Erreur : échec de la commande"
1370
@@ -1345,7 +1396,7 @@ msgstr "Objets empaquetés attendant d'être supprimés"
1396 msgid "Garbage files"
1397 msgstr "Fichiers poubelle"
1398
1348 -#: lib/database.tcl:72ets
1399 +#: lib/database.tcl:72
1400 msgid "Compressing the object database"
1401 msgstr "Compression de la base des objets"
1402
@@ -1363,9 +1414,12 @@ msgid ""
1414 "\n"
1415 "Compress the database now?"
1416 msgstr ""
1366 -"Ce référentiel comprend actuellement environ %i objets ayant leur fichier particulier.\n"
1417 +"Ce référentiel comprend actuellement environ %i objets ayant leur fichier "
1418 +"particulier.\n"
1419 "\n"
1368 -"Pour conserver une performance optimale, il est fortement recommandé de comprimer la base quand plus de %i objets ayant leur fichier particulier existent.\n"
1420 +"Pour conserver une performance optimale, il est fortement recommandé de "
1421 +"comprimer la base quand plus de %i objets ayant leur fichier particulier "
1422 +"existent.\n"
1423 "\n"
1424 "Comprimer la base maintenant ?"
1425
@@ -1391,9 +1445,11 @@ msgstr ""
1445 "\n"
1446 "%s ne comporte aucune modification.\n"
1447 "\n"
1394 -"La date de modification de ce fichier a été mise à jour par une autre application, mais le contenu du fichier n'a pas changé.\n"
1448 +"La date de modification de ce fichier a été mise à jour par une autre "
1449 +"application, mais le contenu du fichier n'a pas changé.\n"
1450 "\n"
1396 -"Une resynchronisation va être lancée automatiquement pour trouver d'autres fichiers qui pourraient se trouver dans le même état."
1451 +"Une resynchronisation va être lancée automatiquement pour trouver d'autres "
1452 +"fichiers qui pourraient se trouver dans le même état."
1453
1454 #: lib/diff.tcl:81
1455 #, tcl-format
@@ -1421,23 +1477,24 @@ msgstr "* Fichier binaire (pas d'apperçu du contenu)."
1477 msgid "Error loading diff:"
1478 msgstr "Erreur lors du chargement des différences :"
1479
1424 -#: lib/diff.tcl:302
1480 +#: lib/diff.tcl:303
1481 msgid "Failed to unstage selected hunk."
1426 -msgstr "La suppression dans le pré-commit de la section sélectionnée a échouée."
1482 +msgstr ""
1483 +"La suppression dans le pré-commit de la section sélectionnée a échouée."
1484
1428 -#: lib/diff.tcl:309
1485 +#: lib/diff.tcl:310
1486 msgid "Failed to stage selected hunk."
1487 msgstr "Le pré-commit de la section sélectionnée a échoué."
1488
1432 -#: lib/error.tcl:12 lib/error.tcl:102
1489 +#: lib/error.tcl:20 lib/error.tcl:114
1490 msgid "error"
1491 msgstr "erreur"
1492
1436 -#: lib/error.tcl:28
1493 +#: lib/error.tcl:36
1494 msgid "warning"
1495 msgstr "attention"
1496
1440 -#: lib/error.tcl:81
1497 +#: lib/error.tcl:94
1498 msgid "You must correct the above errors before committing."
1499 msgstr "Vous devez corriger les erreurs suivantes avant de pouvoir commiter."
1500
@@ -1453,7 +1510,8 @@ msgstr "Erreur de pré-commit"
1510 msgid ""
1511 "Updating the Git index failed. A rescan will be automatically started to "
1512 "resynchronize git-gui."
1456 -msgstr "Le pré-commit a échoué. Une resynchronisation va être lancée automatiquement."
1513 +msgstr ""
1514 +"Le pré-commit a échoué. Une resynchronisation va être lancée automatiquement."
1515
1516 #: lib/index.tcl:27
1517 msgid "Continue"
@@ -1468,6 +1526,11 @@ msgstr "Dévérouiller le pré-commit"
1526 msgid "Unstaging %s from commit"
1527 msgstr "Supprimer %s du commit"
1528
1529 +#: lib/index.tcl:313
1530 +#, fuzzy
1531 +msgid "Ready to commit."
1532 +msgstr "Pré-commité"
1533 +
1534 #: lib/index.tcl:326
1535 #, tcl-format
1536 msgid "Adding %s"
@@ -1483,11 +1546,13 @@ msgstr "Inverser les modifications dans le fichier %s ? "
1546 msgid "Revert changes in these %i files?"
1547 msgstr "Inverser les modifications dans ces %i fichiers ?"
1548
1486 -#: lib/index.tcl:389
1549 +#: lib/index.tcl:391
1550 msgid "Any unstaged changes will be permanently lost by the revert."
1488 -msgstr "Toutes les modifications non pré-commitées seront définitivement perdues lors de l'inversion."
1551 +msgstr ""
1552 +"Toutes les modifications non pré-commitées seront définitivement perdues "
1553 +"lors de l'inversion."
1554
1490 -#: lib/index.tcl:392
1555 +#: lib/index.tcl:394
1556 msgid "Do Nothing"
1557 msgstr "Ne rien faire"
1558
@@ -1499,7 +1564,8 @@ msgid ""
1564 msgstr ""
1565 "Impossible de fucionner pendant une correction.\n"
1566 "\n"
1502 -"Vous devez finir de corriger ce commit avant de lancer une quelconque fusion.\n"
1567 +"Vous devez finir de corriger ce commit avant de lancer une quelconque "
1568 +"fusion.\n"
1569
1570 #: lib/merge.tcl:27
1571 msgid ""
@@ -1510,9 +1576,12 @@ msgid ""
1576 "\n"
1577 "The rescan will be automatically started now.\n"
1578 msgstr ""
1513 -"L'état lors de la dernière synchronisation ne correspond plus à l'état du référentiel.\n"
1579 +"L'état lors de la dernière synchronisation ne correspond plus à l'état du "
1580 +"référentiel.\n"
1581 "\n"
1515 -"Un autre programme Git a modifié ce référentiel depuis la dernière synchronisation. Une resynchronisation doit être effectuée avant de pouvoir fusionner de nouveau.\n"
1582 +"Un autre programme Git a modifié ce référentiel depuis la dernière "
1583 +"synchronisation. Une resynchronisation doit être effectuée avant de pouvoir "
1584 +"fusionner de nouveau.\n"
1585 "\n"
1586 "Cela va être fait tout de suite automatiquement\n"
1587
@@ -1530,7 +1599,9 @@ msgstr ""
1599 "\n"
1600 "Le fichier %s a des conflicts de fusion.\n"
1601 "\n"
1533 -"Vous devez les résoudre, puis pré-commiter le fichier, et enfin commiter pour terminer la fusion courante. Seulementà ce moment là, il sera possible d'effectuer une nouvelle fusion.\n"
1602 +"Vous devez les résoudre, puis pré-commiter le fichier, et enfin commiter "
1603 +"pour terminer la fusion courante. Seulementà ce moment là, il sera possible "
1604 +"d'effectuer une nouvelle fusion.\n"
1605
1606 #: lib/merge.tcl:54
1607 #, tcl-format
@@ -1546,7 +1617,9 @@ msgstr ""
1617 "\n"
1618 "Le fichier %s est modifié.\n"
1619 "\n"
1549 -"Vous devriez terminer le commit courant avant de lancer une fusion. En faisait comme cela, vous éviterez de devoir éventuellement abandonner une fusion ayant échouée.\n"
1620 +"Vous devriez terminer le commit courant avant de lancer une fusion. En "
1621 +"faisait comme cela, vous éviterez de devoir éventuellement abandonner une "
1622 +"fusion ayant échouée.\n"
1623
1624 #: lib/merge.tcl:106
1625 #, tcl-format
@@ -1554,28 +1627,28 @@ msgid "%s of %s"
1627 msgstr "%s de %s"
1628
1629 #: lib/merge.tcl:119
1557 -#, tcl-format
1558 -msgid "Merging %s and %s"
1630 +#, fuzzy, tcl-format
1631 +msgid "Merging %s and %s..."
1632 msgstr "Fusion de %s et %s"
1633
1561 -#: lib/merge.tcl:131
1634 +#: lib/merge.tcl:130
1635 msgid "Merge completed successfully."
1636 msgstr "La fusion s'est faite avec succès."
1637
1565 -#: lib/merge.tcl:133
1638 +#: lib/merge.tcl:132
1639 msgid "Merge failed. Conflict resolution is required."
1640 msgstr "La fusion a echouée. Il est nécessaire de résoudre les conflicts."
1641
1569 -#: lib/merge.tcl:158
1642 +#: lib/merge.tcl:157
1643 #, tcl-format
1644 msgid "Merge Into %s"
1645 msgstr "Fusion dans %s"
1646
1574 -#: lib/merge.tcl:177
1647 +#: lib/merge.tcl:176
1648 msgid "Revision To Merge"
1649 msgstr "Révision à fusionner"
1650
1578 -#: lib/merge.tcl:212
1651 +#: lib/merge.tcl:211
1652 msgid ""
1653 "Cannot abort while amending.\n"
1654 "\n"
@@ -1585,7 +1658,7 @@ msgstr ""
1658 "\n"
1659 "Vous devez finir de corriger ce commit.\n"
1660
1588 -#: lib/merge.tcl:222
1661 +#: lib/merge.tcl:221
1662 msgid ""
1663 "Abort merge?\n"
1664 "\n"
@@ -1595,11 +1668,12 @@ msgid ""
1668 msgstr ""
1669 "Abandonner la fusion ?\n"
1670 "\n"
1598 -"Abandonner la fusion courante entrainera la perte de TOUTES les modifications non commitées.\n"
1671 +"Abandonner la fusion courante entrainera la perte de TOUTES les "
1672 +"modifications non commitées.\n"
1673 "\n"
1674 "Abandonner quand même la fusion courante ?"
1675
1602 -#: lib/merge.tcl:228
1676 +#: lib/merge.tcl:227
1677 msgid ""
1678 "Reset changes?\n"
1679 "\n"
@@ -1609,97 +1683,112 @@ msgid ""
1683 msgstr ""
1684 "Réinitialiser les modifications ?\n"
1685 "\n"
1612 -"Réinitialiser les modifications va faire perdre TOUTES les modifications non commitées.\n"
1686 +"Réinitialiser les modifications va faire perdre TOUTES les modifications non "
1687 +"commitées.\n"
1688 "\n"
1689 "Réinitialiser quand même les modifications courantes ?"
1690
1616 -#: lib/merge.tcl:239
1691 +#: lib/merge.tcl:238
1692 msgid "Aborting"
1693 msgstr "Abandon"
1694
1620 -#: lib/merge.tcl:266
1695 +#: lib/merge.tcl:238
1696 +#, fuzzy
1697 +msgid "files reset"
1698 +msgstr "fichiers"
1699 +
1700 +#: lib/merge.tcl:265
1701 msgid "Abort failed."
1702 msgstr "L'abandon a échoué."
1703
1624 -#: lib/merge.tcl:268
1704 +#: lib/merge.tcl:267
1705 msgid "Abort completed. Ready."
1706 msgstr "Abandon teminé. Prêt."
1707
1628 -#: lib/option.tcl:82
1708 +#: lib/option.tcl:95
1709 msgid "Restore Defaults"
1710 msgstr "Remettre les valeurs par défaut"
1711
1632 -#: lib/option.tcl:86
1712 +#: lib/option.tcl:99
1713 msgid "Save"
1714 msgstr "Sauvegarder"
1715
1636 -#: lib/option.tcl:96
1716 +#: lib/option.tcl:109
1717 #, tcl-format
1718 msgid "%s Repository"
1719 msgstr "Référentiel de %s"
1720
1641 -#: lib/option.tcl:97
1721 +#: lib/option.tcl:110
1722 msgid "Global (All Repositories)"
1723 msgstr "Globales (tous les référentiels)"
1724
1645 -#: lib/option.tcl:103
1725 +#: lib/option.tcl:116
1726 msgid "User Name"
1727 msgstr "Nom d'utilisateur"
1728
1649 -#: lib/option.tcl:104
1729 +#: lib/option.tcl:117
1730 msgid "Email Address"
1731 msgstr "Adresse email"
1732
1653 -#: lib/option.tcl:106
1733 +#: lib/option.tcl:119
1734 msgid "Summarize Merge Commits"
1735 msgstr "Résumer les commits de fusion"
1736
1657 -#: lib/option.tcl:107
1737 +#: lib/option.tcl:120
1738 msgid "Merge Verbosity"
1739 msgstr "Fusion bavarde"
1740
1661 -#: lib/option.tcl:108
1741 +#: lib/option.tcl:121
1742 msgid "Show Diffstat After Merge"
1743 msgstr "Montrer statistiques de diff après fusion"
1744
1665 -#: lib/option.tcl:110
1745 +#: lib/option.tcl:123
1746 msgid "Trust File Modification Timestamps"
1747 msgstr "Faire confiance aux dates de modification de fichiers "
1748
1669 -#: lib/option.tcl:111
1749 +#: lib/option.tcl:124
1750 msgid "Prune Tracking Branches During Fetch"
1751 msgstr "Nettoyer les branches de suivi pendant la récupération"
1752
1673 -#: lib/option.tcl:112
1753 +#: lib/option.tcl:125
1754 msgid "Match Tracking Branches"
1755 msgstr "Faire correspondre les branches de suivi"
1756
1677 -#: lib/option.tcl:113
1757 +#: lib/option.tcl:126
1758 msgid "Number of Diff Context Lines"
1759 msgstr "Nombre de lignes de contexte dans les diffs"
1760
1681 -#: lib/option.tcl:114
1761 +#: lib/option.tcl:127
1762 +#, fuzzy
1763 +msgid "Commit Message Text Width"
1764 +msgstr "Message de commit :"
1765 +
1766 +#: lib/option.tcl:128
1767 msgid "New Branch Name Template"
1768 msgstr "Nouveau modèle de nom de branche"
1769
1685 -#: lib/option.tcl:176
1770 +#: lib/option.tcl:192
1771 +msgid "Spelling Dictionary:"
1772 +msgstr ""
1773 +
1774 +#: lib/option.tcl:216
1775 msgid "Change Font"
1776 msgstr "Modifier les fontes"
1777
1689 -#: lib/option.tcl:180
1778 +#: lib/option.tcl:220
1779 #, tcl-format
1780 msgid "Choose %s"
1781 msgstr "Choisir %s"
1782
1694 -#: lib/option.tcl:186
1783 +#: lib/option.tcl:226
1784 msgid "pt."
1785 msgstr "pt."
1786
1698 -#: lib/option.tcl:200
1787 +#: lib/option.tcl:240
1788 msgid "Preferences"
1789 msgstr "Préférences"
1790
1702 -#: lib/option.tcl:235
1791 +#: lib/option.tcl:275
1792 msgid "Failed to completely save options:"
1793 msgstr "La sauvegarde complète des options a échouée :"
1794
@@ -1755,7 +1844,9 @@ msgstr ""
1844 msgid ""
1845 "One or more of the merge tests failed because you have not fetched the "
1846 "necessary commits. Try fetching from %s first."
1758 -msgstr "Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."
1847 +msgstr ""
1848 +"Une ou plusieurs des tests de fusion ont échoués parce que vous n'avez pas "
1849 +"récupéré les commits nécessaires. Essayez de récupéré à partir de %s d'abord."
1850
1851 #: lib/remote_branch_delete.tcl:207
1852 msgid "Please select one or more branches to delete."
@@ -1805,6 +1896,43 @@ msgstr "Impossible d'écrire le raccourcis :"
1896 msgid "Cannot write icon:"
1897 msgstr "Impossible d'écrire l'icône :"
1898
1899 +#: lib/spellcheck.tcl:57
1900 +msgid "Unsupported spell checker"
1901 +msgstr ""
1902 +
1903 +#: lib/spellcheck.tcl:65
1904 +msgid "Spell checking is unavailable"
1905 +msgstr ""
1906 +
1907 +#: lib/spellcheck.tcl:68
1908 +msgid "Invalid spell checking configuration"
1909 +msgstr ""
1910 +
1911 +#: lib/spellcheck.tcl:70
1912 +#, tcl-format
1913 +msgid "Reverting dictionary to %s."
1914 +msgstr ""
1915 +
1916 +#: lib/spellcheck.tcl:73
1917 +msgid "Spell checker silently failed on startup"
1918 +msgstr ""
1919 +
1920 +#: lib/spellcheck.tcl:80
1921 +msgid "Unrecognized spell checker"
1922 +msgstr ""
1923 +
1924 +#: lib/spellcheck.tcl:180
1925 +msgid "No Suggestions"
1926 +msgstr ""
1927 +
1928 +#: lib/spellcheck.tcl:381
1929 +msgid "Unexpected EOF from spell checker"
1930 +msgstr ""
1931 +
1932 +#: lib/spellcheck.tcl:385
1933 +msgid "Spell Checker Failed"
1934 +msgstr ""
1935 +
1936 #: lib/status_bar.tcl:83
1937 #, tcl-format
1938 msgid "%s ... %*i of %*i %s (%3i%%)"
@@ -1863,7 +1991,9 @@ msgstr "Transférer options"
1991
1992 #: lib/transport.tcl:160
1993 msgid "Force overwrite existing branch (may discard changes)"
1866 -msgstr "Forcer l'écrasement d'une branche existante (peut supprimer des modifications)"
1994 +msgstr ""
1995 +"Forcer l'écrasement d'une branche existante (peut supprimer des "
1996 +"modifications)"
1997
1998 #: lib/transport.tcl:164
1999 msgid "Use thin pack (for slow network connections)"
@@ -1872,4 +2002,3 @@ msgstr "Utiliser des petits paquets (pour les connexions lentes)"
2002 #: lib/transport.tcl:168
2003 msgid "Include tags"
2004 msgstr "Inclure les marques"
1875 -
po/git-gui.pot
+269 -248
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2008-02-16 21:24+0100\n"
11 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,33 +16,33 @@ msgstr ""
16 "Content-Type: text/plain; charset=CHARSET\n"
17 "Content-Transfer-Encoding: 8bit\n"
18
19 -#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
20 -#: git-gui.sh:733
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
21 msgid "git-gui: fatal error"
22 msgstr ""
23
24 -#: git-gui.sh:565
24 +#: git-gui.sh:593
25 #, tcl-format
26 msgid "Invalid font specified in %s:"
27 msgstr ""
28
29 -#: git-gui.sh:590
29 +#: git-gui.sh:620
30 msgid "Main Font"
31 msgstr ""
32
33 -#: git-gui.sh:591
33 +#: git-gui.sh:621
34 msgid "Diff/Console Font"
35 msgstr ""
36
37 -#: git-gui.sh:605
37 +#: git-gui.sh:635
38 msgid "Cannot find git in PATH."
39 msgstr ""
40
41 -#: git-gui.sh:632
41 +#: git-gui.sh:662
42 msgid "Cannot parse Git version string:"
43 msgstr ""
44
45 -#: git-gui.sh:650
45 +#: git-gui.sh:680
46 #, tcl-format
47 msgid ""
48 "Git version cannot be determined.\n"
@@ -54,79 +54,79 @@ msgid ""
54 "Assume '%s' is version 1.5.0?\n"
55 msgstr ""
56
57 -#: git-gui.sh:888
57 +#: git-gui.sh:918
58 msgid "Git directory not found:"
59 msgstr ""
60
61 -#: git-gui.sh:895
61 +#: git-gui.sh:925
62 msgid "Cannot move to top of working directory:"
63 msgstr ""
64
65 -#: git-gui.sh:902
65 +#: git-gui.sh:932
66 msgid "Cannot use funny .git directory:"
67 msgstr ""
68
69 -#: git-gui.sh:907
69 +#: git-gui.sh:937
70 msgid "No working directory"
71 msgstr ""
72
73 -#: git-gui.sh:1054
73 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
74 msgid "Refreshing file status..."
75 msgstr ""
76
77 -#: git-gui.sh:1119
77 +#: git-gui.sh:1149
78 msgid "Scanning for modified files ..."
79 msgstr ""
80
81 -#: git-gui.sh:1294 lib/browser.tcl:245
81 +#: git-gui.sh:1324 lib/browser.tcl:246
82 msgid "Ready."
83 msgstr ""
84
85 -#: git-gui.sh:1560
85 +#: git-gui.sh:1590
86 msgid "Unmodified"
87 msgstr ""
88
89 -#: git-gui.sh:1562
89 +#: git-gui.sh:1592
90 msgid "Modified, not staged"
91 msgstr ""
92
93 -#: git-gui.sh:1563 git-gui.sh:1568
93 +#: git-gui.sh:1593 git-gui.sh:1598
94 msgid "Staged for commit"
95 msgstr ""
96
97 -#: git-gui.sh:1564 git-gui.sh:1569
97 +#: git-gui.sh:1594 git-gui.sh:1599
98 msgid "Portions staged for commit"
99 msgstr ""
100
101 -#: git-gui.sh:1565 git-gui.sh:1570
101 +#: git-gui.sh:1595 git-gui.sh:1600
102 msgid "Staged for commit, missing"
103 msgstr ""
104
105 -#: git-gui.sh:1567
105 +#: git-gui.sh:1597
106 msgid "Untracked, not staged"
107 msgstr ""
108
109 -#: git-gui.sh:1572
109 +#: git-gui.sh:1602
110 msgid "Missing"
111 msgstr ""
112
113 -#: git-gui.sh:1573
113 +#: git-gui.sh:1603
114 msgid "Staged for removal"
115 msgstr ""
116
117 -#: git-gui.sh:1574
117 +#: git-gui.sh:1604
118 msgid "Staged for removal, still present"
119 msgstr ""
120
121 -#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
121 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
122 msgid "Requires merge resolution"
123 msgstr ""
124
125 -#: git-gui.sh:1614
125 +#: git-gui.sh:1644
126 msgid "Starting gitk... please wait..."
127 msgstr ""
128
129 -#: git-gui.sh:1623
129 +#: git-gui.sh:1653
130 #, tcl-format
131 msgid ""
132 "Unable to start gitk:\n"
@@ -134,295 +134,295 @@ msgid ""
134 "%s does not exist"
135 msgstr ""
136
137 -#: git-gui.sh:1823 lib/choose_repository.tcl:35
137 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
138 msgid "Repository"
139 msgstr ""
140
141 -#: git-gui.sh:1824
141 +#: git-gui.sh:1861
142 msgid "Edit"
143 msgstr ""
144
145 -#: git-gui.sh:1826 lib/choose_rev.tcl:560
145 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
146 msgid "Branch"
147 msgstr ""
148
149 -#: git-gui.sh:1829 lib/choose_rev.tcl:547
149 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
150 msgid "Commit@@noun"
151 msgstr ""
152
153 -#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
153 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
154 msgid "Merge"
155 msgstr ""
156
157 -#: git-gui.sh:1833 lib/choose_rev.tcl:556
157 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
158 msgid "Remote"
159 msgstr ""
160
161 -#: git-gui.sh:1842
161 +#: git-gui.sh:1879
162 msgid "Browse Current Branch's Files"
163 msgstr ""
164
165 -#: git-gui.sh:1846
165 +#: git-gui.sh:1883
166 msgid "Browse Branch Files..."
167 msgstr ""
168
169 -#: git-gui.sh:1851
169 +#: git-gui.sh:1888
170 msgid "Visualize Current Branch's History"
171 msgstr ""
172
173 -#: git-gui.sh:1855
173 +#: git-gui.sh:1892
174 msgid "Visualize All Branch History"
175 msgstr ""
176
177 -#: git-gui.sh:1862
177 +#: git-gui.sh:1899
178 #, tcl-format
179 msgid "Browse %s's Files"
180 msgstr ""
181
182 -#: git-gui.sh:1864
182 +#: git-gui.sh:1901
183 #, tcl-format
184 msgid "Visualize %s's History"
185 msgstr ""
186
187 -#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
187 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
188 msgid "Database Statistics"
189 msgstr ""
190
191 -#: git-gui.sh:1872 lib/database.tcl:34
191 +#: git-gui.sh:1909 lib/database.tcl:34
192 msgid "Compress Database"
193 msgstr ""
194
195 -#: git-gui.sh:1875
195 +#: git-gui.sh:1912
196 msgid "Verify Database"
197 msgstr ""
198
199 -#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
199 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
200 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
201 msgid "Create Desktop Icon"
202 msgstr ""
203
204 -#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
204 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
205 msgid "Quit"
206 msgstr ""
207
208 -#: git-gui.sh:1902
208 +#: git-gui.sh:1939
209 msgid "Undo"
210 msgstr ""
211
212 -#: git-gui.sh:1905
212 +#: git-gui.sh:1942
213 msgid "Redo"
214 msgstr ""
215
216 -#: git-gui.sh:1909 git-gui.sh:2403
216 +#: git-gui.sh:1946 git-gui.sh:2443
217 msgid "Cut"
218 msgstr ""
219
220 -#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
221 -#: lib/console.tcl:67
220 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
221 +#: lib/console.tcl:69
222 msgid "Copy"
223 msgstr ""
224
225 -#: git-gui.sh:1915 git-gui.sh:2409
225 +#: git-gui.sh:1952 git-gui.sh:2449
226 msgid "Paste"
227 msgstr ""
228
229 -#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
229 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
230 #: lib/remote_branch_delete.tcl:38
231 msgid "Delete"
232 msgstr ""
233
234 -#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
234 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
235 msgid "Select All"
236 msgstr ""
237
238 -#: git-gui.sh:1931
238 +#: git-gui.sh:1968
239 msgid "Create..."
240 msgstr ""
241
242 -#: git-gui.sh:1937
242 +#: git-gui.sh:1974
243 msgid "Checkout..."
244 msgstr ""
245
246 -#: git-gui.sh:1943
246 +#: git-gui.sh:1980
247 msgid "Rename..."
248 msgstr ""
249
250 -#: git-gui.sh:1948 git-gui.sh:2048
250 +#: git-gui.sh:1985 git-gui.sh:2085
251 msgid "Delete..."
252 msgstr ""
253
254 -#: git-gui.sh:1953
254 +#: git-gui.sh:1990
255 msgid "Reset..."
256 msgstr ""
257
258 -#: git-gui.sh:1965 git-gui.sh:2350
258 +#: git-gui.sh:2002 git-gui.sh:2389
259 msgid "New Commit"
260 msgstr ""
261
262 -#: git-gui.sh:1973 git-gui.sh:2357
262 +#: git-gui.sh:2010 git-gui.sh:2396
263 msgid "Amend Last Commit"
264 msgstr ""
265
266 -#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
266 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
267 msgid "Rescan"
268 msgstr ""
269
270 -#: git-gui.sh:1988
270 +#: git-gui.sh:2025
271 msgid "Stage To Commit"
272 msgstr ""
273
274 -#: git-gui.sh:1994
274 +#: git-gui.sh:2031
275 msgid "Stage Changed Files To Commit"
276 msgstr ""
277
278 -#: git-gui.sh:2000
278 +#: git-gui.sh:2037
279 msgid "Unstage From Commit"
280 msgstr ""
281
282 -#: git-gui.sh:2005 lib/index.tcl:393
282 +#: git-gui.sh:2042 lib/index.tcl:395
283 msgid "Revert Changes"
284 msgstr ""
285
286 -#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
286 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
287 msgid "Sign Off"
288 msgstr ""
289
290 -#: git-gui.sh:2016 git-gui.sh:2333
290 +#: git-gui.sh:2053 git-gui.sh:2372
291 msgid "Commit@@verb"
292 msgstr ""
293
294 -#: git-gui.sh:2027
294 +#: git-gui.sh:2064
295 msgid "Local Merge..."
296 msgstr ""
297
298 -#: git-gui.sh:2032
298 +#: git-gui.sh:2069
299 msgid "Abort Merge..."
300 msgstr ""
301
302 -#: git-gui.sh:2044
302 +#: git-gui.sh:2081
303 msgid "Push..."
304 msgstr ""
305
306 -#: git-gui.sh:2055 lib/choose_repository.tcl:40
306 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
307 msgid "Apple"
308 msgstr ""
309
310 -#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
311 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
310 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
311 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
312 #, tcl-format
313 msgid "About %s"
314 msgstr ""
315
316 -#: git-gui.sh:2062
316 +#: git-gui.sh:2099
317 msgid "Preferences..."
318 msgstr ""
319
320 -#: git-gui.sh:2070 git-gui.sh:2595
320 +#: git-gui.sh:2107 git-gui.sh:2639
321 msgid "Options..."
322 msgstr ""
323
324 -#: git-gui.sh:2076 lib/choose_repository.tcl:46
324 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
325 msgid "Help"
326 msgstr ""
327
328 -#: git-gui.sh:2117
328 +#: git-gui.sh:2154
329 msgid "Online Documentation"
330 msgstr ""
331
332 -#: git-gui.sh:2201
332 +#: git-gui.sh:2238
333 #, tcl-format
334 msgid "fatal: cannot stat path %s: No such file or directory"
335 msgstr ""
336
337 -#: git-gui.sh:2234
337 +#: git-gui.sh:2271
338 msgid "Current Branch:"
339 msgstr ""
340
341 -#: git-gui.sh:2255
341 +#: git-gui.sh:2292
342 msgid "Staged Changes (Will Commit)"
343 msgstr ""
344
345 -#: git-gui.sh:2274
345 +#: git-gui.sh:2312
346 msgid "Unstaged Changes"
347 msgstr ""
348
349 -#: git-gui.sh:2323
349 +#: git-gui.sh:2362
350 msgid "Stage Changed"
351 msgstr ""
352
353 -#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
353 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
354 msgid "Push"
355 msgstr ""
356
357 -#: git-gui.sh:2369
357 +#: git-gui.sh:2408
358 msgid "Initial Commit Message:"
359 msgstr ""
360
361 -#: git-gui.sh:2370
361 +#: git-gui.sh:2409
362 msgid "Amended Commit Message:"
363 msgstr ""
364
365 -#: git-gui.sh:2371
365 +#: git-gui.sh:2410
366 msgid "Amended Initial Commit Message:"
367 msgstr ""
368
369 -#: git-gui.sh:2372
369 +#: git-gui.sh:2411
370 msgid "Amended Merge Commit Message:"
371 msgstr ""
372
373 -#: git-gui.sh:2373
373 +#: git-gui.sh:2412
374 msgid "Merge Commit Message:"
375 msgstr ""
376
377 -#: git-gui.sh:2374
377 +#: git-gui.sh:2413
378 msgid "Commit Message:"
379 msgstr ""
380
381 -#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
381 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
382 msgid "Copy All"
383 msgstr ""
384
385 -#: git-gui.sh:2443 lib/blame.tcl:104
385 +#: git-gui.sh:2483 lib/blame.tcl:107
386 msgid "File:"
387 msgstr ""
388
389 -#: git-gui.sh:2573
389 +#: git-gui.sh:2589
390 msgid "Apply/Reverse Hunk"
391 msgstr ""
392
393 -#: git-gui.sh:2579
393 +#: git-gui.sh:2595
394 msgid "Show Less Context"
395 msgstr ""
396
397 -#: git-gui.sh:2586
397 +#: git-gui.sh:2602
398 msgid "Show More Context"
399 msgstr ""
400
401 -#: git-gui.sh:2594
401 +#: git-gui.sh:2610
402 msgid "Refresh"
403 msgstr ""
404
405 -#: git-gui.sh:2615
405 +#: git-gui.sh:2631
406 msgid "Decrease Font Size"
407 msgstr ""
408
409 -#: git-gui.sh:2619
409 +#: git-gui.sh:2635
410 msgid "Increase Font Size"
411 msgstr ""
412
413 -#: git-gui.sh:2630
413 +#: git-gui.sh:2646
414 msgid "Unstage Hunk From Commit"
415 msgstr ""
416
417 -#: git-gui.sh:2604
417 +#: git-gui.sh:2648
418 msgid "Stage Hunk For Commit"
419 msgstr ""
420
421 -#: git-gui.sh:2623
421 +#: git-gui.sh:2667
422 msgid "Initializing..."
423 msgstr ""
424
425 -#: git-gui.sh:2718
425 +#: git-gui.sh:2762
426 #, tcl-format
427 msgid ""
428 "Possible environment issues exist.\n"
@@ -433,14 +433,14 @@ msgid ""
433 "\n"
434 msgstr ""
435
436 -#: git-gui.sh:2748
436 +#: git-gui.sh:2792
437 msgid ""
438 "\n"
439 "This is due to a known issue with the\n"
440 "Tcl binary distributed by Cygwin."
441 msgstr ""
442
443 -#: git-gui.sh:2753
443 +#: git-gui.sh:2797
444 #, tcl-format
445 msgid ""
446 "\n"
@@ -451,7 +451,7 @@ msgid ""
451 "~/.gitconfig file.\n"
452 msgstr ""
453
454 -#: lib/about.tcl:25
454 +#: lib/about.tcl:26
455 msgid "git-gui - a graphical user interface for Git."
456 msgstr ""
457
@@ -463,56 +463,56 @@ msgstr ""
463 msgid "Commit:"
464 msgstr ""
465
466 -#: lib/blame.tcl:249
466 +#: lib/blame.tcl:264
467 msgid "Copy Commit"
468 msgstr ""
469
470 -#: lib/blame.tcl:369
470 +#: lib/blame.tcl:384
471 #, tcl-format
472 msgid "Reading %s..."
473 msgstr ""
474
475 -#: lib/blame.tcl:473
475 +#: lib/blame.tcl:488
476 msgid "Loading copy/move tracking annotations..."
477 msgstr ""
478
479 -#: lib/blame.tcl:493
479 +#: lib/blame.tcl:508
480 msgid "lines annotated"
481 msgstr ""
482
483 -#: lib/blame.tcl:674
483 +#: lib/blame.tcl:689
484 msgid "Loading original location annotations..."
485 msgstr ""
486
487 -#: lib/blame.tcl:677
487 +#: lib/blame.tcl:692
488 msgid "Annotation complete."
489 msgstr ""
490
491 -#: lib/blame.tcl:731
491 +#: lib/blame.tcl:746
492 msgid "Loading annotation..."
493 msgstr ""
494
495 -#: lib/blame.tcl:787
495 +#: lib/blame.tcl:802
496 msgid "Author:"
497 msgstr ""
498
499 -#: lib/blame.tcl:791
499 +#: lib/blame.tcl:806
500 msgid "Committer:"
501 msgstr ""
502
503 -#: lib/blame.tcl:796
503 +#: lib/blame.tcl:811
504 msgid "Original File:"
505 msgstr ""
506
507 -#: lib/blame.tcl:910
507 +#: lib/blame.tcl:925
508 msgid "Originally By:"
509 msgstr ""
510
511 -#: lib/blame.tcl:916
511 +#: lib/blame.tcl:931
512 msgid "In File:"
513 msgstr ""
514
515 -#: lib/blame.tcl:921
515 +#: lib/blame.tcl:936
516 msgid "Copied Or Moved Here By:"
517 msgstr ""
518
@@ -525,17 +525,17 @@ msgid "Checkout"
525 msgstr ""
526
527 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
528 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
529 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
530 -#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
528 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
529 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
530 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
531 msgid "Cancel"
532 msgstr ""
533
534 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
534 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
535 msgid "Revision"
536 msgstr ""
537
538 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
538 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
539 msgid "Options"
540 msgstr ""
541
@@ -555,7 +555,7 @@ msgstr ""
555 msgid "Create New Branch"
556 msgstr ""
557
558 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
558 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
559 msgid "Create"
560 msgstr ""
561
@@ -690,22 +690,22 @@ msgstr ""
690 msgid "File Browser"
691 msgstr ""
692
693 -#: lib/browser.tcl:125 lib/browser.tcl:142
693 +#: lib/browser.tcl:126 lib/browser.tcl:143
694 #, tcl-format
695 msgid "Loading %s..."
696 msgstr ""
697
698 -#: lib/browser.tcl:186
698 +#: lib/browser.tcl:187
699 msgid "[Up To Parent]"
700 msgstr ""
701
702 -#: lib/browser.tcl:266 lib/browser.tcl:272
702 +#: lib/browser.tcl:267 lib/browser.tcl:273
703 msgid "Browse Branch Files"
704 msgstr ""
705
706 -#: lib/browser.tcl:277 lib/choose_repository.tcl:391
707 -#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
708 -#: lib/choose_repository.tcl:989
706 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
707 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
708 +#: lib/choose_repository.tcl:987
709 msgid "Browse"
710 msgstr ""
711
@@ -719,7 +719,7 @@ msgstr ""
719 msgid "fatal: Cannot resolve %s"
720 msgstr ""
721
722 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
722 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
723 msgid "Close"
724 msgstr ""
725
@@ -792,7 +792,7 @@ msgid ""
792 "Checkout'."
793 msgstr ""
794
795 -#: lib/checkout_op.tcl:446
795 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
796 #, tcl-format
797 msgid "Checked out '%s'."
798 msgstr ""
@@ -811,7 +811,7 @@ msgstr ""
811 msgid "Reset '%s'?"
812 msgstr ""
813
814 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
814 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
815 msgid "Visualize"
816 msgstr ""
817
@@ -834,239 +834,239 @@ msgstr ""
834 msgid "Font Family"
835 msgstr ""
836
837 -#: lib/choose_font.tcl:73
837 +#: lib/choose_font.tcl:74
838 msgid "Font Size"
839 msgstr ""
840
841 -#: lib/choose_font.tcl:90
841 +#: lib/choose_font.tcl:91
842 msgid "Font Example"
843 msgstr ""
844
845 -#: lib/choose_font.tcl:101
845 +#: lib/choose_font.tcl:103
846 msgid ""
847 "This is example text.\n"
848 "If you like this text, it can be your font."
849 msgstr ""
850
851 -#: lib/choose_repository.tcl:27
851 +#: lib/choose_repository.tcl:28
852 msgid "Git Gui"
853 msgstr ""
854
855 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
855 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
856 msgid "Create New Repository"
857 msgstr ""
858
859 -#: lib/choose_repository.tcl:86
859 +#: lib/choose_repository.tcl:87
860 msgid "New..."
861 msgstr ""
862
863 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
863 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
864 msgid "Clone Existing Repository"
865 msgstr ""
866
867 -#: lib/choose_repository.tcl:99
867 +#: lib/choose_repository.tcl:100
868 msgid "Clone..."
869 msgstr ""
870
871 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
871 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
872 msgid "Open Existing Repository"
873 msgstr ""
874
875 -#: lib/choose_repository.tcl:112
875 +#: lib/choose_repository.tcl:113
876 msgid "Open..."
877 msgstr ""
878
879 -#: lib/choose_repository.tcl:125
879 +#: lib/choose_repository.tcl:126
880 msgid "Recent Repositories"
881 msgstr ""
882
883 -#: lib/choose_repository.tcl:131
883 +#: lib/choose_repository.tcl:132
884 msgid "Open Recent Repository:"
885 msgstr ""
886
887 -#: lib/choose_repository.tcl:294
888 -#, tcl-format
889 -msgid "Location %s already exists."
890 -msgstr ""
891 -
892 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
893 -#: lib/choose_repository.tcl:314
887 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
888 +#: lib/choose_repository.tcl:310
889 #, tcl-format
890 msgid "Failed to create repository %s:"
891 msgstr ""
892
898 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
893 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
894 msgid "Directory:"
895 msgstr ""
896
902 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
903 -#: lib/choose_repository.tcl:1013
897 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
898 +#: lib/choose_repository.tcl:1011
899 msgid "Git Repository"
900 msgstr ""
901
907 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
902 +#: lib/choose_repository.tcl:437
903 #, tcl-format
904 msgid "Directory %s already exists."
905 msgstr ""
906
912 -#: lib/choose_repository.tcl:442
907 +#: lib/choose_repository.tcl:441
908 #, tcl-format
909 msgid "File %s already exists."
910 msgstr ""
911
917 -#: lib/choose_repository.tcl:463
912 +#: lib/choose_repository.tcl:455
913 msgid "Clone"
914 msgstr ""
915
921 -#: lib/choose_repository.tcl:476
916 +#: lib/choose_repository.tcl:468
917 msgid "URL:"
918 msgstr ""
919
925 -#: lib/choose_repository.tcl:496
920 +#: lib/choose_repository.tcl:489
921 msgid "Clone Type:"
922 msgstr ""
923
929 -#: lib/choose_repository.tcl:502
924 +#: lib/choose_repository.tcl:495
925 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
926 msgstr ""
927
933 -#: lib/choose_repository.tcl:508
928 +#: lib/choose_repository.tcl:501
929 msgid "Full Copy (Slower, Redundant Backup)"
930 msgstr ""
931
937 -#: lib/choose_repository.tcl:514
932 +#: lib/choose_repository.tcl:507
933 msgid "Shared (Fastest, Not Recommended, No Backup)"
934 msgstr ""
935
941 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
942 -#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
943 -#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
936 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
937 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
938 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
939 #, tcl-format
940 msgid "Not a Git repository: %s"
941 msgstr ""
942
948 -#: lib/choose_repository.tcl:586
943 +#: lib/choose_repository.tcl:579
944 msgid "Standard only available for local repository."
945 msgstr ""
946
952 -#: lib/choose_repository.tcl:590
947 +#: lib/choose_repository.tcl:583
948 msgid "Shared only available for local repository."
949 msgstr ""
950
956 -#: lib/choose_repository.tcl:617
951 +#: lib/choose_repository.tcl:604
952 +#, tcl-format
953 +msgid "Location %s already exists."
954 +msgstr ""
955 +
956 +#: lib/choose_repository.tcl:615
957 msgid "Failed to configure origin"
958 msgstr ""
959
960 -#: lib/choose_repository.tcl:629
960 +#: lib/choose_repository.tcl:627
961 msgid "Counting objects"
962 msgstr ""
963
964 -#: lib/choose_repository.tcl:630
964 +#: lib/choose_repository.tcl:628
965 msgid "buckets"
966 msgstr ""
967
968 -#: lib/choose_repository.tcl:654
968 +#: lib/choose_repository.tcl:652
969 #, tcl-format
970 msgid "Unable to copy objects/info/alternates: %s"
971 msgstr ""
972
973 -#: lib/choose_repository.tcl:690
973 +#: lib/choose_repository.tcl:688
974 #, tcl-format
975 msgid "Nothing to clone from %s."
976 msgstr ""
977
978 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
979 -#: lib/choose_repository.tcl:918
978 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
979 +#: lib/choose_repository.tcl:916
980 msgid "The 'master' branch has not been initialized."
981 msgstr ""
982
983 -#: lib/choose_repository.tcl:705
983 +#: lib/choose_repository.tcl:703
984 msgid "Hardlinks are unavailable. Falling back to copying."
985 msgstr ""
986
987 -#: lib/choose_repository.tcl:717
987 +#: lib/choose_repository.tcl:715
988 #, tcl-format
989 msgid "Cloning from %s"
990 msgstr ""
991
992 -#: lib/choose_repository.tcl:748
992 +#: lib/choose_repository.tcl:746
993 msgid "Copying objects"
994 msgstr ""
995
996 -#: lib/choose_repository.tcl:749
996 +#: lib/choose_repository.tcl:747
997 msgid "KiB"
998 msgstr ""
999
1000 -#: lib/choose_repository.tcl:773
1000 +#: lib/choose_repository.tcl:771
1001 #, tcl-format
1002 msgid "Unable to copy object: %s"
1003 msgstr ""
1004
1005 -#: lib/choose_repository.tcl:783
1005 +#: lib/choose_repository.tcl:781
1006 msgid "Linking objects"
1007 msgstr ""
1008
1009 -#: lib/choose_repository.tcl:784
1009 +#: lib/choose_repository.tcl:782
1010 msgid "objects"
1011 msgstr ""
1012
1013 -#: lib/choose_repository.tcl:792
1013 +#: lib/choose_repository.tcl:790
1014 #, tcl-format
1015 msgid "Unable to hardlink object: %s"
1016 msgstr ""
1017
1018 -#: lib/choose_repository.tcl:847
1018 +#: lib/choose_repository.tcl:845
1019 msgid "Cannot fetch branches and objects. See console output for details."
1020 msgstr ""
1021
1022 -#: lib/choose_repository.tcl:858
1022 +#: lib/choose_repository.tcl:856
1023 msgid "Cannot fetch tags. See console output for details."
1024 msgstr ""
1025
1026 -#: lib/choose_repository.tcl:882
1026 +#: lib/choose_repository.tcl:880
1027 msgid "Cannot determine HEAD. See console output for details."
1028 msgstr ""
1029
1030 -#: lib/choose_repository.tcl:891
1030 +#: lib/choose_repository.tcl:889
1031 #, tcl-format
1032 msgid "Unable to cleanup %s"
1033 msgstr ""
1034
1035 -#: lib/choose_repository.tcl:897
1035 +#: lib/choose_repository.tcl:895
1036 msgid "Clone failed."
1037 msgstr ""
1038
1039 -#: lib/choose_repository.tcl:904
1039 +#: lib/choose_repository.tcl:902
1040 msgid "No default branch obtained."
1041 msgstr ""
1042
1043 -#: lib/choose_repository.tcl:915
1043 +#: lib/choose_repository.tcl:913
1044 #, tcl-format
1045 msgid "Cannot resolve %s as a commit."
1046 msgstr ""
1047
1048 -#: lib/choose_repository.tcl:927
1048 +#: lib/choose_repository.tcl:925
1049 msgid "Creating working directory"
1050 msgstr ""
1051
1052 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1052 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1053 #: lib/index.tcl:193
1054 msgid "files"
1055 msgstr ""
1056
1057 -#: lib/choose_repository.tcl:957
1057 +#: lib/choose_repository.tcl:955
1058 msgid "Initial file checkout failed."
1059 msgstr ""
1060
1061 -#: lib/choose_repository.tcl:973
1061 +#: lib/choose_repository.tcl:971
1062 msgid "Open"
1063 msgstr ""
1064
1065 -#: lib/choose_repository.tcl:983
1065 +#: lib/choose_repository.tcl:981
1066 msgid "Repository:"
1067 msgstr ""
1068
1069 -#: lib/choose_repository.tcl:1033
1069 +#: lib/choose_repository.tcl:1031
1070 #, tcl-format
1071 msgid "Failed to open repository %s:"
1072 msgstr ""
@@ -1087,7 +1087,7 @@ msgstr ""
1087 msgid "Tracking Branch"
1088 msgstr ""
1089
1090 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1090 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1091 msgid "Tag"
1092 msgstr ""
1093
@@ -1104,11 +1104,11 @@ msgstr ""
1104 msgid "Revision expression is empty."
1105 msgstr ""
1106
1107 -#: lib/choose_rev.tcl:530
1107 +#: lib/choose_rev.tcl:531
1108 msgid "Updated"
1109 msgstr ""
1110
1111 -#: lib/choose_rev.tcl:558
1111 +#: lib/choose_rev.tcl:559
1112 msgid "URL"
1113 msgstr ""
1114
@@ -1224,7 +1224,7 @@ msgstr ""
1224 msgid "Commit %s appears to be corrupt"
1225 msgstr ""
1226
1227 -#: lib/commit.tcl:279
1227 +#: lib/commit.tcl:326
1228 msgid ""
1229 "No changes to commit.\n"
1230 "\n"
@@ -1233,7 +1233,7 @@ msgid ""
1233 "A rescan will be automatically started now.\n"
1234 msgstr ""
1235
1236 -#: lib/commit.tcl:286
1236 +#: lib/commit.tcl:333
1237 msgid "No changes to commit."
1238 msgstr ""
1239
@@ -1241,24 +1241,24 @@ msgstr ""
1241 msgid "commit-tree failed:"
1242 msgstr ""
1243
1244 -#: lib/commit.tcl:339
1244 +#: lib/commit.tcl:367
1245 msgid "update-ref failed:"
1246 msgstr ""
1247
1248 -#: lib/commit.tcl:430
1248 +#: lib/commit.tcl:454
1249 #, tcl-format
1250 msgid "Created commit %s: %s"
1251 msgstr ""
1252
1253 -#: lib/console.tcl:57
1253 +#: lib/console.tcl:59
1254 msgid "Working... please wait..."
1255 msgstr ""
1256
1257 -#: lib/console.tcl:183
1257 +#: lib/console.tcl:186
1258 msgid "Success"
1259 msgstr ""
1260
1261 -#: lib/console.tcl:196
1261 +#: lib/console.tcl:200
1262 msgid "Error: Command Failed"
1263 msgstr ""
1264
@@ -1354,23 +1354,23 @@ msgstr ""
1354 msgid "Error loading diff:"
1355 msgstr ""
1356
1357 -#: lib/diff.tcl:302
1357 +#: lib/diff.tcl:303
1358 msgid "Failed to unstage selected hunk."
1359 msgstr ""
1360
1361 -#: lib/diff.tcl:309
1361 +#: lib/diff.tcl:310
1362 msgid "Failed to stage selected hunk."
1363 msgstr ""
1364
1365 -#: lib/error.tcl:12 lib/error.tcl:102
1365 +#: lib/error.tcl:20 lib/error.tcl:114
1366 msgid "error"
1367 msgstr ""
1368
1369 -#: lib/error.tcl:28
1369 +#: lib/error.tcl:36
1370 msgid "warning"
1371 msgstr ""
1372
1373 -#: lib/error.tcl:81
1373 +#: lib/error.tcl:94
1374 msgid "You must correct the above errors before committing."
1375 msgstr ""
1376
@@ -1420,11 +1420,11 @@ msgstr ""
1420 msgid "Revert changes in these %i files?"
1421 msgstr ""
1422
1423 -#: lib/index.tcl:389
1423 +#: lib/index.tcl:391
1424 msgid "Any unstaged changes will be permanently lost by the revert."
1425 msgstr ""
1426
1427 -#: lib/index.tcl:392
1427 +#: lib/index.tcl:394
1428 msgid "Do Nothing"
1429 msgstr ""
1430
@@ -1481,27 +1481,27 @@ msgstr ""
1481 msgid "Merge completed successfully."
1482 msgstr ""
1483
1484 -#: lib/merge.tcl:133
1484 +#: lib/merge.tcl:132
1485 msgid "Merge failed. Conflict resolution is required."
1486 msgstr ""
1487
1488 -#: lib/merge.tcl:158
1488 +#: lib/merge.tcl:157
1489 #, tcl-format
1490 msgid "Merge Into %s"
1491 msgstr ""
1492
1493 -#: lib/merge.tcl:177
1493 +#: lib/merge.tcl:176
1494 msgid "Revision To Merge"
1495 msgstr ""
1496
1497 -#: lib/merge.tcl:212
1497 +#: lib/merge.tcl:211
1498 msgid ""
1499 "Cannot abort while amending.\n"
1500 "\n"
1501 "You must finish amending this commit.\n"
1502 msgstr ""
1503
1504 -#: lib/merge.tcl:222
1504 +#: lib/merge.tcl:221
1505 msgid ""
1506 "Abort merge?\n"
1507 "\n"
@@ -1510,7 +1510,7 @@ msgid ""
1510 "Continue with aborting the current merge?"
1511 msgstr ""
1512
1513 -#: lib/merge.tcl:228
1513 +#: lib/merge.tcl:227
1514 msgid ""
1515 "Reset changes?\n"
1516 "\n"
@@ -1519,7 +1519,7 @@ msgid ""
1519 "Continue with resetting the current changes?"
1520 msgstr ""
1521
1522 -#: lib/merge.tcl:239
1522 +#: lib/merge.tcl:238
1523 msgid "Aborting"
1524 msgstr ""
1525
@@ -1531,89 +1531,93 @@ msgstr ""
1531 msgid "Abort failed."
1532 msgstr ""
1533
1534 -#: lib/merge.tcl:268
1534 +#: lib/merge.tcl:267
1535 msgid "Abort completed. Ready."
1536 msgstr ""
1537
1538 -#: lib/option.tcl:82
1538 +#: lib/option.tcl:95
1539 msgid "Restore Defaults"
1540 msgstr ""
1541
1542 -#: lib/option.tcl:86
1542 +#: lib/option.tcl:99
1543 msgid "Save"
1544 msgstr ""
1545
1546 -#: lib/option.tcl:96
1546 +#: lib/option.tcl:109
1547 #, tcl-format
1548 msgid "%s Repository"
1549 msgstr ""
1550
1551 -#: lib/option.tcl:97
1551 +#: lib/option.tcl:110
1552 msgid "Global (All Repositories)"
1553 msgstr ""
1554
1555 -#: lib/option.tcl:103
1555 +#: lib/option.tcl:116
1556 msgid "User Name"
1557 msgstr ""
1558
1559 -#: lib/option.tcl:104
1559 +#: lib/option.tcl:117
1560 msgid "Email Address"
1561 msgstr ""
1562
1563 -#: lib/option.tcl:106
1563 +#: lib/option.tcl:119
1564 msgid "Summarize Merge Commits"
1565 msgstr ""
1566
1567 -#: lib/option.tcl:107
1567 +#: lib/option.tcl:120
1568 msgid "Merge Verbosity"
1569 msgstr ""
1570
1571 -#: lib/option.tcl:108
1571 +#: lib/option.tcl:121
1572 msgid "Show Diffstat After Merge"
1573 msgstr ""
1574
1575 -#: lib/option.tcl:110
1575 +#: lib/option.tcl:123
1576 msgid "Trust File Modification Timestamps"
1577 msgstr ""
1578
1579 -#: lib/option.tcl:111
1579 +#: lib/option.tcl:124
1580 msgid "Prune Tracking Branches During Fetch"
1581 msgstr ""
1582
1583 -#: lib/option.tcl:112
1583 +#: lib/option.tcl:125
1584 msgid "Match Tracking Branches"
1585 msgstr ""
1586
1587 -#: lib/option.tcl:113
1587 +#: lib/option.tcl:126
1588 msgid "Number of Diff Context Lines"
1589 msgstr ""
1590
1591 -#: lib/option.tcl:114
1591 +#: lib/option.tcl:127
1592 +msgid "Commit Message Text Width"
1593 +msgstr ""
1594 +
1595 +#: lib/option.tcl:128
1596 msgid "New Branch Name Template"
1597 msgstr ""
1598
1595 -#: lib/option.tcl:191
1599 +#: lib/option.tcl:192
1600 msgid "Spelling Dictionary:"
1601 msgstr ""
1602
1599 -#: lib/option.tcl:215
1603 +#: lib/option.tcl:216
1604 msgid "Change Font"
1605 msgstr ""
1606
1603 -#: lib/option.tcl:180
1607 +#: lib/option.tcl:220
1608 #, tcl-format
1609 msgid "Choose %s"
1610 msgstr ""
1611
1608 -#: lib/option.tcl:186
1612 +#: lib/option.tcl:226
1613 msgid "pt."
1614 msgstr ""
1615
1612 -#: lib/option.tcl:200
1616 +#: lib/option.tcl:240
1617 msgid "Preferences"
1618 msgstr ""
1619
1616 -#: lib/option.tcl:235
1620 +#: lib/option.tcl:275
1621 msgid "Failed to completely save options:"
1622 msgstr ""
1623
@@ -1713,23 +1717,40 @@ msgstr ""
1717 msgid "Cannot write icon:"
1718 msgstr ""
1719
1716 -#: lib/spellcheck.tcl:37
1717 -msgid "Not connected to aspell"
1720 +#: lib/spellcheck.tcl:57
1721 +msgid "Unsupported spell checker"
1722 +msgstr ""
1723 +
1724 +#: lib/spellcheck.tcl:65
1725 +msgid "Spell checking is unavailable"
1726 +msgstr ""
1727 +
1728 +#: lib/spellcheck.tcl:68
1729 +msgid "Invalid spell checking configuration"
1730 +msgstr ""
1731 +
1732 +#: lib/spellcheck.tcl:70
1733 +#, tcl-format
1734 +msgid "Reverting dictionary to %s."
1735 +msgstr ""
1736 +
1737 +#: lib/spellcheck.tcl:73
1738 +msgid "Spell checker silently failed on startup"
1739 msgstr ""
1740
1720 -#: lib/spellcheck.tcl:41
1721 -msgid "Unrecognized aspell version"
1741 +#: lib/spellcheck.tcl:80
1742 +msgid "Unrecognized spell checker"
1743 msgstr ""
1744
1724 -#: lib/spellcheck.tcl:135
1745 +#: lib/spellcheck.tcl:180
1746 msgid "No Suggestions"
1747 msgstr ""
1748
1728 -#: lib/spellcheck.tcl:336
1729 -msgid "Unexpected EOF from aspell"
1749 +#: lib/spellcheck.tcl:381
1750 +msgid "Unexpected EOF from spell checker"
1751 msgstr ""
1752
1732 -#: lib/spellcheck.tcl:340
1753 +#: lib/spellcheck.tcl:385
1754 msgid "Spell Checker Failed"
1755 msgstr ""
1756
po/hu.po
+278 -249
@@ -7,7 +7,7 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git-gui-i 18n\n"
9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2008-02-16 21:24+0100\n"
10 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
11 "PO-Revision-Date: 2008-03-13 13:30+0100\n"
12 "Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
13 "Language-Team: Hungarian\n"
@@ -16,33 +16,33 @@ msgstr ""
16 "Content-Transfer-Encoding: 8bit\n"
17 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
18
19 -#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
20 -#: git-gui.sh:733
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
21 msgid "git-gui: fatal error"
22 msgstr "git-gui: végzetes hiba"
23
24 -#: git-gui.sh:565
24 +#: git-gui.sh:593
25 #, tcl-format
26 msgid "Invalid font specified in %s:"
27 msgstr "Érvénytelen font lett megadva itt: %s:"
28
29 -#: git-gui.sh:590
29 +#: git-gui.sh:620
30 msgid "Main Font"
31 msgstr "Fő betűtípus"
32
33 -#: git-gui.sh:591
33 +#: git-gui.sh:621
34 msgid "Diff/Console Font"
35 msgstr "Diff/konzol betűtípus"
36
37 -#: git-gui.sh:605
37 +#: git-gui.sh:635
38 msgid "Cannot find git in PATH."
39 msgstr "A git nem található a PATH-ban."
40
41 -#: git-gui.sh:632
41 +#: git-gui.sh:662
42 msgid "Cannot parse Git version string:"
43 msgstr "Nem értelmezhető a Git verzió sztring:"
44
45 -#: git-gui.sh:650
45 +#: git-gui.sh:680
46 #, tcl-format
47 msgid ""
48 "Git version cannot be determined.\n"
@@ -61,79 +61,79 @@ msgstr ""
61 "\n"
62 "Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n"
63
64 -#: git-gui.sh:888
64 +#: git-gui.sh:918
65 msgid "Git directory not found:"
66 msgstr "A Git könyvtár nem található:"
67
68 -#: git-gui.sh:895
68 +#: git-gui.sh:925
69 msgid "Cannot move to top of working directory:"
70 msgstr "Nem lehet a munkakönyvtár tetejére lépni:"
71
72 -#: git-gui.sh:902
72 +#: git-gui.sh:932
73 msgid "Cannot use funny .git directory:"
74 msgstr "Nem használható vicces .git könyvtár:"
75
76 -#: git-gui.sh:907
76 +#: git-gui.sh:937
77 msgid "No working directory"
78 msgstr "Nincs munkakönyvtár"
79
80 -#: git-gui.sh:1054
80 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
81 msgid "Refreshing file status..."
82 msgstr "A fájlok státuszának frissítése..."
83
84 -#: git-gui.sh:1119
84 +#: git-gui.sh:1149
85 msgid "Scanning for modified files ..."
86 msgstr "Módosított fájlok keresése ..."
87
88 -#: git-gui.sh:1294 lib/browser.tcl:245
88 +#: git-gui.sh:1324 lib/browser.tcl:246
89 msgid "Ready."
90 msgstr "Kész."
91
92 -#: git-gui.sh:1560
92 +#: git-gui.sh:1590
93 msgid "Unmodified"
94 msgstr "Nem módosított"
95
96 -#: git-gui.sh:1562
96 +#: git-gui.sh:1592
97 msgid "Modified, not staged"
98 msgstr "Módosított, de nem kiválasztott"
99
100 -#: git-gui.sh:1563 git-gui.sh:1568
100 +#: git-gui.sh:1593 git-gui.sh:1598
101 msgid "Staged for commit"
102 msgstr "Kiválasztva commitolásra"
103
104 -#: git-gui.sh:1564 git-gui.sh:1569
104 +#: git-gui.sh:1594 git-gui.sh:1599
105 msgid "Portions staged for commit"
106 msgstr "Részek kiválasztva commitolásra"
107
108 -#: git-gui.sh:1565 git-gui.sh:1570
108 +#: git-gui.sh:1595 git-gui.sh:1600
109 msgid "Staged for commit, missing"
110 msgstr "Kiválasztva commitolásra, hiányzó"
111
112 -#: git-gui.sh:1567
112 +#: git-gui.sh:1597
113 msgid "Untracked, not staged"
114 msgstr "Nem követett, nem kiválasztott"
115
116 -#: git-gui.sh:1572
116 +#: git-gui.sh:1602
117 msgid "Missing"
118 msgstr "Hiányzó"
119
120 -#: git-gui.sh:1573
120 +#: git-gui.sh:1603
121 msgid "Staged for removal"
122 msgstr "Kiválasztva eltávolításra"
123
124 -#: git-gui.sh:1574
124 +#: git-gui.sh:1604
125 msgid "Staged for removal, still present"
126 msgstr "Kiválasztva eltávolításra, jelenleg is elérhető"
127
128 -#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
128 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
129 msgid "Requires merge resolution"
130 msgstr "Merge feloldás szükséges"
131
132 -#: git-gui.sh:1614
132 +#: git-gui.sh:1644
133 msgid "Starting gitk... please wait..."
134 msgstr "A gitk indítása... várjunk..."
135
136 -#: git-gui.sh:1623
136 +#: git-gui.sh:1653
137 #, tcl-format
138 msgid ""
139 "Unable to start gitk:\n"
@@ -144,296 +144,296 @@ msgstr ""
144 "\n"
145 "A(z) %s nem létezik"
146
147 -#: git-gui.sh:1823 lib/choose_repository.tcl:35
147 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
148 msgid "Repository"
149 msgstr "Repó"
150
151 -#: git-gui.sh:1824
151 +#: git-gui.sh:1861
152 msgid "Edit"
153 msgstr "Szerkesztés"
154
155 -#: git-gui.sh:1826 lib/choose_rev.tcl:560
155 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
156 msgid "Branch"
157 msgstr "Branch"
158
159 -#: git-gui.sh:1829 lib/choose_rev.tcl:547
159 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
160 msgid "Commit@@noun"
161 msgstr "Commit@@főnév"
162
163 -#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
163 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
164 msgid "Merge"
165 msgstr "Merge"
166
167 -#: git-gui.sh:1833 lib/choose_rev.tcl:556
167 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
168 msgid "Remote"
169 msgstr "Távoli"
170
171 -#: git-gui.sh:1842
171 +#: git-gui.sh:1879
172 msgid "Browse Current Branch's Files"
173 msgstr "A jelenlegi branch fájljainak böngészése"
174
175 -#: git-gui.sh:1846
175 +#: git-gui.sh:1883
176 msgid "Browse Branch Files..."
177 msgstr "A branch fájljainak böngészése..."
178
179 -#: git-gui.sh:1851
179 +#: git-gui.sh:1888
180 msgid "Visualize Current Branch's History"
181 msgstr "A jelenlegi branch történetének vizualizálása"
182
183 -#: git-gui.sh:1855
183 +#: git-gui.sh:1892
184 msgid "Visualize All Branch History"
185 msgstr "Az összes branch történetének vizualizálása"
186
187 -#: git-gui.sh:1862
187 +#: git-gui.sh:1899
188 #, tcl-format
189 msgid "Browse %s's Files"
190 msgstr "A(z) %s branch fájljainak böngészése"
191
192 -#: git-gui.sh:1864
192 +#: git-gui.sh:1901
193 #, tcl-format
194 msgid "Visualize %s's History"
195 msgstr "A(z) %s branch történetének vizualizálása"
196
197 -#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
197 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
198 msgid "Database Statistics"
199 msgstr "Adatbázis statisztikák"
200
201 -#: git-gui.sh:1872 lib/database.tcl:34
201 +#: git-gui.sh:1909 lib/database.tcl:34
202 msgid "Compress Database"
203 msgstr "Adatbázis tömörítése"
204
205 -#: git-gui.sh:1875
205 +#: git-gui.sh:1912
206 msgid "Verify Database"
207 msgstr "Adatbázis ellenőrzése"
208
209 -#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
209 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
210 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
211 msgid "Create Desktop Icon"
212 msgstr "Asztal ikon létrehozása"
213
214 -#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
214 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
215 msgid "Quit"
216 msgstr "Kilépés"
217
218 -#: git-gui.sh:1902
218 +#: git-gui.sh:1939
219 msgid "Undo"
220 msgstr "Visszavonás"
221
222 -#: git-gui.sh:1905
222 +#: git-gui.sh:1942
223 msgid "Redo"
224 msgstr "Mégis"
225
226 -#: git-gui.sh:1909 git-gui.sh:2403
226 +#: git-gui.sh:1946 git-gui.sh:2443
227 msgid "Cut"
228 msgstr "Kivágás"
229
230 -#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
231 -#: lib/console.tcl:67
230 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
231 +#: lib/console.tcl:69
232 msgid "Copy"
233 msgstr "Másolás"
234
235 -#: git-gui.sh:1915 git-gui.sh:2409
235 +#: git-gui.sh:1952 git-gui.sh:2449
236 msgid "Paste"
237 msgstr "Beillesztés"
238
239 -#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
239 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
240 #: lib/remote_branch_delete.tcl:38
241 msgid "Delete"
242 msgstr "Törlés"
243
244 -#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
244 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
245 msgid "Select All"
246 msgstr "Mindent kiválaszt"
247
248 -#: git-gui.sh:1931
248 +#: git-gui.sh:1968
249 msgid "Create..."
250 msgstr "Létrehozás..."
251
252 -#: git-gui.sh:1937
252 +#: git-gui.sh:1974
253 msgid "Checkout..."
254 msgstr "Checkout..."
255
256 -#: git-gui.sh:1943
256 +#: git-gui.sh:1980
257 msgid "Rename..."
258 msgstr "Átnevezés..."
259
260 -#: git-gui.sh:1948 git-gui.sh:2048
260 +#: git-gui.sh:1985 git-gui.sh:2085
261 msgid "Delete..."
262 msgstr "Törlés..."
263
264 -#: git-gui.sh:1953
264 +#: git-gui.sh:1990
265 msgid "Reset..."
266 msgstr "Visszaállítás..."
267
268 -#: git-gui.sh:1965 git-gui.sh:2350
268 +#: git-gui.sh:2002 git-gui.sh:2389
269 msgid "New Commit"
270 msgstr "Új commit"
271
272 -#: git-gui.sh:1973 git-gui.sh:2357
272 +#: git-gui.sh:2010 git-gui.sh:2396
273 msgid "Amend Last Commit"
274 msgstr "Utolsó commit javítása"
275
276 -#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
276 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
277 msgid "Rescan"
278 msgstr "Keresés újra"
279
280 -#: git-gui.sh:1988
280 +#: git-gui.sh:2025
281 msgid "Stage To Commit"
282 msgstr "Kiválasztás commitolásra"
283
284 -#: git-gui.sh:1994
284 +#: git-gui.sh:2031
285 msgid "Stage Changed Files To Commit"
286 msgstr "Módosított fájlok kiválasztása commitolásra"
287
288 -#: git-gui.sh:2000
288 +#: git-gui.sh:2037
289 msgid "Unstage From Commit"
290 msgstr "Commitba való kiválasztás visszavonása"
291
292 -#: git-gui.sh:2005 lib/index.tcl:393
292 +#: git-gui.sh:2042 lib/index.tcl:395
293 msgid "Revert Changes"
294 msgstr "Változtatások visszaállítása"
295
296 -#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
296 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
297 msgid "Sign Off"
298 msgstr "Aláír"
299
300 -#: git-gui.sh:2016 git-gui.sh:2333
300 +#: git-gui.sh:2053 git-gui.sh:2372
301 msgid "Commit@@verb"
302 msgstr "Commit@@ige"
303
304 -#: git-gui.sh:2027
304 +#: git-gui.sh:2064
305 msgid "Local Merge..."
306 msgstr "Helyi merge..."
307
308 -#: git-gui.sh:2032
308 +#: git-gui.sh:2069
309 msgid "Abort Merge..."
310 msgstr "Merge megszakítása..."
311
312 -#: git-gui.sh:2044
312 +#: git-gui.sh:2081
313 msgid "Push..."
314 msgstr "Push..."
315
316 -#: git-gui.sh:2055 lib/choose_repository.tcl:40
316 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
317 msgid "Apple"
318 msgstr "Apple"
319
320 -#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
321 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
320 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
321 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
322 #, tcl-format
323 msgid "About %s"
324 msgstr "Névjegy: %s"
325
326 -#: git-gui.sh:2062
326 +#: git-gui.sh:2099
327 msgid "Preferences..."
328 msgstr "Beállítások..."
329
330 -#: git-gui.sh:2070 git-gui.sh:2595
330 +#: git-gui.sh:2107 git-gui.sh:2639
331 msgid "Options..."
332 msgstr "Opciók..."
333
334 -#: git-gui.sh:2076 lib/choose_repository.tcl:46
334 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
335 msgid "Help"
336 msgstr "Segítség"
337
338 -#: git-gui.sh:2117
338 +#: git-gui.sh:2154
339 msgid "Online Documentation"
340 msgstr "Online dokumentáció"
341
342 -#: git-gui.sh:2201
342 +#: git-gui.sh:2238
343 #, tcl-format
344 msgid "fatal: cannot stat path %s: No such file or directory"
345 msgstr ""
346 "végzetes hiba: nem érhető el a(z) %s útvonal: Nincs ilyen fájl vagy könyvtár"
347
348 -#: git-gui.sh:2234
348 +#: git-gui.sh:2271
349 msgid "Current Branch:"
350 msgstr "Jelenlegi branch:"
351
352 -#: git-gui.sh:2255
352 +#: git-gui.sh:2292
353 msgid "Staged Changes (Will Commit)"
354 msgstr "Kiválasztott változtatások (commitolva lesz)"
355
356 -#: git-gui.sh:2274
356 +#: git-gui.sh:2312
357 msgid "Unstaged Changes"
358 msgstr "Kiválasztatlan változtatások"
359
360 -#: git-gui.sh:2323
360 +#: git-gui.sh:2362
361 msgid "Stage Changed"
362 msgstr "Változtatások kiválasztása"
363
364 -#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
364 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
365 msgid "Push"
366 msgstr "Push"
367
368 -#: git-gui.sh:2369
368 +#: git-gui.sh:2408
369 msgid "Initial Commit Message:"
370 msgstr "Kezdeti commit üzenet:"
371
372 -#: git-gui.sh:2370
372 +#: git-gui.sh:2409
373 msgid "Amended Commit Message:"
374 msgstr "Javító commit üzenet:"
375
376 -#: git-gui.sh:2371
376 +#: git-gui.sh:2410
377 msgid "Amended Initial Commit Message:"
378 msgstr "Kezdeti javító commit üzenet:"
379
380 -#: git-gui.sh:2372
380 +#: git-gui.sh:2411
381 msgid "Amended Merge Commit Message:"
382 msgstr "Javító merge commit üzenet:"
383
384 -#: git-gui.sh:2373
384 +#: git-gui.sh:2412
385 msgid "Merge Commit Message:"
386 msgstr "Merge commit üzenet:"
387
388 -#: git-gui.sh:2374
388 +#: git-gui.sh:2413
389 msgid "Commit Message:"
390 msgstr "Commit üzenet:"
391
392 -#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
392 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
393 msgid "Copy All"
394 msgstr "Összes másolása"
395
396 -#: git-gui.sh:2443 lib/blame.tcl:104
396 +#: git-gui.sh:2483 lib/blame.tcl:107
397 msgid "File:"
398 msgstr "Fájl:"
399
400 -#: git-gui.sh:2573
400 +#: git-gui.sh:2589
401 msgid "Apply/Reverse Hunk"
402 msgstr "Hunk alkalmazása/visszaállítása"
403
404 -#: git-gui.sh:2579
404 +#: git-gui.sh:2595
405 msgid "Show Less Context"
406 msgstr "Kevesebb környezet mutatása"
407
408 -#: git-gui.sh:2586
408 +#: git-gui.sh:2602
409 msgid "Show More Context"
410 msgstr "Több környezet mutatása"
411
412 -#: git-gui.sh:2594
412 +#: git-gui.sh:2610
413 msgid "Refresh"
414 msgstr "Frissítés"
415
416 -#: git-gui.sh:2615
416 +#: git-gui.sh:2631
417 msgid "Decrease Font Size"
418 msgstr "Font méret csökkentése"
419
420 -#: git-gui.sh:2619
420 +#: git-gui.sh:2635
421 msgid "Increase Font Size"
422 msgstr "Fönt méret növelése"
423
424 -#: git-gui.sh:2630
424 +#: git-gui.sh:2646
425 msgid "Unstage Hunk From Commit"
426 msgstr "Hunk törlése commitból"
427
428 -#: git-gui.sh:2604
428 +#: git-gui.sh:2648
429 msgid "Stage Hunk For Commit"
430 msgstr "Hunk kiválasztása commitba"
431
432 -#: git-gui.sh:2623
432 +#: git-gui.sh:2667
433 msgid "Initializing..."
434 msgstr "Inicializálás..."
435
436 -#: git-gui.sh:2718
436 +#: git-gui.sh:2762
437 #, tcl-format
438 msgid ""
439 "Possible environment issues exist.\n"
@@ -450,7 +450,7 @@ msgstr ""
450 "indított folyamatok által:\n"
451 "\n"
452
453 -#: git-gui.sh:2748
453 +#: git-gui.sh:2792
454 msgid ""
455 "\n"
456 "This is due to a known issue with the\n"
@@ -460,7 +460,7 @@ msgstr ""
460 "Ez a Cygwin által terjesztett Tcl binárisban\n"
461 "lévő ismert hiba miatt van."
462
463 -#: git-gui.sh:2753
463 +#: git-gui.sh:2797
464 #, tcl-format
465 msgid ""
466 "\n"
@@ -477,7 +477,7 @@ msgstr ""
477 "elhelyezése a személyes\n"
478 "~/.gitconfig fájlba.\n"
479
480 -#: lib/about.tcl:25
480 +#: lib/about.tcl:26
481 msgid "git-gui - a graphical user interface for Git."
482 msgstr "git-gui - egy grafikus felület a Githez."
483
@@ -489,56 +489,56 @@ msgstr "Fájl néző"
489 msgid "Commit:"
490 msgstr "Commit:"
491
492 -#: lib/blame.tcl:249
492 +#: lib/blame.tcl:264
493 msgid "Copy Commit"
494 msgstr "Commit másolása"
495
496 -#: lib/blame.tcl:369
496 +#: lib/blame.tcl:384
497 #, tcl-format
498 msgid "Reading %s..."
499 msgstr "A(z) %s olvasása..."
500
501 -#: lib/blame.tcl:473
501 +#: lib/blame.tcl:488
502 msgid "Loading copy/move tracking annotations..."
503 msgstr "A másolást/átnevezést követő annotációk betöltése..."
504
505 -#: lib/blame.tcl:493
505 +#: lib/blame.tcl:508
506 msgid "lines annotated"
507 msgstr "sor annotálva"
508
509 -#: lib/blame.tcl:674
509 +#: lib/blame.tcl:689
510 msgid "Loading original location annotations..."
511 msgstr "Az eredeti hely annotációk betöltése..."
512
513 -#: lib/blame.tcl:677
513 +#: lib/blame.tcl:692
514 msgid "Annotation complete."
515 msgstr "Az annotáció kész."
516
517 -#: lib/blame.tcl:731
517 +#: lib/blame.tcl:746
518 msgid "Loading annotation..."
519 msgstr "Az annotáció betöltése..."
520
521 -#: lib/blame.tcl:787
521 +#: lib/blame.tcl:802
522 msgid "Author:"
523 msgstr "Szerző:"
524
525 -#: lib/blame.tcl:791
525 +#: lib/blame.tcl:806
526 msgid "Committer:"
527 msgstr "Commiter:"
528
529 -#: lib/blame.tcl:796
529 +#: lib/blame.tcl:811
530 msgid "Original File:"
531 msgstr "Eredeti fájl:"
532
533 -#: lib/blame.tcl:910
533 +#: lib/blame.tcl:925
534 msgid "Originally By:"
535 msgstr "Eredeti szerző:"
536
537 -#: lib/blame.tcl:916
537 +#: lib/blame.tcl:931
538 msgid "In File:"
539 msgstr "Ebben a fájlban:"
540
541 -#: lib/blame.tcl:921
541 +#: lib/blame.tcl:936
542 msgid "Copied Or Moved Here By:"
543 msgstr "Ide másolta vagy helyezte:"
544
@@ -551,17 +551,17 @@ msgid "Checkout"
551 msgstr "Checkout"
552
553 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
554 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
555 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
556 -#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
554 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
555 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
556 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
557 msgid "Cancel"
558 msgstr "Mégsem"
559
560 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
560 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
561 msgid "Revision"
562 msgstr "Revízió"
563
564 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
564 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
565 msgid "Options"
566 msgstr "Opciók"
567
@@ -581,7 +581,7 @@ msgstr "Branch létrehozása"
581 msgid "Create New Branch"
582 msgstr "Új branch létrehozása"
583
584 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
584 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
585 msgid "Create"
586 msgstr "Létrehozás"
587
@@ -721,22 +721,22 @@ msgstr "Indítás..."
721 msgid "File Browser"
722 msgstr "Fájl böngésző"
723
724 -#: lib/browser.tcl:125 lib/browser.tcl:142
724 +#: lib/browser.tcl:126 lib/browser.tcl:143
725 #, tcl-format
726 msgid "Loading %s..."
727 msgstr "A(z) %s betöltése..."
728
729 -#: lib/browser.tcl:186
729 +#: lib/browser.tcl:187
730 msgid "[Up To Parent]"
731 msgstr "[Fel a szülőhöz]"
732
733 -#: lib/browser.tcl:266 lib/browser.tcl:272
733 +#: lib/browser.tcl:267 lib/browser.tcl:273
734 msgid "Browse Branch Files"
735 msgstr "A branch fájljainak böngészése"
736
737 -#: lib/browser.tcl:277 lib/choose_repository.tcl:391
738 -#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
739 -#: lib/choose_repository.tcl:989
737 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
738 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
739 +#: lib/choose_repository.tcl:987
740 msgid "Browse"
741 msgstr "Böngészés"
742
@@ -750,7 +750,7 @@ msgstr "A(z) %s letöltése innen: %s"
750 msgid "fatal: Cannot resolve %s"
751 msgstr "végzetes: Nem lehet feloldani a következőt: %s"
752
753 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
753 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
754 msgid "Close"
755 msgstr "Bezárás"
756
@@ -838,7 +838,7 @@ msgstr ""
838 "Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott "
839 "checkout'-ból."
840
841 -#: lib/checkout_op.tcl:446
841 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
842 #, tcl-format
843 msgid "Checked out '%s'."
844 msgstr "'%s' kifejtve."
@@ -858,7 +858,7 @@ msgstr "Az elveszett commitok helyreállítása nem biztos, hogy egyszerű."
858 msgid "Reset '%s'?"
859 msgstr "Visszaállítjuk a következőt: '%s'?"
860
861 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
861 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
862 msgid "Visualize"
863 msgstr "Vizualizálás"
864
@@ -887,15 +887,15 @@ msgstr "Kiválaszt"
887 msgid "Font Family"
888 msgstr "Font család"
889
890 -#: lib/choose_font.tcl:73
890 +#: lib/choose_font.tcl:74
891 msgid "Font Size"
892 msgstr "Font méret"
893
894 -#: lib/choose_font.tcl:90
894 +#: lib/choose_font.tcl:91
895 msgid "Font Example"
896 msgstr "Font példa"
897
898 -#: lib/choose_font.tcl:101
898 +#: lib/choose_font.tcl:103
899 msgid ""
900 "This is example text.\n"
901 "If you like this text, it can be your font."
@@ -903,227 +903,227 @@ msgstr ""
903 "Ez egy példa szöveg.\n"
904 "Ha ez megfelel, ez lehet a betűtípus."
905
906 -#: lib/choose_repository.tcl:27
906 +#: lib/choose_repository.tcl:28
907 msgid "Git Gui"
908 msgstr "Git Gui"
909
910 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
910 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
911 msgid "Create New Repository"
912 msgstr "Új repó létrehozása"
913
914 -#: lib/choose_repository.tcl:86
914 +#: lib/choose_repository.tcl:87
915 msgid "New..."
916 msgstr "Új..."
917
918 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
918 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
919 msgid "Clone Existing Repository"
920 msgstr "Létező repó másolása"
921
922 -#: lib/choose_repository.tcl:99
922 +#: lib/choose_repository.tcl:100
923 msgid "Clone..."
924 msgstr "Másolás..."
925
926 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
926 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
927 msgid "Open Existing Repository"
928 msgstr "Létező könyvtár megnyitása"
929
930 -#: lib/choose_repository.tcl:112
930 +#: lib/choose_repository.tcl:113
931 msgid "Open..."
932 msgstr "Meggyitás..."
933
934 -#: lib/choose_repository.tcl:125
934 +#: lib/choose_repository.tcl:126
935 msgid "Recent Repositories"
936 msgstr "Legutóbbi repók"
937
938 -#: lib/choose_repository.tcl:131
938 +#: lib/choose_repository.tcl:132
939 msgid "Open Recent Repository:"
940 msgstr "Legutóbbi repók megnyitása:"
941
942 -#: lib/choose_repository.tcl:294
943 -#, tcl-format
944 -msgid "Location %s already exists."
945 -msgstr "A(z) '%s' hely már létezik."
946 -
947 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
948 -#: lib/choose_repository.tcl:314
942 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
943 +#: lib/choose_repository.tcl:310
944 #, tcl-format
945 msgid "Failed to create repository %s:"
946 msgstr "Nem sikerült letrehozni a(z) %s repót:"
947
953 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
948 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
949 msgid "Directory:"
950 msgstr "Könyvtár:"
951
957 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
958 -#: lib/choose_repository.tcl:1013
952 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
953 +#: lib/choose_repository.tcl:1011
954 msgid "Git Repository"
955 msgstr "Git repó"
956
962 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
957 +#: lib/choose_repository.tcl:437
958 #, tcl-format
959 msgid "Directory %s already exists."
960 msgstr "A(z) '%s' könyvtár már létezik."
961
967 -#: lib/choose_repository.tcl:442
962 +#: lib/choose_repository.tcl:441
963 #, tcl-format
964 msgid "File %s already exists."
965 msgstr "A(z) '%s' fájl már létezik."
966
972 -#: lib/choose_repository.tcl:463
967 +#: lib/choose_repository.tcl:455
968 msgid "Clone"
969 msgstr "Bezárás"
970
976 -#: lib/choose_repository.tcl:476
971 +#: lib/choose_repository.tcl:468
972 msgid "URL:"
973 msgstr "URL:"
974
980 -#: lib/choose_repository.tcl:496
975 +#: lib/choose_repository.tcl:489
976 msgid "Clone Type:"
977 msgstr "Másolás típusa:"
978
984 -#: lib/choose_repository.tcl:502
979 +#: lib/choose_repository.tcl:495
980 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
981 msgstr "Általános (Gyors, félig-redundáns, hardlinkek)"
982
988 -#: lib/choose_repository.tcl:508
983 +#: lib/choose_repository.tcl:501
984 msgid "Full Copy (Slower, Redundant Backup)"
985 msgstr "Teljes másolás (Lassabb, redundáns biztonsági mentés)"
986
992 -#: lib/choose_repository.tcl:514
987 +#: lib/choose_repository.tcl:507
988 msgid "Shared (Fastest, Not Recommended, No Backup)"
989 msgstr "Megosztott (Leggyorsabb, nem ajánlott, nincs mentés)"
990
996 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
997 -#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
998 -#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
991 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
992 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
993 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
994 #, tcl-format
995 msgid "Not a Git repository: %s"
996 msgstr "Nem Git repó: %s"
997
1003 -#: lib/choose_repository.tcl:586
998 +#: lib/choose_repository.tcl:579
999 msgid "Standard only available for local repository."
1000 msgstr "A standard csak helyi repókra érhető el."
1001
1007 -#: lib/choose_repository.tcl:590
1002 +#: lib/choose_repository.tcl:583
1003 msgid "Shared only available for local repository."
1004 msgstr "A megosztott csak helyi repókra érhető el."
1005
1011 -#: lib/choose_repository.tcl:617
1006 +#: lib/choose_repository.tcl:604
1007 +#, tcl-format
1008 +msgid "Location %s already exists."
1009 +msgstr "A(z) '%s' hely már létezik."
1010 +
1011 +#: lib/choose_repository.tcl:615
1012 msgid "Failed to configure origin"
1013 msgstr "Nem sikerült beállítani az origint"
1014
1015 -#: lib/choose_repository.tcl:629
1015 +#: lib/choose_repository.tcl:627
1016 msgid "Counting objects"
1017 msgstr "Objektumok számolása"
1018
1019 -#: lib/choose_repository.tcl:630
1019 +#: lib/choose_repository.tcl:628
1020 msgid "buckets"
1021 msgstr "vödrök"
1022
1023 -#: lib/choose_repository.tcl:654
1023 +#: lib/choose_repository.tcl:652
1024 #, tcl-format
1025 msgid "Unable to copy objects/info/alternates: %s"
1026 msgstr "Nem sikerült másolni az objects/info/alternates-t: %s"
1027
1028 -#: lib/choose_repository.tcl:690
1028 +#: lib/choose_repository.tcl:688
1029 #, tcl-format
1030 msgid "Nothing to clone from %s."
1031 msgstr "Semmi másolni való nincs innen: %s"
1032
1033 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1034 -#: lib/choose_repository.tcl:918
1033 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1034 +#: lib/choose_repository.tcl:916
1035 msgid "The 'master' branch has not been initialized."
1036 msgstr "A 'master' branch nincs inicializálva."
1037
1038 -#: lib/choose_repository.tcl:705
1038 +#: lib/choose_repository.tcl:703
1039 msgid "Hardlinks are unavailable. Falling back to copying."
1040 msgstr "Nem érhetőek el hardlinkek. Másolás használata."
1041
1042 -#: lib/choose_repository.tcl:717
1042 +#: lib/choose_repository.tcl:715
1043 #, tcl-format
1044 msgid "Cloning from %s"
1045 msgstr "Másolás innen: %s"
1046
1047 -#: lib/choose_repository.tcl:748
1047 +#: lib/choose_repository.tcl:746
1048 msgid "Copying objects"
1049 msgstr "Objektumok másolása"
1050
1051 -#: lib/choose_repository.tcl:749
1051 +#: lib/choose_repository.tcl:747
1052 msgid "KiB"
1053 msgstr "KiB"
1054
1055 -#: lib/choose_repository.tcl:773
1055 +#: lib/choose_repository.tcl:771
1056 #, tcl-format
1057 msgid "Unable to copy object: %s"
1058 msgstr "Nem sikerült másolni az objektumot: %s"
1059
1060 -#: lib/choose_repository.tcl:783
1060 +#: lib/choose_repository.tcl:781
1061 msgid "Linking objects"
1062 msgstr "Objektumok összefűzése"
1063
1064 -#: lib/choose_repository.tcl:784
1064 +#: lib/choose_repository.tcl:782
1065 msgid "objects"
1066 msgstr "objektum"
1067
1068 -#: lib/choose_repository.tcl:792
1068 +#: lib/choose_repository.tcl:790
1069 #, tcl-format
1070 msgid "Unable to hardlink object: %s"
1071 msgstr "Nem sikerült hardlinkelni az objektumot: %s"
1072
1073 -#: lib/choose_repository.tcl:847
1073 +#: lib/choose_repository.tcl:845
1074 msgid "Cannot fetch branches and objects. See console output for details."
1075 msgstr ""
1076 "Nem sikerült letölteni a branch-eket és az objektumokat. Bővebben a "
1077 "konzolos kimenetben."
1078
1079 -#: lib/choose_repository.tcl:858
1079 +#: lib/choose_repository.tcl:856
1080 msgid "Cannot fetch tags. See console output for details."
1081 msgstr "Nem sikerült letölteni a tageket. Bővebben a konzolos kimenetben."
1082
1083 -#: lib/choose_repository.tcl:882
1083 +#: lib/choose_repository.tcl:880
1084 msgid "Cannot determine HEAD. See console output for details."
1085 msgstr "Nem sikerült megállapítani a HEAD-et. Bővebben a konzolos kimenetben."
1086
1087 -#: lib/choose_repository.tcl:891
1087 +#: lib/choose_repository.tcl:889
1088 #, tcl-format
1089 msgid "Unable to cleanup %s"
1090 msgstr "Nem sikerült tiszítani: %s."
1091
1092 -#: lib/choose_repository.tcl:897
1092 +#: lib/choose_repository.tcl:895
1093 msgid "Clone failed."
1094 msgstr "A másolás nem sikerült."
1095
1096 -#: lib/choose_repository.tcl:904
1096 +#: lib/choose_repository.tcl:902
1097 msgid "No default branch obtained."
1098 msgstr "Nincs alapértelmezett branch."
1099
1100 -#: lib/choose_repository.tcl:915
1100 +#: lib/choose_repository.tcl:913
1101 #, tcl-format
1102 msgid "Cannot resolve %s as a commit."
1103 msgstr "Nem sikerült felöldani a(z) %s objektumot commitként."
1104
1105 -#: lib/choose_repository.tcl:927
1105 +#: lib/choose_repository.tcl:925
1106 msgid "Creating working directory"
1107 msgstr "Munkakönyvtár létrehozása"
1108
1109 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1109 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1110 #: lib/index.tcl:193
1111 msgid "files"
1112 msgstr "fájl"
1113
1114 -#: lib/choose_repository.tcl:957
1114 +#: lib/choose_repository.tcl:955
1115 msgid "Initial file checkout failed."
1116 msgstr "A kezdeti fájl-kibontás sikertelen."
1117
1118 -#: lib/choose_repository.tcl:973
1118 +#: lib/choose_repository.tcl:971
1119 msgid "Open"
1120 msgstr "Megnyitás"
1121
1122 -#: lib/choose_repository.tcl:983
1122 +#: lib/choose_repository.tcl:981
1123 msgid "Repository:"
1124 msgstr "Repó:"
1125
1126 -#: lib/choose_repository.tcl:1033
1126 +#: lib/choose_repository.tcl:1031
1127 #, tcl-format
1128 msgid "Failed to open repository %s:"
1129 msgstr "Nem sikerült megnyitni a(z) %s repót:"
@@ -1144,7 +1144,7 @@ msgstr "Helyi branch"
1144 msgid "Tracking Branch"
1145 msgstr "Követő branch"
1146
1147 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1147 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1148 msgid "Tag"
1149 msgstr "Tag"
1150
@@ -1161,11 +1161,11 @@ msgstr "Nincs kiválasztva revízió."
1161 msgid "Revision expression is empty."
1162 msgstr "A revízió kifejezés üres."
1163
1164 -#: lib/choose_rev.tcl:530
1164 +#: lib/choose_rev.tcl:531
1165 msgid "Updated"
1166 msgstr "Frissítve"
1167
1168 -#: lib/choose_rev.tcl:558
1168 +#: lib/choose_rev.tcl:559
1169 msgid "URL"
1170 msgstr "URL"
1171
@@ -1313,7 +1313,7 @@ msgstr "A commit nem sikerült."
1313 msgid "Commit %s appears to be corrupt"
1314 msgstr "A(z) %s commit sérültnek tűnik"
1315
1316 -#: lib/commit.tcl:279
1316 +#: lib/commit.tcl:326
1317 msgid ""
1318 "No changes to commit.\n"
1319 "\n"
@@ -1327,7 +1327,7 @@ msgstr ""
1327 "\n"
1328 "Az újrakeresés most automatikusan el fog indulni.\n"
1329
1330 -#: lib/commit.tcl:286
1330 +#: lib/commit.tcl:333
1331 msgid "No changes to commit."
1332 msgstr "Nincs commitolandó változtatás."
1333
@@ -1335,24 +1335,24 @@ msgstr "Nincs commitolandó változtatás."
1335 msgid "commit-tree failed:"
1336 msgstr "a commit-tree sikertelen:"
1337
1338 -#: lib/commit.tcl:339
1338 +#: lib/commit.tcl:367
1339 msgid "update-ref failed:"
1340 msgstr "az update-ref sikertelen:"
1341
1342 -#: lib/commit.tcl:430
1342 +#: lib/commit.tcl:454
1343 #, tcl-format
1344 msgid "Created commit %s: %s"
1345 msgstr "Létrejött a %s commit: %s"
1346
1347 -#: lib/console.tcl:57
1347 +#: lib/console.tcl:59
1348 msgid "Working... please wait..."
1349 msgstr "Munka folyamatban.. Várjunk..."
1350
1351 -#: lib/console.tcl:183
1351 +#: lib/console.tcl:186
1352 msgid "Success"
1353 msgstr "Siker"
1354
1355 -#: lib/console.tcl:196
1355 +#: lib/console.tcl:200
1356 msgid "Error: Command Failed"
1357 msgstr "Hiba: a parancs sikertelen"
1358
@@ -1462,23 +1462,23 @@ msgstr "* Bináris fájl (tartalom elrejtése)."
1462 msgid "Error loading diff:"
1463 msgstr "Hiba a diff betöltése közben:"
1464
1465 -#: lib/diff.tcl:302
1465 +#: lib/diff.tcl:303
1466 msgid "Failed to unstage selected hunk."
1467 msgstr "Nem visszavonni a hunk kiválasztását."
1468
1469 -#: lib/diff.tcl:309
1469 +#: lib/diff.tcl:310
1470 msgid "Failed to stage selected hunk."
1471 msgstr "Nem sikerült kiválasztani a hunkot."
1472
1473 -#: lib/error.tcl:12 lib/error.tcl:102
1473 +#: lib/error.tcl:20 lib/error.tcl:114
1474 msgid "error"
1475 msgstr "hiba"
1476
1477 -#: lib/error.tcl:28
1477 +#: lib/error.tcl:36
1478 msgid "warning"
1479 msgstr "figyelmeztetés"
1480
1481 -#: lib/error.tcl:81
1481 +#: lib/error.tcl:94
1482 msgid "You must correct the above errors before committing."
1483 msgstr "Ki kell javítanunk a fenti hibákat commit előtt."
1484
@@ -1530,13 +1530,13 @@ msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?"
1530 msgid "Revert changes in these %i files?"
1531 msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?"
1532
1533 -#: lib/index.tcl:389
1533 +#: lib/index.tcl:391
1534 msgid "Any unstaged changes will be permanently lost by the revert."
1535 msgstr ""
1536 "Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás "
1537 "által."
1538
1539 -#: lib/index.tcl:392
1539 +#: lib/index.tcl:394
1540 msgid "Do Nothing"
1541 msgstr "Ne csináljunk semmit"
1542
@@ -1616,20 +1616,20 @@ msgstr "A(z) %s és a(z) %s merge-ölése..."
1616 msgid "Merge completed successfully."
1617 msgstr "A merge sikeresen befejeződött."
1618
1619 -#: lib/merge.tcl:133
1619 +#: lib/merge.tcl:132
1620 msgid "Merge failed. Conflict resolution is required."
1621 msgstr "A merge sikertelen. Fel kell oldanunk az ütközéseket."
1622
1623 -#: lib/merge.tcl:158
1623 +#: lib/merge.tcl:157
1624 #, tcl-format
1625 msgid "Merge Into %s"
1626 msgstr "Merge-ölés a következőbe: %s"
1627
1628 -#: lib/merge.tcl:177
1628 +#: lib/merge.tcl:176
1629 msgid "Revision To Merge"
1630 msgstr "Merge-ölni szándékozott revízió"
1631
1632 -#: lib/merge.tcl:212
1632 +#: lib/merge.tcl:211
1633 msgid ""
1634 "Cannot abort while amending.\n"
1635 "\n"
@@ -1639,7 +1639,7 @@ msgstr ""
1639 "\n"
1640 "Be kell fejeznünk ennek a commitnak a javítását.\n"
1641
1642 -#: lib/merge.tcl:222
1642 +#: lib/merge.tcl:221
1643 msgid ""
1644 "Abort merge?\n"
1645 "\n"
@@ -1654,7 +1654,7 @@ msgstr ""
1654 "\n"
1655 "Folytatjuk a jelenlegi merge megszakítását?"
1656
1657 -#: lib/merge.tcl:228
1657 +#: lib/merge.tcl:227
1658 msgid ""
1659 "Reset changes?\n"
1660 "\n"
@@ -1669,7 +1669,7 @@ msgstr ""
1669 "\n"
1670 "Folytatjuk a jelenlegi módosítások visszavonását?"
1671
1672 -#: lib/merge.tcl:239
1672 +#: lib/merge.tcl:238
1673 msgid "Aborting"
1674 msgstr "Félbeszakítás"
1675
@@ -1681,89 +1681,94 @@ msgstr "fájl visszaállítva"
1681 msgid "Abort failed."
1682 msgstr "A félbeszakítás nem sikerült."
1683
1684 -#: lib/merge.tcl:268
1684 +#: lib/merge.tcl:267
1685 msgid "Abort completed. Ready."
1686 msgstr "A megkeszakítás befejeződött. Kész."
1687
1688 -#: lib/option.tcl:82
1688 +#: lib/option.tcl:95
1689 msgid "Restore Defaults"
1690 msgstr "Alapértelmezés visszaállítása"
1691
1692 -#: lib/option.tcl:86
1692 +#: lib/option.tcl:99
1693 msgid "Save"
1694 msgstr "Mentés"
1695
1696 -#: lib/option.tcl:96
1696 +#: lib/option.tcl:109
1697 #, tcl-format
1698 msgid "%s Repository"
1699 msgstr "%s Repó"
1700
1701 -#: lib/option.tcl:97
1701 +#: lib/option.tcl:110
1702 msgid "Global (All Repositories)"
1703 msgstr "Globális (minden repó)"
1704
1705 -#: lib/option.tcl:103
1705 +#: lib/option.tcl:116
1706 msgid "User Name"
1707 msgstr "Felhasználónév"
1708
1709 -#: lib/option.tcl:104
1709 +#: lib/option.tcl:117
1710 msgid "Email Address"
1711 msgstr "Email cím"
1712
1713 -#: lib/option.tcl:106
1713 +#: lib/option.tcl:119
1714 msgid "Summarize Merge Commits"
1715 msgstr "A merge commitok összegzése"
1716
1717 -#: lib/option.tcl:107
1717 +#: lib/option.tcl:120
1718 msgid "Merge Verbosity"
1719 msgstr "Merge beszédesség"
1720
1721 -#: lib/option.tcl:108
1721 +#: lib/option.tcl:121
1722 msgid "Show Diffstat After Merge"
1723 msgstr "Diffstat mutatása merge után"
1724
1725 -#: lib/option.tcl:110
1725 +#: lib/option.tcl:123
1726 msgid "Trust File Modification Timestamps"
1727 msgstr "A fájl módosítási dátumok megbízhatóak"
1728
1729 -#: lib/option.tcl:111
1729 +#: lib/option.tcl:124
1730 msgid "Prune Tracking Branches During Fetch"
1731 msgstr "A követő branchek eltávolítása letöltés alatt"
1732
1733 -#: lib/option.tcl:112
1733 +#: lib/option.tcl:125
1734 msgid "Match Tracking Branches"
1735 msgstr "A követő branchek egyeztetése"
1736
1737 -#: lib/option.tcl:113
1737 +#: lib/option.tcl:126
1738 msgid "Number of Diff Context Lines"
1739 msgstr "A diff környezeti sorok száma"
1740
1741 -#: lib/option.tcl:114
1741 +#: lib/option.tcl:127
1742 +#, fuzzy
1743 +msgid "Commit Message Text Width"
1744 +msgstr "Commit üzenet:"
1745 +
1746 +#: lib/option.tcl:128
1747 msgid "New Branch Name Template"
1748 msgstr "Új branch név sablon"
1749
1745 -#: lib/option.tcl:191
1750 +#: lib/option.tcl:192
1751 msgid "Spelling Dictionary:"
1752 msgstr "Helyesírás-ellenőrző szótár:"
1753
1749 -#: lib/option.tcl:215
1754 +#: lib/option.tcl:216
1755 msgid "Change Font"
1756 msgstr "Betűtípus megváltoztatása"
1757
1753 -#: lib/option.tcl:180
1758 +#: lib/option.tcl:220
1759 #, tcl-format
1760 msgid "Choose %s"
1761 msgstr "%s választása"
1762
1758 -#: lib/option.tcl:186
1763 +#: lib/option.tcl:226
1764 msgid "pt."
1765 msgstr "pt."
1766
1762 -#: lib/option.tcl:200
1767 +#: lib/option.tcl:240
1768 msgid "Preferences"
1769 msgstr "Beállítások"
1770
1766 -#: lib/option.tcl:235
1771 +#: lib/option.tcl:275
1772 msgid "Failed to completely save options:"
1773 msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
1774
@@ -1871,23 +1876,44 @@ msgstr "Nem sikerült írni a gyorsbillentyűt:"
1876 msgid "Cannot write icon:"
1877 msgstr "Nem sikerült írni az ikont:"
1878
1874 -#: lib/spellcheck.tcl:37
1875 -msgid "Not connected to aspell"
1876 -msgstr "Nincs kapcsolat az aspellhez"
1879 +#: lib/spellcheck.tcl:57
1880 +msgid "Unsupported spell checker"
1881 +msgstr ""
1882 +
1883 +#: lib/spellcheck.tcl:65
1884 +#, fuzzy
1885 +msgid "Spell checking is unavailable"
1886 +msgstr "A helyesírás-ellenőrzés sikertelen"
1887 +
1888 +#: lib/spellcheck.tcl:68
1889 +msgid "Invalid spell checking configuration"
1890 +msgstr ""
1891 +
1892 +#: lib/spellcheck.tcl:70
1893 +#, tcl-format
1894 +msgid "Reverting dictionary to %s."
1895 +msgstr ""
1896 +
1897 +#: lib/spellcheck.tcl:73
1898 +#, fuzzy
1899 +msgid "Spell checker silently failed on startup"
1900 +msgstr "A helyesírás-ellenőrzés sikertelen"
1901
1878 -#: lib/spellcheck.tcl:41
1879 -msgid "Unrecognized aspell version"
1902 +#: lib/spellcheck.tcl:80
1903 +#, fuzzy
1904 +msgid "Unrecognized spell checker"
1905 msgstr "Ismeretlen aspell verzió"
1906
1882 -#: lib/spellcheck.tcl:135
1907 +#: lib/spellcheck.tcl:180
1908 msgid "No Suggestions"
1909 msgstr "Nincs javaslat"
1910
1886 -#: lib/spellcheck.tcl:336
1887 -msgid "Unexpected EOF from aspell"
1911 +#: lib/spellcheck.tcl:381
1912 +#, fuzzy
1913 +msgid "Unexpected EOF from spell checker"
1914 msgstr "Nem várt EOF az aspelltől"
1915
1890 -#: lib/spellcheck.tcl:340
1916 +#: lib/spellcheck.tcl:385
1917 msgid "Spell Checker Failed"
1918 msgstr "A helyesírás-ellenőrzés sikertelen"
1919
@@ -1961,6 +1987,9 @@ msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
1987 msgid "Include tags"
1988 msgstr "Tageket is"
1989
1990 +#~ msgid "Not connected to aspell"
1991 +#~ msgstr "Nincs kapcsolat az aspellhez"
1992 +
1993 #~ msgid "Cannot find the git directory:"
1994 #~ msgstr "Nem található a git könyvtár:"
1995
po/it.po
+15 -13
@@ -9,7 +9,7 @@ msgid ""
9 msgstr ""
10 "Project-Id-Version: git-gui\n"
11 "Report-Msgid-Bugs-To: \n"
12 -"POT-Creation-Date: 2008-03-12 22:09+0100\n"
12 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
13 "PO-Revision-Date: 2008-03-12 22:12+0100\n"
14 "Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
15 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1784,18 +1784,6 @@ msgstr "Preferenze"
1784 msgid "Failed to completely save options:"
1785 msgstr "Impossibile salvare completamente le opzioni:"
1786
1787 -#: lib/remote.tcl:165
1788 -msgid "Prune from"
1789 -msgstr "Effettua potatura da"
1790 -
1791 -#: lib/remote.tcl:170
1792 -msgid "Fetch from"
1793 -msgstr "Recupera da"
1794 -
1795 -#: lib/remote.tcl:213
1796 -msgid "Push to"
1797 -msgstr "Propaga verso"
1798 -
1787 #: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1788 msgid "Delete Remote Branch"
1789 msgstr "Cancella ramo remoto"
@@ -1880,6 +1868,18 @@ msgstr "Nessun archivio selezionato."
1868 msgid "Scanning %s..."
1869 msgstr "Analisi in corso %s..."
1870
1871 +#: lib/remote.tcl:165
1872 +msgid "Prune from"
1873 +msgstr "Effettua potatura da"
1874 +
1875 +#: lib/remote.tcl:170
1876 +msgid "Fetch from"
1877 +msgstr "Recupera da"
1878 +
1879 +#: lib/remote.tcl:213
1880 +msgid "Push to"
1881 +msgstr "Propaga verso"
1882 +
1883 #: lib/shortcut.tcl:20 lib/shortcut.tcl:61
1884 msgid "Cannot write shortcut:"
1885 msgstr "Impossibile scrivere shortcut:"
@@ -1910,6 +1910,7 @@ msgid "Spell checker silently failed on startup"
1910 msgstr "Il correttore ortografico ha riportato un errore all'avvio"
1911
1912 #: lib/spellcheck.tcl:80
1913 +#, fuzzy
1914 msgid "Unrecognized spell checker"
1915 msgstr "Correttore ortografico sconosciuto"
1916
@@ -1918,6 +1919,7 @@ msgid "No Suggestions"
1919 msgstr "Nessun suggerimento"
1920
1921 #: lib/spellcheck.tcl:381
1922 +#, fuzzy
1923 msgid "Unexpected EOF from spell checker"
1924 msgstr "Il correttore ortografico ha mandato un EOF inaspettato"
1925
po/ja.po
+348 -261
@@ -8,7 +8,7 @@ msgid ""
8 msgstr ""
9 "Project-Id-Version: git-gui\n"
10 "Report-Msgid-Bugs-To: \n"
11 -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
11 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
12 "PO-Revision-Date: 2007-12-05 06:12+0900\n"
13 "Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
14 "Language-Team: Japanese\n"
@@ -16,33 +16,33 @@ msgstr ""
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\n"
18
19 -#: git-gui.sh:41 git-gui.sh:604 git-gui.sh:618 git-gui.sh:631 git-gui.sh:714
20 -#: git-gui.sh:733
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
21 msgid "git-gui: fatal error"
22 msgstr "git-gui: 致命的なエラー"
23
24 -#: git-gui.sh:565
24 +#: git-gui.sh:593
25 #, tcl-format
26 msgid "Invalid font specified in %s:"
27 msgstr "%s に無効なフォントが指定されています:"
28
29 -#: git-gui.sh:590
29 +#: git-gui.sh:620
30 msgid "Main Font"
31 msgstr "主フォント"
32
33 -#: git-gui.sh:591
33 +#: git-gui.sh:621
34 msgid "Diff/Console Font"
35 msgstr "diff/コンソール・フォント"
36
37 -#: git-gui.sh:605
37 +#: git-gui.sh:635
38 msgid "Cannot find git in PATH."
39 msgstr "PATH 中に git が見つかりません"
40
41 -#: git-gui.sh:632
41 +#: git-gui.sh:662
42 msgid "Cannot parse Git version string:"
43 msgstr "Git バージョン名が理解できません:"
44
45 -#: git-gui.sh:650
45 +#: git-gui.sh:680
46 #, tcl-format
47 msgid ""
48 "Git version cannot be determined.\n"
@@ -61,79 +61,79 @@ msgstr ""
61 "\n"
62 "'%s' はバージョン 1.5.0 と思って良いですか？\n"
63
64 -#: git-gui.sh:888
64 +#: git-gui.sh:918
65 msgid "Git directory not found:"
66 msgstr "Git ディレクトリが見つかりません:"
67
68 -#: git-gui.sh:895
68 +#: git-gui.sh:925
69 msgid "Cannot move to top of working directory:"
70 msgstr "作業ディレクトリの最上位に移動できません"
71
72 -#: git-gui.sh:902
72 +#: git-gui.sh:932
73 msgid "Cannot use funny .git directory:"
74 msgstr "変な .git ディレクトリは使えません"
75
76 -#: git-gui.sh:907
76 +#: git-gui.sh:937
77 msgid "No working directory"
78 msgstr "作業ディレクトリがありません"
79
80 -#: git-gui.sh:1054
80 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
81 msgid "Refreshing file status..."
82 msgstr "ファイル状態を更新しています…"
83
84 -#: git-gui.sh:1119
84 +#: git-gui.sh:1149
85 msgid "Scanning for modified files ..."
86 msgstr "変更されたファイルをスキャンしています…"
87
88 -#: git-gui.sh:1294 lib/browser.tcl:245
88 +#: git-gui.sh:1324 lib/browser.tcl:246
89 msgid "Ready."
90 msgstr "準備完了"
91
92 -#: git-gui.sh:1560
92 +#: git-gui.sh:1590
93 msgid "Unmodified"
94 msgstr "変更無し"
95
96 -#: git-gui.sh:1562
96 +#: git-gui.sh:1592
97 msgid "Modified, not staged"
98 msgstr "変更あり、コミット未予定"
99
100 -#: git-gui.sh:1563 git-gui.sh:1568
100 +#: git-gui.sh:1593 git-gui.sh:1598
101 msgid "Staged for commit"
102 msgstr "コミット予定済"
103
104 -#: git-gui.sh:1564 git-gui.sh:1569
104 +#: git-gui.sh:1594 git-gui.sh:1599
105 msgid "Portions staged for commit"
106 msgstr "部分的にコミット予定済"
107
108 -#: git-gui.sh:1565 git-gui.sh:1570
108 +#: git-gui.sh:1595 git-gui.sh:1600
109 msgid "Staged for commit, missing"
110 msgstr "コミット予定済、ファイル無し"
111
112 -#: git-gui.sh:1567
112 +#: git-gui.sh:1597
113 msgid "Untracked, not staged"
114 msgstr "管理外、コミット未予定"
115
116 -#: git-gui.sh:1572
116 +#: git-gui.sh:1602
117 msgid "Missing"
118 msgstr "ファイル無し"
119
120 -#: git-gui.sh:1573
120 +#: git-gui.sh:1603
121 msgid "Staged for removal"
122 msgstr "削除予定済"
123
124 -#: git-gui.sh:1574
124 +#: git-gui.sh:1604
125 msgid "Staged for removal, still present"
126 msgstr "削除予定済、ファイル未削除"
127
128 -#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
128 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
129 msgid "Requires merge resolution"
130 msgstr "要マージ解決"
131
132 -#: git-gui.sh:1614
132 +#: git-gui.sh:1644
133 msgid "Starting gitk... please wait..."
134 msgstr "gitk を起動中…お待ち下さい…"
135
136 -#: git-gui.sh:1623
136 +#: git-gui.sh:1653
137 #, tcl-format
138 msgid ""
139 "Unable to start gitk:\n"
@@ -144,297 +144,297 @@ msgstr ""
144 "\n"
145 "%s がありません"
146
147 -#: git-gui.sh:1823 lib/choose_repository.tcl:35
147 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
148 msgid "Repository"
149 msgstr "リポジトリ"
150
151 -#: git-gui.sh:1824
151 +#: git-gui.sh:1861
152 msgid "Edit"
153 msgstr "編集"
154
155 -#: git-gui.sh:1826 lib/choose_rev.tcl:560
155 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
156 msgid "Branch"
157 msgstr "ブランチ"
158
159 -#: git-gui.sh:1829 lib/choose_rev.tcl:547
159 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
160 msgid "Commit@@noun"
161 msgstr "コミット"
162
163 -#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
163 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
164 msgid "Merge"
165 msgstr "マージ"
166
167 -#: git-gui.sh:1833 lib/choose_rev.tcl:556
167 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
168 msgid "Remote"
169 msgstr "リモート"
170
171 -#: git-gui.sh:1842
171 +#: git-gui.sh:1879
172 msgid "Browse Current Branch's Files"
173 msgstr "現在のブランチのファイルを見る"
174
175 -#: git-gui.sh:1846
175 +#: git-gui.sh:1883
176 msgid "Browse Branch Files..."
177 msgstr "ブランチのファイルを見る…"
178
179 -#: git-gui.sh:1851
179 +#: git-gui.sh:1888
180 msgid "Visualize Current Branch's History"
181 msgstr "現在のブランチの履歴を見る"
182
183 -#: git-gui.sh:1855
183 +#: git-gui.sh:1892
184 msgid "Visualize All Branch History"
185 msgstr "全てのブランチの履歴を見る"
186
187 -#: git-gui.sh:1862
187 +#: git-gui.sh:1899
188 #, tcl-format
189 msgid "Browse %s's Files"
190 msgstr "ブランチ %s のファイルを見る"
191
192 -#: git-gui.sh:1864
192 +#: git-gui.sh:1901
193 #, tcl-format
194 msgid "Visualize %s's History"
195 msgstr "ブランチ %s の履歴を見る"
196
197 -#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
197 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
198 msgid "Database Statistics"
199 msgstr "データベース統計"
200
201 -#: git-gui.sh:1872 lib/database.tcl:34
201 +#: git-gui.sh:1909 lib/database.tcl:34
202 msgid "Compress Database"
203 msgstr "データベース圧縮"
204
205 -#: git-gui.sh:1875
205 +#: git-gui.sh:1912
206 msgid "Verify Database"
207 msgstr "データベース検証"
208
209 -#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
209 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
210 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
211 msgid "Create Desktop Icon"
212 msgstr "デスクトップ・アイコンを作る"
213
214 -#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
214 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
215 msgid "Quit"
216 msgstr "終了"
217
218 -#: git-gui.sh:1902
218 +#: git-gui.sh:1939
219 msgid "Undo"
220 msgstr "元に戻す"
221
222 -#: git-gui.sh:1905
222 +#: git-gui.sh:1942
223 msgid "Redo"
224 msgstr "やり直し"
225
226 -#: git-gui.sh:1909 git-gui.sh:2403
226 +#: git-gui.sh:1946 git-gui.sh:2443
227 msgid "Cut"
228 msgstr "切り取り"
229
230 -#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
231 -#: lib/console.tcl:67
230 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
231 +#: lib/console.tcl:69
232 msgid "Copy"
233 msgstr "コピー"
234
235 -#: git-gui.sh:1915 git-gui.sh:2409
235 +#: git-gui.sh:1952 git-gui.sh:2449
236 msgid "Paste"
237 msgstr "貼り付け"
238
239 -#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
239 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
240 #: lib/remote_branch_delete.tcl:38
241 msgid "Delete"
242 msgstr "削除"
243
244 -#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
244 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
245 msgid "Select All"
246 msgstr "全て選択"
247
248 -#: git-gui.sh:1931
248 +#: git-gui.sh:1968
249 msgid "Create..."
250 msgstr "作成…"
251
252 -#: git-gui.sh:1937
252 +#: git-gui.sh:1974
253 msgid "Checkout..."
254 msgstr "チェックアウト"
255
256 -#: git-gui.sh:1943
256 +#: git-gui.sh:1980
257 msgid "Rename..."
258 msgstr "名前変更…"
259
260 -#: git-gui.sh:1948 git-gui.sh:2048
260 +#: git-gui.sh:1985 git-gui.sh:2085
261 msgid "Delete..."
262 msgstr "削除…"
263
264 -#: git-gui.sh:1953
264 +#: git-gui.sh:1990
265 msgid "Reset..."
266 msgstr "リセット…"
267
268 -#: git-gui.sh:1965 git-gui.sh:2350
268 +#: git-gui.sh:2002 git-gui.sh:2389
269 msgid "New Commit"
270 msgstr "新規コミット"
271
272 -#: git-gui.sh:1973 git-gui.sh:2357
272 +#: git-gui.sh:2010 git-gui.sh:2396
273 msgid "Amend Last Commit"
274 msgstr "最新コミットを訂正"
275
276 -#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
276 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
277 msgid "Rescan"
278 msgstr "再スキャン"
279
280 -#: git-gui.sh:1988
280 +#: git-gui.sh:2025
281 msgid "Stage To Commit"
282 msgstr "コミット予定する"
283
284 -#: git-gui.sh:1994
284 +#: git-gui.sh:2031
285 msgid "Stage Changed Files To Commit"
286 msgstr "変更されたファイルをコミット予定"
287
288 -#: git-gui.sh:2000
288 +#: git-gui.sh:2037
289 msgid "Unstage From Commit"
290 msgstr "コミットから降ろす"
291
292 -#: git-gui.sh:2005 lib/index.tcl:393
292 +#: git-gui.sh:2042 lib/index.tcl:395
293 msgid "Revert Changes"
294 msgstr "変更を元に戻す"
295
296 -#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
296 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
297 msgid "Sign Off"
298 msgstr "署名"
299
300 -#: git-gui.sh:2016 git-gui.sh:2333
300 +#: git-gui.sh:2053 git-gui.sh:2372
301 msgid "Commit@@verb"
302 msgstr "コミット"
303
304 -#: git-gui.sh:2027
304 +#: git-gui.sh:2064
305 msgid "Local Merge..."
306 msgstr "ローカル・マージ…"
307
308 -#: git-gui.sh:2032
308 +#: git-gui.sh:2069
309 msgid "Abort Merge..."
310 msgstr "マージ中止…"
311
312 -#: git-gui.sh:2044
312 +#: git-gui.sh:2081
313 msgid "Push..."
314 msgstr "プッシュ…"
315
316 -#: git-gui.sh:2055 lib/choose_repository.tcl:40
316 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
317 msgid "Apple"
318 msgstr "りんご"
319
320 -#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
321 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
320 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
321 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
322 #, tcl-format
323 msgid "About %s"
324 msgstr "%s について"
325
326 -#: git-gui.sh:2062
326 +#: git-gui.sh:2099
327 msgid "Preferences..."
328 msgstr "設定…"
329
330 -#: git-gui.sh:2070 git-gui.sh:2595
330 +#: git-gui.sh:2107 git-gui.sh:2639
331 msgid "Options..."
332 msgstr "オプション…"
333
334 -#: git-gui.sh:2076 lib/choose_repository.tcl:46
334 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
335 msgid "Help"
336 msgstr "ヘルプ"
337
338 -#: git-gui.sh:2117
338 +#: git-gui.sh:2154
339 msgid "Online Documentation"
340 msgstr "オンライン・ドキュメント"
341
342 -#: git-gui.sh:2201
342 +#: git-gui.sh:2238
343 #, tcl-format
344 msgid "fatal: cannot stat path %s: No such file or directory"
345 msgstr ""
346 "致命的: パス %s が stat できません。そのようなファイルやディレクトリはありま"
347 "せん"
348
349 -#: git-gui.sh:2234
349 +#: git-gui.sh:2271
350 msgid "Current Branch:"
351 msgstr "現在のブランチ"
352
353 -#: git-gui.sh:2255
353 +#: git-gui.sh:2292
354 msgid "Staged Changes (Will Commit)"
355 msgstr "ステージングされた（コミット予定済の）変更"
356
357 -#: git-gui.sh:2274
357 +#: git-gui.sh:2312
358 msgid "Unstaged Changes"
359 msgstr "コミット予定に入っていない変更"
360
361 -#: git-gui.sh:2323
361 +#: git-gui.sh:2362
362 msgid "Stage Changed"
363 msgstr "変更をコミット予定に入れる"
364
365 -#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
365 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
366 msgid "Push"
367 msgstr "プッシュ"
368
369 -#: git-gui.sh:2369
369 +#: git-gui.sh:2408
370 msgid "Initial Commit Message:"
371 msgstr "最初のコミットメッセージ:"
372
373 -#: git-gui.sh:2370
373 +#: git-gui.sh:2409
374 msgid "Amended Commit Message:"
375 msgstr "訂正したコミットメッセージ:"
376
377 -#: git-gui.sh:2371
377 +#: git-gui.sh:2410
378 msgid "Amended Initial Commit Message:"
379 msgstr "訂正した最初のコミットメッセージ:"
380
381 -#: git-gui.sh:2372
381 +#: git-gui.sh:2411
382 msgid "Amended Merge Commit Message:"
383 msgstr "訂正したマージコミットメッセージ:"
384
385 -#: git-gui.sh:2373
385 +#: git-gui.sh:2412
386 msgid "Merge Commit Message:"
387 msgstr "マージコミットメッセージ:"
388
389 -#: git-gui.sh:2374
389 +#: git-gui.sh:2413
390 msgid "Commit Message:"
391 msgstr "コミットメッセージ:"
392
393 -#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
393 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
394 msgid "Copy All"
395 msgstr "全てコピー"
396
397 -#: git-gui.sh:2443 lib/blame.tcl:104
397 +#: git-gui.sh:2483 lib/blame.tcl:107
398 msgid "File:"
399 msgstr "ファイル:"
400
401 -#: git-gui.sh:2545
402 -msgid "Refresh"
403 -msgstr "再読み込み"
404 -
405 -#: git-gui.sh:2566
401 +#: git-gui.sh:2589
402 msgid "Apply/Reverse Hunk"
403 msgstr "パッチを適用/取り消す"
404
409 -#: git-gui.sh:2572
410 -msgid "Decrease Font Size"
411 -msgstr "フォントを小さく"
412 -
413 -#: git-gui.sh:2576
414 -msgid "Increase Font Size"
415 -msgstr "フォントを大きく"
416 -
417 -#: git-gui.sh:2581
405 +#: git-gui.sh:2595
406 msgid "Show Less Context"
407 msgstr "文脈を少なく"
408
421 -#: git-gui.sh:2588
409 +#: git-gui.sh:2602
410 msgid "Show More Context"
411 msgstr "文脈を多く"
412
425 -#: git-gui.sh:2602
413 +#: git-gui.sh:2610
414 +msgid "Refresh"
415 +msgstr "再読み込み"
416 +
417 +#: git-gui.sh:2631
418 +msgid "Decrease Font Size"
419 +msgstr "フォントを小さく"
420 +
421 +#: git-gui.sh:2635
422 +msgid "Increase Font Size"
423 +msgstr "フォントを大きく"
424 +
425 +#: git-gui.sh:2646
426 msgid "Unstage Hunk From Commit"
427 msgstr "パッチをコミット予定から外す"
428
429 -#: git-gui.sh:2604
429 +#: git-gui.sh:2648
430 msgid "Stage Hunk For Commit"
431 msgstr "パッチをコミット予定に加える"
432
433 -#: git-gui.sh:2623
433 +#: git-gui.sh:2667
434 msgid "Initializing..."
435 msgstr "初期化しています…"
436
437 -#: git-gui.sh:2718
437 +#: git-gui.sh:2762
438 #, tcl-format
439 msgid ""
440 "Possible environment issues exist.\n"
@@ -449,7 +449,7 @@ msgstr ""
449 "以下の環境変数は %s が起動する Git サブプロセスによって無視されるでしょう:\n"
450 "\n"
451
452 -#: git-gui.sh:2748
452 +#: git-gui.sh:2792
453 msgid ""
454 "\n"
455 "This is due to a known issue with the\n"
@@ -459,7 +459,7 @@ msgstr ""
459 "これは Cygwin で配布されている Tcl バイナリに\n"
460 "関しての既知の問題によります"
461
462 -#: git-gui.sh:2753
462 +#: git-gui.sh:2797
463 #, tcl-format
464 msgid ""
465 "\n"
@@ -474,7 +474,7 @@ msgstr ""
474 "個人的な ~/.gitconfig ファイル内で user.name と user.email の値を設定\n"
475 "するのが、%s の良い代用となります\n"
476
477 -#: lib/about.tcl:25
477 +#: lib/about.tcl:26
478 msgid "git-gui - a graphical user interface for Git."
479 msgstr "Git のグラフィカルUI git-gui"
480
@@ -486,56 +486,56 @@ msgstr "ファイルピューワ"
486 msgid "Commit:"
487 msgstr "コミット:"
488
489 -#: lib/blame.tcl:249
489 +#: lib/blame.tcl:264
490 msgid "Copy Commit"
491 msgstr "コミットをコピー"
492
493 -#: lib/blame.tcl:369
493 +#: lib/blame.tcl:384
494 #, tcl-format
495 msgid "Reading %s..."
496 msgstr "%s を読んでいます…"
497
498 -#: lib/blame.tcl:473
498 +#: lib/blame.tcl:488
499 msgid "Loading copy/move tracking annotations..."
500 msgstr "コピー・移動追跡データを読んでいます…"
501
502 -#: lib/blame.tcl:493
502 +#: lib/blame.tcl:508
503 msgid "lines annotated"
504 msgstr "行を注釈しました"
505
506 -#: lib/blame.tcl:674
506 +#: lib/blame.tcl:689
507 msgid "Loading original location annotations..."
508 msgstr "元位置行の注釈データを読んでいます…"
509
510 -#: lib/blame.tcl:677
510 +#: lib/blame.tcl:692
511 msgid "Annotation complete."
512 msgstr "注釈完了しました"
513
514 -#: lib/blame.tcl:731
514 +#: lib/blame.tcl:746
515 msgid "Loading annotation..."
516 msgstr "注釈を読み込んでいます…"
517
518 -#: lib/blame.tcl:787
518 +#: lib/blame.tcl:802
519 msgid "Author:"
520 msgstr "作者:"
521
522 -#: lib/blame.tcl:791
522 +#: lib/blame.tcl:806
523 msgid "Committer:"
524 msgstr "コミット者:"
525
526 -#: lib/blame.tcl:796
526 +#: lib/blame.tcl:811
527 msgid "Original File:"
528 msgstr "元ファイル"
529
530 -#: lib/blame.tcl:910
530 +#: lib/blame.tcl:925
531 msgid "Originally By:"
532 msgstr "原作者:"
533
534 -#: lib/blame.tcl:916
534 +#: lib/blame.tcl:931
535 msgid "In File:"
536 msgstr "ファイル:"
537
538 -#: lib/blame.tcl:921
538 +#: lib/blame.tcl:936
539 msgid "Copied Or Moved Here By:"
540 msgstr "複写・移動者:"
541
@@ -548,17 +548,17 @@ msgid "Checkout"
548 msgstr "チェックアウト"
549
550 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
551 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
552 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
553 -#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
551 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
552 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
553 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
554 msgid "Cancel"
555 msgstr "中止"
556
557 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
557 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
558 msgid "Revision"
559 msgstr "リビジョン"
560
561 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
561 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
562 msgid "Options"
563 msgstr "オプション"
564
@@ -578,7 +578,7 @@ msgstr "ブランチを作成"
578 msgid "Create New Branch"
579 msgstr "ブランチを新規作成"
580
581 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
581 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
582 msgid "Create"
583 msgstr "作成"
584
@@ -718,22 +718,22 @@ msgstr "起動中…"
718 msgid "File Browser"
719 msgstr "ファイル・ブラウザ"
720
721 -#: lib/browser.tcl:125 lib/browser.tcl:142
721 +#: lib/browser.tcl:126 lib/browser.tcl:143
722 #, tcl-format
723 msgid "Loading %s..."
724 msgstr "%s をロード中…"
725
726 -#: lib/browser.tcl:186
726 +#: lib/browser.tcl:187
727 msgid "[Up To Parent]"
728 msgstr "[上位フォルダへ]"
729
730 -#: lib/browser.tcl:266 lib/browser.tcl:272
730 +#: lib/browser.tcl:267 lib/browser.tcl:273
731 msgid "Browse Branch Files"
732 msgstr "現在のブランチのファイルを見る"
733
734 -#: lib/browser.tcl:277 lib/choose_repository.tcl:391
735 -#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
736 -#: lib/choose_repository.tcl:989
734 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
735 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
736 +#: lib/choose_repository.tcl:987
737 msgid "Browse"
738 msgstr "ブラウズ"
739
@@ -747,7 +747,7 @@ msgstr "%s から %s をフェッチしています"
747 msgid "fatal: Cannot resolve %s"
748 msgstr "致命的エラー: %s を解決できません"
749
750 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
750 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
751 msgid "Close"
752 msgstr "閉じる"
753
@@ -804,6 +804,10 @@ msgstr ""
804 msgid "Updating working directory to '%s'..."
805 msgstr "作業ディレクトリを '%s' に更新しています…"
806
807 +#: lib/checkout_op.tcl:323
808 +msgid "files checked out"
809 +msgstr ""
810 +
811 #: lib/checkout_op.tcl:353
812 #, tcl-format
813 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -830,7 +834,7 @@ msgstr ""
834 "ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン"
835 "チを開始してください。"
836
833 -#: lib/checkout_op.tcl:446
837 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
838 #, tcl-format
839 msgid "Checked out '%s'."
840 msgstr "'%s' をチェックアウトしました"
@@ -849,7 +853,7 @@ msgstr "失なわれたコミットを回復するのは簡単ではありませ
853 msgid "Reset '%s'?"
854 msgstr "'%s' をリセットしますか？"
855
852 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
856 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
857 msgid "Visualize"
858 msgstr "可視化"
859
@@ -877,15 +881,15 @@ msgstr "選択"
881 msgid "Font Family"
882 msgstr "フォント・ファミリー"
883
880 -#: lib/choose_font.tcl:73
884 +#: lib/choose_font.tcl:74
885 msgid "Font Size"
886 msgstr "フォントの大きさ"
887
884 -#: lib/choose_font.tcl:90
888 +#: lib/choose_font.tcl:91
889 msgid "Font Example"
890 msgstr "フォント・サンプル"
891
888 -#: lib/choose_font.tcl:101
892 +#: lib/choose_font.tcl:103
893 msgid ""
894 "This is example text.\n"
895 "If you like this text, it can be your font."
@@ -893,225 +897,225 @@ msgstr ""
897 "これはサンプル文です。\n"
898 "このフォントが気に入ればお使いになれます。"
899
896 -#: lib/choose_repository.tcl:27
900 +#: lib/choose_repository.tcl:28
901 msgid "Git Gui"
902 msgstr "Git GUI"
903
900 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
904 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
905 msgid "Create New Repository"
906 msgstr "新しいリポジトリを作る"
907
904 -#: lib/choose_repository.tcl:86
908 +#: lib/choose_repository.tcl:87
909 msgid "New..."
910 msgstr "新規…"
911
908 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
912 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
913 msgid "Clone Existing Repository"
914 msgstr "既存リポジトリを複製する"
915
912 -#: lib/choose_repository.tcl:99
916 +#: lib/choose_repository.tcl:100
917 msgid "Clone..."
918 msgstr "複製…"
919
916 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
920 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
921 msgid "Open Existing Repository"
922 msgstr "既存リポジトリを開く"
923
920 -#: lib/choose_repository.tcl:112
924 +#: lib/choose_repository.tcl:113
925 msgid "Open..."
926 msgstr "開く…"
927
924 -#: lib/choose_repository.tcl:125
928 +#: lib/choose_repository.tcl:126
929 msgid "Recent Repositories"
930 msgstr "最近使ったリポジトリ"
931
928 -#: lib/choose_repository.tcl:131
932 +#: lib/choose_repository.tcl:132
933 msgid "Open Recent Repository:"
934 msgstr "最近使ったリポジトリを開く"
935
932 -#: lib/choose_repository.tcl:294
933 -#, tcl-format
934 -msgid "Location %s already exists."
935 -msgstr "'%s' は既に存在します。"
936 -
937 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
938 -#: lib/choose_repository.tcl:314
936 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
937 +#: lib/choose_repository.tcl:310
938 #, tcl-format
939 msgid "Failed to create repository %s:"
940 msgstr "リポジトリ %s を作製できません:"
941
943 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
942 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
943 msgid "Directory:"
944 msgstr "ディレクトリ:"
945
947 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
948 -#: lib/choose_repository.tcl:1013
946 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
947 +#: lib/choose_repository.tcl:1011
948 msgid "Git Repository"
949 msgstr "GIT リポジトリ"
950
952 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
951 +#: lib/choose_repository.tcl:437
952 #, tcl-format
953 msgid "Directory %s already exists."
954 msgstr "ディレクトリ '%s' は既に存在します。"
955
957 -#: lib/choose_repository.tcl:442
956 +#: lib/choose_repository.tcl:441
957 #, tcl-format
958 msgid "File %s already exists."
959 msgstr "ファイル '%s' は既に存在します。"
960
962 -#: lib/choose_repository.tcl:463
961 +#: lib/choose_repository.tcl:455
962 msgid "Clone"
963 msgstr "複製"
964
966 -#: lib/choose_repository.tcl:476
965 +#: lib/choose_repository.tcl:468
966 msgid "URL:"
967 msgstr "URL:"
968
970 -#: lib/choose_repository.tcl:496
969 +#: lib/choose_repository.tcl:489
970 msgid "Clone Type:"
971 msgstr "複製方式:"
972
974 -#: lib/choose_repository.tcl:502
973 +#: lib/choose_repository.tcl:495
974 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
975 msgstr "標準(高速・中冗長度・ハードリンク)"
976
978 -#: lib/choose_repository.tcl:508
977 +#: lib/choose_repository.tcl:501
978 msgid "Full Copy (Slower, Redundant Backup)"
979 msgstr "全複写(低速・冗長バックアップ)"
980
982 -#: lib/choose_repository.tcl:514
981 +#: lib/choose_repository.tcl:507
982 msgid "Shared (Fastest, Not Recommended, No Backup)"
983 msgstr "共有(最高速・非推奨・バックアップ無し)"
984
986 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
987 -#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
988 -#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
985 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
986 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
987 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
988 #, tcl-format
989 msgid "Not a Git repository: %s"
990 msgstr "Git リポジトリではありません: %s"
991
993 -#: lib/choose_repository.tcl:586
992 +#: lib/choose_repository.tcl:579
993 msgid "Standard only available for local repository."
994 msgstr "標準方式は同一計算機上のリポジトリにのみ使えます。"
995
997 -#: lib/choose_repository.tcl:590
996 +#: lib/choose_repository.tcl:583
997 msgid "Shared only available for local repository."
998 msgstr "共有方式は同一計算機上のリポジトリにのみ使えます。"
999
1001 -#: lib/choose_repository.tcl:617
1000 +#: lib/choose_repository.tcl:604
1001 +#, tcl-format
1002 +msgid "Location %s already exists."
1003 +msgstr "'%s' は既に存在します。"
1004 +
1005 +#: lib/choose_repository.tcl:615
1006 msgid "Failed to configure origin"
1007 msgstr "origin を設定できませんでした"
1008
1005 -#: lib/choose_repository.tcl:629
1009 +#: lib/choose_repository.tcl:627
1010 msgid "Counting objects"
1011 msgstr "オブジェクトを数えています"
1012
1009 -#: lib/choose_repository.tcl:630
1013 +#: lib/choose_repository.tcl:628
1014 msgid "buckets"
1015 msgstr "バケツ"
1016
1013 -#: lib/choose_repository.tcl:654
1017 +#: lib/choose_repository.tcl:652
1018 #, tcl-format
1019 msgid "Unable to copy objects/info/alternates: %s"
1020 msgstr "objects/info/alternates を複写できません: %s"
1021
1018 -#: lib/choose_repository.tcl:690
1022 +#: lib/choose_repository.tcl:688
1023 #, tcl-format
1024 msgid "Nothing to clone from %s."
1025 msgstr "%s から複製する内容はありません"
1026
1023 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1024 -#: lib/choose_repository.tcl:918
1027 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1028 +#: lib/choose_repository.tcl:916
1029 msgid "The 'master' branch has not been initialized."
1030 msgstr "'master' ブランチが初期化されていません"
1031
1028 -#: lib/choose_repository.tcl:705
1032 +#: lib/choose_repository.tcl:703
1033 msgid "Hardlinks are unavailable. Falling back to copying."
1034 msgstr "ハードリンクが作れないので、コピーします"
1035
1032 -#: lib/choose_repository.tcl:717
1036 +#: lib/choose_repository.tcl:715
1037 #, tcl-format
1038 msgid "Cloning from %s"
1039 msgstr "%s から複製しています"
1040
1037 -#: lib/choose_repository.tcl:748
1041 +#: lib/choose_repository.tcl:746
1042 msgid "Copying objects"
1043 msgstr "オブジェクトを複写しています"
1044
1041 -#: lib/choose_repository.tcl:749
1045 +#: lib/choose_repository.tcl:747
1046 msgid "KiB"
1047 msgstr "KiB"
1048
1045 -#: lib/choose_repository.tcl:773
1049 +#: lib/choose_repository.tcl:771
1050 #, tcl-format
1051 msgid "Unable to copy object: %s"
1052 msgstr "オブジェクトを複写できません: %s"
1053
1050 -#: lib/choose_repository.tcl:783
1054 +#: lib/choose_repository.tcl:781
1055 msgid "Linking objects"
1056 msgstr "オブジェクトを連結しています"
1057
1054 -#: lib/choose_repository.tcl:784
1058 +#: lib/choose_repository.tcl:782
1059 msgid "objects"
1060 msgstr "オブジェクト"
1061
1058 -#: lib/choose_repository.tcl:792
1062 +#: lib/choose_repository.tcl:790
1063 #, tcl-format
1064 msgid "Unable to hardlink object: %s"
1065 msgstr "オブジェクトをハードリンクできません: %s"
1066
1063 -#: lib/choose_repository.tcl:847
1067 +#: lib/choose_repository.tcl:845
1068 msgid "Cannot fetch branches and objects. See console output for details."
1069 msgstr "ブランチやオブジェクトを取得できません。コンソール出力を見て下さい"
1070
1067 -#: lib/choose_repository.tcl:858
1071 +#: lib/choose_repository.tcl:856
1072 msgid "Cannot fetch tags. See console output for details."
1073 msgstr "タグを取得できません。コンソール出力を見て下さい"
1074
1071 -#: lib/choose_repository.tcl:882
1075 +#: lib/choose_repository.tcl:880
1076 msgid "Cannot determine HEAD. See console output for details."
1077 msgstr "HEAD を確定できません。コンソール出力を見て下さい"
1078
1075 -#: lib/choose_repository.tcl:891
1079 +#: lib/choose_repository.tcl:889
1080 #, tcl-format
1081 msgid "Unable to cleanup %s"
1082 msgstr "%s を掃除できません"
1083
1080 -#: lib/choose_repository.tcl:897
1084 +#: lib/choose_repository.tcl:895
1085 msgid "Clone failed."
1086 msgstr "複写に失敗しました。"
1087
1084 -#: lib/choose_repository.tcl:904
1088 +#: lib/choose_repository.tcl:902
1089 msgid "No default branch obtained."
1090 msgstr "デフォールト・ブランチが取得されませんでした"
1091
1088 -#: lib/choose_repository.tcl:915
1092 +#: lib/choose_repository.tcl:913
1093 #, tcl-format
1094 msgid "Cannot resolve %s as a commit."
1095 msgstr "%s をコミットとして解釈できません"
1096
1093 -#: lib/choose_repository.tcl:927
1097 +#: lib/choose_repository.tcl:925
1098 msgid "Creating working directory"
1099 msgstr "作業ディレクトリを作成しています"
1100
1097 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1101 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1102 #: lib/index.tcl:193
1103 msgid "files"
1104 msgstr "ファイル"
1105
1102 -#: lib/choose_repository.tcl:957
1106 +#: lib/choose_repository.tcl:955
1107 msgid "Initial file checkout failed."
1108 msgstr "初期チェックアウトに失敗しました"
1109
1106 -#: lib/choose_repository.tcl:973
1110 +#: lib/choose_repository.tcl:971
1111 msgid "Open"
1112 msgstr "開く"
1113
1110 -#: lib/choose_repository.tcl:983
1114 +#: lib/choose_repository.tcl:981
1115 msgid "Repository:"
1116 msgstr "リポジトリ:"
1117
1114 -#: lib/choose_repository.tcl:1033
1118 +#: lib/choose_repository.tcl:1031
1119 #, tcl-format
1120 msgid "Failed to open repository %s:"
1121 msgstr "リポジトリ %s を開けません:"
@@ -1132,7 +1136,7 @@ msgstr "ローカル・ブランチ"
1136 msgid "Tracking Branch"
1137 msgstr "トラッキング・ブランチ"
1138
1135 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1139 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1140 msgid "Tag"
1141 msgstr "タグ"
1142
@@ -1149,11 +1153,11 @@ msgstr "リビジョンが未選択です。"
1153 msgid "Revision expression is empty."
1154 msgstr "リビジョン式が空です。"
1155
1152 -#: lib/choose_rev.tcl:530
1156 +#: lib/choose_rev.tcl:531
1157 msgid "Updated"
1158 msgstr "更新しました"
1159
1156 -#: lib/choose_rev.tcl:558
1160 +#: lib/choose_rev.tcl:559
1161 msgid "URL"
1162 msgstr "URL"
1163
@@ -1262,16 +1266,46 @@ msgstr ""
1266 "- 第２行: 空白\n"
1267 "- 残りの行: なぜ、この変更が良い変更か、の説明。\n"
1268
1265 -#: lib/commit.tcl:257
1269 +#: lib/commit.tcl:207
1270 +#, tcl-format
1271 +msgid "warning: Tcl does not support encoding '%s'."
1272 +msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
1273 +
1274 +#: lib/commit.tcl:221
1275 +msgid "Calling pre-commit hook..."
1276 +msgstr ""
1277 +
1278 +#: lib/commit.tcl:236
1279 +msgid "Commit declined by pre-commit hook."
1280 +msgstr ""
1281 +
1282 +#: lib/commit.tcl:259
1283 +msgid "Calling commit-msg hook..."
1284 +msgstr ""
1285 +
1286 +#: lib/commit.tcl:274
1287 +msgid "Commit declined by commit-msg hook."
1288 +msgstr ""
1289 +
1290 +#: lib/commit.tcl:287
1291 +msgid "Committing changes..."
1292 +msgstr ""
1293 +
1294 +#: lib/commit.tcl:303
1295 msgid "write-tree failed:"
1296 msgstr "write-tree が失敗しました:"
1297
1269 -#: lib/commit.tcl:275
1298 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1299 +#, fuzzy
1300 +msgid "Commit failed."
1301 +msgstr "複写に失敗しました。"
1302 +
1303 +#: lib/commit.tcl:321
1304 #, tcl-format
1305 msgid "Commit %s appears to be corrupt"
1306 msgstr "コミット %s は壊れています"
1307
1274 -#: lib/commit.tcl:279
1308 +#: lib/commit.tcl:326
1309 msgid ""
1310 "No changes to commit.\n"
1311 "\n"
@@ -1285,37 +1319,32 @@ msgstr ""
1319 "\n"
1320 "自動的に再スキャンを開始します。\n"
1321
1288 -#: lib/commit.tcl:286
1322 +#: lib/commit.tcl:333
1323 msgid "No changes to commit."
1324 msgstr "コミットする変更がありません。"
1325
1292 -#: lib/commit.tcl:303
1293 -#, tcl-format
1294 -msgid "warning: Tcl does not support encoding '%s'."
1295 -msgstr "警告: Tcl はエンコーディング '%s' をサポートしていません"
1296 -
1297 -#: lib/commit.tcl:317
1326 +#: lib/commit.tcl:347
1327 msgid "commit-tree failed:"
1328 msgstr "commit-tree が失敗しました:"
1329
1301 -#: lib/commit.tcl:339
1330 +#: lib/commit.tcl:367
1331 msgid "update-ref failed:"
1332 msgstr "update-ref が失敗しました:"
1333
1305 -#: lib/commit.tcl:430
1334 +#: lib/commit.tcl:454
1335 #, tcl-format
1336 msgid "Created commit %s: %s"
1337 msgstr "コミット %s を作成しました: %s"
1338
1310 -#: lib/console.tcl:57
1339 +#: lib/console.tcl:59
1340 msgid "Working... please wait..."
1341 msgstr "実行中…お待ち下さい…"
1342
1314 -#: lib/console.tcl:183
1343 +#: lib/console.tcl:186
1344 msgid "Success"
1345 msgstr "成功"
1346
1318 -#: lib/console.tcl:196
1347 +#: lib/console.tcl:200
1348 msgid "Error: Command Failed"
1349 msgstr "エラー: コマンドが失敗しました"
1350
@@ -1425,23 +1454,23 @@ msgstr "* バイナリファイル(内容は表示しません)"
1454 msgid "Error loading diff:"
1455 msgstr "diff を読む際のエラーです:"
1456
1428 -#: lib/diff.tcl:302
1457 +#: lib/diff.tcl:303
1458 msgid "Failed to unstage selected hunk."
1459 msgstr "選択されたパッチをコミット予定から外せません。"
1460
1432 -#: lib/diff.tcl:309
1461 +#: lib/diff.tcl:310
1462 msgid "Failed to stage selected hunk."
1463 msgstr "選択されたパッチをコミット予定に加えられません。"
1464
1436 -#: lib/error.tcl:12 lib/error.tcl:102
1465 +#: lib/error.tcl:20 lib/error.tcl:114
1466 msgid "error"
1467 msgstr "エラー"
1468
1440 -#: lib/error.tcl:28
1469 +#: lib/error.tcl:36
1470 msgid "warning"
1471 msgstr "警告"
1472
1444 -#: lib/error.tcl:81
1473 +#: lib/error.tcl:94
1474 msgid "You must correct the above errors before committing."
1475 msgstr "コミットする前に、以上のエラーを修正して下さい"
1476
@@ -1457,7 +1486,9 @@ msgstr "索引エラー"
1486 msgid ""
1487 "Updating the Git index failed. A rescan will be automatically started to "
1488 "resynchronize git-gui."
1460 -msgstr "GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンします。"
1489 +msgstr ""
1490 +"GIT インデックスの更新が失敗しました。git-gui と同期をとるために再スキャンし"
1491 +"ます。"
1492
1493 #: lib/index.tcl:27
1494 msgid "Continue"
@@ -1472,6 +1503,11 @@ msgstr "インデックスのロック解除"
1503 msgid "Unstaging %s from commit"
1504 msgstr "コミットから '%s' を降ろす"
1505
1506 +#: lib/index.tcl:313
1507 +#, fuzzy
1508 +msgid "Ready to commit."
1509 +msgstr "コミット予定済"
1510 +
1511 #: lib/index.tcl:326
1512 #, tcl-format
1513 msgid "Adding %s"
@@ -1487,11 +1523,11 @@ msgstr "ファイル %s にした変更を元に戻しますか？"
1523 msgid "Revert changes in these %i files?"
1524 msgstr "これら %i 個のファイルにした変更を元に戻しますか？"
1525
1490 -#: lib/index.tcl:389
1526 +#: lib/index.tcl:391
1527 msgid "Any unstaged changes will be permanently lost by the revert."
1528 msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。"
1529
1494 -#: lib/index.tcl:392
1530 +#: lib/index.tcl:394
1531 msgid "Do Nothing"
1532 msgstr "何もしない"
1533
@@ -1561,28 +1597,28 @@ msgid "%s of %s"
1597 msgstr "%s の %s ブランチ"
1598
1599 #: lib/merge.tcl:119
1564 -#, tcl-format
1565 -msgid "Merging %s and %s"
1600 +#, fuzzy, tcl-format
1601 +msgid "Merging %s and %s..."
1602 msgstr "%s と %s をマージします"
1603
1568 -#: lib/merge.tcl:131
1604 +#: lib/merge.tcl:130
1605 msgid "Merge completed successfully."
1606 msgstr "マージが完了しました"
1607
1572 -#: lib/merge.tcl:133
1608 +#: lib/merge.tcl:132
1609 msgid "Merge failed. Conflict resolution is required."
1610 msgstr "マージが失敗しました。衝突の解決が必要です。"
1611
1576 -#: lib/merge.tcl:158
1612 +#: lib/merge.tcl:157
1613 #, tcl-format
1614 msgid "Merge Into %s"
1615 msgstr "%s にマージ"
1616
1581 -#: lib/merge.tcl:177
1617 +#: lib/merge.tcl:176
1618 msgid "Revision To Merge"
1619 msgstr "マージするリビジョン"
1620
1585 -#: lib/merge.tcl:212
1621 +#: lib/merge.tcl:211
1622 msgid ""
1623 "Cannot abort while amending.\n"
1624 "\n"
@@ -1592,7 +1628,7 @@ msgstr ""
1628 "\n"
1629 "まず今のコミット訂正を完了させて下さい。\n"
1630
1595 -#: lib/merge.tcl:222
1631 +#: lib/merge.tcl:221
1632 msgid ""
1633 "Abort merge?\n"
1634 "\n"
@@ -1606,7 +1642,7 @@ msgstr ""
1642 "\n"
1643 "マージを中断してよろしいですか？"
1644
1609 -#: lib/merge.tcl:228
1645 +#: lib/merge.tcl:227
1646 msgid ""
1647 "Reset changes?\n"
1648 "\n"
@@ -1620,93 +1656,107 @@ msgstr ""
1656 "\n"
1657 "リセットしてよろしいですか？"
1658
1623 -#: lib/merge.tcl:239
1659 +#: lib/merge.tcl:238
1660 msgid "Aborting"
1661 msgstr "中断しています"
1662
1627 -#: lib/merge.tcl:266
1663 +#: lib/merge.tcl:238
1664 +#, fuzzy
1665 +msgid "files reset"
1666 +msgstr "ファイル"
1667 +
1668 +#: lib/merge.tcl:265
1669 msgid "Abort failed."
1670 msgstr "中断に失敗しました。"
1671
1631 -#: lib/merge.tcl:268
1672 +#: lib/merge.tcl:267
1673 msgid "Abort completed. Ready."
1674 msgstr "中断完了。"
1675
1635 -#: lib/option.tcl:82
1676 +#: lib/option.tcl:95
1677 msgid "Restore Defaults"
1678 msgstr "既定値に戻す"
1679
1639 -#: lib/option.tcl:86
1680 +#: lib/option.tcl:99
1681 msgid "Save"
1682 msgstr "保存"
1683
1643 -#: lib/option.tcl:96
1684 +#: lib/option.tcl:109
1685 #, tcl-format
1686 msgid "%s Repository"
1687 msgstr "%s リポジトリ"
1688
1648 -#: lib/option.tcl:97
1689 +#: lib/option.tcl:110
1690 msgid "Global (All Repositories)"
1691 msgstr "大域（全てのリポジトリ）"
1692
1652 -#: lib/option.tcl:103
1693 +#: lib/option.tcl:116
1694 msgid "User Name"
1695 msgstr "ユーザ名"
1696
1656 -#: lib/option.tcl:104
1697 +#: lib/option.tcl:117
1698 msgid "Email Address"
1699 msgstr "電子メールアドレス"
1700
1660 -#: lib/option.tcl:106
1701 +#: lib/option.tcl:119
1702 msgid "Summarize Merge Commits"
1703 msgstr "マージコミットの要約"
1704
1664 -#: lib/option.tcl:107
1705 +#: lib/option.tcl:120
1706 msgid "Merge Verbosity"
1707 msgstr "マージの冗長度"
1708
1668 -#: lib/option.tcl:108
1709 +#: lib/option.tcl:121
1710 msgid "Show Diffstat After Merge"
1711 msgstr "マージ後に diffstat を表示"
1712
1672 -#: lib/option.tcl:110
1713 +#: lib/option.tcl:123
1714 msgid "Trust File Modification Timestamps"
1715 msgstr "ファイル変更時刻を信頼する"
1716
1676 -#: lib/option.tcl:111
1717 +#: lib/option.tcl:124
1718 msgid "Prune Tracking Branches During Fetch"
1719 msgstr "フェッチ中にトラッキングブランチを刈る"
1720
1680 -#: lib/option.tcl:112
1721 +#: lib/option.tcl:125
1722 msgid "Match Tracking Branches"
1723 msgstr "トラッキングブランチを合わせる"
1724
1684 -#: lib/option.tcl:113
1725 +#: lib/option.tcl:126
1726 msgid "Number of Diff Context Lines"
1727 msgstr "diff の文脈行数"
1728
1688 -#: lib/option.tcl:114
1729 +#: lib/option.tcl:127
1730 +#, fuzzy
1731 +msgid "Commit Message Text Width"
1732 +msgstr "コミットメッセージ:"
1733 +
1734 +#: lib/option.tcl:128
1735 msgid "New Branch Name Template"
1736 msgstr "新しいブランチ名のテンプレート"
1737
1692 -#: lib/option.tcl:176
1738 +#: lib/option.tcl:192
1739 +msgid "Spelling Dictionary:"
1740 +msgstr ""
1741 +
1742 +#: lib/option.tcl:216
1743 msgid "Change Font"
1744 msgstr "フォントを変更"
1745
1696 -#: lib/option.tcl:180
1746 +#: lib/option.tcl:220
1747 #, tcl-format
1748 msgid "Choose %s"
1749 msgstr "%s を選択"
1750
1701 -#: lib/option.tcl:186
1751 +#: lib/option.tcl:226
1752 msgid "pt."
1753 msgstr "ポイント"
1754
1705 -#: lib/option.tcl:200
1755 +#: lib/option.tcl:240
1756 msgid "Preferences"
1757 msgstr "設定"
1758
1709 -#: lib/option.tcl:235
1759 +#: lib/option.tcl:275
1760 msgid "Failed to completely save options:"
1761 msgstr "完全にオプションを保存できません:"
1762
@@ -1814,6 +1864,43 @@ msgstr "ショートカットが書けません:"
1864 msgid "Cannot write icon:"
1865 msgstr "アイコンが書けません:"
1866
1867 +#: lib/spellcheck.tcl:57
1868 +msgid "Unsupported spell checker"
1869 +msgstr ""
1870 +
1871 +#: lib/spellcheck.tcl:65
1872 +msgid "Spell checking is unavailable"
1873 +msgstr ""
1874 +
1875 +#: lib/spellcheck.tcl:68
1876 +msgid "Invalid spell checking configuration"
1877 +msgstr ""
1878 +
1879 +#: lib/spellcheck.tcl:70
1880 +#, tcl-format
1881 +msgid "Reverting dictionary to %s."
1882 +msgstr ""
1883 +
1884 +#: lib/spellcheck.tcl:73
1885 +msgid "Spell checker silently failed on startup"
1886 +msgstr ""
1887 +
1888 +#: lib/spellcheck.tcl:80
1889 +msgid "Unrecognized spell checker"
1890 +msgstr ""
1891 +
1892 +#: lib/spellcheck.tcl:180
1893 +msgid "No Suggestions"
1894 +msgstr ""
1895 +
1896 +#: lib/spellcheck.tcl:381
1897 +msgid "Unexpected EOF from spell checker"
1898 +msgstr ""
1899 +
1900 +#: lib/spellcheck.tcl:385
1901 +msgid "Spell Checker Failed"
1902 +msgstr ""
1903 +
1904 #: lib/status_bar.tcl:83
1905 #, tcl-format
1906 msgid "%s ... %*i of %*i %s (%3i%%)"
po/ru.po
+349 -263
@@ -7,7 +7,7 @@ msgid ""
7 msgstr ""
8 "Project-Id-Version: git-gui\n"
9 "Report-Msgid-Bugs-To: \n"
10 -"POT-Creation-Date: 2007-10-31 21:23+0100\n"
10 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
11 "PO-Revision-Date: 2007-10-22 22:30-0200\n"
12 "Last-Translator: Alex Riesen <raa.lkml@gmail.com>\n"
13 "Language-Team: Russian Translation <git@vger.kernel.org>\n"
@@ -15,33 +15,33 @@ msgstr ""
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17
18 -#: git-gui.sh:41 git-gui.sh:597 git-gui.sh:611 git-gui.sh:624 git-gui.sh:707
19 -#: git-gui.sh:726
18 +#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
19 +#: git-gui.sh:763
20 msgid "git-gui: fatal error"
21 msgstr "git-gui: критическая ошибка"
22
23 -#: git-gui.sh:558
23 +#: git-gui.sh:593
24 #, tcl-format
25 msgid "Invalid font specified in %s:"
26 msgstr "В %s установлен неверный шрифт:"
27
28 -#: git-gui.sh:583
28 +#: git-gui.sh:620
29 msgid "Main Font"
30 msgstr "Шрифт интерфейса"
31
32 -#: git-gui.sh:584
32 +#: git-gui.sh:621
33 msgid "Diff/Console Font"
34 msgstr "Шрифт консоли и изменений (diff)"
35
36 -#: git-gui.sh:598
36 +#: git-gui.sh:635
37 msgid "Cannot find git in PATH."
38 msgstr "git не найден в PATH."
39
40 -#: git-gui.sh:625
40 +#: git-gui.sh:662
41 msgid "Cannot parse Git version string:"
42 msgstr "Невозможно распознать строку версии Git: "
43
44 -#: git-gui.sh:643
44 +#: git-gui.sh:680
45 #, tcl-format
46 msgid ""
47 "Git version cannot be determined.\n"
@@ -59,79 +59,79 @@ msgstr ""
59 "\n"
60 "Принять '%s' как версию 1.5.0?\n"
61
62 -#: git-gui.sh:881
62 +#: git-gui.sh:918
63 msgid "Git directory not found:"
64 msgstr "Каталог Git не найден:"
65
66 -#: git-gui.sh:888
66 +#: git-gui.sh:925
67 msgid "Cannot move to top of working directory:"
68 msgstr "Невозможно перейти к корню рабочего каталога репозитория: "
69
70 -#: git-gui.sh:895
70 +#: git-gui.sh:932
71 msgid "Cannot use funny .git directory:"
72 msgstr "Каталог.git испорчен: "
73
74 -#: git-gui.sh:900
74 +#: git-gui.sh:937
75 msgid "No working directory"
76 msgstr "Отсутствует рабочий каталог"
77
78 -#: git-gui.sh:1047
78 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
79 msgid "Refreshing file status..."
80 msgstr "Обновление информации о состоянии файлов..."
81
82 -#: git-gui.sh:1112
82 +#: git-gui.sh:1149
83 msgid "Scanning for modified files ..."
84 msgstr "Поиск измененных файлов..."
85
86 -#: git-gui.sh:1287 lib/browser.tcl:245
86 +#: git-gui.sh:1324 lib/browser.tcl:246
87 msgid "Ready."
88 msgstr "Готово."
89
90 -#: git-gui.sh:1553
90 +#: git-gui.sh:1590
91 msgid "Unmodified"
92 msgstr "Не изменено"
93
94 -#: git-gui.sh:1555
94 +#: git-gui.sh:1592
95 msgid "Modified, not staged"
96 msgstr "Изменено, не подготовлено"
97
98 -#: git-gui.sh:1556 git-gui.sh:1561
98 +#: git-gui.sh:1593 git-gui.sh:1598
99 msgid "Staged for commit"
100 msgstr "Подготовлено для сохранения"
101
102 -#: git-gui.sh:1557 git-gui.sh:1562
102 +#: git-gui.sh:1594 git-gui.sh:1599
103 msgid "Portions staged for commit"
104 msgstr "Части, подготовленные для сохранения"
105
106 -#: git-gui.sh:1558 git-gui.sh:1563
106 +#: git-gui.sh:1595 git-gui.sh:1600
107 msgid "Staged for commit, missing"
108 msgstr "Подготовлено для сохранения, отсутствует"
109
110 -#: git-gui.sh:1560
110 +#: git-gui.sh:1597
111 msgid "Untracked, not staged"
112 msgstr "Не отслеживается, не подготовлено"
113
114 -#: git-gui.sh:1565
114 +#: git-gui.sh:1602
115 msgid "Missing"
116 msgstr "Отсутствует"
117
118 -#: git-gui.sh:1566
118 +#: git-gui.sh:1603
119 msgid "Staged for removal"
120 msgstr "Подготовлено для удаления"
121
122 -#: git-gui.sh:1567
122 +#: git-gui.sh:1604
123 msgid "Staged for removal, still present"
124 msgstr "Подготовлено для удаления, еще не удалено"
125
126 -#: git-gui.sh:1569 git-gui.sh:1570 git-gui.sh:1571 git-gui.sh:1572
126 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
127 msgid "Requires merge resolution"
128 msgstr "Требуется разрешение конфликта при объединении"
129
130 -#: git-gui.sh:1607
130 +#: git-gui.sh:1644
131 msgid "Starting gitk... please wait..."
132 msgstr "Запускается gitk... пожалуйста, ждите..."
133
134 -#: git-gui.sh:1616
134 +#: git-gui.sh:1653
135 #, tcl-format
136 msgid ""
137 "Unable to start gitk:\n"
@@ -142,295 +142,295 @@ msgstr ""
142 "\n"
143 "%s не существует"
144
145 -#: git-gui.sh:1816 lib/choose_repository.tcl:35
145 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
146 msgid "Repository"
147 msgstr "Репозиторий"
148
149 -#: git-gui.sh:1817
149 +#: git-gui.sh:1861
150 msgid "Edit"
151 msgstr "Редактировать"
152
153 -#: git-gui.sh:1819 lib/choose_rev.tcl:560
153 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
154 msgid "Branch"
155 msgstr "Ветвь"
156
157 -#: git-gui.sh:1822 lib/choose_rev.tcl:547
157 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
158 msgid "Commit@@noun"
159 msgstr "Состояние"
160
161 -#: git-gui.sh:1825 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
161 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
162 msgid "Merge"
163 msgstr "Объединить"
164
165 -#: git-gui.sh:1826 lib/choose_rev.tcl:556
165 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
166 msgid "Remote"
167 msgstr "Внешние репозитории"
168
169 -#: git-gui.sh:1835
169 +#: git-gui.sh:1879
170 msgid "Browse Current Branch's Files"
171 msgstr "Просмотреть файлы текущей ветви"
172
173 -#: git-gui.sh:1839
173 +#: git-gui.sh:1883
174 msgid "Browse Branch Files..."
175 msgstr "Показать файлы ветви..."
176
177 -#: git-gui.sh:1844
177 +#: git-gui.sh:1888
178 msgid "Visualize Current Branch's History"
179 msgstr "История текущей ветви наглядно"
180
181 -#: git-gui.sh:1848
181 +#: git-gui.sh:1892
182 msgid "Visualize All Branch History"
183 msgstr "История всех ветвей наглядно"
184
185 -#: git-gui.sh:1855
185 +#: git-gui.sh:1899
186 #, tcl-format
187 msgid "Browse %s's Files"
188 msgstr "Показать файлы ветви %s"
189
190 -#: git-gui.sh:1857
190 +#: git-gui.sh:1901
191 #, tcl-format
192 msgid "Visualize %s's History"
193 msgstr "История ветви %s наглядно"
194
195 -#: git-gui.sh:1862 lib/database.tcl:27 lib/database.tcl:67
195 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
196 msgid "Database Statistics"
197 msgstr "Статистика базы данных"
198
199 -#: git-gui.sh:1865 lib/database.tcl:34
199 +#: git-gui.sh:1909 lib/database.tcl:34
200 msgid "Compress Database"
201 msgstr "Сжать базу данных"
202
203 -#: git-gui.sh:1868
203 +#: git-gui.sh:1912
204 msgid "Verify Database"
205 msgstr "Проверить базу данных"
206
207 -#: git-gui.sh:1875 git-gui.sh:1879 git-gui.sh:1883 lib/shortcut.tcl:7
207 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
208 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
209 msgid "Create Desktop Icon"
210 msgstr "Создать ярлык на рабочем столе"
211
212 -#: git-gui.sh:1888 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
212 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
213 msgid "Quit"
214 msgstr "Выход"
215
216 -#: git-gui.sh:1895
216 +#: git-gui.sh:1939
217 msgid "Undo"
218 msgstr "Отменить"
219
220 -#: git-gui.sh:1898
220 +#: git-gui.sh:1942
221 msgid "Redo"
222 msgstr "Повторить"
223
224 -#: git-gui.sh:1902 git-gui.sh:2395
224 +#: git-gui.sh:1946 git-gui.sh:2443
225 msgid "Cut"
226 msgstr "Вырезать"
227
228 -#: git-gui.sh:1905 git-gui.sh:2398 git-gui.sh:2469 git-gui.sh:2541
229 -#: lib/console.tcl:67
228 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
229 +#: lib/console.tcl:69
230 msgid "Copy"
231 msgstr "Копировать"
232
233 -#: git-gui.sh:1908 git-gui.sh:2401
233 +#: git-gui.sh:1952 git-gui.sh:2449
234 msgid "Paste"
235 msgstr "Вставить"
236
237 -#: git-gui.sh:1911 git-gui.sh:2404 lib/branch_delete.tcl:26
237 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
238 #: lib/remote_branch_delete.tcl:38
239 msgid "Delete"
240 msgstr "Удалить"
241
242 -#: git-gui.sh:1915 git-gui.sh:2408 git-gui.sh:2545 lib/console.tcl:69
242 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
243 msgid "Select All"
244 msgstr "Выделить все"
245
246 -#: git-gui.sh:1924
246 +#: git-gui.sh:1968
247 msgid "Create..."
248 msgstr "Создать..."
249
250 -#: git-gui.sh:1930
250 +#: git-gui.sh:1974
251 msgid "Checkout..."
252 msgstr "Перейти..."
253
254 -#: git-gui.sh:1936
254 +#: git-gui.sh:1980
255 msgid "Rename..."
256 msgstr "Переименовать..."
257
258 -#: git-gui.sh:1941 git-gui.sh:2040
258 +#: git-gui.sh:1985 git-gui.sh:2085
259 msgid "Delete..."
260 msgstr "Удалить..."
261
262 -#: git-gui.sh:1946
262 +#: git-gui.sh:1990
263 msgid "Reset..."
264 msgstr "Сбросить..."
265
266 -#: git-gui.sh:1958 git-gui.sh:2342
266 +#: git-gui.sh:2002 git-gui.sh:2389
267 msgid "New Commit"
268 msgstr "Новое состояние"
269
270 -#: git-gui.sh:1966 git-gui.sh:2349
270 +#: git-gui.sh:2010 git-gui.sh:2396
271 msgid "Amend Last Commit"
272 msgstr "Исправить последнее состояние"
273
274 -#: git-gui.sh:1975 git-gui.sh:2309 lib/remote_branch_delete.tcl:99
274 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
275 msgid "Rescan"
276 msgstr "Перечитать"
277
278 -#: git-gui.sh:1981
278 +#: git-gui.sh:2025
279 msgid "Stage To Commit"
280 msgstr "Подготовить для сохранения"
281
282 -#: git-gui.sh:1986
282 +#: git-gui.sh:2031
283 msgid "Stage Changed Files To Commit"
284 msgstr "Подготовить измененные файлы для сохранения"
285
286 -#: git-gui.sh:1992
286 +#: git-gui.sh:2037
287 msgid "Unstage From Commit"
288 msgstr "Убрать из подготовленного"
289
290 -#: git-gui.sh:1997 lib/index.tcl:393
290 +#: git-gui.sh:2042 lib/index.tcl:395
291 msgid "Revert Changes"
292 msgstr "Отменить изменения"
293
294 -#: git-gui.sh:2004 git-gui.sh:2321 git-gui.sh:2419
294 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
295 msgid "Sign Off"
296 msgstr "Подписать"
297
298 -#: git-gui.sh:2008 git-gui.sh:2325
298 +#: git-gui.sh:2053 git-gui.sh:2372
299 msgid "Commit@@verb"
300 msgstr "Сохранить"
301
302 -#: git-gui.sh:2019
302 +#: git-gui.sh:2064
303 msgid "Local Merge..."
304 msgstr "Локальное объединение..."
305
306 -#: git-gui.sh:2024
306 +#: git-gui.sh:2069
307 msgid "Abort Merge..."
308 msgstr "Прервать объединение..."
309
310 -#: git-gui.sh:2036
310 +#: git-gui.sh:2081
311 msgid "Push..."
312 msgstr "Отправить..."
313
314 -#: git-gui.sh:2047 lib/choose_repository.tcl:40
314 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
315 msgid "Apple"
316 msgstr ""
317
318 -#: git-gui.sh:2050 git-gui.sh:2072 lib/about.tcl:13
319 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
318 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
319 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
320 #, tcl-format
321 msgid "About %s"
322 msgstr "О %s"
323
324 -#: git-gui.sh:2054
324 +#: git-gui.sh:2099
325 msgid "Preferences..."
326 msgstr "Настройки..."
327
328 -#: git-gui.sh:2062 git-gui.sh:2587
328 +#: git-gui.sh:2107 git-gui.sh:2639
329 msgid "Options..."
330 msgstr "Настройки..."
331
332 -#: git-gui.sh:2068 lib/choose_repository.tcl:46
332 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
333 msgid "Help"
334 msgstr "Помощь"
335
336 -#: git-gui.sh:2109
336 +#: git-gui.sh:2154
337 msgid "Online Documentation"
338 msgstr "Документация в интернете"
339
340 -#: git-gui.sh:2193
340 +#: git-gui.sh:2238
341 #, tcl-format
342 msgid "fatal: cannot stat path %s: No such file or directory"
343 msgstr "критическая ошибка: %s: нет такого файла или каталога"
344
345 -#: git-gui.sh:2226
345 +#: git-gui.sh:2271
346 msgid "Current Branch:"
347 msgstr "Текущая ветвь:"
348
349 -#: git-gui.sh:2247
349 +#: git-gui.sh:2292
350 msgid "Staged Changes (Will Commit)"
351 msgstr "Подготовлено (будет сохранено)"
352
353 -#: git-gui.sh:2266
353 +#: git-gui.sh:2312
354 msgid "Unstaged Changes"
355 msgstr "Изменено (не будет сохранено)"
356
357 -#: git-gui.sh:2315
357 +#: git-gui.sh:2362
358 msgid "Stage Changed"
359 msgstr "Подготовить все"
360
361 -#: git-gui.sh:2331 lib/transport.tcl:93 lib/transport.tcl:182
361 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
362 msgid "Push"
363 msgstr "Отправить"
364
365 -#: git-gui.sh:2361
365 +#: git-gui.sh:2408
366 msgid "Initial Commit Message:"
367 msgstr "Комментарий к первому состоянию:"
368
369 -#: git-gui.sh:2362
369 +#: git-gui.sh:2409
370 msgid "Amended Commit Message:"
371 msgstr "Комментарий к исправленному состоянию:"
372
373 -#: git-gui.sh:2363
373 +#: git-gui.sh:2410
374 msgid "Amended Initial Commit Message:"
375 msgstr "Комментарий к исправленному первоначальному состоянию:"
376
377 -#: git-gui.sh:2364
377 +#: git-gui.sh:2411
378 msgid "Amended Merge Commit Message:"
379 msgstr "Комментарий к исправленному объединению:"
380
381 -#: git-gui.sh:2365
381 +#: git-gui.sh:2412
382 msgid "Merge Commit Message:"
383 msgstr "Комментарий к объединению:"
384
385 -#: git-gui.sh:2366
385 +#: git-gui.sh:2413
386 msgid "Commit Message:"
387 msgstr "Комментарий к состоянию:"
388
389 -#: git-gui.sh:2411 git-gui.sh:2549 lib/console.tcl:71
389 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
390 msgid "Copy All"
391 msgstr "Копировать все"
392
393 -#: git-gui.sh:2435 lib/blame.tcl:104
393 +#: git-gui.sh:2483 lib/blame.tcl:107
394 msgid "File:"
395 msgstr "Файл:"
396
397 -#: git-gui.sh:2537
398 -msgid "Refresh"
399 -msgstr "Обновить"
400 -
401 -#: git-gui.sh:2558
397 +#: git-gui.sh:2589
398 msgid "Apply/Reverse Hunk"
399 msgstr "Применить/Убрать изменение"
400
405 -#: git-gui.sh:2564
406 -msgid "Decrease Font Size"
407 -msgstr "Уменьшить размер шрифта"
408 -
409 -#: git-gui.sh:2568
410 -msgid "Increase Font Size"
411 -msgstr "Увеличить размер шрифта"
412 -
413 -#: git-gui.sh:2573
401 +#: git-gui.sh:2595
402 msgid "Show Less Context"
403 msgstr "Меньше контекста"
404
417 -#: git-gui.sh:2580
405 +#: git-gui.sh:2602
406 msgid "Show More Context"
407 msgstr "Больше контекста"
408
421 -#: git-gui.sh:2594
409 +#: git-gui.sh:2610
410 +msgid "Refresh"
411 +msgstr "Обновить"
412 +
413 +#: git-gui.sh:2631
414 +msgid "Decrease Font Size"
415 +msgstr "Уменьшить размер шрифта"
416 +
417 +#: git-gui.sh:2635
418 +msgid "Increase Font Size"
419 +msgstr "Увеличить размер шрифта"
420 +
421 +#: git-gui.sh:2646
422 msgid "Unstage Hunk From Commit"
423 msgstr "Не сохранять часть"
424
425 -#: git-gui.sh:2596
425 +#: git-gui.sh:2648
426 msgid "Stage Hunk For Commit"
427 msgstr "Подготовить часть для сохранения"
428
429 -#: git-gui.sh:2615
429 +#: git-gui.sh:2667
430 msgid "Initializing..."
431 msgstr "Инициализация..."
432
433 -#: git-gui.sh:2706
433 +#: git-gui.sh:2762
434 #, tcl-format
435 msgid ""
436 "Possible environment issues exist.\n"
@@ -447,7 +447,7 @@ msgstr ""
447 "запущенными из %s\n"
448 "\n"
449
450 -#: git-gui.sh:2736
450 +#: git-gui.sh:2792
451 msgid ""
452 "\n"
453 "This is due to a known issue with the\n"
@@ -457,7 +457,7 @@ msgstr ""
457 "Это известная проблема с Tcl,\n"
458 "распространяемым Cygwin."
459
460 -#: git-gui.sh:2741
460 +#: git-gui.sh:2797
461 #, tcl-format
462 msgid ""
463 "\n"
@@ -474,7 +474,7 @@ msgstr ""
474 "user.email в Вашем персональном\n"
475 "файле ~/.gitconfig.\n"
476
477 -#: lib/about.tcl:25
477 +#: lib/about.tcl:26
478 msgid "git-gui - a graphical user interface for Git."
479 msgstr "git-gui - графический пользовательский интерфейс к Git."
480
@@ -486,56 +486,56 @@ msgstr "Просмотр файла"
486 msgid "Commit:"
487 msgstr "Сохраненное состояние:"
488
489 -#: lib/blame.tcl:249
489 +#: lib/blame.tcl:264
490 msgid "Copy Commit"
491 msgstr "Скопировать SHA-1"
492
493 -#: lib/blame.tcl:369
493 +#: lib/blame.tcl:384
494 #, tcl-format
495 msgid "Reading %s..."
496 msgstr "Чтение %s..."
497
498 -#: lib/blame.tcl:473
498 +#: lib/blame.tcl:488
499 msgid "Loading copy/move tracking annotations..."
500 msgstr "Загрузка аннотации копирований/переименований..."
501
502 -#: lib/blame.tcl:493
502 +#: lib/blame.tcl:508
503 msgid "lines annotated"
504 msgstr "строк прокомментировано"
505
506 -#: lib/blame.tcl:674
506 +#: lib/blame.tcl:689
507 msgid "Loading original location annotations..."
508 msgstr "Загрузка аннотаций первоначального положения объекта..."
509
510 -#: lib/blame.tcl:677
510 +#: lib/blame.tcl:692
511 msgid "Annotation complete."
512 msgstr "Аннотация завершена."
513
514 -#: lib/blame.tcl:731
514 +#: lib/blame.tcl:746
515 msgid "Loading annotation..."
516 msgstr "Загрузка аннотации..."
517
518 -#: lib/blame.tcl:787
518 +#: lib/blame.tcl:802
519 msgid "Author:"
520 msgstr "Автор:"
521
522 -#: lib/blame.tcl:791
522 +#: lib/blame.tcl:806
523 msgid "Committer:"
524 msgstr "Сохранил:"
525
526 -#: lib/blame.tcl:796
526 +#: lib/blame.tcl:811
527 msgid "Original File:"
528 msgstr "Исходный файл:"
529
530 -#: lib/blame.tcl:910
530 +#: lib/blame.tcl:925
531 msgid "Originally By:"
532 msgstr "Источник:"
533
534 -#: lib/blame.tcl:916
534 +#: lib/blame.tcl:931
535 msgid "In File:"
536 msgstr "Файл:"
537
538 -#: lib/blame.tcl:921
538 +#: lib/blame.tcl:936
539 msgid "Copied Or Moved Here By:"
540 msgstr "Скопировано/перемещено в:"
541
@@ -548,17 +548,17 @@ msgid "Checkout"
548 msgstr "Перейти"
549
550 #: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
551 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
552 -#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
553 -#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
551 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
552 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
553 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
554 msgid "Cancel"
555 msgstr "Отменить"
556
557 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
557 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
558 msgid "Revision"
559 msgstr "Версия"
560
561 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
561 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
562 msgid "Options"
563 msgstr "Настройки"
564
@@ -578,7 +578,7 @@ msgstr "Создание ветви"
578 msgid "Create New Branch"
579 msgstr "Создать новую ветвь"
580
581 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
581 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
582 msgid "Create"
583 msgstr "Создать"
584
@@ -718,22 +718,22 @@ msgstr "Запуск..."
718 msgid "File Browser"
719 msgstr "Просмотр списка файлов"
720
721 -#: lib/browser.tcl:125 lib/browser.tcl:142
721 +#: lib/browser.tcl:126 lib/browser.tcl:143
722 #, tcl-format
723 msgid "Loading %s..."
724 msgstr "Загрузка %s..."
725
726 -#: lib/browser.tcl:186
726 +#: lib/browser.tcl:187
727 msgid "[Up To Parent]"
728 msgstr "[На уровень выше]"
729
730 -#: lib/browser.tcl:266 lib/browser.tcl:272
730 +#: lib/browser.tcl:267 lib/browser.tcl:273
731 msgid "Browse Branch Files"
732 msgstr "Показать файлы ветви"
733
734 -#: lib/browser.tcl:277 lib/choose_repository.tcl:391
735 -#: lib/choose_repository.tcl:482 lib/choose_repository.tcl:492
736 -#: lib/choose_repository.tcl:989
734 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
735 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
736 +#: lib/choose_repository.tcl:987
737 msgid "Browse"
738 msgstr "Показать"
739
@@ -747,7 +747,7 @@ msgstr "Получение %s из %s "
747 msgid "fatal: Cannot resolve %s"
748 msgstr "критическая ошибка: невозможно разрешить %s"
749
750 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
750 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
751 msgid "Close"
752 msgstr "Закрыть"
753
@@ -804,6 +804,10 @@ msgstr ""
804 msgid "Updating working directory to '%s'..."
805 msgstr "Обновление рабочего каталога из '%s'..."
806
807 +#: lib/checkout_op.tcl:323
808 +msgid "files checked out"
809 +msgstr ""
810 +
811 #: lib/checkout_op.tcl:353
812 #, tcl-format
813 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -830,7 +834,7 @@ msgstr ""
834 "Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, "
835 "начиная с 'Текущего отсоединенного состояния'."
836
833 -#: lib/checkout_op.tcl:446
837 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
838 #, tcl-format
839 msgid "Checked out '%s'."
840 msgstr "Ветвь '%s' сделана текущей."
@@ -849,7 +853,7 @@ msgstr "Восстановить потерянные сохраненные с
853 msgid "Reset '%s'?"
854 msgstr "Сбросить '%s'?"
855
852 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
856 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
857 msgid "Visualize"
858 msgstr "Наглядно"
859
@@ -878,15 +882,15 @@ msgstr "Выбрать"
882 msgid "Font Family"
883 msgstr "Шрифт"
884
881 -#: lib/choose_font.tcl:73
885 +#: lib/choose_font.tcl:74
886 msgid "Font Size"
887 msgstr "Размер шрифта"
888
885 -#: lib/choose_font.tcl:90
889 +#: lib/choose_font.tcl:91
890 msgid "Font Example"
891 msgstr "Пример текста"
892
889 -#: lib/choose_font.tcl:101
893 +#: lib/choose_font.tcl:103
894 msgid ""
895 "This is example text.\n"
896 "If you like this text, it can be your font."
@@ -894,226 +898,226 @@ msgstr ""
898 "Это пример текста.\n"
899 "Если Вам нравится этот текст, это может быть Ваш шрифт."
900
897 -#: lib/choose_repository.tcl:27
901 +#: lib/choose_repository.tcl:28
902 msgid "Git Gui"
903 msgstr ""
904
901 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
905 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
906 msgid "Create New Repository"
907 msgstr "Создать новый репозиторий"
908
905 -#: lib/choose_repository.tcl:86
909 +#: lib/choose_repository.tcl:87
910 msgid "New..."
911 msgstr "Новый..."
912
909 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
913 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
914 msgid "Clone Existing Repository"
915 msgstr "Склонировать существующий репозиторий"
916
913 -#: lib/choose_repository.tcl:99
917 +#: lib/choose_repository.tcl:100
918 msgid "Clone..."
919 msgstr "Склонировать..."
920
917 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
921 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
922 msgid "Open Existing Repository"
923 msgstr "Выбрать существующий репозиторий"
924
921 -#: lib/choose_repository.tcl:112
925 +#: lib/choose_repository.tcl:113
926 msgid "Open..."
927 msgstr "Открыть..."
928
925 -#: lib/choose_repository.tcl:125
929 +#: lib/choose_repository.tcl:126
930 msgid "Recent Repositories"
931 msgstr "Недавние репозитории"
932
929 -#: lib/choose_repository.tcl:131
933 +#: lib/choose_repository.tcl:132
934 msgid "Open Recent Repository:"
935 msgstr "Открыть последний репозиторий"
936
933 -#: lib/choose_repository.tcl:294
934 -#, tcl-format
935 -msgid "Location %s already exists."
936 -msgstr "Путь '%s' уже существует."
937 -
938 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
939 -#: lib/choose_repository.tcl:314
937 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
938 +#: lib/choose_repository.tcl:310
939 #, tcl-format
940 msgid "Failed to create repository %s:"
941 msgstr "Не удалось создать репозиторий %s:"
942
944 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
943 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
944 msgid "Directory:"
945 msgstr "Каталог:"
946
948 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
949 -#: lib/choose_repository.tcl:1013
947 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
948 +#: lib/choose_repository.tcl:1011
949 msgid "Git Repository"
950 msgstr "Репозиторий"
951
953 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
952 +#: lib/choose_repository.tcl:437
953 #, tcl-format
954 msgid "Directory %s already exists."
955 msgstr "Каталог '%s' уже существует."
956
958 -#: lib/choose_repository.tcl:442
957 +#: lib/choose_repository.tcl:441
958 #, tcl-format
959 msgid "File %s already exists."
960 msgstr "Файл '%s' уже существует."
961
963 -#: lib/choose_repository.tcl:463
962 +#: lib/choose_repository.tcl:455
963 msgid "Clone"
964 msgstr "Склонировать"
965
967 -#: lib/choose_repository.tcl:476
966 +#: lib/choose_repository.tcl:468
967 msgid "URL:"
968 msgstr "Ссылка:"
969
971 -#: lib/choose_repository.tcl:496
970 +#: lib/choose_repository.tcl:489
971 msgid "Clone Type:"
972 msgstr "Тип клона:"
973
975 -#: lib/choose_repository.tcl:502
974 +#: lib/choose_repository.tcl:495
975 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
976 msgstr "Стандартный (Быстрый, полуизбыточный, \"жесткие\" ссылки)"
977
979 -#: lib/choose_repository.tcl:508
978 +#: lib/choose_repository.tcl:501
979 msgid "Full Copy (Slower, Redundant Backup)"
980 msgstr "Полная копия (Медленный, создает резервную копию)"
981
983 -#: lib/choose_repository.tcl:514
982 +#: lib/choose_repository.tcl:507
983 msgid "Shared (Fastest, Not Recommended, No Backup)"
984 msgstr "Общий (Самый быстрый, не рекомендуется, без резервной копии)"
985
987 -#: lib/choose_repository.tcl:550 lib/choose_repository.tcl:597
988 -#: lib/choose_repository.tcl:738 lib/choose_repository.tcl:808
989 -#: lib/choose_repository.tcl:1019 lib/choose_repository.tcl:1027
986 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
987 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
988 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
989 #, tcl-format
990 msgid "Not a Git repository: %s"
991 msgstr "Каталог не является репозиторием: %s"
992
994 -#: lib/choose_repository.tcl:586
993 +#: lib/choose_repository.tcl:579
994 msgid "Standard only available for local repository."
995 msgstr "Стандартный клон возможен только для локального репозитория."
996
998 -#: lib/choose_repository.tcl:590
997 +#: lib/choose_repository.tcl:583
998 msgid "Shared only available for local repository."
999 msgstr "Общий клон возможен только для локального репозитория."
1000
1002 -#: lib/choose_repository.tcl:617
1001 +#: lib/choose_repository.tcl:604
1002 +#, tcl-format
1003 +msgid "Location %s already exists."
1004 +msgstr "Путь '%s' уже существует."
1005 +
1006 +#: lib/choose_repository.tcl:615
1007 msgid "Failed to configure origin"
1008 msgstr "Не могу сконфигурировать исходный репозиторий."
1009
1006 -#: lib/choose_repository.tcl:629
1010 +#: lib/choose_repository.tcl:627
1011 msgid "Counting objects"
1012 msgstr "Считаю объекты"
1013
1010 -#: lib/choose_repository.tcl:630
1014 +#: lib/choose_repository.tcl:628
1015 msgid "buckets"
1016 msgstr ""
1017
1014 -#: lib/choose_repository.tcl:654
1018 +#: lib/choose_repository.tcl:652
1019 #, tcl-format
1020 msgid "Unable to copy objects/info/alternates: %s"
1021 msgstr "Не могу скопировать objects/info/alternates: %s"
1022
1019 -#: lib/choose_repository.tcl:690
1023 +#: lib/choose_repository.tcl:688
1024 #, tcl-format
1025 msgid "Nothing to clone from %s."
1026 msgstr "Нечего клонировать с %s."
1027
1024 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1025 -#: lib/choose_repository.tcl:918
1028 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1029 +#: lib/choose_repository.tcl:916
1030 msgid "The 'master' branch has not been initialized."
1031 msgstr "Не инициализирована ветвь 'master'."
1032
1029 -#: lib/choose_repository.tcl:705
1033 +#: lib/choose_repository.tcl:703
1034 msgid "Hardlinks are unavailable. Falling back to copying."
1035 msgstr "\"Жесткие ссылки\" не доступны. Буду использовать копирование."
1036
1033 -#: lib/choose_repository.tcl:717
1037 +#: lib/choose_repository.tcl:715
1038 #, tcl-format
1039 msgid "Cloning from %s"
1040 msgstr "Клонирование %s"
1041
1038 -#: lib/choose_repository.tcl:748
1042 +#: lib/choose_repository.tcl:746
1043 msgid "Copying objects"
1044 msgstr "Копирование objects"
1045
1042 -#: lib/choose_repository.tcl:749
1046 +#: lib/choose_repository.tcl:747
1047 msgid "KiB"
1048 msgstr "КБ"
1049
1046 -#: lib/choose_repository.tcl:773
1050 +#: lib/choose_repository.tcl:771
1051 #, tcl-format
1052 msgid "Unable to copy object: %s"
1053 msgstr "Не могу скопировать объект: %s"
1054
1051 -#: lib/choose_repository.tcl:783
1055 +#: lib/choose_repository.tcl:781
1056 msgid "Linking objects"
1057 msgstr "Создание ссылок на objects"
1058
1055 -#: lib/choose_repository.tcl:784
1059 +#: lib/choose_repository.tcl:782
1060 msgid "objects"
1061 msgstr "объекты"
1062
1059 -#: lib/choose_repository.tcl:792
1063 +#: lib/choose_repository.tcl:790
1064 #, tcl-format
1065 msgid "Unable to hardlink object: %s"
1066 msgstr "Не могу \"жестко связать\" объект: %s"
1067
1064 -#: lib/choose_repository.tcl:847
1068 +#: lib/choose_repository.tcl:845
1069 msgid "Cannot fetch branches and objects. See console output for details."
1070 msgstr ""
1071 "Не могу получить ветви и объекты. Дополнительная информация на консоли."
1072
1069 -#: lib/choose_repository.tcl:858
1073 +#: lib/choose_repository.tcl:856
1074 msgid "Cannot fetch tags. See console output for details."
1075 msgstr "Не могу получить метки. Дополнительная информация на консоли."
1076
1073 -#: lib/choose_repository.tcl:882
1077 +#: lib/choose_repository.tcl:880
1078 msgid "Cannot determine HEAD. See console output for details."
1079 msgstr "Не могу определить HEAD. Дополнительная информация на консоли."
1080
1077 -#: lib/choose_repository.tcl:891
1081 +#: lib/choose_repository.tcl:889
1082 #, tcl-format
1083 msgid "Unable to cleanup %s"
1084 msgstr "Не могу очистить %s"
1085
1082 -#: lib/choose_repository.tcl:897
1086 +#: lib/choose_repository.tcl:895
1087 msgid "Clone failed."
1088 msgstr "Клонирование не удалось."
1089
1086 -#: lib/choose_repository.tcl:904
1090 +#: lib/choose_repository.tcl:902
1091 msgid "No default branch obtained."
1092 msgstr "Не было получено ветви по умолчанию."
1093
1090 -#: lib/choose_repository.tcl:915
1094 +#: lib/choose_repository.tcl:913
1095 #, tcl-format
1096 msgid "Cannot resolve %s as a commit."
1097 msgstr "Не могу распознать %s как состояние."
1098
1095 -#: lib/choose_repository.tcl:927
1099 +#: lib/choose_repository.tcl:925
1100 msgid "Creating working directory"
1101 msgstr "Создаю рабочий каталог"
1102
1099 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1103 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1104 #: lib/index.tcl:193
1105 msgid "files"
1106 msgstr "файлов"
1107
1104 -#: lib/choose_repository.tcl:957
1108 +#: lib/choose_repository.tcl:955
1109 msgid "Initial file checkout failed."
1110 msgstr "Не удалось получить начальное состояние файлов репозитория."
1111
1108 -#: lib/choose_repository.tcl:973
1112 +#: lib/choose_repository.tcl:971
1113 msgid "Open"
1114 msgstr "Открыть"
1115
1112 -#: lib/choose_repository.tcl:983
1116 +#: lib/choose_repository.tcl:981
1117 msgid "Repository:"
1118 msgstr "Репозиторий:"
1119
1116 -#: lib/choose_repository.tcl:1033
1120 +#: lib/choose_repository.tcl:1031
1121 #, tcl-format
1122 msgid "Failed to open repository %s:"
1123 msgstr "Не удалось открыть репозиторий %s:"
@@ -1134,7 +1138,7 @@ msgstr "Локальная ветвь:"
1138 msgid "Tracking Branch"
1139 msgstr "Ветвь слежения"
1140
1137 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1141 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1142 msgid "Tag"
1143 msgstr "Таг"
1144
@@ -1151,11 +1155,11 @@ msgstr "Версия не указана."
1155 msgid "Revision expression is empty."
1156 msgstr "Пустое выражение для определения версии."
1157
1154 -#: lib/choose_rev.tcl:530
1158 +#: lib/choose_rev.tcl:531
1159 msgid "Updated"
1160 msgstr "Обновлено"
1161
1158 -#: lib/choose_rev.tcl:558
1162 +#: lib/choose_rev.tcl:559
1163 msgid "URL"
1164 msgstr "Ссылка"
1165
@@ -1246,12 +1250,13 @@ msgstr ""
1250 "Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
1251
1252 #: lib/commit.tcl:183
1253 +#, fuzzy
1254 msgid ""
1255 "Please supply a commit message.\n"
1256 "\n"
1257 "A good commit message has the following format:\n"
1258 "\n"
1254 -"- First line: Describe in one sentance what you did.\n"
1259 +"- First line: Describe in one sentence what you did.\n"
1260 "- Second line: Blank\n"
1261 "- Remaining lines: Describe why this change is good.\n"
1262 msgstr ""
@@ -1263,16 +1268,46 @@ msgstr ""
1268 "- вторая строка пустая\n"
1269 "- оставшиеся строки: опишите, что дают ваши изменения.\n"
1270
1266 -#: lib/commit.tcl:257
1271 +#: lib/commit.tcl:207
1272 +#, tcl-format
1273 +msgid "warning: Tcl does not support encoding '%s'."
1274 +msgstr "предупреждение: Tcl не поддерживает кодировку '%s'."
1275 +
1276 +#: lib/commit.tcl:221
1277 +msgid "Calling pre-commit hook..."
1278 +msgstr ""
1279 +
1280 +#: lib/commit.tcl:236
1281 +msgid "Commit declined by pre-commit hook."
1282 +msgstr ""
1283 +
1284 +#: lib/commit.tcl:259
1285 +msgid "Calling commit-msg hook..."
1286 +msgstr ""
1287 +
1288 +#: lib/commit.tcl:274
1289 +msgid "Commit declined by commit-msg hook."
1290 +msgstr ""
1291 +
1292 +#: lib/commit.tcl:287
1293 +msgid "Committing changes..."
1294 +msgstr ""
1295 +
1296 +#: lib/commit.tcl:303
1297 msgid "write-tree failed:"
1298 msgstr "Программа write-tree завершилась с ошибкой:"
1299
1270 -#: lib/commit.tcl:275
1300 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1301 +#, fuzzy
1302 +msgid "Commit failed."
1303 +msgstr "Клонирование не удалось."
1304 +
1305 +#: lib/commit.tcl:321
1306 #, tcl-format
1307 msgid "Commit %s appears to be corrupt"
1308 msgstr "Состояние %s выглядит поврежденным"
1309
1275 -#: lib/commit.tcl:279
1310 +#: lib/commit.tcl:326
1311 msgid ""
1312 "No changes to commit.\n"
1313 "\n"
@@ -1286,37 +1321,32 @@ msgstr ""
1321 "\n"
1322 "Сейчас автоматически запустится перечитывание репозитория.\n"
1323
1289 -#: lib/commit.tcl:286
1324 +#: lib/commit.tcl:333
1325 msgid "No changes to commit."
1326 msgstr "Отуствуют измения для сохранения."
1327
1293 -#: lib/commit.tcl:303
1294 -#, tcl-format
1295 -msgid "warning: Tcl does not support encoding '%s'."
1296 -msgstr "предупреждение: Tcl не поддерживает кодировку '%s'."
1297 -
1298 -#: lib/commit.tcl:317
1328 +#: lib/commit.tcl:347
1329 msgid "commit-tree failed:"
1330 msgstr "Программа commit-tree завершилась с ошибкой:"
1331
1302 -#: lib/commit.tcl:339
1332 +#: lib/commit.tcl:367
1333 msgid "update-ref failed:"
1334 msgstr "Программа update-ref завершилась с ошибкой:"
1335
1306 -#: lib/commit.tcl:430
1336 +#: lib/commit.tcl:454
1337 #, tcl-format
1338 msgid "Created commit %s: %s"
1339 msgstr "Создано состояние %s: %s "
1340
1311 -#: lib/console.tcl:57
1341 +#: lib/console.tcl:59
1342 msgid "Working... please wait..."
1343 msgstr "В процессе... пожалуйста, ждите..."
1344
1315 -#: lib/console.tcl:183
1345 +#: lib/console.tcl:186
1346 msgid "Success"
1347 msgstr "Процесс успешно завершен"
1348
1319 -#: lib/console.tcl:196
1349 +#: lib/console.tcl:200
1350 msgid "Error: Command Failed"
1351 msgstr "Ошибка: не удалось выполнить команду"
1352
@@ -1426,23 +1456,23 @@ msgstr "* Двоичный файл (содержимое не показано)
1456 msgid "Error loading diff:"
1457 msgstr "Ошибка загрузки diff:"
1458
1429 -#: lib/diff.tcl:302
1459 +#: lib/diff.tcl:303
1460 msgid "Failed to unstage selected hunk."
1461 msgstr "Не удалось исключить выбранную часть."
1462
1433 -#: lib/diff.tcl:309
1463 +#: lib/diff.tcl:310
1464 msgid "Failed to stage selected hunk."
1465 msgstr "Не удалось подготовить к сохранению выбранную часть."
1466
1437 -#: lib/error.tcl:12 lib/error.tcl:102
1467 +#: lib/error.tcl:20 lib/error.tcl:114
1468 msgid "error"
1469 msgstr "ошибка"
1470
1441 -#: lib/error.tcl:28
1471 +#: lib/error.tcl:36
1472 msgid "warning"
1473 msgstr "предупреждение"
1474
1445 -#: lib/error.tcl:81
1475 +#: lib/error.tcl:94
1476 msgid "You must correct the above errors before committing."
1477 msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
1478
@@ -1459,8 +1489,8 @@ msgid ""
1489 "Updating the Git index failed. A rescan will be automatically started to "
1490 "resynchronize git-gui."
1491 msgstr ""
1462 -"Не удалось обновить индекс Git. Состояние репозитория будет"
1463 -"перечитано автоматически."
1492 +"Не удалось обновить индекс Git. Состояние репозитория будетперечитано "
1493 +"автоматически."
1494
1495 #: lib/index.tcl:27
1496 msgid "Continue"
@@ -1475,6 +1505,11 @@ msgstr "Разблокировать индекс"
1505 msgid "Unstaging %s from commit"
1506 msgstr "Удаление %s из подготовленного"
1507
1508 +#: lib/index.tcl:313
1509 +#, fuzzy
1510 +msgid "Ready to commit."
1511 +msgstr "Подготовлено для сохранения"
1512 +
1513 #: lib/index.tcl:326
1514 #, tcl-format
1515 msgid "Adding %s"
@@ -1490,13 +1525,13 @@ msgstr "Отменить изменения в файле %s?"
1525 msgid "Revert changes in these %i files?"
1526 msgstr "Отменить изменения в %i файле(-ах)?"
1527
1493 -#: lib/index.tcl:389
1528 +#: lib/index.tcl:391
1529 msgid "Any unstaged changes will be permanently lost by the revert."
1530 msgstr ""
1531 "Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
1532 "операции."
1533
1499 -#: lib/index.tcl:392
1534 +#: lib/index.tcl:394
1535 msgid "Do Nothing"
1536 msgstr "Ничего не делать"
1537
@@ -1567,28 +1602,28 @@ msgid "%s of %s"
1602 msgstr "%s из %s"
1603
1604 #: lib/merge.tcl:119
1570 -#, tcl-format
1571 -msgid "Merging %s and %s"
1605 +#, fuzzy, tcl-format
1606 +msgid "Merging %s and %s..."
1607 msgstr "Объединение %s и %s"
1608
1574 -#: lib/merge.tcl:131
1609 +#: lib/merge.tcl:130
1610 msgid "Merge completed successfully."
1611 msgstr "Объединение успешно завершено."
1612
1578 -#: lib/merge.tcl:133
1613 +#: lib/merge.tcl:132
1614 msgid "Merge failed. Conflict resolution is required."
1615 msgstr "Не удалось завершить объединение. Требуется разрешение конфликта."
1616
1582 -#: lib/merge.tcl:158
1617 +#: lib/merge.tcl:157
1618 #, tcl-format
1619 msgid "Merge Into %s"
1620 msgstr "Объединить с %s"
1621
1587 -#: lib/merge.tcl:177
1622 +#: lib/merge.tcl:176
1623 msgid "Revision To Merge"
1624 msgstr "Версия для объединения"
1625
1591 -#: lib/merge.tcl:212
1626 +#: lib/merge.tcl:211
1627 msgid ""
1628 "Cannot abort while amending.\n"
1629 "\n"
@@ -1598,7 +1633,7 @@ msgstr ""
1633 "\n"
1634 "Завершите текущее исправление сохраненного состояния.\n"
1635
1601 -#: lib/merge.tcl:222
1636 +#: lib/merge.tcl:221
1637 msgid ""
1638 "Abort merge?\n"
1639 "\n"
@@ -1612,7 +1647,7 @@ msgstr ""
1647 "\n"
1648 "Продолжить?"
1649
1615 -#: lib/merge.tcl:228
1650 +#: lib/merge.tcl:227
1651 msgid ""
1652 "Reset changes?\n"
1653 "\n"
@@ -1626,94 +1661,108 @@ msgstr ""
1661 "\n"
1662 "Продолжить?"
1663
1629 -#: lib/merge.tcl:239
1664 +#: lib/merge.tcl:238
1665 msgid "Aborting"
1666 msgstr "Прерываю"
1667
1633 -#: lib/merge.tcl:266
1668 +#: lib/merge.tcl:238
1669 +#, fuzzy
1670 +msgid "files reset"
1671 +msgstr "файлов"
1672 +
1673 +#: lib/merge.tcl:265
1674 msgid "Abort failed."
1675 msgstr "Прервать не удалось."
1676
1637 -#: lib/merge.tcl:268
1677 +#: lib/merge.tcl:267
1678 msgid "Abort completed. Ready."
1679 msgstr "Прервано."
1680
1641 -#: lib/option.tcl:82
1681 +#: lib/option.tcl:95
1682 msgid "Restore Defaults"
1683 msgstr "Восстановить настройки по умолчанию"
1684
1645 -#: lib/option.tcl:86
1685 +#: lib/option.tcl:99
1686 msgid "Save"
1687 msgstr "Сохранить"
1688
1649 -#: lib/option.tcl:96
1689 +#: lib/option.tcl:109
1690 #, tcl-format
1691 msgid "%s Repository"
1692 msgstr "для репозитория %s"
1693
1654 -#: lib/option.tcl:97
1694 +#: lib/option.tcl:110
1695 msgid "Global (All Repositories)"
1696 msgstr "Общие (для всех репозиториев)"
1697
1658 -#: lib/option.tcl:103
1698 +#: lib/option.tcl:116
1699 msgid "User Name"
1700 msgstr "Имя пользователя"
1701
1662 -#: lib/option.tcl:104
1702 +#: lib/option.tcl:117
1703 msgid "Email Address"
1704 msgstr "Адес электронной почты"
1705
1666 -#: lib/option.tcl:106
1706 +#: lib/option.tcl:119
1707 msgid "Summarize Merge Commits"
1708 msgstr "Суммарный комментарий при объединении"
1709
1670 -#: lib/option.tcl:107
1710 +#: lib/option.tcl:120
1711 msgid "Merge Verbosity"
1712 msgstr "Уровень детальности сообщений при объединении"
1713
1674 -#: lib/option.tcl:108
1714 +#: lib/option.tcl:121
1715 msgid "Show Diffstat After Merge"
1716 msgstr "Показать отчет об изменениях после объединения"
1717
1678 -#: lib/option.tcl:110
1718 +#: lib/option.tcl:123
1719 msgid "Trust File Modification Timestamps"
1720 msgstr "Доверять времени модификации файла"
1721
1682 -#: lib/option.tcl:111
1722 +#: lib/option.tcl:124
1723 msgid "Prune Tracking Branches During Fetch"
1724 msgstr "Чистка ветвей слежения при получении изменений"
1725
1686 -#: lib/option.tcl:112
1726 +#: lib/option.tcl:125
1727 msgid "Match Tracking Branches"
1728 msgstr "Имя новой ветви взять из имен ветвей слежения"
1729
1690 -#: lib/option.tcl:113
1730 +#: lib/option.tcl:126
1731 msgid "Number of Diff Context Lines"
1732 msgstr "Число строк в контексте diff"
1733
1694 -#: lib/option.tcl:114
1734 +#: lib/option.tcl:127
1735 +#, fuzzy
1736 +msgid "Commit Message Text Width"
1737 +msgstr "Комментарий к состоянию:"
1738 +
1739 +#: lib/option.tcl:128
1740 msgid "New Branch Name Template"
1741 msgstr "Шаблон для имени новой ветви"
1742
1698 -#: lib/option.tcl:176
1743 +#: lib/option.tcl:192
1744 +msgid "Spelling Dictionary:"
1745 +msgstr ""
1746 +
1747 +#: lib/option.tcl:216
1748 msgid "Change Font"
1749 msgstr "Изменить шрифт"
1750
1702 -#: lib/option.tcl:180
1751 +#: lib/option.tcl:220
1752 #, tcl-format
1753 msgid "Choose %s"
1754 msgstr "Выберите %s"
1755
1756 # carbon copy
1708 -#: lib/option.tcl:186
1757 +#: lib/option.tcl:226
1758 msgid "pt."
1759 msgstr ""
1760
1712 -#: lib/option.tcl:200
1761 +#: lib/option.tcl:240
1762 msgid "Preferences"
1763 msgstr "Настройки"
1764
1716 -#: lib/option.tcl:235
1765 +#: lib/option.tcl:275
1766 msgid "Failed to completely save options:"
1767 msgstr "Не удалось полностью сохранить настройки:"
1768
@@ -1820,6 +1869,43 @@ msgstr "Невозможно записать ссылку:"
1869 msgid "Cannot write icon:"
1870 msgstr "Невозможно записать значок:"
1871
1872 +#: lib/spellcheck.tcl:57
1873 +msgid "Unsupported spell checker"
1874 +msgstr ""
1875 +
1876 +#: lib/spellcheck.tcl:65
1877 +msgid "Spell checking is unavailable"
1878 +msgstr ""
1879 +
1880 +#: lib/spellcheck.tcl:68
1881 +msgid "Invalid spell checking configuration"
1882 +msgstr ""
1883 +
1884 +#: lib/spellcheck.tcl:70
1885 +#, tcl-format
1886 +msgid "Reverting dictionary to %s."
1887 +msgstr ""
1888 +
1889 +#: lib/spellcheck.tcl:73
1890 +msgid "Spell checker silently failed on startup"
1891 +msgstr ""
1892 +
1893 +#: lib/spellcheck.tcl:80
1894 +msgid "Unrecognized spell checker"
1895 +msgstr ""
1896 +
1897 +#: lib/spellcheck.tcl:180
1898 +msgid "No Suggestions"
1899 +msgstr ""
1900 +
1901 +#: lib/spellcheck.tcl:381
1902 +msgid "Unexpected EOF from spell checker"
1903 +msgstr ""
1904 +
1905 +#: lib/spellcheck.tcl:385
1906 +msgid "Spell Checker Failed"
1907 +msgstr ""
1908 +
1909 #: lib/status_bar.tcl:83
1910 #, tcl-format
1911 msgid "%s ... %*i of %*i %s (%3i%%)"
po/zh_cn.po
+348 -263
@@ -15,7 +15,7 @@
15 # fast forward 快速合并(??)
16 # stage 缓存 (译自 index/cache)
17 # amend 修正
18 -# reset 复位
18 +# reset 复位
19 #
20 # 2008-01-06 Eric Miao <eric.y.miao@gmail.com>
21 # FIXME: checkout 的标准翻译
@@ -25,7 +25,7 @@ msgid ""
25 msgstr ""
26 "Project-Id-Version: git-gui\n"
27 "Report-Msgid-Bugs-To: \n"
28 -"POT-Creation-Date: 2007-11-24 10:36+0100\n"
28 +"POT-Creation-Date: 2008-03-14 07:18+0100\n"
29 "PO-Revision-Date: 2007-07-21 01:23-0700\n"
30 "Last-Translator: Eric Miao <eric.y.miao@gmail.com>\n"
31 "Language-Team: Chinese\n"
@@ -33,33 +33,33 @@ msgstr ""
33 "Content-Type: text/plain; charset=UTF-8\n"
34 "Content-Transfer-Encoding: 8bit\n"
35
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
36 +#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
37 +#: git-gui.sh:763
38 msgid "git-gui: fatal error"
39 msgstr "git-gui: 致命错误"
40
41 -#: git-gui.sh:565
41 +#: git-gui.sh:593
42 #, tcl-format
43 msgid "Invalid font specified in %s:"
44 msgstr "%s 中指定的字体无效:"
45
46 -#: git-gui.sh:590
46 +#: git-gui.sh:620
47 msgid "Main Font"
48 msgstr "主要字体"
49
50 -#: git-gui.sh:591
50 +#: git-gui.sh:621
51 msgid "Diff/Console Font"
52 msgstr "Diff/控制终端字体"
53
54 -#: git-gui.sh:605
54 +#: git-gui.sh:635
55 msgid "Cannot find git in PATH."
56 msgstr "PATH 中没有找到 git"
57
58 -#: git-gui.sh:632
58 +#: git-gui.sh:662
59 msgid "Cannot parse Git version string:"
60 msgstr "无法解析 Git 的版本信息:"
61
62 -#: git-gui.sh:650
62 +#: git-gui.sh:680
63 #, tcl-format
64 msgid ""
65 "Git version cannot be determined.\n"
@@ -78,79 +78,79 @@ msgstr ""
78 "\n"
79 "是否假定 '%s' 为版本 1.5.0?\n"
80
81 -#: git-gui.sh:888
81 +#: git-gui.sh:918
82 msgid "Git directory not found:"
83 msgstr "Git 目录无法找到:"
84
85 -#: git-gui.sh:895
85 +#: git-gui.sh:925
86 msgid "Cannot move to top of working directory:"
87 msgstr "无法移动到工作根目录:"
88
89 -#: git-gui.sh:902
89 +#: git-gui.sh:932
90 msgid "Cannot use funny .git directory:"
91 msgstr "无法使用 .git 目录:"
92
93 -#: git-gui.sh:907
93 +#: git-gui.sh:937
94 msgid "No working directory"
95 msgstr "没有工作目录"
96
97 -#: git-gui.sh:1054
97 +#: git-gui.sh:1084 lib/checkout_op.tcl:283
98 msgid "Refreshing file status..."
99 msgstr "更新文件状态..."
100
101 -#: git-gui.sh:1119
101 +#: git-gui.sh:1149
102 msgid "Scanning for modified files ..."
103 msgstr "扫描修改过的文件 ..."
104
105 -#: git-gui.sh:1294 lib/browser.tcl:245
105 +#: git-gui.sh:1324 lib/browser.tcl:246
106 msgid "Ready."
107 msgstr "就绪"
108
109 -#: git-gui.sh:1560
109 +#: git-gui.sh:1590
110 msgid "Unmodified"
111 msgstr "未修改"
112
113 -#: git-gui.sh:1562
113 +#: git-gui.sh:1592
114 msgid "Modified, not staged"
115 msgstr "修改但未缓存"
116
117 -#: git-gui.sh:1563 git-gui.sh:1568
117 +#: git-gui.sh:1593 git-gui.sh:1598
118 msgid "Staged for commit"
119 msgstr "缓存为提交"
120
121 -#: git-gui.sh:1564 git-gui.sh:1569
121 +#: git-gui.sh:1594 git-gui.sh:1599
122 msgid "Portions staged for commit"
123 msgstr "部分缓存为提交"
124
125 -#: git-gui.sh:1565 git-gui.sh:1570
125 +#: git-gui.sh:1595 git-gui.sh:1600
126 msgid "Staged for commit, missing"
127 msgstr "缓存为提交, 不存在"
128
129 -#: git-gui.sh:1567
129 +#: git-gui.sh:1597
130 msgid "Untracked, not staged"
131 msgstr "未跟踪, 未缓存"
132
133 -#: git-gui.sh:1572
133 +#: git-gui.sh:1602
134 msgid "Missing"
135 msgstr "不存在"
136
137 -#: git-gui.sh:1573
137 +#: git-gui.sh:1603
138 msgid "Staged for removal"
139 msgstr "缓存为删除"
140
141 -#: git-gui.sh:1574
141 +#: git-gui.sh:1604
142 msgid "Staged for removal, still present"
143 msgstr "缓存为删除, 但仍存在"
144
145 -#: git-gui.sh:1576 git-gui.sh:1577 git-gui.sh:1578 git-gui.sh:1579
145 +#: git-gui.sh:1606 git-gui.sh:1607 git-gui.sh:1608 git-gui.sh:1609
146 msgid "Requires merge resolution"
147 msgstr "需要解决合并冲突"
148
149 -#: git-gui.sh:1614
149 +#: git-gui.sh:1644
150 msgid "Starting gitk... please wait..."
151 msgstr "启动 gitk... 请等待..."
152
153 -#: git-gui.sh:1623
153 +#: git-gui.sh:1653
154 #, tcl-format
155 msgid ""
156 "Unable to start gitk:\n"
@@ -161,295 +161,295 @@ msgstr ""
161 "\n"
162 "%s 不存在"
163
164 -#: git-gui.sh:1823 lib/choose_repository.tcl:35
164 +#: git-gui.sh:1860 lib/choose_repository.tcl:36
165 msgid "Repository"
166 msgstr "版本库(repository)"
167
168 -#: git-gui.sh:1824
168 +#: git-gui.sh:1861
169 msgid "Edit"
170 msgstr "编辑"
171
172 -#: git-gui.sh:1826 lib/choose_rev.tcl:560
172 +#: git-gui.sh:1863 lib/choose_rev.tcl:561
173 msgid "Branch"
174 msgstr "分支(branch)"
175
176 -#: git-gui.sh:1829 lib/choose_rev.tcl:547
176 +#: git-gui.sh:1866 lib/choose_rev.tcl:548
177 msgid "Commit@@noun"
178 msgstr "提交(commit)"
179
180 -#: git-gui.sh:1832 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
180 +#: git-gui.sh:1869 lib/merge.tcl:120 lib/merge.tcl:149 lib/merge.tcl:167
181 msgid "Merge"
182 msgstr "合并(merge)"
183
184 -#: git-gui.sh:1833 lib/choose_rev.tcl:556
184 +#: git-gui.sh:1870 lib/choose_rev.tcl:557
185 msgid "Remote"
186 msgstr "远端(remote)"
187
188 -#: git-gui.sh:1842
188 +#: git-gui.sh:1879
189 msgid "Browse Current Branch's Files"
190 msgstr "浏览当前分支上的文件"
191
192 -#: git-gui.sh:1846
192 +#: git-gui.sh:1883
193 msgid "Browse Branch Files..."
194 msgstr "浏览分支上的文件..."
195
196 -#: git-gui.sh:1851
196 +#: git-gui.sh:1888
197 msgid "Visualize Current Branch's History"
198 msgstr "图示当前分支的历史"
199
200 -#: git-gui.sh:1855
200 +#: git-gui.sh:1892
201 msgid "Visualize All Branch History"
202 msgstr "图示所有分支的历史"
203
204 -#: git-gui.sh:1862
204 +#: git-gui.sh:1899
205 #, tcl-format
206 msgid "Browse %s's Files"
207 msgstr "浏览 %s 上的文件"
208
209 -#: git-gui.sh:1864
209 +#: git-gui.sh:1901
210 #, tcl-format
211 msgid "Visualize %s's History"
212 msgstr "图示 %s 分支的历史"
213
214 -#: git-gui.sh:1869 lib/database.tcl:27 lib/database.tcl:67
214 +#: git-gui.sh:1906 lib/database.tcl:27 lib/database.tcl:67
215 msgid "Database Statistics"
216 msgstr "数据库统计信息"
217
218 -#: git-gui.sh:1872 lib/database.tcl:34
218 +#: git-gui.sh:1909 lib/database.tcl:34
219 msgid "Compress Database"
220 msgstr "压缩数据库"
221
222 -#: git-gui.sh:1875
222 +#: git-gui.sh:1912
223 msgid "Verify Database"
224 msgstr "验证数据库"
225
226 -#: git-gui.sh:1882 git-gui.sh:1886 git-gui.sh:1890 lib/shortcut.tcl:7
226 +#: git-gui.sh:1919 git-gui.sh:1923 git-gui.sh:1927 lib/shortcut.tcl:7
227 #: lib/shortcut.tcl:39 lib/shortcut.tcl:71
228 msgid "Create Desktop Icon"
229 msgstr "创建桌面图标"
230
231 -#: git-gui.sh:1895 lib/choose_repository.tcl:176 lib/choose_repository.tcl:184
231 +#: git-gui.sh:1932 lib/choose_repository.tcl:177 lib/choose_repository.tcl:185
232 msgid "Quit"
233 msgstr "退出"
234
235 -#: git-gui.sh:1902
235 +#: git-gui.sh:1939
236 msgid "Undo"
237 msgstr "撤销"
238
239 -#: git-gui.sh:1905
239 +#: git-gui.sh:1942
240 msgid "Redo"
241 msgstr "重做"
242
243 -#: git-gui.sh:1909 git-gui.sh:2403
243 +#: git-gui.sh:1946 git-gui.sh:2443
244 msgid "Cut"
245 msgstr "剪切"
246
247 -#: git-gui.sh:1912 git-gui.sh:2406 git-gui.sh:2477 git-gui.sh:2549
248 -#: lib/console.tcl:67
247 +#: git-gui.sh:1949 git-gui.sh:2446 git-gui.sh:2520 git-gui.sh:2614
248 +#: lib/console.tcl:69
249 msgid "Copy"
250 msgstr "复制"
251
252 -#: git-gui.sh:1915 git-gui.sh:2409
252 +#: git-gui.sh:1952 git-gui.sh:2449
253 msgid "Paste"
254 msgstr "粘贴"
255
256 -#: git-gui.sh:1918 git-gui.sh:2412 lib/branch_delete.tcl:26
256 +#: git-gui.sh:1955 git-gui.sh:2452 lib/branch_delete.tcl:26
257 #: lib/remote_branch_delete.tcl:38
258 msgid "Delete"
259 msgstr "删除"
260
261 -#: git-gui.sh:1922 git-gui.sh:2416 git-gui.sh:2553 lib/console.tcl:69
261 +#: git-gui.sh:1959 git-gui.sh:2456 git-gui.sh:2618 lib/console.tcl:71
262 msgid "Select All"
263 msgstr "全选"
264
265 -#: git-gui.sh:1931
265 +#: git-gui.sh:1968
266 msgid "Create..."
267 msgstr "新建..."
268
269 -#: git-gui.sh:1937
269 +#: git-gui.sh:1974
270 msgid "Checkout..."
271 msgstr "Checkout..."
272
273 -#: git-gui.sh:1943
273 +#: git-gui.sh:1980
274 msgid "Rename..."
275 msgstr "更名..."
276
277 -#: git-gui.sh:1948 git-gui.sh:2048
277 +#: git-gui.sh:1985 git-gui.sh:2085
278 msgid "Delete..."
279 msgstr "删除..."
280
281 -#: git-gui.sh:1953
281 +#: git-gui.sh:1990
282 msgid "Reset..."
283 msgstr "复位(Reset)..."
284
285 -#: git-gui.sh:1965 git-gui.sh:2350
285 +#: git-gui.sh:2002 git-gui.sh:2389
286 msgid "New Commit"
287 msgstr "新建提交"
288
289 -#: git-gui.sh:1973 git-gui.sh:2357
289 +#: git-gui.sh:2010 git-gui.sh:2396
290 msgid "Amend Last Commit"
291 msgstr "修正上次提交"
292
293 -#: git-gui.sh:1982 git-gui.sh:2317 lib/remote_branch_delete.tcl:99
293 +#: git-gui.sh:2019 git-gui.sh:2356 lib/remote_branch_delete.tcl:99
294 msgid "Rescan"
295 msgstr "重新扫描"
296
297 -#: git-gui.sh:1988
297 +#: git-gui.sh:2025
298 msgid "Stage To Commit"
299 msgstr "缓存为提交"
300
301 -#: git-gui.sh:1994
301 +#: git-gui.sh:2031
302 msgid "Stage Changed Files To Commit"
303 msgstr "缓存修改的文件为提交"
304
305 -#: git-gui.sh:2000
305 +#: git-gui.sh:2037
306 msgid "Unstage From Commit"
307 msgstr "从本次提交撤除"
308
309 -#: git-gui.sh:2005 lib/index.tcl:393
309 +#: git-gui.sh:2042 lib/index.tcl:395
310 msgid "Revert Changes"
311 msgstr "撤销修改"
312
313 -#: git-gui.sh:2012 git-gui.sh:2329 git-gui.sh:2427
313 +#: git-gui.sh:2049 git-gui.sh:2368 git-gui.sh:2467
314 msgid "Sign Off"
315 msgstr "签名(Sign Off)"
316
317 -#: git-gui.sh:2016 git-gui.sh:2333
317 +#: git-gui.sh:2053 git-gui.sh:2372
318 msgid "Commit@@verb"
319 msgstr "提交"
320
321 -#: git-gui.sh:2027
321 +#: git-gui.sh:2064
322 msgid "Local Merge..."
323 msgstr "本地合并..."
324
325 -#: git-gui.sh:2032
325 +#: git-gui.sh:2069
326 msgid "Abort Merge..."
327 msgstr "中止合并..."
328
329 -#: git-gui.sh:2044
329 +#: git-gui.sh:2081
330 msgid "Push..."
331 msgstr "上传..."
332
333 -#: git-gui.sh:2055 lib/choose_repository.tcl:40
333 +#: git-gui.sh:2092 lib/choose_repository.tcl:41
334 msgid "Apple"
335 msgstr "苹果"
336
337 -#: git-gui.sh:2058 git-gui.sh:2080 lib/about.tcl:13
338 -#: lib/choose_repository.tcl:43 lib/choose_repository.tcl:49
337 +#: git-gui.sh:2095 git-gui.sh:2117 lib/about.tcl:14
338 +#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
339 #, tcl-format
340 msgid "About %s"
341 msgstr "关于 %s"
342
343 -#: git-gui.sh:2062
343 +#: git-gui.sh:2099
344 msgid "Preferences..."
345 msgstr "首选项..."
346
347 -#: git-gui.sh:2070 git-gui.sh:2595
347 +#: git-gui.sh:2107 git-gui.sh:2639
348 msgid "Options..."
349 msgstr "选项..."
350
351 -#: git-gui.sh:2076 lib/choose_repository.tcl:46
351 +#: git-gui.sh:2113 lib/choose_repository.tcl:47
352 msgid "Help"
353 msgstr "帮助"
354
355 -#: git-gui.sh:2117
355 +#: git-gui.sh:2154
356 msgid "Online Documentation"
357 msgstr "在线文档"
358
359 -#: git-gui.sh:2201
359 +#: git-gui.sh:2238
360 #, tcl-format
361 msgid "fatal: cannot stat path %s: No such file or directory"
362 msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
363
364 -#: git-gui.sh:2234
364 +#: git-gui.sh:2271
365 msgid "Current Branch:"
366 msgstr "当前分支:"
367
368 -#: git-gui.sh:2255
368 +#: git-gui.sh:2292
369 msgid "Staged Changes (Will Commit)"
370 msgstr "已缓存的改动 (将被提交)"
371
372 -#: git-gui.sh:2274
372 +#: git-gui.sh:2312
373 msgid "Unstaged Changes"
374 msgstr "未缓存的改动"
375
376 -#: git-gui.sh:2323
376 +#: git-gui.sh:2362
377 msgid "Stage Changed"
378 msgstr "缓存改动"
379
380 -#: git-gui.sh:2339 lib/transport.tcl:93 lib/transport.tcl:182
380 +#: git-gui.sh:2378 lib/transport.tcl:93 lib/transport.tcl:182
381 msgid "Push"
382 msgstr "上传"
383
384 -#: git-gui.sh:2369
384 +#: git-gui.sh:2408
385 msgid "Initial Commit Message:"
386 msgstr "初始的提交描述:"
387
388 -#: git-gui.sh:2370
388 +#: git-gui.sh:2409
389 msgid "Amended Commit Message:"
390 msgstr "修正的提交描述:"
391
392 -#: git-gui.sh:2371
392 +#: git-gui.sh:2410
393 msgid "Amended Initial Commit Message:"
394 msgstr "修正的初始提交描述:"
395
396 -#: git-gui.sh:2372
396 +#: git-gui.sh:2411
397 msgid "Amended Merge Commit Message:"
398 msgstr "修正的合并提交描述:"
399
400 -#: git-gui.sh:2373
400 +#: git-gui.sh:2412
401 msgid "Merge Commit Message:"
402 msgstr "合并提交描述:"
403
404 -#: git-gui.sh:2374
404 +#: git-gui.sh:2413
405 msgid "Commit Message:"
406 msgstr "提交描述:"
407
408 -#: git-gui.sh:2419 git-gui.sh:2557 lib/console.tcl:71
408 +#: git-gui.sh:2459 git-gui.sh:2622 lib/console.tcl:73
409 msgid "Copy All"
410 msgstr "全部复制"
411
412 -#: git-gui.sh:2443 lib/blame.tcl:104
412 +#: git-gui.sh:2483 lib/blame.tcl:107
413 msgid "File:"
414 msgstr "文件:"
415
416 -#: git-gui.sh:2545
417 -msgid "Refresh"
418 -msgstr "刷新"
419 -
420 -#: git-gui.sh:2566
416 +#: git-gui.sh:2589
417 msgid "Apply/Reverse Hunk"
418 msgstr "应用/撤消此修改块"
419
424 -#: git-gui.sh:2572
425 -msgid "Decrease Font Size"
426 -msgstr "缩小字体"
427 -
428 -#: git-gui.sh:2576
429 -msgid "Increase Font Size"
430 -msgstr "放大字体"
431 -
432 -#: git-gui.sh:2581
420 +#: git-gui.sh:2595
421 msgid "Show Less Context"
422 msgstr "显示更少上下文"
423
436 -#: git-gui.sh:2588
424 +#: git-gui.sh:2602
425 msgid "Show More Context"
426 msgstr "显示更多上下文"
427
440 -#: git-gui.sh:2602
428 +#: git-gui.sh:2610
429 +msgid "Refresh"
430 +msgstr "刷新"
431 +
432 +#: git-gui.sh:2631
433 +msgid "Decrease Font Size"
434 +msgstr "缩小字体"
435 +
436 +#: git-gui.sh:2635
437 +msgid "Increase Font Size"
438 +msgstr "放大字体"
439 +
440 +#: git-gui.sh:2646
441 msgid "Unstage Hunk From Commit"
442 msgstr "从提交中撤除修改块"
443
444 -#: git-gui.sh:2604
444 +#: git-gui.sh:2648
445 msgid "Stage Hunk For Commit"
446 msgstr "缓存修改块为提交"
447
448 -#: git-gui.sh:2623
448 +#: git-gui.sh:2667
449 msgid "Initializing..."
450 msgstr "初始化..."
451
452 -#: git-gui.sh:2718
452 +#: git-gui.sh:2762
453 #, tcl-format
454 msgid ""
455 "Possible environment issues exist.\n"
@@ -464,7 +464,7 @@ msgstr ""
464 "由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
465 "\n"
466
467 -#: git-gui.sh:2748
467 +#: git-gui.sh:2792
468 msgid ""
469 "\n"
470 "This is due to a known issue with the\n"
@@ -474,7 +474,7 @@ msgstr ""
474 "这是由 Cygwin 发布的 Tcl 代码中一个\n"
475 "已知问题所引起."
476
477 -#: git-gui.sh:2753
477 +#: git-gui.sh:2797
478 #, tcl-format
479 msgid ""
480 "\n"
@@ -489,7 +489,7 @@ msgstr ""
489 "%s 的一个很好的替代方案是将 user.name 以及\n"
490 "user.email 设置放在你的个人 ~/.gitconfig 文件中.\n"
491
492 -#: lib/about.tcl:25
492 +#: lib/about.tcl:26
493 msgid "git-gui - a graphical user interface for Git."
494 msgstr "git-gui - Git 的图形化用户界面"
495
@@ -501,56 +501,56 @@ msgstr "文件查看器"
501 msgid "Commit:"
502 msgstr "提交:"
503
504 -#: lib/blame.tcl:249
504 +#: lib/blame.tcl:264
505 msgid "Copy Commit"
506 msgstr "复制提交"
507
508 -#: lib/blame.tcl:369
508 +#: lib/blame.tcl:384
509 #, tcl-format
510 msgid "Reading %s..."
511 msgstr "读取 %s..."
512
513 -#: lib/blame.tcl:473
513 +#: lib/blame.tcl:488
514 msgid "Loading copy/move tracking annotations..."
515 msgstr "装载复制/移动跟踪标注..."
516
517 -#: lib/blame.tcl:493
517 +#: lib/blame.tcl:508
518 msgid "lines annotated"
519 msgstr "标注行"
520
521 -#: lib/blame.tcl:674
521 +#: lib/blame.tcl:689
522 msgid "Loading original location annotations..."
523 msgstr "装载原始位置标注..."
524
525 -#: lib/blame.tcl:677
525 +#: lib/blame.tcl:692
526 msgid "Annotation complete."
527 msgstr "标注完成."
528
529 -#: lib/blame.tcl:731
529 +#: lib/blame.tcl:746
530 msgid "Loading annotation..."
531 msgstr "裝載标注..."
532
533 -#: lib/blame.tcl:787
533 +#: lib/blame.tcl:802
534 msgid "Author:"
535 msgstr "作者:"
536
537 -#: lib/blame.tcl:791
537 +#: lib/blame.tcl:806
538 msgid "Committer:"
539 msgstr "提交者:"
540
541 -#: lib/blame.tcl:796
541 +#: lib/blame.tcl:811
542 msgid "Original File:"
543 msgstr "原始文件:"
544
545 -#: lib/blame.tcl:910
545 +#: lib/blame.tcl:925
546 msgid "Originally By:"
547 msgstr "最初由:"
548
549 -#: lib/blame.tcl:916
549 +#: lib/blame.tcl:931
550 msgid "In File:"
551 msgstr "在文件:"
552
553 -#: lib/blame.tcl:921
553 +#: lib/blame.tcl:936
554 msgid "Copied Or Moved Here By:"
555 msgstr "由复制或移动至此:"
556
@@ -563,17 +563,17 @@ msgid "Checkout"
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
566 +#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
567 +#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:171
568 +#: lib/option.tcl:103 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
569 msgid "Cancel"
570 msgstr "取消"
571
572 -#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
572 +#: lib/branch_checkout.tcl:32 lib/browser.tcl:287
573 msgid "Revision"
574 msgstr "版本"
575
576 -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
576 +#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:242
577 msgid "Options"
578 msgstr "选项..."
579
@@ -593,7 +593,7 @@ msgstr "创建分支"
593 msgid "Create New Branch"
594 msgstr "新建分支"
595
596 -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:375
596 +#: lib/branch_create.tcl:31 lib/choose_repository.tcl:371
597 msgid "Create"
598 msgstr "新建"
599
@@ -733,22 +733,22 @@ msgstr "开始..."
733 msgid "File Browser"
734 msgstr "文件浏览器"
735
736 -#: lib/browser.tcl:125 lib/browser.tcl:142
736 +#: lib/browser.tcl:126 lib/browser.tcl:143
737 #, tcl-format
738 msgid "Loading %s..."
739 msgstr "装载 %s..."
740
741 -#: lib/browser.tcl:186
741 +#: lib/browser.tcl:187
742 msgid "[Up To Parent]"
743 msgstr "[上层目录]"
744
745 -#: lib/browser.tcl:266 lib/browser.tcl:272
745 +#: lib/browser.tcl:267 lib/browser.tcl:273
746 msgid "Browse Branch Files"
747 msgstr "浏览分支文件"
748
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
749 +#: lib/browser.tcl:278 lib/choose_repository.tcl:387
750 +#: lib/choose_repository.tcl:474 lib/choose_repository.tcl:484
751 +#: lib/choose_repository.tcl:987
752 msgid "Browse"
753 msgstr "浏览"
754
@@ -762,7 +762,7 @@ msgstr "获取 %s 自 %s"
762 msgid "fatal: Cannot resolve %s"
763 msgstr "致命错误: 无法解决 %s"
764
765 -#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
765 +#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
766 msgid "Close"
767 msgstr "关闭"
768
@@ -819,6 +819,10 @@ msgstr ""
819 msgid "Updating working directory to '%s'..."
820 msgstr "更新工作目录到 '%s'..."
821
822 +#: lib/checkout_op.tcl:323
823 +msgid "files checked out"
824 +msgstr ""
825 +
826 #: lib/checkout_op.tcl:353
827 #, tcl-format
828 msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -844,7 +848,7 @@ msgstr ""
848 "\n"
849 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
850
847 -#: lib/checkout_op.tcl:446
851 +#: lib/checkout_op.tcl:446 lib/checkout_op.tcl:450
852 #, tcl-format
853 msgid "Checked out '%s'."
854 msgstr "'%s' 已被 checkout"
@@ -863,7 +867,7 @@ msgstr "恢复丢失的提交是比较困难的."
867 msgid "Reset '%s'?"
868 msgstr "复位 '%s'?"
869
866 -#: lib/checkout_op.tcl:510 lib/merge.tcl:164
870 +#: lib/checkout_op.tcl:510 lib/merge.tcl:163
871 msgid "Visualize"
872 msgstr "图示"
873
@@ -892,15 +896,15 @@ msgstr "选择"
896 msgid "Font Family"
897 msgstr "字体族"
898
895 -#: lib/choose_font.tcl:73
899 +#: lib/choose_font.tcl:74
900 msgid "Font Size"
901 msgstr "字体大小"
902
899 -#: lib/choose_font.tcl:90
903 +#: lib/choose_font.tcl:91
904 msgid "Font Example"
905 msgstr "字体样例"
906
903 -#: lib/choose_font.tcl:101
907 +#: lib/choose_font.tcl:103
908 msgid ""
909 "This is example text.\n"
910 "If you like this text, it can be your font."
@@ -908,226 +912,226 @@ msgstr ""
912 "这是样例文本.\n"
913 "如果你喜欢, 你可以设置该字体."
914
911 -#: lib/choose_repository.tcl:27
915 +#: lib/choose_repository.tcl:28
916 msgid "Git Gui"
917 msgstr "Git Gui"
918
915 -#: lib/choose_repository.tcl:80 lib/choose_repository.tcl:380
919 +#: lib/choose_repository.tcl:81 lib/choose_repository.tcl:376
920 msgid "Create New Repository"
921 msgstr "创建新的版本库"
922
919 -#: lib/choose_repository.tcl:86
923 +#: lib/choose_repository.tcl:87
924 msgid "New..."
925 msgstr "新建..."
926
923 -#: lib/choose_repository.tcl:93 lib/choose_repository.tcl:468
927 +#: lib/choose_repository.tcl:94 lib/choose_repository.tcl:460
928 msgid "Clone Existing Repository"
929 msgstr "克隆已有版本库"
930
927 -#: lib/choose_repository.tcl:99
931 +#: lib/choose_repository.tcl:100
932 msgid "Clone..."
933 msgstr "克隆..."
934
931 -#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:978
935 +#: lib/choose_repository.tcl:107 lib/choose_repository.tcl:976
936 msgid "Open Existing Repository"
937 msgstr "打开已有版本库"
938
935 -#: lib/choose_repository.tcl:112
939 +#: lib/choose_repository.tcl:113
940 msgid "Open..."
941 msgstr "打开..."
942
939 -#: lib/choose_repository.tcl:125
943 +#: lib/choose_repository.tcl:126
944 msgid "Recent Repositories"
945 msgstr "最近版本库"
946
943 -#: lib/choose_repository.tcl:131
947 +#: lib/choose_repository.tcl:132
948 msgid "Open Recent Repository:"
949 msgstr "打开最近版本库"
950
947 -#: lib/choose_repository.tcl:294
948 -#, tcl-format
949 -msgid "Location %s already exists."
950 -msgstr "位置 %s 已经存在."
951 -
952 -#: lib/choose_repository.tcl:300 lib/choose_repository.tcl:307
953 -#: lib/choose_repository.tcl:314
951 +#: lib/choose_repository.tcl:296 lib/choose_repository.tcl:303
952 +#: lib/choose_repository.tcl:310
953 #, tcl-format
954 msgid "Failed to create repository %s:"
955 msgstr "无法创建版本库 %s:"
956
958 -#: lib/choose_repository.tcl:385 lib/choose_repository.tcl:486
957 +#: lib/choose_repository.tcl:381 lib/choose_repository.tcl:478
958 msgid "Directory:"
959 msgstr "目录:"
960
962 -#: lib/choose_repository.tcl:415 lib/choose_repository.tcl:544
963 -#: lib/choose_repository.tcl:1013
961 +#: lib/choose_repository.tcl:412 lib/choose_repository.tcl:537
962 +#: lib/choose_repository.tcl:1011
963 msgid "Git Repository"
964 msgstr "Git 版本库"
965
967 -#: lib/choose_repository.tcl:430 lib/choose_repository.tcl:437
966 +#: lib/choose_repository.tcl:437
967 #, tcl-format
968 msgid "Directory %s already exists."
969 msgstr "目录 %s 已经存在."
970
972 -#: lib/choose_repository.tcl:442
971 +#: lib/choose_repository.tcl:441
972 #, tcl-format
973 msgid "File %s already exists."
974 msgstr "文件 %s 已经存在."
975
977 -#: lib/choose_repository.tcl:463
976 +#: lib/choose_repository.tcl:455
977 msgid "Clone"
978 msgstr "克隆"
979
981 -#: lib/choose_repository.tcl:476
980 +#: lib/choose_repository.tcl:468
981 msgid "URL:"
982 msgstr "URL:"
983
985 -#: lib/choose_repository.tcl:496
984 +#: lib/choose_repository.tcl:489
985 msgid "Clone Type:"
986 msgstr "克隆类型:"
987
989 -#: lib/choose_repository.tcl:502
988 +#: lib/choose_repository.tcl:495
989 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
990 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
991
993 -#: lib/choose_repository.tcl:508
992 +#: lib/choose_repository.tcl:501
993 msgid "Full Copy (Slower, Redundant Backup)"
994 msgstr "全部复制 (较慢, 做备份)"
995
997 -#: lib/choose_repository.tcl:514
996 +#: lib/choose_repository.tcl:507
997 msgid "Shared (Fastest, Not Recommended, No Backup)"
998 msgstr "共享方式 (最快, 不推荐, 不做备份)"
999
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
1000 +#: lib/choose_repository.tcl:543 lib/choose_repository.tcl:590
1001 +#: lib/choose_repository.tcl:736 lib/choose_repository.tcl:806
1002 +#: lib/choose_repository.tcl:1017 lib/choose_repository.tcl:1025
1003 #, tcl-format
1004 msgid "Not a Git repository: %s"
1005 msgstr "不是一个 Git 版本库: %s"
1006
1008 -#: lib/choose_repository.tcl:586
1007 +#: lib/choose_repository.tcl:579
1008 msgid "Standard only available for local repository."
1009 msgstr "标准方式仅当是本地版本库时有效."
1010
1012 -#: lib/choose_repository.tcl:590
1011 +#: lib/choose_repository.tcl:583
1012 msgid "Shared only available for local repository."
1013 msgstr "共享方式仅当是本地版本库时有效."
1014
1016 -#: lib/choose_repository.tcl:617
1015 +#: lib/choose_repository.tcl:604
1016 +#, tcl-format
1017 +msgid "Location %s already exists."
1018 +msgstr "位置 %s 已经存在."
1019 +
1020 +#: lib/choose_repository.tcl:615
1021 msgid "Failed to configure origin"
1022 msgstr "无法配置 origin"
1023
1020 -#: lib/choose_repository.tcl:629
1024 +#: lib/choose_repository.tcl:627
1025 msgid "Counting objects"
1026 msgstr "清点对象"
1027
1024 -#: lib/choose_repository.tcl:630
1028 +#: lib/choose_repository.tcl:628
1029 #, fuzzy
1030 msgid "buckets"
1031 msgstr "水桶??"
1032
1029 -#: lib/choose_repository.tcl:654
1033 +#: lib/choose_repository.tcl:652
1034 #, tcl-format
1035 msgid "Unable to copy objects/info/alternates: %s"
1036 msgstr "无法复制 objects/info/alternates: %s"
1037
1034 -#: lib/choose_repository.tcl:690
1038 +#: lib/choose_repository.tcl:688
1039 #, tcl-format
1040 msgid "Nothing to clone from %s."
1041 msgstr "没有东西可从 %s 克隆."
1042
1039 -#: lib/choose_repository.tcl:692 lib/choose_repository.tcl:906
1040 -#: lib/choose_repository.tcl:918
1043 +#: lib/choose_repository.tcl:690 lib/choose_repository.tcl:904
1044 +#: lib/choose_repository.tcl:916
1045 msgid "The 'master' branch has not been initialized."
1046 msgstr "'master'分支尚未初始化."
1047
1044 -#: lib/choose_repository.tcl:705
1048 +#: lib/choose_repository.tcl:703
1049 msgid "Hardlinks are unavailable. Falling back to copying."
1050 msgstr "硬连接不可用. 使用复制."
1051
1048 -#: lib/choose_repository.tcl:717
1052 +#: lib/choose_repository.tcl:715
1053 #, tcl-format
1054 msgid "Cloning from %s"
1055 msgstr "从 %s 克隆"
1056
1053 -#: lib/choose_repository.tcl:748
1057 +#: lib/choose_repository.tcl:746
1058 msgid "Copying objects"
1059 msgstr "复制 objects"
1060
1057 -#: lib/choose_repository.tcl:749
1061 +#: lib/choose_repository.tcl:747
1062 msgid "KiB"
1063 msgstr "KiB"
1064
1061 -#: lib/choose_repository.tcl:773
1065 +#: lib/choose_repository.tcl:771
1066 #, tcl-format
1067 msgid "Unable to copy object: %s"
1068 msgstr "无法复制 object: %s"
1069
1066 -#: lib/choose_repository.tcl:783
1070 +#: lib/choose_repository.tcl:781
1071 msgid "Linking objects"
1072 msgstr "链接 objects"
1073
1070 -#: lib/choose_repository.tcl:784
1074 +#: lib/choose_repository.tcl:782
1075 msgid "objects"
1076 msgstr "objects"
1077
1074 -#: lib/choose_repository.tcl:792
1078 +#: lib/choose_repository.tcl:790
1079 #, tcl-format
1080 msgid "Unable to hardlink object: %s"
1081 msgstr "无法硬链接 object: %s"
1082
1079 -#: lib/choose_repository.tcl:847
1083 +#: lib/choose_repository.tcl:845
1084 msgid "Cannot fetch branches and objects. See console output for details."
1085 msgstr "无法获取分支和对象. 请查看控制终端的输出."
1086
1083 -#: lib/choose_repository.tcl:858
1087 +#: lib/choose_repository.tcl:856
1088 msgid "Cannot fetch tags. See console output for details."
1089 msgstr "无法获取标签. 请查看控制终端的输出."
1090
1087 -#: lib/choose_repository.tcl:882
1091 +#: lib/choose_repository.tcl:880
1092 msgid "Cannot determine HEAD. See console output for details."
1093 msgstr "无法确定 HEAD. 请查看控制终端的输出."
1094
1091 -#: lib/choose_repository.tcl:891
1095 +#: lib/choose_repository.tcl:889
1096 #, tcl-format
1097 msgid "Unable to cleanup %s"
1098 msgstr "无法清理 %s"
1099
1096 -#: lib/choose_repository.tcl:897
1100 +#: lib/choose_repository.tcl:895
1101 msgid "Clone failed."
1102 msgstr "克隆失败."
1103
1100 -#: lib/choose_repository.tcl:904
1104 +#: lib/choose_repository.tcl:902
1105 msgid "No default branch obtained."
1106 msgstr "没有获取缺省分支"
1107
1104 -#: lib/choose_repository.tcl:915
1108 +#: lib/choose_repository.tcl:913
1109 #, tcl-format
1110 msgid "Cannot resolve %s as a commit."
1111 msgstr "无法解析 %s 为提交."
1112
1109 -#: lib/choose_repository.tcl:927
1113 +#: lib/choose_repository.tcl:925
1114 msgid "Creating working directory"
1115 msgstr "创建工作目录"
1116
1113 -#: lib/choose_repository.tcl:928 lib/index.tcl:65 lib/index.tcl:127
1117 +#: lib/choose_repository.tcl:926 lib/index.tcl:65 lib/index.tcl:127
1118 #: lib/index.tcl:193
1119 msgid "files"
1120 msgstr "文件"
1121
1118 -#: lib/choose_repository.tcl:957
1122 +#: lib/choose_repository.tcl:955
1123 msgid "Initial file checkout failed."
1124 msgstr "初始的文件checkout失败"
1125
1122 -#: lib/choose_repository.tcl:973
1126 +#: lib/choose_repository.tcl:971
1127 msgid "Open"
1128 msgstr "打开"
1129
1126 -#: lib/choose_repository.tcl:983
1130 +#: lib/choose_repository.tcl:981
1131 msgid "Repository:"
1132 msgstr "版本库"
1133
1130 -#: lib/choose_repository.tcl:1033
1134 +#: lib/choose_repository.tcl:1031
1135 #, tcl-format
1136 msgid "Failed to open repository %s:"
1137 msgstr "无法打开版本库 %s:"
@@ -1148,7 +1152,7 @@ msgstr "本地分支"
1152 msgid "Tracking Branch"
1153 msgstr "跟踪分支:"
1154
1151 -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1155 +#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1156 msgid "Tag"
1157 msgstr "标签"
1158
@@ -1165,11 +1169,11 @@ msgstr "没有选择版本."
1169 msgid "Revision expression is empty."
1170 msgstr "版本表达式为空."
1171
1168 -#: lib/choose_rev.tcl:530
1172 +#: lib/choose_rev.tcl:531
1173 msgid "Updated"
1174 msgstr "已更新"
1175
1172 -#: lib/choose_rev.tcl:558
1176 +#: lib/choose_rev.tcl:559
1177 msgid "URL"
1178 msgstr "URL"
1179
@@ -1276,16 +1280,46 @@ msgstr ""
1280 "- 第二行: 空行\n"
1281 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
1282
1279 -#: lib/commit.tcl:257
1283 +#: lib/commit.tcl:207
1284 +#, tcl-format
1285 +msgid "warning: Tcl does not support encoding '%s'."
1286 +msgstr "警告: Tcl 不支持编码方式 '%s'."
1287 +
1288 +#: lib/commit.tcl:221
1289 +msgid "Calling pre-commit hook..."
1290 +msgstr ""
1291 +
1292 +#: lib/commit.tcl:236
1293 +msgid "Commit declined by pre-commit hook."
1294 +msgstr ""
1295 +
1296 +#: lib/commit.tcl:259
1297 +msgid "Calling commit-msg hook..."
1298 +msgstr ""
1299 +
1300 +#: lib/commit.tcl:274
1301 +msgid "Commit declined by commit-msg hook."
1302 +msgstr ""
1303 +
1304 +#: lib/commit.tcl:287
1305 +msgid "Committing changes..."
1306 +msgstr ""
1307 +
1308 +#: lib/commit.tcl:303
1309 msgid "write-tree failed:"
1310 msgstr "write-tree 失败:"
1311
1283 -#: lib/commit.tcl:275
1312 +#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1313 +#, fuzzy
1314 +msgid "Commit failed."
1315 +msgstr "克隆失败."
1316 +
1317 +#: lib/commit.tcl:321
1318 #, tcl-format
1319 msgid "Commit %s appears to be corrupt"
1320 msgstr "提交 %s 似乎已损坏"
1321
1288 -#: lib/commit.tcl:279
1322 +#: lib/commit.tcl:326
1323 msgid ""
1324 "No changes to commit.\n"
1325 "\n"
@@ -1299,37 +1333,32 @@ msgstr ""
1333 "\n"
1334 "重新扫描将自动开始.\n"
1335
1302 -#: lib/commit.tcl:286
1336 +#: lib/commit.tcl:333
1337 msgid "No changes to commit."
1338 msgstr "没有改动要提交."
1339
1306 -#: lib/commit.tcl:303
1307 -#, tcl-format
1308 -msgid "warning: Tcl does not support encoding '%s'."
1309 -msgstr "警告: Tcl 不支持编码方式 '%s'."
1310 -
1311 -#: lib/commit.tcl:317
1340 +#: lib/commit.tcl:347
1341 msgid "commit-tree failed:"
1342 msgstr "commit-tree 失败:"
1343
1315 -#: lib/commit.tcl:339
1344 +#: lib/commit.tcl:367
1345 msgid "update-ref failed:"
1346 msgstr "update-ref 失败:"
1347
1319 -#: lib/commit.tcl:430
1348 +#: lib/commit.tcl:454
1349 #, tcl-format
1350 msgid "Created commit %s: %s"
1351 msgstr "创建了 commit %s: %s"
1352
1324 -#: lib/console.tcl:57
1353 +#: lib/console.tcl:59
1354 msgid "Working... please wait..."
1355 msgstr "工作中... 请等待..."
1356
1328 -#: lib/console.tcl:183
1357 +#: lib/console.tcl:186
1358 msgid "Success"
1359 msgstr "成功"
1360
1332 -#: lib/console.tcl:196
1361 +#: lib/console.tcl:200
1362 msgid "Error: Command Failed"
1363 msgstr "错误: 命令失败"
1364
@@ -1435,23 +1464,23 @@ msgstr "* 二进制文件 (不显示内容)."
1464 msgid "Error loading diff:"
1465 msgstr "装载 diff 错误:"
1466
1438 -#: lib/diff.tcl:302
1467 +#: lib/diff.tcl:303
1468 msgid "Failed to unstage selected hunk."
1469 msgstr "无法将选择的代码段从缓存中删除."
1470
1442 -#: lib/diff.tcl:309
1471 +#: lib/diff.tcl:310
1472 msgid "Failed to stage selected hunk."
1473 msgstr "无法缓存所选代码段."
1474
1446 -#: lib/error.tcl:12 lib/error.tcl:102
1475 +#: lib/error.tcl:20 lib/error.tcl:114
1476 msgid "error"
1477 msgstr "错误"
1478
1450 -#: lib/error.tcl:28
1479 +#: lib/error.tcl:36
1480 msgid "warning"
1481 msgstr "警告"
1482
1454 -#: lib/error.tcl:81
1483 +#: lib/error.tcl:94
1484 msgid "You must correct the above errors before committing."
1485 msgstr "你必须在提交前修正上述错误."
1486
@@ -1482,6 +1511,11 @@ msgstr "解锁 Index"
1511 msgid "Unstaging %s from commit"
1512 msgstr "从提交缓存中删除 %s"
1513
1514 +#: lib/index.tcl:313
1515 +#, fuzzy
1516 +msgid "Ready to commit."
1517 +msgstr "缓存为提交"
1518 +
1519 #: lib/index.tcl:326
1520 #, tcl-format
1521 msgid "Adding %s"
@@ -1497,11 +1531,11 @@ msgstr "撤销文件 %s 中的改动?"
1531 msgid "Revert changes in these %i files?"
1532 msgstr "撤销这些 (%i个) 文件的改动?"
1533
1500 -#: lib/index.tcl:389
1534 +#: lib/index.tcl:391
1535 msgid "Any unstaged changes will be permanently lost by the revert."
1536 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
1537
1504 -#: lib/index.tcl:392
1538 +#: lib/index.tcl:394
1539 msgid "Do Nothing"
1540 msgstr "不做操作"
1541
@@ -1562,8 +1596,8 @@ msgstr ""
1596 "\n"
1597 "文件 %s 已被修改.\n"
1598 "\n"
1565 -"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于"
1566 -"中止一次失败的合并.\n"
1599 +"你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合"
1600 +"并.\n"
1601
1602 #: lib/merge.tcl:106
1603 #, tcl-format
@@ -1571,28 +1605,28 @@ msgid "%s of %s"
1605 msgstr ""
1606
1607 #: lib/merge.tcl:119
1574 -#, tcl-format
1575 -msgid "Merging %s and %s"
1608 +#, fuzzy, tcl-format
1609 +msgid "Merging %s and %s..."
1610 msgstr "合并 %s 和 %s"
1611
1578 -#: lib/merge.tcl:131
1612 +#: lib/merge.tcl:130
1613 msgid "Merge completed successfully."
1614 msgstr "合并成功完成."
1615
1582 -#: lib/merge.tcl:133
1616 +#: lib/merge.tcl:132
1617 msgid "Merge failed. Conflict resolution is required."
1618 msgstr "合并失败. 需要解决冲突."
1619
1586 -#: lib/merge.tcl:158
1620 +#: lib/merge.tcl:157
1621 #, tcl-format
1622 msgid "Merge Into %s"
1623 msgstr "合并到 %s"
1624
1591 -#: lib/merge.tcl:177
1625 +#: lib/merge.tcl:176
1626 msgid "Revision To Merge"
1627 msgstr "要合并的版本"
1628
1595 -#: lib/merge.tcl:212
1629 +#: lib/merge.tcl:211
1630 msgid ""
1631 "Cannot abort while amending.\n"
1632 "\n"
@@ -1602,7 +1636,7 @@ msgstr ""
1636 "\n"
1637 "你必须先完成本次修正操作.\n"
1638
1605 -#: lib/merge.tcl:222
1639 +#: lib/merge.tcl:221
1640 msgid ""
1641 "Abort merge?\n"
1642 "\n"
@@ -1616,7 +1650,7 @@ msgstr ""
1650 "\n"
1651 "是否要继续中止当前的合并操作?"
1652
1619 -#: lib/merge.tcl:228
1653 +#: lib/merge.tcl:227
1654 msgid ""
1655 "Reset changes?\n"
1656 "\n"
@@ -1630,93 +1664,107 @@ msgstr ""
1664 "\n"
1665 "是否要继续复位当前的改动?"
1666
1633 -#: lib/merge.tcl:239
1667 +#: lib/merge.tcl:238
1668 msgid "Aborting"
1669 msgstr "中止"
1670
1637 -#: lib/merge.tcl:266
1671 +#: lib/merge.tcl:238
1672 +#, fuzzy
1673 +msgid "files reset"
1674 +msgstr "文件"
1675 +
1676 +#: lib/merge.tcl:265
1677 msgid "Abort failed."
1678 msgstr "中止失败"
1679
1641 -#: lib/merge.tcl:268
1680 +#: lib/merge.tcl:267
1681 msgid "Abort completed. Ready."
1682 msgstr "中止完成. 就绪."
1683
1645 -#: lib/option.tcl:82
1684 +#: lib/option.tcl:95
1685 msgid "Restore Defaults"
1686 msgstr "恢复默认值"
1687
1649 -#: lib/option.tcl:86
1688 +#: lib/option.tcl:99
1689 msgid "Save"
1690 msgstr "保存"
1691
1653 -#: lib/option.tcl:96
1692 +#: lib/option.tcl:109
1693 #, tcl-format
1694 msgid "%s Repository"
1695 msgstr "%s 版本库"
1696
1658 -#: lib/option.tcl:97
1697 +#: lib/option.tcl:110
1698 msgid "Global (All Repositories)"
1699 msgstr "全局 (所有版本库)"
1700
1662 -#: lib/option.tcl:103
1701 +#: lib/option.tcl:116
1702 msgid "User Name"
1703 msgstr "用户名"
1704
1666 -#: lib/option.tcl:104
1705 +#: lib/option.tcl:117
1706 msgid "Email Address"
1707 msgstr "Email 地址"
1708
1670 -#: lib/option.tcl:106
1709 +#: lib/option.tcl:119
1710 msgid "Summarize Merge Commits"
1711 msgstr "概述合并提交:"
1712
1674 -#: lib/option.tcl:107
1713 +#: lib/option.tcl:120
1714 msgid "Merge Verbosity"
1715 msgstr "合并冗余度"
1716
1678 -#: lib/option.tcl:108
1717 +#: lib/option.tcl:121
1718 msgid "Show Diffstat After Merge"
1719 msgstr "在合并后显示 Diffstat"
1720
1682 -#: lib/option.tcl:110
1721 +#: lib/option.tcl:123
1722 msgid "Trust File Modification Timestamps"
1723 msgstr "相信文件的改动时间"
1724
1686 -#: lib/option.tcl:111
1725 +#: lib/option.tcl:124
1726 msgid "Prune Tracking Branches During Fetch"
1727 msgstr "获取时清除跟踪分支"
1728
1690 -#: lib/option.tcl:112
1729 +#: lib/option.tcl:125
1730 msgid "Match Tracking Branches"
1731 msgstr "匹配跟踪分支"
1732
1694 -#: lib/option.tcl:113
1733 +#: lib/option.tcl:126
1734 msgid "Number of Diff Context Lines"
1735 msgstr "Diff 上下文行数"
1736
1698 -#: lib/option.tcl:114
1737 +#: lib/option.tcl:127
1738 +#, fuzzy
1739 +msgid "Commit Message Text Width"
1740 +msgstr "提交描述:"
1741 +
1742 +#: lib/option.tcl:128
1743 msgid "New Branch Name Template"
1744 msgstr "新建分支命名模板"
1745
1702 -#: lib/option.tcl:176
1746 +#: lib/option.tcl:192
1747 +msgid "Spelling Dictionary:"
1748 +msgstr ""
1749 +
1750 +#: lib/option.tcl:216
1751 msgid "Change Font"
1752 msgstr "更改字体"
1753
1706 -#: lib/option.tcl:180
1754 +#: lib/option.tcl:220
1755 #, tcl-format
1756 msgid "Choose %s"
1757 msgstr "选择 %s"
1758
1711 -#: lib/option.tcl:186
1759 +#: lib/option.tcl:226
1760 msgid "pt."
1761 msgstr "磅"
1762
1715 -#: lib/option.tcl:200
1763 +#: lib/option.tcl:240
1764 msgid "Preferences"
1765 msgstr "首选项"
1766
1719 -#: lib/option.tcl:235
1767 +#: lib/option.tcl:275
1768 msgid "Failed to completely save options:"
1769 msgstr "无法完全保存选项:"
1770
@@ -1823,6 +1871,43 @@ msgstr "无法修改快捷方式:"
1871 msgid "Cannot write icon:"
1872 msgstr "无法修改图标:"
1873
1874 +#: lib/spellcheck.tcl:57
1875 +msgid "Unsupported spell checker"
1876 +msgstr ""
1877 +
1878 +#: lib/spellcheck.tcl:65
1879 +msgid "Spell checking is unavailable"
1880 +msgstr ""
1881 +
1882 +#: lib/spellcheck.tcl:68
1883 +msgid "Invalid spell checking configuration"
1884 +msgstr ""
1885 +
1886 +#: lib/spellcheck.tcl:70
1887 +#, tcl-format
1888 +msgid "Reverting dictionary to %s."
1889 +msgstr ""
1890 +
1891 +#: lib/spellcheck.tcl:73
1892 +msgid "Spell checker silently failed on startup"
1893 +msgstr ""
1894 +
1895 +#: lib/spellcheck.tcl:80
1896 +msgid "Unrecognized spell checker"
1897 +msgstr ""
1898 +
1899 +#: lib/spellcheck.tcl:180
1900 +msgid "No Suggestions"
1901 +msgstr ""
1902 +
1903 +#: lib/spellcheck.tcl:381
1904 +msgid "Unexpected EOF from spell checker"
1905 +msgstr ""
1906 +
1907 +#: lib/spellcheck.tcl:385
1908 +msgid "Spell Checker Failed"
1909 +msgstr ""
1910 +
1911 #: lib/status_bar.tcl:83
1912 #, tcl-format
1913 msgid "%s ... %*i of %*i %s (%3i%%)"