git-gui: Updated po strings based on current sources
Shawn O. Pearce committed
Oct 10, 2007 at 04:11 UTC
57364320bf5a15e849ea627423397eda3f34ebb7
7 files changed
+4423
-1657
po/de.po
+235
-218
@@ -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-05 22:01+0200\n"
10
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
11
"PO-Revision-Date: 2007-10-05 22:27+0200\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:631 git-gui.sh:645 git-gui.sh:658 git-gui.sh:740
19
-#: git-gui.sh:759
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:592
23
+#: git-gui.sh:595
24
#, tcl-format
25
msgid "Invalid font specified in %s:"
26
msgstr "Ungültige Zeichensatz-Angabe in %s:"
27
28
-#: git-gui.sh:617
28
+#: git-gui.sh:620
29
msgid "Main Font"
30
msgstr "Programmschriftart"
31
32
-#: git-gui.sh:618
32
+#: git-gui.sh:621
33
msgid "Diff/Console Font"
34
msgstr "Vergleich-Schriftart"
35
36
-#: git-gui.sh:632
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:659
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:676
44
+#: git-gui.sh:680
45
#, tcl-format
46
msgid ""
47
"Git version cannot be determined.\n"
@@ -60,79 +60,81 @@ msgstr ""
60
"\n"
61
"Soll angenommen werden, »%s« sei Version 1.5.0?\n"
62
63
-#: git-gui.sh:849
63
+#: git-gui.sh:853
64
msgid "Git directory not found:"
65
msgstr "Git-Verzeichnis nicht gefunden:"
66
67
-#: git-gui.sh:856
67
+#: git-gui.sh:860
68
msgid "Cannot move to top of working directory:"
69
-msgstr "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt werden:"
69
+msgstr ""
70
+"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
71
+"werden:"
72
71
-#: git-gui.sh:863
73
+#: git-gui.sh:867
74
msgid "Cannot use funny .git directory:"
75
msgstr "Unerwartete Struktur des .git Verzeichnis:"
76
75
-#: git-gui.sh:868
77
+#: git-gui.sh:872
78
msgid "No working directory"
79
msgstr "Kein Arbeitsverzeichnis"
80
79
-#: git-gui.sh:1015
81
+#: git-gui.sh:1019
82
msgid "Refreshing file status..."
83
msgstr "Dateistatus aktualisieren..."
84
83
-#: git-gui.sh:1080
85
+#: git-gui.sh:1084
86
msgid "Scanning for modified files ..."
87
msgstr "Nach geänderten Dateien suchen..."
88
87
-#: git-gui.sh:1255 lib/browser.tcl:245
89
+#: git-gui.sh:1259 lib/browser.tcl:245
90
msgid "Ready."
91
msgstr "Bereit."
92
91
-#: git-gui.sh:1521
93
+#: git-gui.sh:1525
94
msgid "Unmodified"
95
msgstr "Unverändert"
96
95
-#: git-gui.sh:1523
97
+#: git-gui.sh:1527
98
msgid "Modified, not staged"
99
msgstr "Verändert, nicht bereitgestellt"
100
99
-#: git-gui.sh:1524 git-gui.sh:1529
101
+#: git-gui.sh:1528 git-gui.sh:1533
102
msgid "Staged for commit"
103
msgstr "Bereitgestellt zum Eintragen"
104
103
-#: git-gui.sh:1525 git-gui.sh:1530
105
+#: git-gui.sh:1529 git-gui.sh:1534
106
msgid "Portions staged for commit"
107
msgstr "Teilweise bereitgestellt zum Eintragen"
108
107
-#: git-gui.sh:1526 git-gui.sh:1531
109
+#: git-gui.sh:1530 git-gui.sh:1535
110
msgid "Staged for commit, missing"
111
msgstr "Bereitgestellt zum Eintragen, fehlend"
112
111
-#: git-gui.sh:1528
113
+#: git-gui.sh:1532
114
msgid "Untracked, not staged"
115
msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
116
115
-#: git-gui.sh:1533
117
+#: git-gui.sh:1537
118
msgid "Missing"
119
msgstr "Fehlend"
120
119
-#: git-gui.sh:1534
121
+#: git-gui.sh:1538
122
msgid "Staged for removal"
123
msgstr "Bereitgestellt zum Löschen"
124
123
-#: git-gui.sh:1535
125
+#: git-gui.sh:1539
126
msgid "Staged for removal, still present"
127
msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
128
127
-#: git-gui.sh:1537 git-gui.sh:1538 git-gui.sh:1539 git-gui.sh:1540
129
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
130
msgid "Requires merge resolution"
131
msgstr "Konfliktauflösung nötig"
132
131
-#: git-gui.sh:1575
133
+#: git-gui.sh:1579
134
msgid "Starting gitk... please wait..."
135
msgstr "Gitk wird gestartet... bitte warten."
136
135
-#: git-gui.sh:1584
137
+#: git-gui.sh:1588
138
#, tcl-format
139
msgid ""
140
"Unable to start gitk:\n"
@@ -143,291 +145,297 @@ msgstr ""
145
"\n"
146
"%s existiert nicht"
147
146
-#: git-gui.sh:1784 lib/choose_repository.tcl:64
148
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
149
msgid "Repository"
150
msgstr "Projektarchiv"
151
150
-#: git-gui.sh:1785
152
+#: git-gui.sh:1789
153
msgid "Edit"
154
msgstr "Bearbeiten"
155
154
-#: git-gui.sh:1787 lib/choose_rev.tcl:560
156
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
157
msgid "Branch"
158
msgstr "Zweig"
159
158
-#: git-gui.sh:1790 lib/choose_rev.tcl:547
160
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
161
msgid "Commit@@noun"
162
msgstr "Version"
163
162
-#: git-gui.sh:1793 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
164
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
165
msgid "Merge"
166
msgstr "Zusammenführen"
167
166
-#: git-gui.sh:1794
167
-msgid "Fetch"
168
-msgstr "Anfordern"
169
-
170
-#: git-gui.sh:1795 git-gui.sh:2294 lib/transport.tcl:93 lib/transport.tcl:182
171
-msgid "Push"
172
-msgstr "Ausliefern"
168
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
169
+msgid "Remote"
170
+msgstr "Gegenseite"
171
174
-#: git-gui.sh:1804
172
+#: git-gui.sh:1807
173
msgid "Browse Current Branch's Files"
174
msgstr "Aktuellen Zweig durchblättern"
175
178
-#: git-gui.sh:1808
176
+#: git-gui.sh:1811
177
msgid "Browse Branch Files..."
178
msgstr "Einen Zweig durchblättern..."
179
182
-#: git-gui.sh:1813
180
+#: git-gui.sh:1816
181
msgid "Visualize Current Branch's History"
182
msgstr "Aktuellen Zweig darstellen"
183
186
-#: git-gui.sh:1817
184
+#: git-gui.sh:1820
185
msgid "Visualize All Branch History"
186
msgstr "Alle Zweige darstellen"
187
190
-#: git-gui.sh:1824
188
+#: git-gui.sh:1827
189
#, tcl-format
190
msgid "Browse %s's Files"
191
msgstr "Zweig »%s« durchblättern"
192
195
-#: git-gui.sh:1826
193
+#: git-gui.sh:1829
194
#, tcl-format
195
msgid "Visualize %s's History"
196
msgstr "Historie von »%s« darstellen"
197
200
-#: git-gui.sh:1831 lib/database.tcl:27 lib/database.tcl:67
198
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
199
msgid "Database Statistics"
200
msgstr "Datenbankstatistik"
201
204
-#: git-gui.sh:1834 lib/database.tcl:34
202
+#: git-gui.sh:1837 lib/database.tcl:34
203
msgid "Compress Database"
204
msgstr "Datenbank komprimieren"
205
208
-#: git-gui.sh:1837
206
+#: git-gui.sh:1840
207
msgid "Verify Database"
208
msgstr "Datenbank überprüfen"
209
212
-#: git-gui.sh:1844 git-gui.sh:1848 git-gui.sh:1852 lib/shortcut.tcl:9
210
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
211
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
212
msgid "Create Desktop Icon"
213
msgstr "Desktop-Icon erstellen"
214
217
-#: git-gui.sh:1857 lib/choose_repository.tcl:68 lib/choose_repository.tcl:132
215
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
216
msgid "Quit"
217
msgstr "Beenden"
218
221
-#: git-gui.sh:1864
219
+#: git-gui.sh:1867
220
msgid "Undo"
221
msgstr "Rückgängig"
222
225
-#: git-gui.sh:1867
223
+#: git-gui.sh:1870
224
msgid "Redo"
225
msgstr "Wiederholen"
226
229
-#: git-gui.sh:1871 git-gui.sh:2358
227
+#: git-gui.sh:1874 git-gui.sh:2366
228
msgid "Cut"
229
msgstr "Ausschneiden"
230
233
-#: git-gui.sh:1874 git-gui.sh:2361 git-gui.sh:2432 git-gui.sh:2504
231
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
232
#: lib/console.tcl:67
233
msgid "Copy"
234
msgstr "Kopieren"
235
238
-#: git-gui.sh:1877 git-gui.sh:2364
236
+#: git-gui.sh:1880 git-gui.sh:2372
237
msgid "Paste"
238
msgstr "Einfügen"
239
242
-#: git-gui.sh:1880 git-gui.sh:2367 lib/branch_delete.tcl:26
240
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
241
#: lib/remote_branch_delete.tcl:38
242
msgid "Delete"
243
msgstr "Löschen"
244
247
-#: git-gui.sh:1884 git-gui.sh:2371 git-gui.sh:2508 lib/console.tcl:69
245
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
246
msgid "Select All"
247
msgstr "Alle auswählen"
248
251
-#: git-gui.sh:1893
249
+#: git-gui.sh:1896
250
msgid "Create..."
251
msgstr "Erstellen..."
252
255
-#: git-gui.sh:1899
253
+#: git-gui.sh:1902
254
msgid "Checkout..."
255
msgstr "Umstellen..."
256
259
-#: git-gui.sh:1905
257
+#: git-gui.sh:1908
258
msgid "Rename..."
259
msgstr "Umbenennen..."
260
263
-#: git-gui.sh:1910 git-gui.sh:2008
261
+#: git-gui.sh:1913 git-gui.sh:2012
262
msgid "Delete..."
263
msgstr "Löschen..."
264
267
-#: git-gui.sh:1915
265
+#: git-gui.sh:1918
266
msgid "Reset..."
267
msgstr "Zurücksetzen..."
268
271
-#: git-gui.sh:1927 git-gui.sh:2305
269
+#: git-gui.sh:1930 git-gui.sh:2313
270
msgid "New Commit"
271
msgstr "Neue Version"
272
275
-#: git-gui.sh:1935 git-gui.sh:2312
273
+#: git-gui.sh:1938 git-gui.sh:2320
274
msgid "Amend Last Commit"
275
msgstr "Letzte Version nachbessern"
276
279
-#: git-gui.sh:1944 git-gui.sh:2272 lib/remote_branch_delete.tcl:99
277
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
278
msgid "Rescan"
279
msgstr "Neu laden"
280
283
-#: git-gui.sh:1950
281
+#: git-gui.sh:1953
282
msgid "Stage To Commit"
283
msgstr "Zum Eintragen bereitstellen"
284
287
-#: git-gui.sh:1955
285
+#: git-gui.sh:1958
286
msgid "Stage Changed Files To Commit"
287
msgstr "Geänderte Dateien zum Eintragen bereitstellen"
288
291
-#: git-gui.sh:1961
289
+#: git-gui.sh:1964
290
msgid "Unstage From Commit"
291
msgstr "Aus der Bereitstellung herausnehmen"
292
295
-#: git-gui.sh:1966 lib/index.tcl:382
293
+#: git-gui.sh:1969 lib/index.tcl:352
294
msgid "Revert Changes"
295
msgstr "Änderungen revidieren"
296
299
-#: git-gui.sh:1973 git-gui.sh:2284 git-gui.sh:2382
297
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
298
msgid "Sign Off"
299
msgstr "Abzeichnen"
300
303
-#: git-gui.sh:1977 git-gui.sh:2288
301
+#: git-gui.sh:1980 git-gui.sh:2296
302
msgid "Commit@@verb"
303
msgstr "Eintragen"
304
307
-#: git-gui.sh:1988
305
+#: git-gui.sh:1991
306
msgid "Local Merge..."
307
msgstr "Lokales Zusammenführen..."
308
311
-#: git-gui.sh:1993
309
+#: git-gui.sh:1996
310
msgid "Abort Merge..."
311
msgstr "Zusammenführen abbrechen..."
312
315
-#: git-gui.sh:2005
313
+#: git-gui.sh:2008
314
msgid "Push..."
315
msgstr "Ausliefern..."
316
319
-#: git-gui.sh:2015 lib/choose_repository.tcl:73
317
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
318
msgid "Apple"
319
msgstr "Apple"
320
323
-#: git-gui.sh:2018 git-gui.sh:2036 lib/choose_repository.tcl:76
324
-#: lib/choose_repository.tcl:82 lib/option.tcl:65
321
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
322
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
323
#, tcl-format
324
msgid "About %s"
325
msgstr "Über %s"
326
329
-#: git-gui.sh:2020 git-gui.sh:2026 git-gui.sh:2550
327
+#: git-gui.sh:2026
328
+msgid "Preferences..."
329
+msgstr ""
330
+
331
+#: git-gui.sh:2034 git-gui.sh:2558
332
msgid "Options..."
333
msgstr "Optionen..."
334
333
-#: git-gui.sh:2032 lib/choose_repository.tcl:79
335
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
336
msgid "Help"
337
msgstr "Hilfe"
338
337
-#: git-gui.sh:2073
339
+#: git-gui.sh:2081
340
msgid "Online Documentation"
341
msgstr "Online-Dokumentation"
342
341
-#: git-gui.sh:2157
343
+#: git-gui.sh:2165
344
#, tcl-format
345
msgid "fatal: cannot stat path %s: No such file or directory"
346
msgstr ""
347
346
-#: git-gui.sh:2190
348
+#: git-gui.sh:2198
349
msgid "Current Branch:"
350
msgstr "Aktueller Zweig:"
351
350
-#: git-gui.sh:2211
351
-msgid "Staged Changes (Will Be Committed)"
352
+#: git-gui.sh:2219
353
+#, fuzzy
354
+msgid "Staged Changes (Will Commit)"
355
msgstr "Bereitgestellte Änderungen (werden eingetragen)"
356
354
-#: git-gui.sh:2231
355
-msgid "Unstaged Changes (Will Not Be Committed)"
356
-msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)"
357
+#: git-gui.sh:2239
358
+#, fuzzy
359
+msgid "Unstaged Changes"
360
+msgstr "Geänderte bereitstellen"
361
358
-#: git-gui.sh:2278
362
+#: git-gui.sh:2286
363
msgid "Stage Changed"
364
msgstr "Geänderte bereitstellen"
365
362
-#: git-gui.sh:2324
366
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
367
+msgid "Push"
368
+msgstr "Ausliefern"
369
+
370
+#: git-gui.sh:2332
371
msgid "Initial Commit Message:"
372
msgstr "Beschreibung der ersten Version:"
373
366
-#: git-gui.sh:2325
374
+#: git-gui.sh:2333
375
msgid "Amended Commit Message:"
376
msgstr "Beschreibung der nachgebesserten Version:"
377
370
-#: git-gui.sh:2326
378
+#: git-gui.sh:2334
379
msgid "Amended Initial Commit Message:"
380
msgstr "Beschreibung der nachgebesserten ersten Version:"
381
374
-#: git-gui.sh:2327
382
+#: git-gui.sh:2335
383
msgid "Amended Merge Commit Message:"
384
msgstr "Beschreibung der nachgebesserten Zusammenführungs-Version:"
385
378
-#: git-gui.sh:2328
386
+#: git-gui.sh:2336
387
msgid "Merge Commit Message:"
388
msgstr "Beschreibung der Zusammenführungs-Version:"
389
382
-#: git-gui.sh:2329
390
+#: git-gui.sh:2337
391
msgid "Commit Message:"
392
msgstr "Versionsbeschreibung:"
393
386
-#: git-gui.sh:2374 git-gui.sh:2512 lib/console.tcl:71
394
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
395
msgid "Copy All"
396
msgstr "Alle kopieren"
397
390
-#: git-gui.sh:2398 lib/blame.tcl:104
398
+#: git-gui.sh:2406 lib/blame.tcl:104
399
msgid "File:"
400
msgstr "Datei:"
401
394
-#: git-gui.sh:2500
402
+#: git-gui.sh:2508
403
msgid "Refresh"
404
msgstr "Aktualisieren"
405
398
-#: git-gui.sh:2521
406
+#: git-gui.sh:2529
407
msgid "Apply/Reverse Hunk"
408
msgstr "Änderung anwenden/umkehren"
409
402
-#: git-gui.sh:2527
410
+#: git-gui.sh:2535
411
msgid "Decrease Font Size"
412
msgstr "Schriftgröße verkleinern"
413
406
-#: git-gui.sh:2531
414
+#: git-gui.sh:2539
415
msgid "Increase Font Size"
416
msgstr "Schriftgröße vergrößern"
417
410
-#: git-gui.sh:2536
418
+#: git-gui.sh:2544
419
msgid "Show Less Context"
420
msgstr "Weniger Kontext anzeigen"
421
414
-#: git-gui.sh:2543
422
+#: git-gui.sh:2551
423
msgid "Show More Context"
424
msgstr "Mehr Kontext anzeigen"
425
418
-#: git-gui.sh:2557
426
+#: git-gui.sh:2565
427
msgid "Unstage Hunk From Commit"
428
msgstr "Aus der Bereitstellung herausnehmen"
429
422
-#: git-gui.sh:2559
430
+#: git-gui.sh:2567
431
msgid "Stage Hunk For Commit"
432
msgstr "In die Bereitstellung hinzufügen"
433
426
-#: git-gui.sh:2578
434
+#: git-gui.sh:2586
435
msgid "Initializing..."
436
msgstr "Initialisieren..."
437
430
-#: git-gui.sh:2669
438
+#: git-gui.sh:2677
439
#, tcl-format
440
msgid ""
441
"Possible environment issues exist.\n"
@@ -438,14 +446,14 @@ msgid ""
446
"\n"
447
msgstr ""
448
441
-#: git-gui.sh:2699
449
+#: git-gui.sh:2707
450
msgid ""
451
"\n"
452
"This is due to a known issue with the\n"
453
"Tcl binary distributed by Cygwin."
454
msgstr ""
455
448
-#: git-gui.sh:2704
456
+#: git-gui.sh:2712
457
#, tcl-format
458
msgid ""
459
"\n"
@@ -456,6 +464,10 @@ msgid ""
464
"~/.gitconfig file.\n"
465
msgstr ""
466
467
+#: lib/about.tcl:25
468
+msgid "git-gui - a graphical user interface for Git."
469
+msgstr "git-gui - eine grafische Oberfläche für Git."
470
+
471
#: lib/blame.tcl:77
472
msgid "File Viewer"
473
msgstr "Datei-Browser"
@@ -528,7 +540,7 @@ msgstr "Umstellen"
540
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
541
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
542
#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
531
-#: lib/option.tcl:172 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
543
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
544
msgid "Cancel"
545
msgstr "Abbrechen"
546
@@ -536,8 +548,7 @@ msgstr "Abbrechen"
548
msgid "Revision"
549
msgstr "Version"
550
539
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
540
-#: lib/option.tcl:280
551
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
552
msgid "Options"
553
msgstr "Optionen"
554
@@ -557,7 +568,7 @@ msgstr "Zweig erstellen"
568
msgid "Create New Branch"
569
msgstr "Neuen Zweig erstellen"
570
560
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:236
571
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
572
msgid "Create"
573
msgstr "Erstellen"
574
@@ -710,9 +721,9 @@ msgstr "[Nach oben]"
721
msgid "Browse Branch Files"
722
msgstr "Dateien des Zweigs durchblättern"
723
713
-#: lib/browser.tcl:277 lib/choose_repository.tcl:252
714
-#: lib/choose_repository.tcl:342 lib/choose_repository.tcl:352
715
-#: lib/choose_repository.tcl:848
724
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
725
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
726
+#: lib/choose_repository.tcl:811
727
msgid "Browse"
728
msgstr "Blättern"
729
@@ -878,208 +889,209 @@ msgstr ""
889
"Dies ist ein Beispieltext.\n"
890
"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
891
881
-#: lib/choose_repository.tcl:57
892
+#: lib/choose_repository.tcl:25
893
msgid "Git Gui"
894
msgstr "Git Gui"
895
885
-#: lib/choose_repository.tcl:106 lib/choose_repository.tcl:241
896
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
897
msgid "Create New Repository"
898
msgstr "Neues Projektarchiv"
899
889
-#: lib/choose_repository.tcl:111 lib/choose_repository.tcl:328
900
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
901
msgid "Clone Existing Repository"
902
msgstr "Projektarchiv kopieren"
903
893
-#: lib/choose_repository.tcl:116 lib/choose_repository.tcl:837
904
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
905
msgid "Open Existing Repository"
906
msgstr "Projektarchiv öffnen"
907
897
-#: lib/choose_repository.tcl:128
908
+#: lib/choose_repository.tcl:91
909
msgid "Next >"
910
msgstr "Weiter >"
911
901
-#: lib/choose_repository.tcl:189
912
+#: lib/choose_repository.tcl:152
913
#, tcl-format
914
msgid "Location %s already exists."
915
msgstr "Projektarchiv »%s« existiert bereits."
916
906
-#: lib/choose_repository.tcl:195 lib/choose_repository.tcl:202
907
-#: lib/choose_repository.tcl:209
917
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
918
+#: lib/choose_repository.tcl:172
919
#, tcl-format
920
msgid "Failed to create repository %s:"
921
msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
922
912
-#: lib/choose_repository.tcl:246 lib/choose_repository.tcl:346
923
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
924
msgid "Directory:"
925
msgstr "Verzeichnis:"
926
916
-#: lib/choose_repository.tcl:275 lib/choose_repository.tcl:400
917
-#: lib/choose_repository.tcl:871
927
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
928
+#: lib/choose_repository.tcl:834
929
msgid "Git Repository"
930
msgstr "Git Projektarchiv"
931
921
-#: lib/choose_repository.tcl:290 lib/choose_repository.tcl:297
932
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
933
#, tcl-format
934
msgid "Directory %s already exists."
935
msgstr "Verzeichnis »%s« existiert bereits."
936
926
-#: lib/choose_repository.tcl:302
937
+#: lib/choose_repository.tcl:265
938
#, tcl-format
939
msgid "File %s already exists."
940
msgstr "Datei »%s« existiert bereits."
941
931
-#: lib/choose_repository.tcl:323
942
+#: lib/choose_repository.tcl:286
943
msgid "Clone"
944
msgstr "Kopieren"
945
935
-#: lib/choose_repository.tcl:336
946
+#: lib/choose_repository.tcl:299
947
msgid "URL:"
948
msgstr "URL:"
949
939
-#: lib/choose_repository.tcl:356
950
+#: lib/choose_repository.tcl:319
951
msgid "Clone Type:"
952
msgstr "Art der Kopie:"
953
943
-#: lib/choose_repository.tcl:362
954
+#: lib/choose_repository.tcl:325
955
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
956
msgstr ""
957
947
-#: lib/choose_repository.tcl:368
958
+#: lib/choose_repository.tcl:331
959
msgid "Full Copy (Slower, Redundant Backup)"
960
msgstr ""
961
951
-#: lib/choose_repository.tcl:374
962
+#: lib/choose_repository.tcl:337
963
msgid "Shared (Fastest, Not Recommended, No Backup)"
964
msgstr ""
965
955
-#: lib/choose_repository.tcl:406 lib/choose_repository.tcl:455
956
-#: lib/choose_repository.tcl:597 lib/choose_repository.tcl:667
957
-#: lib/choose_repository.tcl:877 lib/choose_repository.tcl:885
966
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
967
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
968
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
969
#, tcl-format
970
msgid "Not a Git repository: %s"
971
msgstr "Kein Git-Projektarchiv in »%s« gefunden."
972
962
-#: lib/choose_repository.tcl:442
973
+#: lib/choose_repository.tcl:405
974
msgid "Standard only available for local repository."
975
msgstr ""
976
966
-#: lib/choose_repository.tcl:446
977
+#: lib/choose_repository.tcl:409
978
msgid "Shared only available for local repository."
979
msgstr ""
980
970
-#: lib/choose_repository.tcl:476
981
+#: lib/choose_repository.tcl:439
982
msgid "Failed to configure origin"
983
msgstr ""
984
974
-#: lib/choose_repository.tcl:488
985
+#: lib/choose_repository.tcl:451
986
msgid "Counting objects"
987
msgstr ""
988
978
-#: lib/choose_repository.tcl:489
989
+#: lib/choose_repository.tcl:452
990
msgid "buckets"
991
msgstr ""
992
982
-#: lib/choose_repository.tcl:513
993
+#: lib/choose_repository.tcl:476
994
#, tcl-format
995
msgid "Unable to copy objects/info/alternates: %s"
996
msgstr ""
997
987
-#: lib/choose_repository.tcl:549
998
+#: lib/choose_repository.tcl:512
999
#, tcl-format
1000
msgid "Nothing to clone from %s."
1001
msgstr "Von »%s« konnte nichts kopiert werden."
1002
992
-#: lib/choose_repository.tcl:551 lib/choose_repository.tcl:765
993
-#: lib/choose_repository.tcl:777
1003
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
1004
+#: lib/choose_repository.tcl:740
1005
msgid "The 'master' branch has not been initialized."
1006
msgstr ""
1007
997
-#: lib/choose_repository.tcl:564
1008
+#: lib/choose_repository.tcl:527
1009
msgid "Hardlinks are unavailable. Falling back to copying."
1010
msgstr ""
1011
1001
-#: lib/choose_repository.tcl:576
1012
+#: lib/choose_repository.tcl:539
1013
#, tcl-format
1014
msgid "Cloning from %s"
1015
msgstr "Kopieren von »%s«"
1016
1006
-#: lib/choose_repository.tcl:607
1017
+#: lib/choose_repository.tcl:570
1018
msgid "Copying objects"
1019
msgstr "Objektdatenbank kopieren"
1020
1010
-#: lib/choose_repository.tcl:608
1021
+#: lib/choose_repository.tcl:571
1022
msgid "KiB"
1023
msgstr "KB"
1024
1014
-#: lib/choose_repository.tcl:632
1025
+#: lib/choose_repository.tcl:595
1026
#, tcl-format
1027
msgid "Unable to copy object: %s"
1028
msgstr "Objekt kann nicht kopiert werden: %s"
1029
1019
-#: lib/choose_repository.tcl:642
1030
+#: lib/choose_repository.tcl:605
1031
msgid "Linking objects"
1032
msgstr "Objekte verlinken"
1033
1023
-#: lib/choose_repository.tcl:643
1034
+#: lib/choose_repository.tcl:606
1035
msgid "objects"
1036
msgstr "Objekte"
1037
1027
-#: lib/choose_repository.tcl:651
1038
+#: lib/choose_repository.tcl:614
1039
#, tcl-format
1040
msgid "Unable to hardlink object: %s"
1041
msgstr "Objekt kann nicht hartverlinkt werden: %s"
1042
1032
-#: lib/choose_repository.tcl:706
1043
+#: lib/choose_repository.tcl:669
1044
msgid "Cannot fetch branches and objects. See console output for details."
1045
msgstr ""
1046
1036
-#: lib/choose_repository.tcl:717
1047
+#: lib/choose_repository.tcl:680
1048
msgid "Cannot fetch tags. See console output for details."
1049
msgstr ""
1050
1040
-#: lib/choose_repository.tcl:741
1051
+#: lib/choose_repository.tcl:704
1052
msgid "Cannot determine HEAD. See console output for details."
1053
msgstr ""
1054
1044
-#: lib/choose_repository.tcl:750
1055
+#: lib/choose_repository.tcl:713
1056
#, tcl-format
1057
msgid "Unable to cleanup %s"
1058
msgstr ""
1059
1049
-#: lib/choose_repository.tcl:756
1060
+#: lib/choose_repository.tcl:719
1061
msgid "Clone failed."
1062
msgstr "Kopieren fehlgeschlagen."
1063
1053
-#: lib/choose_repository.tcl:763
1064
+#: lib/choose_repository.tcl:726
1065
msgid "No default branch obtained."
1066
msgstr ""
1067
1057
-#: lib/choose_repository.tcl:774
1068
+#: lib/choose_repository.tcl:737
1069
#, tcl-format
1070
msgid "Cannot resolve %s as a commit."
1071
msgstr ""
1072
1062
-#: lib/choose_repository.tcl:786
1073
+#: lib/choose_repository.tcl:749
1074
msgid "Creating working directory"
1075
msgstr "Arbeitskopie erstellen"
1076
1066
-#: lib/choose_repository.tcl:787
1077
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1078
+#: lib/index.tcl:149
1079
msgid "files"
1080
msgstr "Dateien"
1081
1070
-#: lib/choose_repository.tcl:816
1082
+#: lib/choose_repository.tcl:779
1083
msgid "Initial file checkout failed."
1084
msgstr ""
1085
1074
-#: lib/choose_repository.tcl:832
1086
+#: lib/choose_repository.tcl:795
1087
msgid "Open"
1088
msgstr "Öffnen"
1089
1078
-#: lib/choose_repository.tcl:842
1090
+#: lib/choose_repository.tcl:805
1091
msgid "Repository:"
1092
msgstr "Projektarchiv:"
1093
1082
-#: lib/choose_repository.tcl:891
1094
+#: lib/choose_repository.tcl:854
1095
#, tcl-format
1096
msgid "Failed to open repository %s:"
1097
msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
@@ -1121,10 +1133,6 @@ msgstr "Versions-Ausdruck ist leer."
1133
msgid "Updated"
1134
msgstr "Aktualisiert"
1135
1124
-#: lib/choose_rev.tcl:556
1125
-msgid "Remote"
1126
-msgstr "Gegenseite"
1127
-
1136
#: lib/choose_rev.tcl:558
1137
msgid "URL"
1138
msgstr "URL"
@@ -1344,7 +1352,9 @@ msgid ""
1352
msgstr ""
1353
"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
1354
"\n"
1347
-"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte vorliegen.\n"
1355
+"Für eine optimale Performance wird empfohlen, die Datenbank des "
1356
+"Projektarchivs zu komprimieren, sobald mehr als %i nicht verknüpfte Objekte "
1357
+"vorliegen.\n"
1358
"\n"
1359
"Soll die Datenbank jetzt komprimiert werden?"
1360
@@ -1422,32 +1432,32 @@ msgid "You must correct the above errors before committing."
1432
msgstr ""
1433
"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
1434
1425
-#: lib/index.tcl:271
1435
+#: lib/index.tcl:241
1436
#, tcl-format
1437
msgid "Unstaging %s from commit"
1438
msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
1439
1430
-#: lib/index.tcl:315
1440
+#: lib/index.tcl:285
1441
#, tcl-format
1442
msgid "Adding %s"
1443
msgstr "»%s« hinzufügen..."
1444
1435
-#: lib/index.tcl:370
1445
+#: lib/index.tcl:340
1446
#, tcl-format
1447
msgid "Revert changes in file %s?"
1448
msgstr "Änderungen in Datei »%s« revidieren?"
1449
1440
-#: lib/index.tcl:372
1450
+#: lib/index.tcl:342
1451
#, tcl-format
1452
msgid "Revert changes in these %i files?"
1453
msgstr "Änderungen in den gewählten %i Dateien revidieren?"
1454
1445
-#: lib/index.tcl:378
1455
+#: lib/index.tcl:348
1456
msgid "Any unstaged changes will be permanently lost by the revert."
1457
msgstr ""
1458
"Alle nicht bereitgestellten Änderungen werden beim Revidieren verloren gehen."
1459
1450
-#: lib/index.tcl:381
1460
+#: lib/index.tcl:351
1461
msgid "Do Nothing"
1462
msgstr "Nichts tun"
1463
@@ -1591,84 +1601,99 @@ msgstr "Abbruch fehlgeschlagen."
1601
msgid "Abort completed. Ready."
1602
msgstr "Abbruch durchgeführt. Bereit."
1603
1594
-#: lib/option.tcl:77
1595
-msgid "git-gui - a graphical user interface for Git."
1596
-msgstr "git-gui - eine grafische Oberfläche für Git."
1597
-
1598
-#: lib/option.tcl:164
1604
+#: lib/option.tcl:82
1605
msgid "Restore Defaults"
1606
msgstr "Voreinstellungen wiederherstellen"
1607
1602
-#: lib/option.tcl:168
1608
+#: lib/option.tcl:86
1609
msgid "Save"
1610
msgstr "Speichern"
1611
1606
-#: lib/option.tcl:178
1612
+#: lib/option.tcl:96
1613
#, tcl-format
1614
msgid "%s Repository"
1615
msgstr "Projektarchiv %s"
1616
1611
-#: lib/option.tcl:179
1617
+#: lib/option.tcl:97
1618
msgid "Global (All Repositories)"
1619
msgstr "Global (Alle Projektarchive)"
1620
1615
-#: lib/option.tcl:185
1621
+#: lib/option.tcl:103
1622
msgid "User Name"
1623
msgstr "Benutzername"
1624
1619
-#: lib/option.tcl:186
1625
+#: lib/option.tcl:104
1626
msgid "Email Address"
1627
msgstr "E-Mail-Adresse"
1628
1623
-#: lib/option.tcl:188
1629
+#: lib/option.tcl:106
1630
msgid "Summarize Merge Commits"
1631
msgstr "Zusammenführungs-Versionen zusammenfassen"
1632
1627
-#: lib/option.tcl:189
1633
+#: lib/option.tcl:107
1634
msgid "Merge Verbosity"
1635
msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
1636
1631
-#: lib/option.tcl:190
1637
+#: lib/option.tcl:108
1638
msgid "Show Diffstat After Merge"
1639
msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
1640
1635
-#: lib/option.tcl:192
1641
+#: lib/option.tcl:110
1642
msgid "Trust File Modification Timestamps"
1643
msgstr "Auf Dateiänderungsdatum verlassen"
1644
1639
-#: lib/option.tcl:193
1645
+#: lib/option.tcl:111
1646
msgid "Prune Tracking Branches During Fetch"
1647
msgstr "Übernahmezweige löschen während Anforderung"
1648
1643
-#: lib/option.tcl:194
1649
+#: lib/option.tcl:112
1650
msgid "Match Tracking Branches"
1651
msgstr "Passend zu Übernahmezweig"
1652
1647
-#: lib/option.tcl:195
1653
+#: lib/option.tcl:113
1654
msgid "Number of Diff Context Lines"
1655
msgstr "Anzahl der Kontextzeilen beim Vergleich"
1656
1651
-#: lib/option.tcl:196
1657
+#: lib/option.tcl:114
1658
msgid "New Branch Name Template"
1659
msgstr "Namensvorschlag für neue Zweige"
1660
1655
-#: lib/option.tcl:258
1661
+#: lib/option.tcl:176
1662
msgid "Change Font"
1663
msgstr "Schriftart ändern"
1664
1659
-#: lib/option.tcl:262
1665
+#: lib/option.tcl:180
1666
#, tcl-format
1667
msgid "Choose %s"
1668
msgstr "%s wählen"
1669
1664
-#: lib/option.tcl:268
1670
+#: lib/option.tcl:186
1671
msgid "pt."
1672
msgstr "pt."
1673
1668
-#: lib/option.tcl:311
1674
+#: lib/option.tcl:200
1675
+msgid "Preferences"
1676
+msgstr ""
1677
+
1678
+#: lib/option.tcl:235
1679
msgid "Failed to completely save options:"
1680
msgstr "Optionen konnten nicht gespeichert werden:"
1681
1682
+#: lib/remote.tcl:165
1683
+#, fuzzy
1684
+msgid "Prune from"
1685
+msgstr "Löschen von »%s«"
1686
+
1687
+#: lib/remote.tcl:170
1688
+#, fuzzy
1689
+msgid "Fetch from"
1690
+msgstr "Von »%s« anfordern"
1691
+
1692
+#: lib/remote.tcl:213
1693
+#, fuzzy
1694
+msgid "Push to"
1695
+msgstr "Nach »%s« ausliefern"
1696
+
1697
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1698
msgid "Delete Remote Branch"
1699
msgstr "Zweig im Projektarchiv der Gegenseite löschen"
@@ -1755,21 +1780,6 @@ msgstr "Kein Projektarchiv ausgewählt."
1780
msgid "Scanning %s..."
1781
msgstr "»%s« laden..."
1782
1758
-#: lib/remote.tcl:162
1759
-#, tcl-format
1760
-msgid "Fetch from %s"
1761
-msgstr "Von »%s« anfordern"
1762
-
1763
-#: lib/remote.tcl:172
1764
-#, tcl-format
1765
-msgid "Prune from %s"
1766
-msgstr "Löschen von »%s«"
1767
-
1768
-#: lib/remote.tcl:206
1769
-#, tcl-format
1770
-msgid "Push to %s"
1771
-msgstr "Nach »%s« ausliefern"
1772
-
1783
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1784
msgid "Cannot write script:"
1785
msgstr "Fehler beim Schreiben des Scripts:"
@@ -1836,7 +1846,8 @@ msgstr "Netzwerk-Einstellungen"
1846
1847
#: lib/transport.tcl:160
1848
msgid "Force overwrite existing branch (may discard changes)"
1839
-msgstr "Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
1849
+msgstr ""
1850
+"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
1851
1852
#: lib/transport.tcl:164
1853
msgid "Use thin pack (for slow network connections)"
@@ -1845,3 +1856,9 @@ msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
1856
#: lib/transport.tcl:168
1857
msgid "Include tags"
1858
msgstr "Mit Markierungen übertragen"
1859
+
1860
+#~ msgid "Fetch"
1861
+#~ msgstr "Anfordern"
1862
+
1863
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
1864
+#~ msgstr "Nicht bereitgestellte Änderungen (werden nicht eingetragen)"
po/git-gui.pot
+621
-181
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
11
+"POT-Creation-Date: 2007-10-10 04:04-0400\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,15 +16,33 @@ msgstr ""
16
"Content-Type: text/plain; charset=CHARSET\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
-#: git-gui.sh:531
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:595
25
+#, tcl-format
26
+msgid "Invalid font specified in %s:"
27
+msgstr ""
28
+
29
+#: git-gui.sh:620
30
+msgid "Main Font"
31
+msgstr ""
32
+
33
+#: git-gui.sh:621
34
+msgid "Diff/Console Font"
35
+msgstr ""
36
+
37
+#: git-gui.sh:635
38
msgid "Cannot find git in PATH."
39
msgstr ""
40
23
-#: git-gui.sh:550
41
+#: git-gui.sh:662
42
msgid "Cannot parse Git version string:"
43
msgstr ""
44
27
-#: git-gui.sh:567
45
+#: git-gui.sh:680
46
#, tcl-format
47
msgid ""
48
"Git version cannot be determined.\n"
@@ -36,79 +54,79 @@ msgid ""
54
"Assume '%s' is version 1.5.0?\n"
55
msgstr ""
56
39
-#: git-gui.sh:689
40
-msgid "Cannot find the git directory:"
57
+#: git-gui.sh:853
58
+msgid "Git directory not found:"
59
msgstr ""
60
43
-#: git-gui.sh:697
44
-msgid "Git directory not found:"
61
+#: git-gui.sh:860
62
+msgid "Cannot move to top of working directory:"
63
msgstr ""
64
47
-#: git-gui.sh:703
65
+#: git-gui.sh:867
66
msgid "Cannot use funny .git directory:"
67
msgstr ""
68
51
-#: git-gui.sh:708
69
+#: git-gui.sh:872
70
msgid "No working directory"
71
msgstr ""
72
55
-#: git-gui.sh:854
73
+#: git-gui.sh:1019
74
msgid "Refreshing file status..."
75
msgstr ""
76
59
-#: git-gui.sh:891
77
+#: git-gui.sh:1084
78
msgid "Scanning for modified files ..."
79
msgstr ""
80
63
-#: git-gui.sh:1057 lib/browser.tcl:247
81
+#: git-gui.sh:1259 lib/browser.tcl:245
82
msgid "Ready."
83
msgstr ""
84
67
-#: git-gui.sh:1322
85
+#: git-gui.sh:1525
86
msgid "Unmodified"
87
msgstr ""
88
71
-#: git-gui.sh:1324
89
+#: git-gui.sh:1527
90
msgid "Modified, not staged"
91
msgstr ""
92
75
-#: git-gui.sh:1325 git-gui.sh:1330
93
+#: git-gui.sh:1528 git-gui.sh:1533
94
msgid "Staged for commit"
95
msgstr ""
96
79
-#: git-gui.sh:1326 git-gui.sh:1331
97
+#: git-gui.sh:1529 git-gui.sh:1534
98
msgid "Portions staged for commit"
99
msgstr ""
100
83
-#: git-gui.sh:1327 git-gui.sh:1332
101
+#: git-gui.sh:1530 git-gui.sh:1535
102
msgid "Staged for commit, missing"
103
msgstr ""
104
87
-#: git-gui.sh:1329
105
+#: git-gui.sh:1532
106
msgid "Untracked, not staged"
107
msgstr ""
108
91
-#: git-gui.sh:1334
109
+#: git-gui.sh:1537
110
msgid "Missing"
111
msgstr ""
112
95
-#: git-gui.sh:1335
113
+#: git-gui.sh:1538
114
msgid "Staged for removal"
115
msgstr ""
116
99
-#: git-gui.sh:1336
117
+#: git-gui.sh:1539
118
msgid "Staged for removal, still present"
119
msgstr ""
120
103
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
121
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
122
msgid "Requires merge resolution"
123
msgstr ""
124
107
-#: git-gui.sh:1383
125
+#: git-gui.sh:1579
126
msgid "Starting gitk... please wait..."
127
msgstr ""
128
111
-#: git-gui.sh:1392
129
+#: git-gui.sh:1588
130
#, tcl-format
131
msgid ""
132
"Unable to start gitk:\n"
@@ -116,293 +134,327 @@ msgid ""
134
"%s does not exist"
135
msgstr ""
136
119
-#: git-gui.sh:1609
120
-#, tcl-format
121
-msgid "Invalid font specified in gui.%s:"
122
-msgstr ""
123
-
124
-#: git-gui.sh:1634
125
-msgid "Main Font"
126
-msgstr ""
127
-
128
-#: git-gui.sh:1635
129
-msgid "Diff/Console Font"
130
-msgstr ""
131
-
132
-#: git-gui.sh:1649
137
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
138
msgid "Repository"
139
msgstr ""
140
136
-#: git-gui.sh:1650
141
+#: git-gui.sh:1789
142
msgid "Edit"
143
msgstr ""
144
140
-#: git-gui.sh:1652
145
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
146
msgid "Branch"
147
msgstr ""
148
144
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
145
-msgid "Commit"
149
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
150
+msgid "Commit@@noun"
151
msgstr ""
152
148
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
153
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
154
msgid "Merge"
155
msgstr ""
156
152
-#: git-gui.sh:1659
153
-msgid "Fetch"
157
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
158
+msgid "Remote"
159
msgstr ""
160
156
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
157
-msgid "Push"
158
-msgstr ""
159
-
160
-#: git-gui.sh:1669
161
+#: git-gui.sh:1807
162
msgid "Browse Current Branch's Files"
163
msgstr ""
164
164
-#: git-gui.sh:1673
165
+#: git-gui.sh:1811
166
msgid "Browse Branch Files..."
167
msgstr ""
168
168
-#: git-gui.sh:1678
169
+#: git-gui.sh:1816
170
msgid "Visualize Current Branch's History"
171
msgstr ""
172
172
-#: git-gui.sh:1682
173
+#: git-gui.sh:1820
174
msgid "Visualize All Branch History"
175
msgstr ""
176
176
-#: git-gui.sh:1689
177
+#: git-gui.sh:1827
178
#, tcl-format
179
msgid "Browse %s's Files"
180
msgstr ""
181
181
-#: git-gui.sh:1691
182
+#: git-gui.sh:1829
183
#, tcl-format
184
msgid "Visualize %s's History"
185
msgstr ""
186
186
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
187
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
188
msgid "Database Statistics"
189
msgstr ""
190
190
-#: git-gui.sh:1699 lib/database.tcl:34
191
+#: git-gui.sh:1837 lib/database.tcl:34
192
msgid "Compress Database"
193
msgstr ""
194
194
-#: git-gui.sh:1702
195
+#: git-gui.sh:1840
196
msgid "Verify Database"
197
msgstr ""
198
198
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
199
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
200
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
201
msgid "Create Desktop Icon"
202
msgstr ""
203
203
-#: git-gui.sh:1722
204
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
205
msgid "Quit"
206
msgstr ""
207
207
-#: git-gui.sh:1729
208
+#: git-gui.sh:1867
209
msgid "Undo"
210
msgstr ""
211
211
-#: git-gui.sh:1732
212
+#: git-gui.sh:1870
213
msgid "Redo"
214
msgstr ""
215
215
-#: git-gui.sh:1736 git-gui.sh:2222
216
+#: git-gui.sh:1874 git-gui.sh:2366
217
msgid "Cut"
218
msgstr ""
219
219
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
220
-#: lib/console.tcl:69
220
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
221
+#: lib/console.tcl:67
222
msgid "Copy"
223
msgstr ""
224
224
-#: git-gui.sh:1742 git-gui.sh:2228
225
+#: git-gui.sh:1880 git-gui.sh:2372
226
msgid "Paste"
227
msgstr ""
228
228
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
229
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
230
#: lib/remote_branch_delete.tcl:38
231
msgid "Delete"
232
msgstr ""
233
233
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
234
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
235
msgid "Select All"
236
msgstr ""
237
237
-#: git-gui.sh:1758
238
+#: git-gui.sh:1896
239
msgid "Create..."
240
msgstr ""
241
241
-#: git-gui.sh:1764
242
+#: git-gui.sh:1902
243
msgid "Checkout..."
244
msgstr ""
245
245
-#: git-gui.sh:1770
246
+#: git-gui.sh:1908
247
msgid "Rename..."
248
msgstr ""
249
249
-#: git-gui.sh:1775 git-gui.sh:1873
250
+#: git-gui.sh:1913 git-gui.sh:2012
251
msgid "Delete..."
252
msgstr ""
253
253
-#: git-gui.sh:1780
254
+#: git-gui.sh:1918
255
msgid "Reset..."
256
msgstr ""
257
257
-#: git-gui.sh:1792 git-gui.sh:2169
258
+#: git-gui.sh:1930 git-gui.sh:2313
259
msgid "New Commit"
260
msgstr ""
261
261
-#: git-gui.sh:1800 git-gui.sh:2176
262
+#: git-gui.sh:1938 git-gui.sh:2320
263
msgid "Amend Last Commit"
264
msgstr ""
265
265
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
266
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
267
msgid "Rescan"
268
msgstr ""
269
269
-#: git-gui.sh:1815
270
+#: git-gui.sh:1953
271
msgid "Stage To Commit"
272
msgstr ""
273
273
-#: git-gui.sh:1820
274
+#: git-gui.sh:1958
275
msgid "Stage Changed Files To Commit"
276
msgstr ""
277
277
-#: git-gui.sh:1826
278
+#: git-gui.sh:1964
279
msgid "Unstage From Commit"
280
msgstr ""
281
281
-#: git-gui.sh:1831 lib/index.tcl:376
282
+#: git-gui.sh:1969 lib/index.tcl:352
283
msgid "Revert Changes"
284
msgstr ""
285
285
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
286
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
287
msgid "Sign Off"
288
msgstr ""
289
289
-#: git-gui.sh:1853
290
+#: git-gui.sh:1980 git-gui.sh:2296
291
+msgid "Commit@@verb"
292
+msgstr ""
293
+
294
+#: git-gui.sh:1991
295
msgid "Local Merge..."
296
msgstr ""
297
293
-#: git-gui.sh:1858
298
+#: git-gui.sh:1996
299
msgid "Abort Merge..."
300
msgstr ""
301
297
-#: git-gui.sh:1870
302
+#: git-gui.sh:2008
303
msgid "Push..."
304
msgstr ""
305
301
-#: git-gui.sh:1880
306
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
307
msgid "Apple"
308
msgstr ""
309
305
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
310
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
311
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
312
#, tcl-format
313
msgid "About %s"
314
msgstr ""
315
310
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
316
+#: git-gui.sh:2026
317
+msgid "Preferences..."
318
+msgstr ""
319
+
320
+#: git-gui.sh:2034 git-gui.sh:2558
321
msgid "Options..."
322
msgstr ""
323
314
-#: git-gui.sh:1897
324
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
325
msgid "Help"
326
msgstr ""
327
318
-#: git-gui.sh:1938
328
+#: git-gui.sh:2081
329
msgid "Online Documentation"
330
msgstr ""
331
322
-#: git-gui.sh:2054
332
+#: git-gui.sh:2165
333
+#, tcl-format
334
+msgid "fatal: cannot stat path %s: No such file or directory"
335
+msgstr ""
336
+
337
+#: git-gui.sh:2198
338
msgid "Current Branch:"
339
msgstr ""
340
326
-#: git-gui.sh:2075
327
-msgid "Staged Changes (Will Be Committed)"
341
+#: git-gui.sh:2219
342
+msgid "Staged Changes (Will Commit)"
343
msgstr ""
344
330
-#: git-gui.sh:2095
331
-msgid "Unstaged Changes (Will Not Be Committed)"
345
+#: git-gui.sh:2239
346
+msgid "Unstaged Changes"
347
msgstr ""
348
334
-#: git-gui.sh:2142
349
+#: git-gui.sh:2286
350
msgid "Stage Changed"
351
msgstr ""
352
338
-#: git-gui.sh:2188
353
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
354
+msgid "Push"
355
+msgstr ""
356
+
357
+#: git-gui.sh:2332
358
msgid "Initial Commit Message:"
359
msgstr ""
360
342
-#: git-gui.sh:2189
361
+#: git-gui.sh:2333
362
msgid "Amended Commit Message:"
363
msgstr ""
364
346
-#: git-gui.sh:2190
365
+#: git-gui.sh:2334
366
msgid "Amended Initial Commit Message:"
367
msgstr ""
368
350
-#: git-gui.sh:2191
369
+#: git-gui.sh:2335
370
msgid "Amended Merge Commit Message:"
371
msgstr ""
372
354
-#: git-gui.sh:2192
373
+#: git-gui.sh:2336
374
msgid "Merge Commit Message:"
375
msgstr ""
376
358
-#: git-gui.sh:2193
377
+#: git-gui.sh:2337
378
msgid "Commit Message:"
379
msgstr ""
380
362
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
381
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
382
msgid "Copy All"
383
msgstr ""
384
366
-#: git-gui.sh:2262 lib/blame.tcl:104
385
+#: git-gui.sh:2406 lib/blame.tcl:104
386
msgid "File:"
387
msgstr ""
388
370
-#: git-gui.sh:2364
389
+#: git-gui.sh:2508
390
msgid "Refresh"
391
msgstr ""
392
374
-#: git-gui.sh:2385
393
+#: git-gui.sh:2529
394
msgid "Apply/Reverse Hunk"
395
msgstr ""
396
378
-#: git-gui.sh:2391
397
+#: git-gui.sh:2535
398
msgid "Decrease Font Size"
399
msgstr ""
400
382
-#: git-gui.sh:2395
401
+#: git-gui.sh:2539
402
msgid "Increase Font Size"
403
msgstr ""
404
386
-#: git-gui.sh:2400
405
+#: git-gui.sh:2544
406
msgid "Show Less Context"
407
msgstr ""
408
390
-#: git-gui.sh:2407
409
+#: git-gui.sh:2551
410
msgid "Show More Context"
411
msgstr ""
412
394
-#: git-gui.sh:2422
413
+#: git-gui.sh:2565
414
msgid "Unstage Hunk From Commit"
415
msgstr ""
416
398
-#: git-gui.sh:2426 git-gui.sh:2430
417
+#: git-gui.sh:2567
418
msgid "Stage Hunk For Commit"
419
msgstr ""
420
402
-#: git-gui.sh:2440
421
+#: git-gui.sh:2586
422
msgid "Initializing..."
423
msgstr ""
424
425
+#: git-gui.sh:2677
426
+#, tcl-format
427
+msgid ""
428
+"Possible environment issues exist.\n"
429
+"\n"
430
+"The following environment variables are probably\n"
431
+"going to be ignored by any Git subprocess run\n"
432
+"by %s:\n"
433
+"\n"
434
+msgstr ""
435
+
436
+#: git-gui.sh:2707
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:2712
444
+#, tcl-format
445
+msgid ""
446
+"\n"
447
+"\n"
448
+"A good replacement for %s\n"
449
+"is placing values for the user.name and\n"
450
+"user.email settings into your personal\n"
451
+"~/.gitconfig file.\n"
452
+msgstr ""
453
+
454
+#: lib/about.tcl:25
455
+msgid "git-gui - a graphical user interface for Git."
456
+msgstr ""
457
+
458
#: lib/blame.tcl:77
459
msgid "File Viewer"
460
msgstr ""
@@ -420,6 +472,50 @@ msgstr ""
472
msgid "Reading %s..."
473
msgstr ""
474
475
+#: lib/blame.tcl:473
476
+msgid "Loading copy/move tracking annotations..."
477
+msgstr ""
478
+
479
+#: lib/blame.tcl:493
480
+msgid "lines annotated"
481
+msgstr ""
482
+
483
+#: lib/blame.tcl:674
484
+msgid "Loading original location annotations..."
485
+msgstr ""
486
+
487
+#: lib/blame.tcl:677
488
+msgid "Annotation complete."
489
+msgstr ""
490
+
491
+#: lib/blame.tcl:731
492
+msgid "Loading annotation..."
493
+msgstr ""
494
+
495
+#: lib/blame.tcl:787
496
+msgid "Author:"
497
+msgstr ""
498
+
499
+#: lib/blame.tcl:791
500
+msgid "Committer:"
501
+msgstr ""
502
+
503
+#: lib/blame.tcl:796
504
+msgid "Original File:"
505
+msgstr ""
506
+
507
+#: lib/blame.tcl:910
508
+msgid "Originally By:"
509
+msgstr ""
510
+
511
+#: lib/blame.tcl:916
512
+msgid "In File:"
513
+msgstr ""
514
+
515
+#: lib/blame.tcl:921
516
+msgid "Copied Or Moved Here By:"
517
+msgstr ""
518
+
519
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
520
msgid "Checkout Branch"
521
msgstr ""
@@ -429,18 +525,17 @@ msgid "Checkout"
525
msgstr ""
526
527
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
432
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283
433
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
434
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
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
531
msgid "Cancel"
532
msgstr ""
533
438
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
534
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
535
msgid "Revision"
536
msgstr ""
537
442
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
443
-#: lib/option.tcl:274
538
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
539
msgid "Options"
540
msgstr ""
541
@@ -460,7 +555,7 @@ msgstr ""
555
msgid "Create New Branch"
556
msgstr ""
557
463
-#: lib/branch_create.tcl:31
558
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
559
msgid "Create"
560
msgstr ""
561
@@ -595,20 +690,22 @@ msgstr ""
690
msgid "File Browser"
691
msgstr ""
692
598
-#: lib/browser.tcl:127 lib/browser.tcl:144
693
+#: lib/browser.tcl:125 lib/browser.tcl:142
694
#, tcl-format
695
msgid "Loading %s..."
696
msgstr ""
697
603
-#: lib/browser.tcl:188
698
+#: lib/browser.tcl:186
699
msgid "[Up To Parent]"
700
msgstr ""
701
607
-#: lib/browser.tcl:268 lib/browser.tcl:274
702
+#: lib/browser.tcl:266 lib/browser.tcl:272
703
msgid "Browse Branch Files"
704
msgstr ""
705
611
-#: lib/browser.tcl:279
706
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
707
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
708
+#: lib/choose_repository.tcl:811
709
msgid "Browse"
710
msgstr ""
711
@@ -617,7 +714,12 @@ msgstr ""
714
msgid "Fetching %s from %s"
715
msgstr ""
716
620
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
717
+#: lib/checkout_op.tcl:127
718
+#, tcl-format
719
+msgid "fatal: Cannot resolve %s"
720
+msgstr ""
721
+
722
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
723
msgid "Close"
724
msgstr ""
725
@@ -659,6 +761,11 @@ msgid ""
761
"The rescan will be automatically started now.\n"
762
msgstr ""
763
764
+#: lib/checkout_op.tcl:322
765
+#, tcl-format
766
+msgid "Updating working directory to '%s'..."
767
+msgstr ""
768
+
769
#: lib/checkout_op.tcl:353
770
#, tcl-format
771
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -681,6 +788,11 @@ msgid ""
788
"Checkout'."
789
msgstr ""
790
791
+#: lib/checkout_op.tcl:446
792
+#, tcl-format
793
+msgid "Checked out '%s'."
794
+msgstr ""
795
+
796
#: lib/checkout_op.tcl:478
797
#, tcl-format
798
msgid "Resetting '%s' to '%s' will lose the following commits:"
@@ -710,6 +822,235 @@ msgid ""
822
"This should not have occurred. %s will now close and give up."
823
msgstr ""
824
825
+#: lib/choose_font.tcl:39
826
+msgid "Select"
827
+msgstr ""
828
+
829
+#: lib/choose_font.tcl:53
830
+msgid "Font Family"
831
+msgstr ""
832
+
833
+#: lib/choose_font.tcl:73
834
+msgid "Font Size"
835
+msgstr ""
836
+
837
+#: lib/choose_font.tcl:90
838
+msgid "Font Example"
839
+msgstr ""
840
+
841
+#: lib/choose_font.tcl:101
842
+msgid ""
843
+"This is example text.\n"
844
+"If you like this text, it can be your font."
845
+msgstr ""
846
+
847
+#: lib/choose_repository.tcl:25
848
+msgid "Git Gui"
849
+msgstr ""
850
+
851
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
852
+msgid "Create New Repository"
853
+msgstr ""
854
+
855
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
856
+msgid "Clone Existing Repository"
857
+msgstr ""
858
+
859
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
860
+msgid "Open Existing Repository"
861
+msgstr ""
862
+
863
+#: lib/choose_repository.tcl:91
864
+msgid "Next >"
865
+msgstr ""
866
+
867
+#: lib/choose_repository.tcl:152
868
+#, tcl-format
869
+msgid "Location %s already exists."
870
+msgstr ""
871
+
872
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
873
+#: lib/choose_repository.tcl:172
874
+#, tcl-format
875
+msgid "Failed to create repository %s:"
876
+msgstr ""
877
+
878
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
879
+msgid "Directory:"
880
+msgstr ""
881
+
882
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
883
+#: lib/choose_repository.tcl:834
884
+msgid "Git Repository"
885
+msgstr ""
886
+
887
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
888
+#, tcl-format
889
+msgid "Directory %s already exists."
890
+msgstr ""
891
+
892
+#: lib/choose_repository.tcl:265
893
+#, tcl-format
894
+msgid "File %s already exists."
895
+msgstr ""
896
+
897
+#: lib/choose_repository.tcl:286
898
+msgid "Clone"
899
+msgstr ""
900
+
901
+#: lib/choose_repository.tcl:299
902
+msgid "URL:"
903
+msgstr ""
904
+
905
+#: lib/choose_repository.tcl:319
906
+msgid "Clone Type:"
907
+msgstr ""
908
+
909
+#: lib/choose_repository.tcl:325
910
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
911
+msgstr ""
912
+
913
+#: lib/choose_repository.tcl:331
914
+msgid "Full Copy (Slower, Redundant Backup)"
915
+msgstr ""
916
+
917
+#: lib/choose_repository.tcl:337
918
+msgid "Shared (Fastest, Not Recommended, No Backup)"
919
+msgstr ""
920
+
921
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
922
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
923
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
924
+#, tcl-format
925
+msgid "Not a Git repository: %s"
926
+msgstr ""
927
+
928
+#: lib/choose_repository.tcl:405
929
+msgid "Standard only available for local repository."
930
+msgstr ""
931
+
932
+#: lib/choose_repository.tcl:409
933
+msgid "Shared only available for local repository."
934
+msgstr ""
935
+
936
+#: lib/choose_repository.tcl:439
937
+msgid "Failed to configure origin"
938
+msgstr ""
939
+
940
+#: lib/choose_repository.tcl:451
941
+msgid "Counting objects"
942
+msgstr ""
943
+
944
+#: lib/choose_repository.tcl:452
945
+msgid "buckets"
946
+msgstr ""
947
+
948
+#: lib/choose_repository.tcl:476
949
+#, tcl-format
950
+msgid "Unable to copy objects/info/alternates: %s"
951
+msgstr ""
952
+
953
+#: lib/choose_repository.tcl:512
954
+#, tcl-format
955
+msgid "Nothing to clone from %s."
956
+msgstr ""
957
+
958
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
959
+#: lib/choose_repository.tcl:740
960
+msgid "The 'master' branch has not been initialized."
961
+msgstr ""
962
+
963
+#: lib/choose_repository.tcl:527
964
+msgid "Hardlinks are unavailable. Falling back to copying."
965
+msgstr ""
966
+
967
+#: lib/choose_repository.tcl:539
968
+#, tcl-format
969
+msgid "Cloning from %s"
970
+msgstr ""
971
+
972
+#: lib/choose_repository.tcl:570
973
+msgid "Copying objects"
974
+msgstr ""
975
+
976
+#: lib/choose_repository.tcl:571
977
+msgid "KiB"
978
+msgstr ""
979
+
980
+#: lib/choose_repository.tcl:595
981
+#, tcl-format
982
+msgid "Unable to copy object: %s"
983
+msgstr ""
984
+
985
+#: lib/choose_repository.tcl:605
986
+msgid "Linking objects"
987
+msgstr ""
988
+
989
+#: lib/choose_repository.tcl:606
990
+msgid "objects"
991
+msgstr ""
992
+
993
+#: lib/choose_repository.tcl:614
994
+#, tcl-format
995
+msgid "Unable to hardlink object: %s"
996
+msgstr ""
997
+
998
+#: lib/choose_repository.tcl:669
999
+msgid "Cannot fetch branches and objects. See console output for details."
1000
+msgstr ""
1001
+
1002
+#: lib/choose_repository.tcl:680
1003
+msgid "Cannot fetch tags. See console output for details."
1004
+msgstr ""
1005
+
1006
+#: lib/choose_repository.tcl:704
1007
+msgid "Cannot determine HEAD. See console output for details."
1008
+msgstr ""
1009
+
1010
+#: lib/choose_repository.tcl:713
1011
+#, tcl-format
1012
+msgid "Unable to cleanup %s"
1013
+msgstr ""
1014
+
1015
+#: lib/choose_repository.tcl:719
1016
+msgid "Clone failed."
1017
+msgstr ""
1018
+
1019
+#: lib/choose_repository.tcl:726
1020
+msgid "No default branch obtained."
1021
+msgstr ""
1022
+
1023
+#: lib/choose_repository.tcl:737
1024
+#, tcl-format
1025
+msgid "Cannot resolve %s as a commit."
1026
+msgstr ""
1027
+
1028
+#: lib/choose_repository.tcl:749
1029
+msgid "Creating working directory"
1030
+msgstr ""
1031
+
1032
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1033
+#: lib/index.tcl:149
1034
+msgid "files"
1035
+msgstr ""
1036
+
1037
+#: lib/choose_repository.tcl:779
1038
+msgid "Initial file checkout failed."
1039
+msgstr ""
1040
+
1041
+#: lib/choose_repository.tcl:795
1042
+msgid "Open"
1043
+msgstr ""
1044
+
1045
+#: lib/choose_repository.tcl:805
1046
+msgid "Repository:"
1047
+msgstr ""
1048
+
1049
+#: lib/choose_repository.tcl:854
1050
+#, tcl-format
1051
+msgid "Failed to open repository %s:"
1052
+msgstr ""
1053
+
1054
#: lib/choose_rev.tcl:53
1055
msgid "This Detached Checkout"
1056
msgstr ""
@@ -726,7 +1067,7 @@ msgstr ""
1067
msgid "Tracking Branch"
1068
msgstr ""
1069
729
-#: lib/choose_rev.tcl:84
1070
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1071
msgid "Tag"
1072
msgstr ""
1073
@@ -743,6 +1084,14 @@ msgstr ""
1084
msgid "Revision expression is empty."
1085
msgstr ""
1086
1087
+#: lib/choose_rev.tcl:530
1088
+msgid "Updated"
1089
+msgstr ""
1090
+
1091
+#: lib/choose_rev.tcl:558
1092
+msgid "URL"
1093
+msgstr ""
1094
+
1095
#: lib/commit.tcl:9
1096
msgid ""
1097
"There is nothing to amend.\n"
@@ -821,6 +1170,11 @@ msgstr ""
1170
msgid "write-tree failed:"
1171
msgstr ""
1172
1173
+#: lib/commit.tcl:275
1174
+#, tcl-format
1175
+msgid "Commit %s appears to be corrupt"
1176
+msgstr ""
1177
+
1178
#: lib/commit.tcl:279
1179
msgid ""
1180
"No changes to commit.\n"
@@ -834,6 +1188,11 @@ msgstr ""
1188
msgid "No changes to commit."
1189
msgstr ""
1190
1191
+#: lib/commit.tcl:303
1192
+#, tcl-format
1193
+msgid "warning: Tcl does not support encoding '%s'."
1194
+msgstr ""
1195
+
1196
#: lib/commit.tcl:317
1197
msgid "commit-tree failed:"
1198
msgstr ""
@@ -847,15 +1206,15 @@ msgstr ""
1206
msgid "Created commit %s: %s"
1207
msgstr ""
1208
850
-#: lib/console.tcl:55
1209
+#: lib/console.tcl:57
1210
msgid "Working... please wait..."
1211
msgstr ""
1212
854
-#: lib/console.tcl:184
1213
+#: lib/console.tcl:183
1214
msgid "Success"
1215
msgstr ""
1216
858
-#: lib/console.tcl:194
1217
+#: lib/console.tcl:196
1218
msgid "Error: Command Failed"
1219
msgstr ""
1220
@@ -895,6 +1254,22 @@ msgstr ""
1254
msgid "Verifying the object database with fsck-objects"
1255
msgstr ""
1256
1257
+#: lib/database.tcl:108
1258
+#, tcl-format
1259
+msgid ""
1260
+"This repository currently has approximately %i loose objects.\n"
1261
+"\n"
1262
+"To maintain optimal performance it is strongly recommended that you compress "
1263
+"the database when more than %i loose objects exist.\n"
1264
+"\n"
1265
+"Compress the database now?"
1266
+msgstr ""
1267
+
1268
+#: lib/date.tcl:25
1269
+#, tcl-format
1270
+msgid "Invalid date from Git: %s"
1271
+msgstr ""
1272
+
1273
#: lib/diff.tcl:42
1274
#, tcl-format
1275
msgid ""
@@ -909,19 +1284,37 @@ msgid ""
1284
"the same state."
1285
msgstr ""
1286
912
-#: lib/diff.tcl:97
1287
+#: lib/diff.tcl:81
1288
+#, tcl-format
1289
+msgid "Loading diff of %s..."
1290
+msgstr ""
1291
+
1292
+#: lib/diff.tcl:114 lib/diff.tcl:184
1293
+#, tcl-format
1294
+msgid "Unable to display %s"
1295
+msgstr ""
1296
+
1297
+#: lib/diff.tcl:115
1298
msgid "Error loading file:"
1299
msgstr ""
1300
916
-#: lib/diff.tcl:162
1301
+#: lib/diff.tcl:122
1302
+msgid "Git Repository (subproject)"
1303
+msgstr ""
1304
+
1305
+#: lib/diff.tcl:134
1306
+msgid "* Binary file (not showing content)."
1307
+msgstr ""
1308
+
1309
+#: lib/diff.tcl:185
1310
msgid "Error loading diff:"
1311
msgstr ""
1312
920
-#: lib/diff.tcl:278
1313
+#: lib/diff.tcl:302
1314
msgid "Failed to unstage selected hunk."
1315
msgstr ""
1316
924
-#: lib/diff.tcl:285
1317
+#: lib/diff.tcl:309
1318
msgid "Failed to stage selected hunk."
1319
msgstr ""
1320
@@ -937,21 +1330,31 @@ msgstr ""
1330
msgid "You must correct the above errors before committing."
1331
msgstr ""
1332
940
-#: lib/index.tcl:364
1333
+#: lib/index.tcl:241
1334
+#, tcl-format
1335
+msgid "Unstaging %s from commit"
1336
+msgstr ""
1337
+
1338
+#: lib/index.tcl:285
1339
+#, tcl-format
1340
+msgid "Adding %s"
1341
+msgstr ""
1342
+
1343
+#: lib/index.tcl:340
1344
#, tcl-format
1345
msgid "Revert changes in file %s?"
1346
msgstr ""
1347
945
-#: lib/index.tcl:366
1348
+#: lib/index.tcl:342
1349
#, tcl-format
1350
msgid "Revert changes in these %i files?"
1351
msgstr ""
1352
950
-#: lib/index.tcl:372
1353
+#: lib/index.tcl:348
1354
msgid "Any unstaged changes will be permanently lost by the revert."
1355
msgstr ""
1356
954
-#: lib/index.tcl:375
1357
+#: lib/index.tcl:351
1358
msgid "Do Nothing"
1359
msgstr ""
1360
@@ -1058,71 +1461,96 @@ msgstr ""
1461
msgid "Abort completed. Ready."
1462
msgstr ""
1463
1061
-#: lib/option.tcl:77
1062
-msgid "git-gui - a graphical user interface for Git."
1063
-msgstr ""
1064
-
1065
-#: lib/option.tcl:164
1464
+#: lib/option.tcl:82
1465
msgid "Restore Defaults"
1466
msgstr ""
1467
1069
-#: lib/option.tcl:168
1468
+#: lib/option.tcl:86
1469
msgid "Save"
1470
msgstr ""
1471
1073
-#: lib/option.tcl:178
1472
+#: lib/option.tcl:96
1473
#, tcl-format
1474
msgid "%s Repository"
1475
msgstr ""
1476
1078
-#: lib/option.tcl:179
1477
+#: lib/option.tcl:97
1478
msgid "Global (All Repositories)"
1479
msgstr ""
1480
1082
-#: lib/option.tcl:185
1481
+#: lib/option.tcl:103
1482
msgid "User Name"
1483
msgstr ""
1484
1086
-#: lib/option.tcl:186
1485
+#: lib/option.tcl:104
1486
msgid "Email Address"
1487
msgstr ""
1488
1090
-#: lib/option.tcl:188
1489
+#: lib/option.tcl:106
1490
msgid "Summarize Merge Commits"
1491
msgstr ""
1492
1094
-#: lib/option.tcl:189
1493
+#: lib/option.tcl:107
1494
msgid "Merge Verbosity"
1495
msgstr ""
1496
1098
-#: lib/option.tcl:190
1497
+#: lib/option.tcl:108
1498
msgid "Show Diffstat After Merge"
1499
msgstr ""
1500
1102
-#: lib/option.tcl:192
1501
+#: lib/option.tcl:110
1502
msgid "Trust File Modification Timestamps"
1503
msgstr ""
1504
1106
-#: lib/option.tcl:193
1505
+#: lib/option.tcl:111
1506
msgid "Prune Tracking Branches During Fetch"
1507
msgstr ""
1508
1110
-#: lib/option.tcl:194
1509
+#: lib/option.tcl:112
1510
msgid "Match Tracking Branches"
1511
msgstr ""
1512
1114
-#: lib/option.tcl:195
1513
+#: lib/option.tcl:113
1514
msgid "Number of Diff Context Lines"
1515
msgstr ""
1516
1118
-#: lib/option.tcl:196
1517
+#: lib/option.tcl:114
1518
msgid "New Branch Name Template"
1519
msgstr ""
1520
1122
-#: lib/option.tcl:305
1521
+#: lib/option.tcl:176
1522
+msgid "Change Font"
1523
+msgstr ""
1524
+
1525
+#: lib/option.tcl:180
1526
+#, tcl-format
1527
+msgid "Choose %s"
1528
+msgstr ""
1529
+
1530
+#: lib/option.tcl:186
1531
+msgid "pt."
1532
+msgstr ""
1533
+
1534
+#: lib/option.tcl:200
1535
+msgid "Preferences"
1536
+msgstr ""
1537
+
1538
+#: lib/option.tcl:235
1539
msgid "Failed to completely save options:"
1540
msgstr ""
1541
1542
+#: lib/remote.tcl:165
1543
+msgid "Prune from"
1544
+msgstr ""
1545
+
1546
+#: lib/remote.tcl:170
1547
+msgid "Fetch from"
1548
+msgstr ""
1549
+
1550
+#: lib/remote.tcl:213
1551
+msgid "Push to"
1552
+msgstr ""
1553
+
1554
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1555
msgid "Delete Remote Branch"
1556
msgstr ""
@@ -1131,11 +1559,11 @@ msgstr ""
1559
msgid "From Repository"
1560
msgstr ""
1561
1134
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
1562
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1563
msgid "Remote:"
1564
msgstr ""
1565
1138
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
1566
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1567
msgid "Arbitrary URL:"
1568
msgstr ""
1569
@@ -1159,6 +1587,14 @@ msgstr ""
1587
msgid "A branch is required for 'Merged Into'."
1588
msgstr ""
1589
1590
+#: lib/remote_branch_delete.tcl:184
1591
+#, tcl-format
1592
+msgid ""
1593
+"The following branches are not completely merged into %s:\n"
1594
+"\n"
1595
+" - %s"
1596
+msgstr ""
1597
+
1598
#: lib/remote_branch_delete.tcl:189
1599
#, tcl-format
1600
msgid ""
@@ -1191,21 +1627,6 @@ msgstr ""
1627
msgid "Scanning %s..."
1628
msgstr ""
1629
1194
-#: lib/remote.tcl:162
1195
-#, tcl-format
1196
-msgid "Fetch from %s..."
1197
-msgstr ""
1198
-
1199
-#: lib/remote.tcl:172
1200
-#, tcl-format
1201
-msgid "Prune from %s..."
1202
-msgstr ""
1203
-
1204
-#: lib/remote.tcl:206
1205
-#, tcl-format
1206
-msgid "Push to %s..."
1207
-msgstr ""
1208
-
1630
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1631
msgid "Cannot write script:"
1632
msgstr ""
@@ -1214,51 +1635,70 @@ msgstr ""
1635
msgid "Cannot write icon:"
1636
msgstr ""
1637
1217
-#: lib/status_bar.tcl:58
1638
+#: lib/status_bar.tcl:83
1639
#, tcl-format
1640
msgid "%s ... %*i of %*i %s (%3i%%)"
1641
msgstr ""
1642
1643
+#: lib/transport.tcl:6
1644
+#, tcl-format
1645
+msgid "fetch %s"
1646
+msgstr ""
1647
+
1648
#: lib/transport.tcl:7
1649
#, tcl-format
1650
msgid "Fetching new changes from %s"
1651
msgstr ""
1652
1653
+#: lib/transport.tcl:18
1654
+#, tcl-format
1655
+msgid "remote prune %s"
1656
+msgstr ""
1657
+
1658
#: lib/transport.tcl:19
1659
#, tcl-format
1660
msgid "Pruning tracking branches deleted from %s"
1661
msgstr ""
1662
1663
+#: lib/transport.tcl:25 lib/transport.tcl:71
1664
+#, tcl-format
1665
+msgid "push %s"
1666
+msgstr ""
1667
+
1668
#: lib/transport.tcl:26
1669
#, tcl-format
1670
msgid "Pushing changes to %s"
1671
msgstr ""
1672
1237
-#: lib/transport.tcl:68
1673
+#: lib/transport.tcl:72
1674
#, tcl-format
1675
msgid "Pushing %s %s to %s"
1676
msgstr ""
1677
1242
-#: lib/transport.tcl:84
1678
+#: lib/transport.tcl:89
1679
msgid "Push Branches"
1680
msgstr ""
1681
1246
-#: lib/transport.tcl:98
1682
+#: lib/transport.tcl:103
1683
msgid "Source Branches"
1684
msgstr ""
1685
1250
-#: lib/transport.tcl:115
1686
+#: lib/transport.tcl:120
1687
msgid "Destination Repository"
1688
msgstr ""
1689
1254
-#: lib/transport.tcl:153
1690
+#: lib/transport.tcl:158
1691
msgid "Transfer Options"
1692
msgstr ""
1693
1258
-#: lib/transport.tcl:155
1694
+#: lib/transport.tcl:160
1695
+msgid "Force overwrite existing branch (may discard changes)"
1696
+msgstr ""
1697
+
1698
+#: lib/transport.tcl:164
1699
msgid "Use thin pack (for slow network connections)"
1700
msgstr ""
1701
1262
-#: lib/transport.tcl:159
1702
+#: lib/transport.tcl:168
1703
msgid "Include tags"
1704
msgstr ""
po/hu.po
+658
-185
@@ -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: 2007-08-11 17:28+0200\n"
10
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
11
"PO-Revision-Date: 2007-07-27 13:15+0200\n"
12
"Last-Translator: Miklos Vajna <vmiklos@frugalware.org>\n"
13
"Language-Team: Hungarian\n"
@@ -16,15 +16,33 @@ msgstr ""
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
18
19
-#: git-gui.sh:531
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:595
25
+#, fuzzy, tcl-format
26
+msgid "Invalid font specified in %s:"
27
+msgstr "Érvénytelen font lett megadva a grafikus felületben.%s:"
28
+
29
+#: git-gui.sh:620
30
+msgid "Main Font"
31
+msgstr "Fő betűtípus"
32
+
33
+#: git-gui.sh:621
34
+msgid "Diff/Console Font"
35
+msgstr "Diff/konzol betűtípus"
36
+
37
+#: git-gui.sh:635
38
msgid "Cannot find git in PATH."
39
msgstr "A git nem található a PATH-ban."
40
23
-#: git-gui.sh:550
41
+#: git-gui.sh:662
42
msgid "Cannot parse Git version string:"
43
msgstr "Nem értelmezhető a Git verzió sztring:"
44
27
-#: git-gui.sh:567
45
+#: git-gui.sh:680
46
#, tcl-format
47
msgid ""
48
"Git version cannot be determined.\n"
@@ -43,79 +61,80 @@ msgstr ""
61
"\n"
62
"Feltételezhetjük, hogy a(z) '%s' verziója legalább 1.5.0?\n"
63
46
-#: git-gui.sh:689
47
-msgid "Cannot find the git directory:"
48
-msgstr "Nem található a git könyvtár:"
49
-
50
-#: git-gui.sh:697
64
+#: git-gui.sh:853
65
msgid "Git directory not found:"
66
msgstr "A Git könyvtár nem található:"
67
54
-#: git-gui.sh:703
68
+#: git-gui.sh:860
69
+#, fuzzy
70
+msgid "Cannot move to top of working directory:"
71
+msgstr "Nem használható vicces .git könyvtár:"
72
+
73
+#: git-gui.sh:867
74
msgid "Cannot use funny .git directory:"
75
msgstr "Nem használható vicces .git könyvtár:"
76
58
-#: git-gui.sh:708
77
+#: git-gui.sh:872
78
msgid "No working directory"
79
msgstr "Nincs munkakönyvtár"
80
62
-#: git-gui.sh:854
81
+#: git-gui.sh:1019
82
msgid "Refreshing file status..."
83
msgstr "A fájlok státuszának frissítése..."
84
66
-#: git-gui.sh:891
85
+#: git-gui.sh:1084
86
msgid "Scanning for modified files ..."
87
msgstr "Módosított fájlok keresése ..."
88
70
-#: git-gui.sh:1057 lib/browser.tcl:247
89
+#: git-gui.sh:1259 lib/browser.tcl:245
90
msgid "Ready."
91
msgstr "Kész."
92
74
-#: git-gui.sh:1322
93
+#: git-gui.sh:1525
94
msgid "Unmodified"
95
msgstr "Nem módosított"
96
78
-#: git-gui.sh:1324
97
+#: git-gui.sh:1527
98
msgid "Modified, not staged"
99
msgstr "Módosított, de nem kiválasztott"
100
82
-#: git-gui.sh:1325 git-gui.sh:1330
101
+#: git-gui.sh:1528 git-gui.sh:1533
102
msgid "Staged for commit"
103
msgstr "Kiválasztva commitolásra"
104
86
-#: git-gui.sh:1326 git-gui.sh:1331
105
+#: git-gui.sh:1529 git-gui.sh:1534
106
msgid "Portions staged for commit"
107
msgstr "Részek kiválasztva commitolásra"
108
90
-#: git-gui.sh:1327 git-gui.sh:1332
109
+#: git-gui.sh:1530 git-gui.sh:1535
110
msgid "Staged for commit, missing"
111
msgstr "Kiválasztva commitolásra, hiányzó"
112
94
-#: git-gui.sh:1329
113
+#: git-gui.sh:1532
114
msgid "Untracked, not staged"
115
msgstr "Nem követett, nem kiválasztott"
116
98
-#: git-gui.sh:1334
117
+#: git-gui.sh:1537
118
msgid "Missing"
119
msgstr "Hiányzó"
120
102
-#: git-gui.sh:1335
121
+#: git-gui.sh:1538
122
msgid "Staged for removal"
123
msgstr "Kiválasztva eltávolításra"
124
106
-#: git-gui.sh:1336
125
+#: git-gui.sh:1539
126
msgid "Staged for removal, still present"
127
msgstr "Kiválasztva eltávolításra, jelenleg is elérhető"
128
110
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
129
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
130
msgid "Requires merge resolution"
131
msgstr "Merge feloldás szükséges"
132
114
-#: git-gui.sh:1383
133
+#: git-gui.sh:1579
134
msgid "Starting gitk... please wait..."
135
msgstr "A gitk indítása... várjunk..."
136
118
-#: git-gui.sh:1392
137
+#: git-gui.sh:1588
138
#, tcl-format
139
msgid ""
140
"Unable to start gitk:\n"
@@ -126,293 +145,332 @@ msgstr ""
145
"\n"
146
"A(z) %s nem létezik"
147
129
-#: git-gui.sh:1609
130
-#, tcl-format
131
-msgid "Invalid font specified in gui.%s:"
132
-msgstr "Érvénytelen font lett megadva a grafikus felületben.%s:"
133
-
134
-#: git-gui.sh:1634
135
-msgid "Main Font"
136
-msgstr "Fő betűtípus"
137
-
138
-#: git-gui.sh:1635
139
-msgid "Diff/Console Font"
140
-msgstr "Diff/konzol betűtípus"
141
-
142
-#: git-gui.sh:1649
148
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
149
msgid "Repository"
150
msgstr "Repó"
151
146
-#: git-gui.sh:1650
152
+#: git-gui.sh:1789
153
msgid "Edit"
154
msgstr "Szerkesztés"
155
150
-#: git-gui.sh:1652
156
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
157
msgid "Branch"
158
msgstr "Branch"
159
154
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
155
-msgid "Commit"
160
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
161
+#, fuzzy
162
+msgid "Commit@@noun"
163
msgstr "Commit"
164
158
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
165
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
166
msgid "Merge"
167
msgstr "Merge"
168
162
-#: git-gui.sh:1659
163
-msgid "Fetch"
164
-msgstr "Letöltés"
165
-
166
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
167
-msgid "Push"
168
-msgstr "Push"
169
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
170
+#, fuzzy
171
+msgid "Remote"
172
+msgstr "Távoli:"
173
170
-#: git-gui.sh:1669
174
+#: git-gui.sh:1807
175
msgid "Browse Current Branch's Files"
176
msgstr "A jelenlegi branch fájljainak böngészése"
177
174
-#: git-gui.sh:1673
178
+#: git-gui.sh:1811
179
msgid "Browse Branch Files..."
180
msgstr "A branch fájljainak böngészése..."
181
178
-#: git-gui.sh:1678
182
+#: git-gui.sh:1816
183
msgid "Visualize Current Branch's History"
184
msgstr "A jelenlegi branch történetének vizualizálása"
185
182
-#: git-gui.sh:1682
186
+#: git-gui.sh:1820
187
msgid "Visualize All Branch History"
188
msgstr "Az összes branch történetének vizualizálása"
189
186
-#: git-gui.sh:1689
190
+#: git-gui.sh:1827
191
#, tcl-format
192
msgid "Browse %s's Files"
193
msgstr "A(z) %s branch fájljainak böngészése"
194
191
-#: git-gui.sh:1691
195
+#: git-gui.sh:1829
196
#, tcl-format
197
msgid "Visualize %s's History"
198
msgstr "A(z) %s branch történetének vizualizálása"
199
196
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
200
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
201
msgid "Database Statistics"
202
msgstr "Adatbázis statisztikák"
203
200
-#: git-gui.sh:1699 lib/database.tcl:34
204
+#: git-gui.sh:1837 lib/database.tcl:34
205
msgid "Compress Database"
206
msgstr "Adatbázis tömörítése"
207
204
-#: git-gui.sh:1702
208
+#: git-gui.sh:1840
209
msgid "Verify Database"
210
msgstr "Adatbázis ellenőrzése"
211
208
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
212
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
213
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
214
msgid "Create Desktop Icon"
215
msgstr "Asztal ikon létrehozása"
216
213
-#: git-gui.sh:1722
217
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
218
msgid "Quit"
219
msgstr "Kilépés"
220
217
-#: git-gui.sh:1729
221
+#: git-gui.sh:1867
222
msgid "Undo"
223
msgstr "Visszavonás"
224
221
-#: git-gui.sh:1732
225
+#: git-gui.sh:1870
226
msgid "Redo"
227
msgstr "Mégis"
228
225
-#: git-gui.sh:1736 git-gui.sh:2222
229
+#: git-gui.sh:1874 git-gui.sh:2366
230
msgid "Cut"
231
msgstr "Kivágás"
232
229
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
230
-#: lib/console.tcl:69
233
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
234
+#: lib/console.tcl:67
235
msgid "Copy"
236
msgstr "Másolás"
237
234
-#: git-gui.sh:1742 git-gui.sh:2228
238
+#: git-gui.sh:1880 git-gui.sh:2372
239
msgid "Paste"
240
msgstr "Beillesztés"
241
238
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
242
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
243
#: lib/remote_branch_delete.tcl:38
244
msgid "Delete"
245
msgstr "Törlés"
246
243
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
247
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
248
msgid "Select All"
249
msgstr "Mindent kiválaszt"
250
247
-#: git-gui.sh:1758
251
+#: git-gui.sh:1896
252
msgid "Create..."
253
msgstr "Létrehozás..."
254
251
-#: git-gui.sh:1764
255
+#: git-gui.sh:1902
256
msgid "Checkout..."
257
msgstr "Checkout..."
258
255
-#: git-gui.sh:1770
259
+#: git-gui.sh:1908
260
msgid "Rename..."
261
msgstr "Átnevezés..."
262
259
-#: git-gui.sh:1775 git-gui.sh:1873
263
+#: git-gui.sh:1913 git-gui.sh:2012
264
msgid "Delete..."
265
msgstr "Törlés..."
266
263
-#: git-gui.sh:1780
267
+#: git-gui.sh:1918
268
msgid "Reset..."
269
msgstr "Visszaállítás..."
270
267
-#: git-gui.sh:1792 git-gui.sh:2169
271
+#: git-gui.sh:1930 git-gui.sh:2313
272
msgid "New Commit"
273
msgstr "Új commit"
274
271
-#: git-gui.sh:1800 git-gui.sh:2176
275
+#: git-gui.sh:1938 git-gui.sh:2320
276
msgid "Amend Last Commit"
277
msgstr "Utolsó commit javítása"
278
275
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
279
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
280
msgid "Rescan"
281
msgstr "Keresés újra"
282
279
-#: git-gui.sh:1815
283
+#: git-gui.sh:1953
284
msgid "Stage To Commit"
285
msgstr "Kiválasztás commitolásra"
286
283
-#: git-gui.sh:1820
287
+#: git-gui.sh:1958
288
msgid "Stage Changed Files To Commit"
289
msgstr "Módosított fájlok kiválasztása commitolásra"
290
287
-#: git-gui.sh:1826
291
+#: git-gui.sh:1964
292
msgid "Unstage From Commit"
293
msgstr "Commitba való kiválasztás visszavonása"
294
291
-#: git-gui.sh:1831 lib/index.tcl:376
295
+#: git-gui.sh:1969 lib/index.tcl:352
296
msgid "Revert Changes"
297
msgstr "Változtatások visszaállítása"
298
295
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
299
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
300
msgid "Sign Off"
301
msgstr "Aláír"
302
299
-#: git-gui.sh:1853
303
+#: git-gui.sh:1980 git-gui.sh:2296
304
+#, fuzzy
305
+msgid "Commit@@verb"
306
+msgstr "Commit"
307
+
308
+#: git-gui.sh:1991
309
msgid "Local Merge..."
310
msgstr "Helyi merge..."
311
303
-#: git-gui.sh:1858
312
+#: git-gui.sh:1996
313
msgid "Abort Merge..."
314
msgstr "Merge megszakítása..."
315
307
-#: git-gui.sh:1870
316
+#: git-gui.sh:2008
317
msgid "Push..."
318
msgstr "Push..."
319
311
-#: git-gui.sh:1880
320
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
321
msgid "Apple"
322
msgstr "Apple"
323
315
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
324
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
325
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
326
#, tcl-format
327
msgid "About %s"
328
msgstr "Névjegy: %s"
329
320
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
330
+#: git-gui.sh:2026
331
+msgid "Preferences..."
332
+msgstr ""
333
+
334
+#: git-gui.sh:2034 git-gui.sh:2558
335
msgid "Options..."
336
msgstr "Opciók..."
337
324
-#: git-gui.sh:1897
338
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
339
msgid "Help"
340
msgstr "Segítség"
341
328
-#: git-gui.sh:1938
342
+#: git-gui.sh:2081
343
msgid "Online Documentation"
344
msgstr "Online dokumentáció"
345
332
-#: git-gui.sh:2054
346
+#: git-gui.sh:2165
347
+#, tcl-format
348
+msgid "fatal: cannot stat path %s: No such file or directory"
349
+msgstr ""
350
+
351
+#: git-gui.sh:2198
352
msgid "Current Branch:"
353
msgstr "Jelenlegi branch:"
354
336
-#: git-gui.sh:2075
337
-msgid "Staged Changes (Will Be Committed)"
355
+#: git-gui.sh:2219
356
+#, fuzzy
357
+msgid "Staged Changes (Will Commit)"
358
msgstr "Kiválasztott változtatások (commitolva lesz)"
359
340
-#: git-gui.sh:2095
341
-msgid "Unstaged Changes (Will Not Be Committed)"
342
-msgstr "Nem kiválasztott változtatások (nem lesz commitolva)"
360
+#: git-gui.sh:2239
361
+#, fuzzy
362
+msgid "Unstaged Changes"
363
+msgstr "Változtatások kiválasztása"
364
344
-#: git-gui.sh:2142
365
+#: git-gui.sh:2286
366
msgid "Stage Changed"
367
msgstr "Változtatások kiválasztása"
368
348
-#: git-gui.sh:2188
369
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
370
+msgid "Push"
371
+msgstr "Push"
372
+
373
+#: git-gui.sh:2332
374
msgid "Initial Commit Message:"
375
msgstr "Kezdeti commit üzenet:"
376
352
-#: git-gui.sh:2189
377
+#: git-gui.sh:2333
378
msgid "Amended Commit Message:"
379
msgstr "Javító commit üzenet:"
380
356
-#: git-gui.sh:2190
381
+#: git-gui.sh:2334
382
msgid "Amended Initial Commit Message:"
383
msgstr "Kezdeti javító commit üzenet:"
384
360
-#: git-gui.sh:2191
385
+#: git-gui.sh:2335
386
msgid "Amended Merge Commit Message:"
387
msgstr "Javító merge commit üzenet:"
388
364
-#: git-gui.sh:2192
389
+#: git-gui.sh:2336
390
msgid "Merge Commit Message:"
391
msgstr "Merge commit üzenet:"
392
368
-#: git-gui.sh:2193
393
+#: git-gui.sh:2337
394
msgid "Commit Message:"
395
msgstr "Commit üzenet:"
396
372
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
397
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
398
msgid "Copy All"
399
msgstr "Összes másolása"
400
376
-#: git-gui.sh:2262 lib/blame.tcl:104
401
+#: git-gui.sh:2406 lib/blame.tcl:104
402
msgid "File:"
403
msgstr "Fájl:"
404
380
-#: git-gui.sh:2364
405
+#: git-gui.sh:2508
406
msgid "Refresh"
407
msgstr "Frissítés"
408
384
-#: git-gui.sh:2385
409
+#: git-gui.sh:2529
410
msgid "Apply/Reverse Hunk"
411
msgstr "Hunk alkalmazása/visszaállítása"
412
388
-#: git-gui.sh:2391
413
+#: git-gui.sh:2535
414
msgid "Decrease Font Size"
415
msgstr "Font méret csökkentése"
416
392
-#: git-gui.sh:2395
417
+#: git-gui.sh:2539
418
msgid "Increase Font Size"
419
msgstr "Fönt méret növelése"
420
396
-#: git-gui.sh:2400
421
+#: git-gui.sh:2544
422
msgid "Show Less Context"
423
msgstr "Kevesebb környezet mutatása"
424
400
-#: git-gui.sh:2407
425
+#: git-gui.sh:2551
426
msgid "Show More Context"
427
msgstr "Több környezet mutatása"
428
404
-#: git-gui.sh:2422
429
+#: git-gui.sh:2565
430
msgid "Unstage Hunk From Commit"
431
msgstr "Hunk törlése commitból"
432
408
-#: git-gui.sh:2426 git-gui.sh:2430
433
+#: git-gui.sh:2567
434
msgid "Stage Hunk For Commit"
435
msgstr "Hunk kiválasztása commitba"
436
412
-#: git-gui.sh:2440
437
+#: git-gui.sh:2586
438
msgid "Initializing..."
439
msgstr "Inicializálás..."
440
441
+#: git-gui.sh:2677
442
+#, tcl-format
443
+msgid ""
444
+"Possible environment issues exist.\n"
445
+"\n"
446
+"The following environment variables are probably\n"
447
+"going to be ignored by any Git subprocess run\n"
448
+"by %s:\n"
449
+"\n"
450
+msgstr ""
451
+
452
+#: git-gui.sh:2707
453
+msgid ""
454
+"\n"
455
+"This is due to a known issue with the\n"
456
+"Tcl binary distributed by Cygwin."
457
+msgstr ""
458
+
459
+#: git-gui.sh:2712
460
+#, tcl-format
461
+msgid ""
462
+"\n"
463
+"\n"
464
+"A good replacement for %s\n"
465
+"is placing values for the user.name and\n"
466
+"user.email settings into your personal\n"
467
+"~/.gitconfig file.\n"
468
+msgstr ""
469
+
470
+#: lib/about.tcl:25
471
+msgid "git-gui - a graphical user interface for Git."
472
+msgstr "git-gui - egy grafikus felület a Githez."
473
+
474
#: lib/blame.tcl:77
475
msgid "File Viewer"
476
msgstr "Fájl néző"
@@ -430,6 +488,53 @@ msgstr "Commit másolása"
488
msgid "Reading %s..."
489
msgstr "A(z) %s olvasása..."
490
491
+#: lib/blame.tcl:473
492
+msgid "Loading copy/move tracking annotations..."
493
+msgstr ""
494
+
495
+#: lib/blame.tcl:493
496
+msgid "lines annotated"
497
+msgstr ""
498
+
499
+#: lib/blame.tcl:674
500
+msgid "Loading original location annotations..."
501
+msgstr ""
502
+
503
+#: lib/blame.tcl:677
504
+msgid "Annotation complete."
505
+msgstr ""
506
+
507
+#: lib/blame.tcl:731
508
+#, fuzzy
509
+msgid "Loading annotation..."
510
+msgstr "A(z) %s betöltése..."
511
+
512
+#: lib/blame.tcl:787
513
+msgid "Author:"
514
+msgstr ""
515
+
516
+#: lib/blame.tcl:791
517
+#, fuzzy
518
+msgid "Committer:"
519
+msgstr "Commit:"
520
+
521
+#: lib/blame.tcl:796
522
+msgid "Original File:"
523
+msgstr ""
524
+
525
+#: lib/blame.tcl:910
526
+msgid "Originally By:"
527
+msgstr ""
528
+
529
+#: lib/blame.tcl:916
530
+#, fuzzy
531
+msgid "In File:"
532
+msgstr "Fájl:"
533
+
534
+#: lib/blame.tcl:921
535
+msgid "Copied Or Moved Here By:"
536
+msgstr ""
537
+
538
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
539
msgid "Checkout Branch"
540
msgstr "Branch checkoutolása"
@@ -439,18 +544,17 @@ msgid "Checkout"
544
msgstr "Checkout"
545
546
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
442
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283
443
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
444
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
547
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
548
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
549
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
550
msgid "Cancel"
551
msgstr "Mégsem"
552
448
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
553
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
554
msgid "Revision"
555
msgstr "Revízió"
556
452
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
453
-#: lib/option.tcl:274
557
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
558
msgid "Options"
559
msgstr "Opciók"
560
@@ -470,7 +574,7 @@ msgstr "Branch létrehozása"
574
msgid "Create New Branch"
575
msgstr "Új branch létrehozása"
576
473
-#: lib/branch_create.tcl:31
577
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
578
msgid "Create"
579
msgstr "Létrehozás"
580
@@ -610,20 +714,22 @@ msgstr "Indítás..."
714
msgid "File Browser"
715
msgstr "Fájl böngésző"
716
613
-#: lib/browser.tcl:127 lib/browser.tcl:144
717
+#: lib/browser.tcl:125 lib/browser.tcl:142
718
#, tcl-format
719
msgid "Loading %s..."
720
msgstr "A(z) %s betöltése..."
721
618
-#: lib/browser.tcl:188
722
+#: lib/browser.tcl:186
723
msgid "[Up To Parent]"
724
msgstr "[Fel a szülőhöz]"
725
622
-#: lib/browser.tcl:268 lib/browser.tcl:274
726
+#: lib/browser.tcl:266 lib/browser.tcl:272
727
msgid "Browse Branch Files"
728
msgstr "A branch fájljainak böngészése"
729
626
-#: lib/browser.tcl:279
730
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
731
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
732
+#: lib/choose_repository.tcl:811
733
msgid "Browse"
734
msgstr "Böngészés"
735
@@ -632,7 +738,12 @@ msgstr "Böngészés"
738
msgid "Fetching %s from %s"
739
msgstr "A(z) %s letöltése innen: %s"
740
635
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
741
+#: lib/checkout_op.tcl:127
742
+#, tcl-format
743
+msgid "fatal: Cannot resolve %s"
744
+msgstr ""
745
+
746
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
747
msgid "Close"
748
msgstr "Bezárás"
749
@@ -685,6 +796,11 @@ msgstr ""
796
"\n"
797
"Az újrakeresés most automatikusan el fog indulni.\n"
798
799
+#: lib/checkout_op.tcl:322
800
+#, fuzzy, tcl-format
801
+msgid "Updating working directory to '%s'..."
802
+msgstr "Nincs munkakönyvtár"
803
+
804
#: lib/checkout_op.tcl:353
805
#, tcl-format
806
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -711,6 +827,11 @@ msgstr ""
827
"Ha egy branchen szeretnénk lenni, hozzunk létre egyet az 'Ez a leválasztott "
828
"checkout'-ból."
829
830
+#: lib/checkout_op.tcl:446
831
+#, fuzzy, tcl-format
832
+msgid "Checked out '%s'."
833
+msgstr "Checkout..."
834
+
835
#: lib/checkout_op.tcl:478
836
#, tcl-format
837
msgid "Resetting '%s' to '%s' will lose the following commits:"
@@ -747,6 +868,246 @@ msgstr ""
868
"\n"
869
"Ennek nem szabad megtörténnie. A(z) %s most kilép és feladja."
870
871
+#: lib/choose_font.tcl:39
872
+#, fuzzy
873
+msgid "Select"
874
+msgstr "Mindent kiválaszt"
875
+
876
+#: lib/choose_font.tcl:53
877
+msgid "Font Family"
878
+msgstr ""
879
+
880
+#: lib/choose_font.tcl:73
881
+#, fuzzy
882
+msgid "Font Size"
883
+msgstr "Font méret csökkentése"
884
+
885
+#: lib/choose_font.tcl:90
886
+msgid "Font Example"
887
+msgstr ""
888
+
889
+#: lib/choose_font.tcl:101
890
+msgid ""
891
+"This is example text.\n"
892
+"If you like this text, it can be your font."
893
+msgstr ""
894
+
895
+#: lib/choose_repository.tcl:25
896
+msgid "Git Gui"
897
+msgstr ""
898
+
899
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
900
+#, fuzzy
901
+msgid "Create New Repository"
902
+msgstr "Forrás repó"
903
+
904
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
905
+#, fuzzy
906
+msgid "Clone Existing Repository"
907
+msgstr "Cél repó"
908
+
909
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
910
+#, fuzzy
911
+msgid "Open Existing Repository"
912
+msgstr "Cél repó"
913
+
914
+#: lib/choose_repository.tcl:91
915
+msgid "Next >"
916
+msgstr ""
917
+
918
+#: lib/choose_repository.tcl:152
919
+#, fuzzy, tcl-format
920
+msgid "Location %s already exists."
921
+msgstr "A(z) '%s' branch már létezik."
922
+
923
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
924
+#: lib/choose_repository.tcl:172
925
+#, fuzzy, tcl-format
926
+msgid "Failed to create repository %s:"
927
+msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
928
+
929
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
930
+msgid "Directory:"
931
+msgstr ""
932
+
933
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
934
+#: lib/choose_repository.tcl:834
935
+#, fuzzy
936
+msgid "Git Repository"
937
+msgstr "Repó"
938
+
939
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
940
+#, fuzzy, tcl-format
941
+msgid "Directory %s already exists."
942
+msgstr "A(z) '%s' branch már létezik."
943
+
944
+#: lib/choose_repository.tcl:265
945
+#, fuzzy, tcl-format
946
+msgid "File %s already exists."
947
+msgstr "A(z) '%s' branch már létezik."
948
+
949
+#: lib/choose_repository.tcl:286
950
+#, fuzzy
951
+msgid "Clone"
952
+msgstr "Bezárás"
953
+
954
+#: lib/choose_repository.tcl:299
955
+msgid "URL:"
956
+msgstr ""
957
+
958
+#: lib/choose_repository.tcl:319
959
+msgid "Clone Type:"
960
+msgstr ""
961
+
962
+#: lib/choose_repository.tcl:325
963
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
964
+msgstr ""
965
+
966
+#: lib/choose_repository.tcl:331
967
+msgid "Full Copy (Slower, Redundant Backup)"
968
+msgstr ""
969
+
970
+#: lib/choose_repository.tcl:337
971
+msgid "Shared (Fastest, Not Recommended, No Backup)"
972
+msgstr ""
973
+
974
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
975
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
976
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
977
+#, fuzzy, tcl-format
978
+msgid "Not a Git repository: %s"
979
+msgstr "Nincs kiválasztott repó."
980
+
981
+#: lib/choose_repository.tcl:405
982
+msgid "Standard only available for local repository."
983
+msgstr ""
984
+
985
+#: lib/choose_repository.tcl:409
986
+msgid "Shared only available for local repository."
987
+msgstr ""
988
+
989
+#: lib/choose_repository.tcl:439
990
+msgid "Failed to configure origin"
991
+msgstr ""
992
+
993
+#: lib/choose_repository.tcl:451
994
+msgid "Counting objects"
995
+msgstr ""
996
+
997
+#: lib/choose_repository.tcl:452
998
+msgid "buckets"
999
+msgstr ""
1000
+
1001
+#: lib/choose_repository.tcl:476
1002
+#, tcl-format
1003
+msgid "Unable to copy objects/info/alternates: %s"
1004
+msgstr ""
1005
+
1006
+#: lib/choose_repository.tcl:512
1007
+#, fuzzy, tcl-format
1008
+msgid "Nothing to clone from %s."
1009
+msgstr "Új változások letöltése innen: %s"
1010
+
1011
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
1012
+#: lib/choose_repository.tcl:740
1013
+msgid "The 'master' branch has not been initialized."
1014
+msgstr ""
1015
+
1016
+#: lib/choose_repository.tcl:527
1017
+msgid "Hardlinks are unavailable. Falling back to copying."
1018
+msgstr ""
1019
+
1020
+#: lib/choose_repository.tcl:539
1021
+#, fuzzy, tcl-format
1022
+msgid "Cloning from %s"
1023
+msgstr "A(z) %s letöltése innen: %s"
1024
+
1025
+#: lib/choose_repository.tcl:570
1026
+#, fuzzy
1027
+msgid "Copying objects"
1028
+msgstr "Az objektum adatbázis tömörítése"
1029
+
1030
+#: lib/choose_repository.tcl:571
1031
+msgid "KiB"
1032
+msgstr ""
1033
+
1034
+#: lib/choose_repository.tcl:595
1035
+#, tcl-format
1036
+msgid "Unable to copy object: %s"
1037
+msgstr ""
1038
+
1039
+#: lib/choose_repository.tcl:605
1040
+msgid "Linking objects"
1041
+msgstr ""
1042
+
1043
+#: lib/choose_repository.tcl:606
1044
+msgid "objects"
1045
+msgstr ""
1046
+
1047
+#: lib/choose_repository.tcl:614
1048
+#, tcl-format
1049
+msgid "Unable to hardlink object: %s"
1050
+msgstr ""
1051
+
1052
+#: lib/choose_repository.tcl:669
1053
+msgid "Cannot fetch branches and objects. See console output for details."
1054
+msgstr ""
1055
+
1056
+#: lib/choose_repository.tcl:680
1057
+msgid "Cannot fetch tags. See console output for details."
1058
+msgstr ""
1059
+
1060
+#: lib/choose_repository.tcl:704
1061
+msgid "Cannot determine HEAD. See console output for details."
1062
+msgstr ""
1063
+
1064
+#: lib/choose_repository.tcl:713
1065
+#, tcl-format
1066
+msgid "Unable to cleanup %s"
1067
+msgstr ""
1068
+
1069
+#: lib/choose_repository.tcl:719
1070
+#, fuzzy
1071
+msgid "Clone failed."
1072
+msgstr "A félbeszakítás nem sikerült."
1073
+
1074
+#: lib/choose_repository.tcl:726
1075
+msgid "No default branch obtained."
1076
+msgstr ""
1077
+
1078
+#: lib/choose_repository.tcl:737
1079
+#, tcl-format
1080
+msgid "Cannot resolve %s as a commit."
1081
+msgstr ""
1082
+
1083
+#: lib/choose_repository.tcl:749
1084
+#, fuzzy
1085
+msgid "Creating working directory"
1086
+msgstr "Nincs munkakönyvtár"
1087
+
1088
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1089
+#: lib/index.tcl:149
1090
+msgid "files"
1091
+msgstr ""
1092
+
1093
+#: lib/choose_repository.tcl:779
1094
+msgid "Initial file checkout failed."
1095
+msgstr ""
1096
+
1097
+#: lib/choose_repository.tcl:795
1098
+msgid "Open"
1099
+msgstr ""
1100
+
1101
+#: lib/choose_repository.tcl:805
1102
+#, fuzzy
1103
+msgid "Repository:"
1104
+msgstr "Repó"
1105
+
1106
+#: lib/choose_repository.tcl:854
1107
+#, fuzzy, tcl-format
1108
+msgid "Failed to open repository %s:"
1109
+msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
1110
+
1111
#: lib/choose_rev.tcl:53
1112
msgid "This Detached Checkout"
1113
msgstr "Ez a leválasztott checkout"
@@ -763,7 +1124,7 @@ msgstr "Helyi branch"
1124
msgid "Tracking Branch"
1125
msgstr "Követő branch"
1126
766
-#: lib/choose_rev.tcl:84
1127
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1128
msgid "Tag"
1129
msgstr "Tag"
1130
@@ -780,6 +1141,14 @@ msgstr "Nincs kiválasztva revízió."
1141
msgid "Revision expression is empty."
1142
msgstr "A revízió kifejezés üres."
1143
1144
+#: lib/choose_rev.tcl:530
1145
+msgid "Updated"
1146
+msgstr ""
1147
+
1148
+#: lib/choose_rev.tcl:558
1149
+msgid "URL"
1150
+msgstr ""
1151
+
1152
#: lib/commit.tcl:9
1153
msgid ""
1154
"There is nothing to amend.\n"
@@ -890,6 +1259,11 @@ msgstr ""
1259
msgid "write-tree failed:"
1260
msgstr "a write-tree sikertelen:"
1261
1262
+#: lib/commit.tcl:275
1263
+#, tcl-format
1264
+msgid "Commit %s appears to be corrupt"
1265
+msgstr ""
1266
+
1267
#: lib/commit.tcl:279
1268
msgid ""
1269
"No changes to commit.\n"
@@ -908,6 +1282,11 @@ msgstr ""
1282
msgid "No changes to commit."
1283
msgstr "Nincs commitolandó változtatás."
1284
1285
+#: lib/commit.tcl:303
1286
+#, tcl-format
1287
+msgid "warning: Tcl does not support encoding '%s'."
1288
+msgstr ""
1289
+
1290
#: lib/commit.tcl:317
1291
msgid "commit-tree failed:"
1292
msgstr "a commit-tree sikertelen:"
@@ -921,15 +1300,15 @@ msgstr "az update-ref sikertelen:"
1300
msgid "Created commit %s: %s"
1301
msgstr "Létrejött a %s commit: %s"
1302
924
-#: lib/console.tcl:55
1303
+#: lib/console.tcl:57
1304
msgid "Working... please wait..."
1305
msgstr "Munka folyamatban.. Várjunk..."
1306
928
-#: lib/console.tcl:184
1307
+#: lib/console.tcl:183
1308
msgid "Success"
1309
msgstr "Siker"
1310
932
-#: lib/console.tcl:194
1311
+#: lib/console.tcl:196
1312
msgid "Error: Command Failed"
1313
msgstr "Hiba: a parancs sikertelen"
1314
@@ -969,6 +1348,22 @@ msgstr "Az objektum adatbázis tömörítése"
1348
msgid "Verifying the object database with fsck-objects"
1349
msgstr "Az objektum adatbázis ellenőrzése az fsck-objects használatával"
1350
1351
+#: lib/database.tcl:108
1352
+#, tcl-format
1353
+msgid ""
1354
+"This repository currently has approximately %i loose objects.\n"
1355
+"\n"
1356
+"To maintain optimal performance it is strongly recommended that you compress "
1357
+"the database when more than %i loose objects exist.\n"
1358
+"\n"
1359
+"Compress the database now?"
1360
+msgstr ""
1361
+
1362
+#: lib/date.tcl:25
1363
+#, fuzzy, tcl-format
1364
+msgid "Invalid date from Git: %s"
1365
+msgstr "Érvénytelen revízió: %s"
1366
+
1367
#: lib/diff.tcl:42
1368
#, tcl-format
1369
msgid ""
@@ -991,19 +1386,37 @@ msgstr ""
1386
"\n"
1387
"Egy újrakeresés fog indulni a hasonló állapotú fájlok megtalálása érdekében."
1388
994
-#: lib/diff.tcl:97
1389
+#: lib/diff.tcl:81
1390
+#, fuzzy, tcl-format
1391
+msgid "Loading diff of %s..."
1392
+msgstr "A(z) %s betöltése..."
1393
+
1394
+#: lib/diff.tcl:114 lib/diff.tcl:184
1395
+#, tcl-format
1396
+msgid "Unable to display %s"
1397
+msgstr ""
1398
+
1399
+#: lib/diff.tcl:115
1400
msgid "Error loading file:"
1401
msgstr "Hiba a fájl betöltése közben:"
1402
998
-#: lib/diff.tcl:162
1403
+#: lib/diff.tcl:122
1404
+msgid "Git Repository (subproject)"
1405
+msgstr ""
1406
+
1407
+#: lib/diff.tcl:134
1408
+msgid "* Binary file (not showing content)."
1409
+msgstr ""
1410
+
1411
+#: lib/diff.tcl:185
1412
msgid "Error loading diff:"
1413
msgstr "Hiba a diff betöltése közben:"
1414
1002
-#: lib/diff.tcl:278
1415
+#: lib/diff.tcl:302
1416
msgid "Failed to unstage selected hunk."
1417
msgstr "Nem visszavonni a hunk kiválasztását."
1418
1006
-#: lib/diff.tcl:285
1419
+#: lib/diff.tcl:309
1420
msgid "Failed to stage selected hunk."
1421
msgstr "Nem sikerült kiválasztani a hunkot."
1422
@@ -1019,23 +1432,33 @@ msgstr "figyelmeztetés"
1432
msgid "You must correct the above errors before committing."
1433
msgstr "Ki kell javítanunk a fenti hibákat commit előtt."
1434
1022
-#: lib/index.tcl:364
1435
+#: lib/index.tcl:241
1436
+#, fuzzy, tcl-format
1437
+msgid "Unstaging %s from commit"
1438
+msgstr "Commitba való kiválasztás visszavonása"
1439
+
1440
+#: lib/index.tcl:285
1441
+#, fuzzy, tcl-format
1442
+msgid "Adding %s"
1443
+msgstr "A(z) %s olvasása..."
1444
+
1445
+#: lib/index.tcl:340
1446
#, tcl-format
1447
msgid "Revert changes in file %s?"
1448
msgstr "Visszaállítja a változtatásokat a(z) %s fájlban?"
1449
1027
-#: lib/index.tcl:366
1450
+#: lib/index.tcl:342
1451
#, tcl-format
1452
msgid "Revert changes in these %i files?"
1453
msgstr "Visszaállítja a változtatásokat ebben e %i fájlban?"
1454
1032
-#: lib/index.tcl:372
1455
+#: lib/index.tcl:348
1456
msgid "Any unstaged changes will be permanently lost by the revert."
1457
msgstr ""
1458
"Minden nem kiválasztott változtatás el fog veszni ezáltal a visszaállítás "
1459
"által."
1460
1038
-#: lib/index.tcl:375
1461
+#: lib/index.tcl:351
1462
msgid "Do Nothing"
1463
msgstr "Ne csináljunk semmit"
1464
@@ -1180,71 +1603,101 @@ msgstr "A félbeszakítás nem sikerült."
1603
msgid "Abort completed. Ready."
1604
msgstr "A megkeszakítás befejeződött. Kész."
1605
1183
-#: lib/option.tcl:77
1184
-msgid "git-gui - a graphical user interface for Git."
1185
-msgstr "git-gui - egy grafikus felület a Githez."
1186
-
1187
-#: lib/option.tcl:164
1606
+#: lib/option.tcl:82
1607
msgid "Restore Defaults"
1608
msgstr "Alapértelmezés visszaállítása"
1609
1191
-#: lib/option.tcl:168
1610
+#: lib/option.tcl:86
1611
msgid "Save"
1612
msgstr "Mentés"
1613
1195
-#: lib/option.tcl:178
1614
+#: lib/option.tcl:96
1615
#, tcl-format
1616
msgid "%s Repository"
1617
msgstr "%s Repó"
1618
1200
-#: lib/option.tcl:179
1619
+#: lib/option.tcl:97
1620
msgid "Global (All Repositories)"
1621
msgstr "Globális (minden repó)"
1622
1204
-#: lib/option.tcl:185
1623
+#: lib/option.tcl:103
1624
msgid "User Name"
1625
msgstr "Felhasználónév"
1626
1208
-#: lib/option.tcl:186
1627
+#: lib/option.tcl:104
1628
msgid "Email Address"
1629
msgstr "Email cím"
1630
1212
-#: lib/option.tcl:188
1631
+#: lib/option.tcl:106
1632
msgid "Summarize Merge Commits"
1633
msgstr "A merge commitok összegzése"
1634
1216
-#: lib/option.tcl:189
1635
+#: lib/option.tcl:107
1636
msgid "Merge Verbosity"
1637
msgstr "Merge beszédesség"
1638
1220
-#: lib/option.tcl:190
1639
+#: lib/option.tcl:108
1640
msgid "Show Diffstat After Merge"
1641
msgstr "Diffstat mutatása merge után"
1642
1224
-#: lib/option.tcl:192
1643
+#: lib/option.tcl:110
1644
msgid "Trust File Modification Timestamps"
1645
msgstr "A fájl módosítási dátumok megbízhatóak"
1646
1228
-#: lib/option.tcl:193
1647
+#: lib/option.tcl:111
1648
msgid "Prune Tracking Branches During Fetch"
1649
msgstr "A követő branchek eltávolítása letöltés alatt"
1650
1232
-#: lib/option.tcl:194
1651
+#: lib/option.tcl:112
1652
msgid "Match Tracking Branches"
1653
msgstr "A követő branchek egyeztetése"
1654
1236
-#: lib/option.tcl:195
1655
+#: lib/option.tcl:113
1656
msgid "Number of Diff Context Lines"
1657
msgstr "A diff környezeti sorok száma"
1658
1240
-#: lib/option.tcl:196
1659
+#: lib/option.tcl:114
1660
msgid "New Branch Name Template"
1661
msgstr "Új branch név sablon"
1662
1244
-#: lib/option.tcl:305
1663
+#: lib/option.tcl:176
1664
+#, fuzzy
1665
+msgid "Change Font"
1666
+msgstr "Fő betűtípus"
1667
+
1668
+#: lib/option.tcl:180
1669
+#, tcl-format
1670
+msgid "Choose %s"
1671
+msgstr ""
1672
+
1673
+#: lib/option.tcl:186
1674
+msgid "pt."
1675
+msgstr ""
1676
+
1677
+#: lib/option.tcl:200
1678
+msgid "Preferences"
1679
+msgstr ""
1680
+
1681
+#: lib/option.tcl:235
1682
msgid "Failed to completely save options:"
1683
msgstr "Nem sikerült teljesen elmenteni a beállításokat:"
1684
1685
+#: lib/remote.tcl:165
1686
+#, fuzzy
1687
+msgid "Prune from"
1688
+msgstr "Törlés innen: %s..."
1689
+
1690
+# tcl-format
1691
+#: lib/remote.tcl:170
1692
+#, fuzzy
1693
+msgid "Fetch from"
1694
+msgstr "Letöltés innen: %s..."
1695
+
1696
+#: lib/remote.tcl:213
1697
+#, fuzzy
1698
+msgid "Push to"
1699
+msgstr "Push"
1700
+
1701
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1702
msgid "Delete Remote Branch"
1703
msgstr "Távoli branch törlése"
@@ -1253,11 +1706,11 @@ msgstr "Távoli branch törlése"
1706
msgid "From Repository"
1707
msgstr "Forrás repó"
1708
1256
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
1709
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1710
msgid "Remote:"
1711
msgstr "Távoli:"
1712
1260
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
1713
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1714
msgid "Arbitrary URL:"
1715
msgstr "Tetszőleges URL:"
1716
@@ -1281,6 +1734,14 @@ msgstr "Mindig (Ne végezzen merge vizsgálatokat)"
1734
msgid "A branch is required for 'Merged Into'."
1735
msgstr "Egy branch szükséges a 'Merge-ölt a következőbe'-hez."
1736
1737
+#: lib/remote_branch_delete.tcl:184
1738
+#, fuzzy, tcl-format
1739
+msgid ""
1740
+"The following branches are not completely merged into %s:\n"
1741
+"\n"
1742
+" - %s"
1743
+msgstr "A következő branchek nem teljesen lettek merge-ölve ebbe: %s:"
1744
+
1745
#: lib/remote_branch_delete.tcl:189
1746
#, tcl-format
1747
msgid ""
@@ -1318,22 +1779,6 @@ msgstr "Nincs kiválasztott repó."
1779
msgid "Scanning %s..."
1780
msgstr "Keresés itt: %s..."
1781
1321
-# tcl-format
1322
-#: lib/remote.tcl:162
1323
-#, tcl-format
1324
-msgid "Fetch from %s..."
1325
-msgstr "Letöltés innen: %s..."
1326
-
1327
-#: lib/remote.tcl:172
1328
-#, tcl-format
1329
-msgid "Prune from %s..."
1330
-msgstr "Törlés innen: %s..."
1331
-
1332
-#: lib/remote.tcl:206
1333
-#, tcl-format
1334
-msgid "Push to %s..."
1335
-msgstr "Pusholás ide: %s..."
1336
-
1782
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1783
msgid "Cannot write script:"
1784
msgstr "Nem sikerült írni a scriptet:"
@@ -1342,55 +1787,83 @@ msgstr "Nem sikerült írni a scriptet:"
1787
msgid "Cannot write icon:"
1788
msgstr "Nem sikerült írni az ikont:"
1789
1345
-#: lib/status_bar.tcl:58
1790
+#: lib/status_bar.tcl:83
1791
#, tcl-format
1792
msgid "%s ... %*i of %*i %s (%3i%%)"
1793
msgstr "%s ... %*i / %*i %s (%3i%%)"
1794
1795
+#: lib/transport.tcl:6
1796
+#, fuzzy, tcl-format
1797
+msgid "fetch %s"
1798
+msgstr "Letöltés"
1799
+
1800
#: lib/transport.tcl:7
1801
#, tcl-format
1802
msgid "Fetching new changes from %s"
1803
msgstr "Új változások letöltése innen: %s"
1804
1805
+#: lib/transport.tcl:18
1806
+#, tcl-format
1807
+msgid "remote prune %s"
1808
+msgstr ""
1809
+
1810
#: lib/transport.tcl:19
1811
#, tcl-format
1812
msgid "Pruning tracking branches deleted from %s"
1813
msgstr "A %s repóból törölt követő branchek törlése"
1814
1815
+#: lib/transport.tcl:25 lib/transport.tcl:71
1816
+#, tcl-format
1817
+msgid "push %s"
1818
+msgstr ""
1819
+
1820
#: lib/transport.tcl:26
1821
#, tcl-format
1822
msgid "Pushing changes to %s"
1823
msgstr "Változások pusholása ide: %s"
1824
1365
-#: lib/transport.tcl:68
1825
+#: lib/transport.tcl:72
1826
#, tcl-format
1827
msgid "Pushing %s %s to %s"
1828
msgstr "Pusholás: %s %s, ide: %s"
1829
1370
-#: lib/transport.tcl:84
1830
+#: lib/transport.tcl:89
1831
msgid "Push Branches"
1832
msgstr "Branchek pusholása"
1833
1374
-#: lib/transport.tcl:98
1834
+#: lib/transport.tcl:103
1835
msgid "Source Branches"
1836
msgstr "Forrás branchek"
1837
1378
-#: lib/transport.tcl:115
1838
+#: lib/transport.tcl:120
1839
msgid "Destination Repository"
1840
msgstr "Cél repó"
1841
1382
-#: lib/transport.tcl:153
1842
+#: lib/transport.tcl:158
1843
msgid "Transfer Options"
1844
msgstr "Átviteli opciók"
1845
1386
-#: lib/transport.tcl:155
1846
+#: lib/transport.tcl:160
1847
+msgid "Force overwrite existing branch (may discard changes)"
1848
+msgstr ""
1849
+
1850
+#: lib/transport.tcl:164
1851
msgid "Use thin pack (for slow network connections)"
1852
msgstr "Vékony csomagok használata (lassú hálózati kapcsolatok számára)"
1853
1390
-#: lib/transport.tcl:159
1854
+#: lib/transport.tcl:168
1855
msgid "Include tags"
1856
msgstr "Tageket is"
1857
1858
+#~ msgid "Cannot find the git directory:"
1859
+#~ msgstr "Nem található a git könyvtár:"
1860
+
1861
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
1862
+#~ msgstr "Nem kiválasztott változtatások (nem lesz commitolva)"
1863
+
1864
+#~ msgid "Push to %s..."
1865
+#~ msgstr "Pusholás ide: %s..."
1866
+
1867
#~ msgid "Add To Commit"
1868
#~ msgstr "Hozzáadás a commithoz"
1869
po/it.po
+673
-199
@@ -9,23 +9,41 @@ msgid ""
9
msgstr ""
10
"Project-Id-Version: git-gui\n"
11
"Report-Msgid-Bugs-To: \n"
12
-"POT-Creation-Date: 2007-08-11 17:28+0200\n"
12
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
13
"PO-Revision-Date: 2007-08-09 00:27+0200\n"
14
"Last-Translator: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>\n"
15
"Language-Team: Italian <tp@lists.linux.it>\n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=UTF-8\n"
18
-"Content-Transfer-Encoding: 8bit"
18
+"Content-Transfer-Encoding: 8bit\n"
19
20
-#: git-gui.sh:531
20
+#: git-gui.sh:41 git-gui.sh:634 git-gui.sh:648 git-gui.sh:661 git-gui.sh:744
21
+#: git-gui.sh:763
22
+msgid "git-gui: fatal error"
23
+msgstr ""
24
+
25
+#: git-gui.sh:595
26
+#, fuzzy, tcl-format
27
+msgid "Invalid font specified in %s:"
28
+msgstr "Caratteri non validi specificati nella gui.%s:"
29
+
30
+#: git-gui.sh:620
31
+msgid "Main Font"
32
+msgstr "Caratteri principali"
33
+
34
+#: git-gui.sh:621
35
+msgid "Diff/Console Font"
36
+msgstr "Caratteri per confronti e terminale"
37
+
38
+#: git-gui.sh:635
39
msgid "Cannot find git in PATH."
40
msgstr "Impossibile trovare git nel PATH"
41
24
-#: git-gui.sh:550
42
+#: git-gui.sh:662
43
msgid "Cannot parse Git version string:"
44
msgstr "Impossibile determinare la versione di Git:"
45
28
-#: git-gui.sh:567
46
+#: git-gui.sh:680
47
#, tcl-format
48
msgid ""
49
"Git version cannot be determined.\n"
@@ -44,79 +62,80 @@ msgstr ""
62
"\n"
63
"Assumere che '%s' sia alla versione 1.5.0?\n"
64
47
-#: git-gui.sh:689
48
-msgid "Cannot find the git directory:"
49
-msgstr "Non posso trovare la directory di git:"
50
-
51
-#: git-gui.sh:697
65
+#: git-gui.sh:853
66
msgid "Git directory not found:"
67
msgstr "Non trovo la directory di git: "
68
55
-#: git-gui.sh:703
69
+#: git-gui.sh:860
70
+#, fuzzy
71
+msgid "Cannot move to top of working directory:"
72
+msgstr "Impossibile usare una .git directory strana:"
73
+
74
+#: git-gui.sh:867
75
msgid "Cannot use funny .git directory:"
76
msgstr "Impossibile usare una .git directory strana:"
77
59
-#: git-gui.sh:708
78
+#: git-gui.sh:872
79
msgid "No working directory"
80
msgstr "Nessuna directory di lavoro"
81
63
-#: git-gui.sh:854
82
+#: git-gui.sh:1019
83
msgid "Refreshing file status..."
84
msgstr "Controllo dello stato dei file in corso..."
85
67
-#: git-gui.sh:891
86
+#: git-gui.sh:1084
87
msgid "Scanning for modified files ..."
88
msgstr "Ricerca di file modificati in corso..."
89
71
-#: git-gui.sh:1057 lib/browser.tcl:247
90
+#: git-gui.sh:1259 lib/browser.tcl:245
91
msgid "Ready."
92
msgstr "Pronto."
93
75
-#: git-gui.sh:1322
94
+#: git-gui.sh:1525
95
msgid "Unmodified"
96
msgstr "Non modificato"
97
79
-#: git-gui.sh:1324
98
+#: git-gui.sh:1527
99
msgid "Modified, not staged"
100
msgstr "Modificato, non pronto per il commit"
101
83
-#: git-gui.sh:1325 git-gui.sh:1330
102
+#: git-gui.sh:1528 git-gui.sh:1533
103
msgid "Staged for commit"
104
msgstr "Pronto per il commit"
105
87
-#: git-gui.sh:1326 git-gui.sh:1331
106
+#: git-gui.sh:1529 git-gui.sh:1534
107
msgid "Portions staged for commit"
108
msgstr "Parti pronte per il commit"
109
91
-#: git-gui.sh:1327 git-gui.sh:1332
110
+#: git-gui.sh:1530 git-gui.sh:1535
111
msgid "Staged for commit, missing"
112
msgstr "Pronto per il commit, mancante"
113
95
-#: git-gui.sh:1329
114
+#: git-gui.sh:1532
115
msgid "Untracked, not staged"
116
msgstr "Non tracciato, non pronto per il commit"
117
99
-#: git-gui.sh:1334
118
+#: git-gui.sh:1537
119
msgid "Missing"
120
msgstr "Mancante"
121
103
-#: git-gui.sh:1335
122
+#: git-gui.sh:1538
123
msgid "Staged for removal"
124
msgstr "Pronto per la rimozione"
125
107
-#: git-gui.sh:1336
126
+#: git-gui.sh:1539
127
msgid "Staged for removal, still present"
128
msgstr "Pronto alla rimozione, ancora presente"
129
111
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
130
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
131
msgid "Requires merge resolution"
132
msgstr "Richiede risoluzione dei conflitti"
133
115
-#: git-gui.sh:1383
134
+#: git-gui.sh:1579
135
msgid "Starting gitk... please wait..."
136
msgstr "Avvio di gitk... attendere..."
137
119
-#: git-gui.sh:1392
138
+#: git-gui.sh:1588
139
#, tcl-format
140
msgid ""
141
"Unable to start gitk:\n"
@@ -127,293 +146,332 @@ msgstr ""
146
"\n"
147
"%s non esiste"
148
130
-#: git-gui.sh:1609
131
-#, tcl-format
132
-msgid "Invalid font specified in gui.%s:"
133
-msgstr "Caratteri non validi specificati nella gui.%s:"
134
-
135
-#: git-gui.sh:1634
136
-msgid "Main Font"
137
-msgstr "Caratteri principali"
138
-
139
-#: git-gui.sh:1635
140
-msgid "Diff/Console Font"
141
-msgstr "Caratteri per confronti e terminale"
142
-
143
-#: git-gui.sh:1649
149
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
150
msgid "Repository"
151
msgstr "Archivio"
152
147
-#: git-gui.sh:1650
153
+#: git-gui.sh:1789
154
msgid "Edit"
155
msgstr "Modifica"
156
151
-#: git-gui.sh:1652
157
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
158
msgid "Branch"
159
msgstr "Ramo"
160
155
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
156
-msgid "Commit"
161
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
162
+#, fuzzy
163
+msgid "Commit@@noun"
164
msgstr "Commit"
165
159
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
166
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
167
msgid "Merge"
168
msgstr "Fusione (Merge)"
169
163
-#: git-gui.sh:1659
164
-msgid "Fetch"
165
-msgstr "Preleva (Fetch)"
166
-
167
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
168
-msgid "Push"
169
-msgstr "Propaga (Push)"
170
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
171
+#, fuzzy
172
+msgid "Remote"
173
+msgstr "Remoto:"
174
171
-#: git-gui.sh:1669
175
+#: git-gui.sh:1807
176
msgid "Browse Current Branch's Files"
177
msgstr "Esplora i file del ramo corrente"
178
175
-#: git-gui.sh:1673
179
+#: git-gui.sh:1811
180
msgid "Browse Branch Files..."
181
msgstr "Esplora i file del ramo..."
182
179
-#: git-gui.sh:1678
183
+#: git-gui.sh:1816
184
msgid "Visualize Current Branch's History"
185
msgstr "Visualizza la cronologia del ramo corrente"
186
183
-#: git-gui.sh:1682
187
+#: git-gui.sh:1820
188
msgid "Visualize All Branch History"
189
msgstr "Visualizza la cronologia di tutti i rami"
190
187
-#: git-gui.sh:1689
191
+#: git-gui.sh:1827
192
#, tcl-format
193
msgid "Browse %s's Files"
194
msgstr "Esplora i file di %s"
195
192
-#: git-gui.sh:1691
196
+#: git-gui.sh:1829
197
#, tcl-format
198
msgid "Visualize %s's History"
199
msgstr "Visualizza la cronologia di %s"
200
197
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
201
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
202
msgid "Database Statistics"
203
msgstr "Statistiche del database"
204
201
-#: git-gui.sh:1699 lib/database.tcl:34
205
+#: git-gui.sh:1837 lib/database.tcl:34
206
msgid "Compress Database"
207
msgstr "Comprimi il database"
208
205
-#: git-gui.sh:1702
209
+#: git-gui.sh:1840
210
msgid "Verify Database"
211
msgstr "Verifica il database"
212
209
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
213
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
214
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
215
msgid "Create Desktop Icon"
216
msgstr "Crea icona desktop"
217
214
-#: git-gui.sh:1722
218
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
219
msgid "Quit"
220
msgstr "Esci"
221
218
-#: git-gui.sh:1729
222
+#: git-gui.sh:1867
223
msgid "Undo"
224
msgstr "Annulla"
225
222
-#: git-gui.sh:1732
226
+#: git-gui.sh:1870
227
msgid "Redo"
228
msgstr "Ripeti"
229
226
-#: git-gui.sh:1736 git-gui.sh:2222
230
+#: git-gui.sh:1874 git-gui.sh:2366
231
msgid "Cut"
232
msgstr "Taglia"
233
230
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
231
-#: lib/console.tcl:69
234
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
235
+#: lib/console.tcl:67
236
msgid "Copy"
237
msgstr "Copia"
238
235
-#: git-gui.sh:1742 git-gui.sh:2228
239
+#: git-gui.sh:1880 git-gui.sh:2372
240
msgid "Paste"
241
msgstr "Incolla"
242
239
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
243
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
244
#: lib/remote_branch_delete.tcl:38
245
msgid "Delete"
246
msgstr "Elimina"
247
244
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
248
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
249
msgid "Select All"
250
msgstr "Seleziona tutto"
251
248
-#: git-gui.sh:1758
252
+#: git-gui.sh:1896
253
msgid "Create..."
254
msgstr "Crea..."
255
252
-#: git-gui.sh:1764
256
+#: git-gui.sh:1902
257
msgid "Checkout..."
258
msgstr "Checkout..."
259
256
-#: git-gui.sh:1770
260
+#: git-gui.sh:1908
261
msgid "Rename..."
262
msgstr "Rinomina"
263
260
-#: git-gui.sh:1775 git-gui.sh:1873
264
+#: git-gui.sh:1913 git-gui.sh:2012
265
msgid "Delete..."
266
msgstr "Elimina..."
267
264
-#: git-gui.sh:1780
268
+#: git-gui.sh:1918
269
msgid "Reset..."
270
msgstr "Ripristina..."
271
268
-#: git-gui.sh:1792 git-gui.sh:2169
272
+#: git-gui.sh:1930 git-gui.sh:2313
273
msgid "New Commit"
274
msgstr "Nuovo commit"
275
272
-#: git-gui.sh:1800 git-gui.sh:2176
276
+#: git-gui.sh:1938 git-gui.sh:2320
277
msgid "Amend Last Commit"
278
msgstr "Correggi l'ultimo commit"
279
276
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
280
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
281
msgid "Rescan"
282
msgstr "Analizza nuovamente"
283
280
-#: git-gui.sh:1815
284
+#: git-gui.sh:1953
285
msgid "Stage To Commit"
286
msgstr "Prepara per il commit"
287
284
-#: git-gui.sh:1820
288
+#: git-gui.sh:1958
289
msgid "Stage Changed Files To Commit"
290
msgstr "Prepara per il commit i file modificati"
291
288
-#: git-gui.sh:1826
292
+#: git-gui.sh:1964
293
msgid "Unstage From Commit"
294
msgstr "Non pronto per il commit"
295
292
-#: git-gui.sh:1831 lib/index.tcl:376
296
+#: git-gui.sh:1969 lib/index.tcl:352
297
msgid "Revert Changes"
298
msgstr "Annulla modifiche"
299
296
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
300
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
301
msgid "Sign Off"
302
msgstr "Sign Off"
303
300
-#: git-gui.sh:1853
304
+#: git-gui.sh:1980 git-gui.sh:2296
305
+#, fuzzy
306
+msgid "Commit@@verb"
307
+msgstr "Commit"
308
+
309
+#: git-gui.sh:1991
310
msgid "Local Merge..."
311
msgstr "Fusione locale"
312
304
-#: git-gui.sh:1858
313
+#: git-gui.sh:1996
314
msgid "Abort Merge..."
315
msgstr "Interrompi fusione"
316
308
-#: git-gui.sh:1870
317
+#: git-gui.sh:2008
318
msgid "Push..."
319
msgstr "Propaga..."
320
312
-#: git-gui.sh:1880
321
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
322
msgid "Apple"
323
msgstr "Apple"
324
316
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
325
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
326
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
327
#, tcl-format
328
msgid "About %s"
329
msgstr "Informazioni su %s"
330
321
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
331
+#: git-gui.sh:2026
332
+msgid "Preferences..."
333
+msgstr ""
334
+
335
+#: git-gui.sh:2034 git-gui.sh:2558
336
msgid "Options..."
337
msgstr "Opzioni..."
338
325
-#: git-gui.sh:1897
339
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
340
msgid "Help"
341
msgstr "Aiuto"
342
329
-#: git-gui.sh:1938
343
+#: git-gui.sh:2081
344
msgid "Online Documentation"
345
msgstr "Documentazione sul web"
346
333
-#: git-gui.sh:2054
347
+#: git-gui.sh:2165
348
+#, tcl-format
349
+msgid "fatal: cannot stat path %s: No such file or directory"
350
+msgstr ""
351
+
352
+#: git-gui.sh:2198
353
msgid "Current Branch:"
354
msgstr "Ramo attuale:"
355
337
-#: git-gui.sh:2075
338
-msgid "Staged Changes (Will Be Committed)"
356
+#: git-gui.sh:2219
357
+#, fuzzy
358
+msgid "Staged Changes (Will Commit)"
359
msgstr "Modifiche preparate (ne verrà effettuato il commit)"
360
341
-#: git-gui.sh:2095
342
-msgid "Unstaged Changes (Will Not Be Committed)"
343
-msgstr "Modifiche non preparate (non ne verrà effettuato il commit)"
361
+#: git-gui.sh:2239
362
+#, fuzzy
363
+msgid "Unstaged Changes"
364
+msgstr "Prepara modificati"
365
345
-#: git-gui.sh:2142
366
+#: git-gui.sh:2286
367
msgid "Stage Changed"
368
msgstr "Prepara modificati"
369
349
-#: git-gui.sh:2188
370
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
371
+msgid "Push"
372
+msgstr "Propaga (Push)"
373
+
374
+#: git-gui.sh:2332
375
msgid "Initial Commit Message:"
376
msgstr "Messaggio di commit iniziale:"
377
353
-#: git-gui.sh:2189
378
+#: git-gui.sh:2333
379
msgid "Amended Commit Message:"
380
msgstr "Messaggio di commit corretto:"
381
357
-#: git-gui.sh:2190
382
+#: git-gui.sh:2334
383
msgid "Amended Initial Commit Message:"
384
msgstr "Messaggio iniziale di commit corretto:"
385
361
-#: git-gui.sh:2191
386
+#: git-gui.sh:2335
387
msgid "Amended Merge Commit Message:"
388
msgstr "Messaggio di fusione corretto:"
389
365
-#: git-gui.sh:2192
390
+#: git-gui.sh:2336
391
msgid "Merge Commit Message:"
392
msgstr "Messaggio di fusione:"
393
369
-#: git-gui.sh:2193
394
+#: git-gui.sh:2337
395
msgid "Commit Message:"
396
msgstr "Messaggio di commit:"
397
373
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
398
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
399
msgid "Copy All"
400
msgstr "Copia tutto"
401
377
-#: git-gui.sh:2262 lib/blame.tcl:104
402
+#: git-gui.sh:2406 lib/blame.tcl:104
403
msgid "File:"
404
msgstr "File:"
405
381
-#: git-gui.sh:2364
406
+#: git-gui.sh:2508
407
msgid "Refresh"
408
msgstr "Rinfresca"
409
385
-#: git-gui.sh:2385
410
+#: git-gui.sh:2529
411
msgid "Apply/Reverse Hunk"
412
msgstr "Applica/Inverti sezione"
413
389
-#: git-gui.sh:2391
414
+#: git-gui.sh:2535
415
msgid "Decrease Font Size"
416
msgstr "Diminuisci dimensione caratteri"
417
393
-#: git-gui.sh:2395
418
+#: git-gui.sh:2539
419
msgid "Increase Font Size"
420
msgstr "Aumenta dimensione caratteri"
421
397
-#: git-gui.sh:2400
422
+#: git-gui.sh:2544
423
msgid "Show Less Context"
424
msgstr "Mostra meno contesto"
425
401
-#: git-gui.sh:2407
426
+#: git-gui.sh:2551
427
msgid "Show More Context"
428
msgstr "Mostra più contesto"
429
405
-#: git-gui.sh:2422
430
+#: git-gui.sh:2565
431
msgid "Unstage Hunk From Commit"
432
msgstr "Sezione non pronta per il commit"
433
409
-#: git-gui.sh:2426 git-gui.sh:2430
434
+#: git-gui.sh:2567
435
msgid "Stage Hunk For Commit"
436
msgstr "Prepara sezione per il commit"
437
413
-#: git-gui.sh:2440
438
+#: git-gui.sh:2586
439
msgid "Initializing..."
440
msgstr "Inizializzazione..."
441
442
+#: git-gui.sh:2677
443
+#, tcl-format
444
+msgid ""
445
+"Possible environment issues exist.\n"
446
+"\n"
447
+"The following environment variables are probably\n"
448
+"going to be ignored by any Git subprocess run\n"
449
+"by %s:\n"
450
+"\n"
451
+msgstr ""
452
+
453
+#: git-gui.sh:2707
454
+msgid ""
455
+"\n"
456
+"This is due to a known issue with the\n"
457
+"Tcl binary distributed by Cygwin."
458
+msgstr ""
459
+
460
+#: git-gui.sh:2712
461
+#, tcl-format
462
+msgid ""
463
+"\n"
464
+"\n"
465
+"A good replacement for %s\n"
466
+"is placing values for the user.name and\n"
467
+"user.email settings into your personal\n"
468
+"~/.gitconfig file.\n"
469
+msgstr ""
470
+
471
+#: lib/about.tcl:25
472
+msgid "git-gui - a graphical user interface for Git."
473
+msgstr "git-gui - un'interfaccia grafica per Git."
474
+
475
#: lib/blame.tcl:77
476
msgid "File Viewer"
477
msgstr "Mostra file"
@@ -431,6 +489,53 @@ msgstr "Copia commit"
489
msgid "Reading %s..."
490
msgstr "Lettura di %s..."
491
492
+#: lib/blame.tcl:473
493
+msgid "Loading copy/move tracking annotations..."
494
+msgstr ""
495
+
496
+#: lib/blame.tcl:493
497
+msgid "lines annotated"
498
+msgstr ""
499
+
500
+#: lib/blame.tcl:674
501
+msgid "Loading original location annotations..."
502
+msgstr ""
503
+
504
+#: lib/blame.tcl:677
505
+msgid "Annotation complete."
506
+msgstr ""
507
+
508
+#: lib/blame.tcl:731
509
+#, fuzzy
510
+msgid "Loading annotation..."
511
+msgstr "Caricamento %s..."
512
+
513
+#: lib/blame.tcl:787
514
+msgid "Author:"
515
+msgstr ""
516
+
517
+#: lib/blame.tcl:791
518
+#, fuzzy
519
+msgid "Committer:"
520
+msgstr "Commit:"
521
+
522
+#: lib/blame.tcl:796
523
+msgid "Original File:"
524
+msgstr ""
525
+
526
+#: lib/blame.tcl:910
527
+msgid "Originally By:"
528
+msgstr ""
529
+
530
+#: lib/blame.tcl:916
531
+#, fuzzy
532
+msgid "In File:"
533
+msgstr "File:"
534
+
535
+#: lib/blame.tcl:921
536
+msgid "Copied Or Moved Here By:"
537
+msgstr ""
538
+
539
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
540
msgid "Checkout Branch"
541
msgstr "Checkout ramo"
@@ -440,18 +545,17 @@ msgid "Checkout"
545
msgstr "Checkout"
546
547
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
443
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283
444
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
445
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
548
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
549
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
550
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
551
msgid "Cancel"
552
msgstr "Annulla"
553
449
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
554
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
555
msgid "Revision"
556
msgstr "Revisione"
557
453
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
454
-#: lib/option.tcl:274
558
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
559
msgid "Options"
560
msgstr "Opzioni"
561
@@ -471,7 +575,7 @@ msgstr "Crea ramo"
575
msgid "Create New Branch"
576
msgstr "Crea nuovo ramo"
577
474
-#: lib/branch_create.tcl:31
578
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
579
msgid "Create"
580
msgstr "Crea"
581
@@ -611,20 +715,22 @@ msgstr "Avvio in corso..."
715
msgid "File Browser"
716
msgstr "File browser"
717
614
-#: lib/browser.tcl:127 lib/browser.tcl:144
718
+#: lib/browser.tcl:125 lib/browser.tcl:142
719
#, tcl-format
720
msgid "Loading %s..."
721
msgstr "Caricamento %s..."
722
619
-#: lib/browser.tcl:188
723
+#: lib/browser.tcl:186
724
msgid "[Up To Parent]"
725
msgstr "[Directory superiore]"
726
623
-#: lib/browser.tcl:268 lib/browser.tcl:274
727
+#: lib/browser.tcl:266 lib/browser.tcl:272
728
msgid "Browse Branch Files"
729
msgstr "Esplora i file del ramo"
730
627
-#: lib/browser.tcl:279
731
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
732
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
733
+#: lib/choose_repository.tcl:811
734
msgid "Browse"
735
msgstr "Sfoglia"
736
@@ -633,7 +739,12 @@ msgstr "Sfoglia"
739
msgid "Fetching %s from %s"
740
msgstr "Recupero %s da %s"
741
636
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
742
+#: lib/checkout_op.tcl:127
743
+#, tcl-format
744
+msgid "fatal: Cannot resolve %s"
745
+msgstr ""
746
+
747
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
748
msgid "Close"
749
msgstr "Chiudi"
750
@@ -649,7 +760,8 @@ msgid ""
760
"\n"
761
"It cannot fast-forward to %s.\n"
762
"A merge is required."
652
-msgstr "Il ramo '%s' esiste già.\n"
763
+msgstr ""
764
+"Il ramo '%s' esiste già.\n"
765
"\n"
766
"Non può effettuare un 'fast-forward' a %s.\n"
767
"E' necessaria una fusione."
@@ -685,6 +797,11 @@ msgstr ""
797
"\n"
798
"La nuova analisi comincerà ora.\n"
799
800
+#: lib/checkout_op.tcl:322
801
+#, fuzzy, tcl-format
802
+msgid "Updating working directory to '%s'..."
803
+msgstr "Nessuna directory di lavoro"
804
+
805
#: lib/checkout_op.tcl:353
806
#, tcl-format
807
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -708,8 +825,13 @@ msgid ""
825
msgstr ""
826
"Non si è più su un ramo locale\n"
827
"\n"
711
-"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questo checkout "
712
-"staccato'."
828
+"Se si vuole rimanere su un ramo, crearne uno ora a partire da 'Questo "
829
+"checkout staccato'."
830
+
831
+#: lib/checkout_op.tcl:446
832
+#, fuzzy, tcl-format
833
+msgid "Checked out '%s'."
834
+msgstr "Checkout..."
835
836
#: lib/checkout_op.tcl:478
837
#, tcl-format
@@ -741,12 +863,252 @@ msgid ""
863
msgstr ""
864
"Preparazione ramo corrente fallita.\n"
865
"\n"
744
-"Questa directory di lavoro è stata convertita solo parzialmente. I file "
745
-"sono stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha "
866
+"Questa directory di lavoro è stata convertita solo parzialmente. I file sono "
867
+"stati aggiornati correttamente, ma l'aggiornamento di un file di Git ha "
868
"prodotto degli errori.\n"
869
"\n"
870
"Questo non sarebbe dovuto succedere. %s ora terminerà senza altre azioni."
871
872
+#: lib/choose_font.tcl:39
873
+#, fuzzy
874
+msgid "Select"
875
+msgstr "Seleziona tutto"
876
+
877
+#: lib/choose_font.tcl:53
878
+msgid "Font Family"
879
+msgstr ""
880
+
881
+#: lib/choose_font.tcl:73
882
+#, fuzzy
883
+msgid "Font Size"
884
+msgstr "Diminuisci dimensione caratteri"
885
+
886
+#: lib/choose_font.tcl:90
887
+msgid "Font Example"
888
+msgstr ""
889
+
890
+#: lib/choose_font.tcl:101
891
+msgid ""
892
+"This is example text.\n"
893
+"If you like this text, it can be your font."
894
+msgstr ""
895
+
896
+#: lib/choose_repository.tcl:25
897
+msgid "Git Gui"
898
+msgstr ""
899
+
900
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
901
+#, fuzzy
902
+msgid "Create New Repository"
903
+msgstr "Da archivio"
904
+
905
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
906
+#, fuzzy
907
+msgid "Clone Existing Repository"
908
+msgstr "Archivio di destinazione"
909
+
910
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
911
+#, fuzzy
912
+msgid "Open Existing Repository"
913
+msgstr "Archivio di destinazione"
914
+
915
+#: lib/choose_repository.tcl:91
916
+msgid "Next >"
917
+msgstr ""
918
+
919
+#: lib/choose_repository.tcl:152
920
+#, fuzzy, tcl-format
921
+msgid "Location %s already exists."
922
+msgstr "Il ramo '%s' esiste già"
923
+
924
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
925
+#: lib/choose_repository.tcl:172
926
+#, fuzzy, tcl-format
927
+msgid "Failed to create repository %s:"
928
+msgstr "Fallimento nel salvataggio completo delle opzioni:"
929
+
930
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
931
+msgid "Directory:"
932
+msgstr ""
933
+
934
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
935
+#: lib/choose_repository.tcl:834
936
+#, fuzzy
937
+msgid "Git Repository"
938
+msgstr "Archivio"
939
+
940
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
941
+#, fuzzy, tcl-format
942
+msgid "Directory %s already exists."
943
+msgstr "Il ramo '%s' esiste già"
944
+
945
+#: lib/choose_repository.tcl:265
946
+#, fuzzy, tcl-format
947
+msgid "File %s already exists."
948
+msgstr "Il ramo '%s' esiste già"
949
+
950
+#: lib/choose_repository.tcl:286
951
+#, fuzzy
952
+msgid "Clone"
953
+msgstr "Chiudi"
954
+
955
+#: lib/choose_repository.tcl:299
956
+msgid "URL:"
957
+msgstr ""
958
+
959
+#: lib/choose_repository.tcl:319
960
+msgid "Clone Type:"
961
+msgstr ""
962
+
963
+#: lib/choose_repository.tcl:325
964
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
965
+msgstr ""
966
+
967
+#: lib/choose_repository.tcl:331
968
+msgid "Full Copy (Slower, Redundant Backup)"
969
+msgstr ""
970
+
971
+#: lib/choose_repository.tcl:337
972
+msgid "Shared (Fastest, Not Recommended, No Backup)"
973
+msgstr ""
974
+
975
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
976
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
977
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
978
+#, fuzzy, tcl-format
979
+msgid "Not a Git repository: %s"
980
+msgstr "Nessun archivio selezionato."
981
+
982
+#: lib/choose_repository.tcl:405
983
+msgid "Standard only available for local repository."
984
+msgstr ""
985
+
986
+#: lib/choose_repository.tcl:409
987
+msgid "Shared only available for local repository."
988
+msgstr ""
989
+
990
+#: lib/choose_repository.tcl:439
991
+msgid "Failed to configure origin"
992
+msgstr ""
993
+
994
+#: lib/choose_repository.tcl:451
995
+msgid "Counting objects"
996
+msgstr ""
997
+
998
+#: lib/choose_repository.tcl:452
999
+msgid "buckets"
1000
+msgstr ""
1001
+
1002
+#: lib/choose_repository.tcl:476
1003
+#, tcl-format
1004
+msgid "Unable to copy objects/info/alternates: %s"
1005
+msgstr ""
1006
+
1007
+#: lib/choose_repository.tcl:512
1008
+#, fuzzy, tcl-format
1009
+msgid "Nothing to clone from %s."
1010
+msgstr "Recupero nuove modifiche da %s"
1011
+
1012
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
1013
+#: lib/choose_repository.tcl:740
1014
+msgid "The 'master' branch has not been initialized."
1015
+msgstr ""
1016
+
1017
+#: lib/choose_repository.tcl:527
1018
+msgid "Hardlinks are unavailable. Falling back to copying."
1019
+msgstr ""
1020
+
1021
+#: lib/choose_repository.tcl:539
1022
+#, fuzzy, tcl-format
1023
+msgid "Cloning from %s"
1024
+msgstr "Recupero %s da %s"
1025
+
1026
+#: lib/choose_repository.tcl:570
1027
+#, fuzzy
1028
+msgid "Copying objects"
1029
+msgstr "Compressione del database in corso"
1030
+
1031
+#: lib/choose_repository.tcl:571
1032
+msgid "KiB"
1033
+msgstr ""
1034
+
1035
+#: lib/choose_repository.tcl:595
1036
+#, tcl-format
1037
+msgid "Unable to copy object: %s"
1038
+msgstr ""
1039
+
1040
+#: lib/choose_repository.tcl:605
1041
+msgid "Linking objects"
1042
+msgstr ""
1043
+
1044
+#: lib/choose_repository.tcl:606
1045
+msgid "objects"
1046
+msgstr ""
1047
+
1048
+#: lib/choose_repository.tcl:614
1049
+#, tcl-format
1050
+msgid "Unable to hardlink object: %s"
1051
+msgstr ""
1052
+
1053
+#: lib/choose_repository.tcl:669
1054
+msgid "Cannot fetch branches and objects. See console output for details."
1055
+msgstr ""
1056
+
1057
+#: lib/choose_repository.tcl:680
1058
+msgid "Cannot fetch tags. See console output for details."
1059
+msgstr ""
1060
+
1061
+#: lib/choose_repository.tcl:704
1062
+msgid "Cannot determine HEAD. See console output for details."
1063
+msgstr ""
1064
+
1065
+#: lib/choose_repository.tcl:713
1066
+#, tcl-format
1067
+msgid "Unable to cleanup %s"
1068
+msgstr ""
1069
+
1070
+#: lib/choose_repository.tcl:719
1071
+#, fuzzy
1072
+msgid "Clone failed."
1073
+msgstr "Interruzione fallita."
1074
+
1075
+#: lib/choose_repository.tcl:726
1076
+msgid "No default branch obtained."
1077
+msgstr ""
1078
+
1079
+#: lib/choose_repository.tcl:737
1080
+#, tcl-format
1081
+msgid "Cannot resolve %s as a commit."
1082
+msgstr ""
1083
+
1084
+#: lib/choose_repository.tcl:749
1085
+#, fuzzy
1086
+msgid "Creating working directory"
1087
+msgstr "Nessuna directory di lavoro"
1088
+
1089
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1090
+#: lib/index.tcl:149
1091
+msgid "files"
1092
+msgstr ""
1093
+
1094
+#: lib/choose_repository.tcl:779
1095
+msgid "Initial file checkout failed."
1096
+msgstr ""
1097
+
1098
+#: lib/choose_repository.tcl:795
1099
+msgid "Open"
1100
+msgstr ""
1101
+
1102
+#: lib/choose_repository.tcl:805
1103
+#, fuzzy
1104
+msgid "Repository:"
1105
+msgstr "Archivio"
1106
+
1107
+#: lib/choose_repository.tcl:854
1108
+#, fuzzy, tcl-format
1109
+msgid "Failed to open repository %s:"
1110
+msgstr "Fallimento nel salvataggio completo delle opzioni:"
1111
+
1112
#: lib/choose_rev.tcl:53
1113
msgid "This Detached Checkout"
1114
msgstr "Questo checkout staccato"
@@ -763,7 +1125,7 @@ msgstr "Ramo locale"
1125
msgid "Tracking Branch"
1126
msgstr "Ramo in 'tracking'"
1127
766
-#: lib/choose_rev.tcl:84
1128
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1129
msgid "Tag"
1130
msgstr "Etichetta"
1131
@@ -780,6 +1142,14 @@ msgstr "Nessuna revisione selezionata."
1142
msgid "Revision expression is empty."
1143
msgstr "L'espressione di revisione è vuota."
1144
1145
+#: lib/choose_rev.tcl:530
1146
+msgid "Updated"
1147
+msgstr ""
1148
+
1149
+#: lib/choose_rev.tcl:558
1150
+msgid "URL"
1151
+msgstr ""
1152
+
1153
#: lib/commit.tcl:9
1154
msgid ""
1155
"There is nothing to amend.\n"
@@ -844,8 +1214,8 @@ msgid ""
1214
msgstr ""
1215
"Non è possibile effettuare il commit di file non sottoposti a fusione.\n"
1216
"\n"
847
-"Il file %s presenta dei conflitti. Devi risolverli e preparare il file "
848
-"per il commit prima di effettuare questa azione.\n"
1217
+"Il file %s presenta dei conflitti. Devi risolverli e preparare il file per "
1218
+"il commit prima di effettuare questa azione.\n"
1219
1220
#: lib/commit.tcl:162
1221
#, tcl-format
@@ -866,7 +1236,8 @@ msgid ""
1236
msgstr ""
1237
"Nessuna modifica per la quale effettuare il commit.\n"
1238
"\n"
869
-"Devi preparare per il commit almeno 1 file prima di effettuare questa operazione.\n"
1239
+"Devi preparare per il commit almeno 1 file prima di effettuare questa "
1240
+"operazione.\n"
1241
1242
#: lib/commit.tcl:183
1243
msgid ""
@@ -890,6 +1261,11 @@ msgstr ""
1261
msgid "write-tree failed:"
1262
msgstr "write-tree fallito:"
1263
1264
+#: lib/commit.tcl:275
1265
+#, tcl-format
1266
+msgid "Commit %s appears to be corrupt"
1267
+msgstr ""
1268
+
1269
#: lib/commit.tcl:279
1270
msgid ""
1271
"No changes to commit.\n"
@@ -908,6 +1284,11 @@ msgstr ""
1284
msgid "No changes to commit."
1285
msgstr "Nessuna modifica pronta per il commit."
1286
1287
+#: lib/commit.tcl:303
1288
+#, tcl-format
1289
+msgid "warning: Tcl does not support encoding '%s'."
1290
+msgstr ""
1291
+
1292
#: lib/commit.tcl:317
1293
msgid "commit-tree failed:"
1294
msgstr "commit-tree fallito:"
@@ -921,15 +1302,15 @@ msgstr "update-ref fallito:"
1302
msgid "Created commit %s: %s"
1303
msgstr "Creato commit %s: %s"
1304
924
-#: lib/console.tcl:55
1305
+#: lib/console.tcl:57
1306
msgid "Working... please wait..."
1307
msgstr "Elaborazione in corso... attendere..."
1308
928
-#: lib/console.tcl:184
1309
+#: lib/console.tcl:183
1310
msgid "Success"
1311
msgstr "Successo"
1312
932
-#: lib/console.tcl:194
1313
+#: lib/console.tcl:196
1314
msgid "Error: Command Failed"
1315
msgstr "Errore: comando fallito"
1316
@@ -969,6 +1350,22 @@ msgstr "Compressione del database in corso"
1350
msgid "Verifying the object database with fsck-objects"
1351
msgstr "Verifica dell'archivio con fsck-objects in corso"
1352
1353
+#: lib/database.tcl:108
1354
+#, tcl-format
1355
+msgid ""
1356
+"This repository currently has approximately %i loose objects.\n"
1357
+"\n"
1358
+"To maintain optimal performance it is strongly recommended that you compress "
1359
+"the database when more than %i loose objects exist.\n"
1360
+"\n"
1361
+"Compress the database now?"
1362
+msgstr ""
1363
+
1364
+#: lib/date.tcl:25
1365
+#, fuzzy, tcl-format
1366
+msgid "Invalid date from Git: %s"
1367
+msgstr "Revisione non valida: %s"
1368
+
1369
#: lib/diff.tcl:42
1370
#, tcl-format
1371
msgid ""
@@ -992,19 +1389,37 @@ msgstr ""
1389
"Si procederà automaticamente ad una nuova analisi per trovare altri file che "
1390
"potrebbero avere lo stesso stato."
1391
995
-#: lib/diff.tcl:97
1392
+#: lib/diff.tcl:81
1393
+#, fuzzy, tcl-format
1394
+msgid "Loading diff of %s..."
1395
+msgstr "Caricamento %s..."
1396
+
1397
+#: lib/diff.tcl:114 lib/diff.tcl:184
1398
+#, tcl-format
1399
+msgid "Unable to display %s"
1400
+msgstr ""
1401
+
1402
+#: lib/diff.tcl:115
1403
msgid "Error loading file:"
1404
msgstr "Errore nel caricamento del file:"
1405
999
-#: lib/diff.tcl:162
1406
+#: lib/diff.tcl:122
1407
+msgid "Git Repository (subproject)"
1408
+msgstr ""
1409
+
1410
+#: lib/diff.tcl:134
1411
+msgid "* Binary file (not showing content)."
1412
+msgstr ""
1413
+
1414
+#: lib/diff.tcl:185
1415
msgid "Error loading diff:"
1416
msgstr "Errore nel caricamento delle differenze:"
1417
1003
-#: lib/diff.tcl:278
1418
+#: lib/diff.tcl:302
1419
msgid "Failed to unstage selected hunk."
1420
msgstr "La sezione scelta è ancora pronta per il commit."
1421
1007
-#: lib/diff.tcl:285
1422
+#: lib/diff.tcl:309
1423
msgid "Failed to stage selected hunk."
1424
msgstr "La sezione scelta non è ancora pronta per il commit."
1425
@@ -1020,21 +1435,32 @@ msgstr "avviso"
1435
msgid "You must correct the above errors before committing."
1436
msgstr "Bisogna correggere gli errori suddetti prima di effettuare un commit."
1437
1023
-#: lib/index.tcl:364
1438
+#: lib/index.tcl:241
1439
+#, fuzzy, tcl-format
1440
+msgid "Unstaging %s from commit"
1441
+msgstr "Non pronto per il commit"
1442
+
1443
+#: lib/index.tcl:285
1444
+#, fuzzy, tcl-format
1445
+msgid "Adding %s"
1446
+msgstr "Lettura di %s..."
1447
+
1448
+#: lib/index.tcl:340
1449
#, tcl-format
1450
msgid "Revert changes in file %s?"
1451
msgstr "Annullare le modifiche nel file %s?"
1452
1028
-#: lib/index.tcl:366
1453
+#: lib/index.tcl:342
1454
#, tcl-format
1455
msgid "Revert changes in these %i files?"
1456
msgstr "Annullare le modifiche in questi %i file?"
1457
1033
-#: lib/index.tcl:372
1458
+#: lib/index.tcl:348
1459
msgid "Any unstaged changes will be permanently lost by the revert."
1035
-msgstr "Tutte le modifiche non preparate per il commit saranno perse per sempre."
1460
+msgstr ""
1461
+"Tutte le modifiche non preparate per il commit saranno perse per sempre."
1462
1037
-#: lib/index.tcl:375
1463
+#: lib/index.tcl:351
1464
msgid "Do Nothing"
1465
msgstr "Non fare niente"
1466
@@ -1080,9 +1506,8 @@ msgstr ""
1506
"Il file %s ha dei conflitti.\n"
1507
"\n"
1508
"Bisogna risolvere i conflitti, preparare il file per il commit ed infine "
1083
-"effettuare un commit "
1084
-"per completare la fusione corrente. Solo a questo punto potrai iniziare "
1085
-"un'altra fusione.\n"
1509
+"effettuare un commit per completare la fusione corrente. Solo a questo punto "
1510
+"potrai iniziare un'altra fusione.\n"
1511
1512
#: lib/merge.tcl:54
1513
#, tcl-format
@@ -1164,8 +1589,8 @@ msgid ""
1589
msgstr ""
1590
"Annullare le modifiche?\n"
1591
"\n"
1167
-"L'annullamento delle modifiche causerà la perdita di *TUTTE* le "
1168
-"modifiche non ancora presenti nei commit.\n"
1592
+"L'annullamento delle modifiche causerà la perdita di *TUTTE* le modifiche "
1593
+"non ancora presenti nei commit.\n"
1594
"\n"
1595
"Continuare con l'annullamento delle modifiche correnti?"
1596
@@ -1181,71 +1606,100 @@ msgstr "Interruzione fallita."
1606
msgid "Abort completed. Ready."
1607
msgstr "Interruzione completata. Pronto."
1608
1184
-#: lib/option.tcl:77
1185
-msgid "git-gui - a graphical user interface for Git."
1186
-msgstr "git-gui - un'interfaccia grafica per Git."
1187
-
1188
-#: lib/option.tcl:164
1609
+#: lib/option.tcl:82
1610
msgid "Restore Defaults"
1611
msgstr "Ripristina predefiniti"
1612
1192
-#: lib/option.tcl:168
1613
+#: lib/option.tcl:86
1614
msgid "Save"
1615
msgstr "Salva"
1616
1196
-#: lib/option.tcl:178
1617
+#: lib/option.tcl:96
1618
#, tcl-format
1619
msgid "%s Repository"
1620
msgstr "%s archivio"
1621
1201
-#: lib/option.tcl:179
1622
+#: lib/option.tcl:97
1623
msgid "Global (All Repositories)"
1624
msgstr "Globale (Tutti i repository)"
1625
1205
-#: lib/option.tcl:185
1626
+#: lib/option.tcl:103
1627
msgid "User Name"
1628
msgstr "Nome utente"
1629
1209
-#: lib/option.tcl:186
1630
+#: lib/option.tcl:104
1631
msgid "Email Address"
1632
msgstr "Indirizzo Email"
1633
1213
-#: lib/option.tcl:188
1634
+#: lib/option.tcl:106
1635
msgid "Summarize Merge Commits"
1636
msgstr "Riepilogo nei commit di fusione"
1637
1217
-#: lib/option.tcl:189
1638
+#: lib/option.tcl:107
1639
msgid "Merge Verbosity"
1640
msgstr "Verbosità della fusione"
1641
1221
-#: lib/option.tcl:190
1642
+#: lib/option.tcl:108
1643
msgid "Show Diffstat After Merge"
1644
msgstr "Mostra statistiche delle differenze dopo la fusione"
1645
1225
-#: lib/option.tcl:192
1646
+#: lib/option.tcl:110
1647
msgid "Trust File Modification Timestamps"
1648
msgstr "Fidati delle date di modifica dei file"
1649
1229
-#: lib/option.tcl:193
1650
+#: lib/option.tcl:111
1651
msgid "Prune Tracking Branches During Fetch"
1652
msgstr "Effettua potatura dei rami in 'tracking' durante il recupero"
1653
1233
-#: lib/option.tcl:194
1654
+#: lib/option.tcl:112
1655
msgid "Match Tracking Branches"
1656
msgstr "Appaia rami in 'tracking'"
1657
1237
-#: lib/option.tcl:195
1658
+#: lib/option.tcl:113
1659
msgid "Number of Diff Context Lines"
1660
msgstr "Numero di linee di contesto nelle differenze"
1661
1241
-#: lib/option.tcl:196
1662
+#: lib/option.tcl:114
1663
msgid "New Branch Name Template"
1664
msgstr "Modello per il nome di un nuovo ramo"
1665
1245
-#: lib/option.tcl:305
1666
+#: lib/option.tcl:176
1667
+#, fuzzy
1668
+msgid "Change Font"
1669
+msgstr "Caratteri principali"
1670
+
1671
+#: lib/option.tcl:180
1672
+#, tcl-format
1673
+msgid "Choose %s"
1674
+msgstr ""
1675
+
1676
+#: lib/option.tcl:186
1677
+msgid "pt."
1678
+msgstr ""
1679
+
1680
+#: lib/option.tcl:200
1681
+msgid "Preferences"
1682
+msgstr ""
1683
+
1684
+#: lib/option.tcl:235
1685
msgid "Failed to completely save options:"
1686
msgstr "Fallimento nel salvataggio completo delle opzioni:"
1687
1688
+#: lib/remote.tcl:165
1689
+#, fuzzy
1690
+msgid "Prune from"
1691
+msgstr "Effettua potatura da %s..."
1692
+
1693
+#: lib/remote.tcl:170
1694
+#, fuzzy
1695
+msgid "Fetch from"
1696
+msgstr "Preleva da %s..."
1697
+
1698
+#: lib/remote.tcl:213
1699
+#, fuzzy
1700
+msgid "Push to"
1701
+msgstr "Propaga (Push)"
1702
+
1703
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1704
msgid "Delete Remote Branch"
1705
msgstr "Cancella ramo remoto"
@@ -1254,11 +1708,11 @@ msgstr "Cancella ramo remoto"
1708
msgid "From Repository"
1709
msgstr "Da archivio"
1710
1257
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
1711
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1712
msgid "Remote:"
1713
msgstr "Remoto:"
1714
1261
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
1715
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1716
msgid "Arbitrary URL:"
1717
msgstr "URL arbitrario:"
1718
@@ -1282,6 +1736,14 @@ msgstr "Sempre (Non effettuare controlli durante la fusione)"
1736
msgid "A branch is required for 'Merged Into'."
1737
msgstr "Si richiede un ramo per 'Fuso in'."
1738
1739
+#: lib/remote_branch_delete.tcl:184
1740
+#, fuzzy, tcl-format
1741
+msgid ""
1742
+"The following branches are not completely merged into %s:\n"
1743
+"\n"
1744
+" - %s"
1745
+msgstr "I rami seguenti non sono stati fusi completamente in %s:"
1746
+
1747
#: lib/remote_branch_delete.tcl:189
1748
#, tcl-format
1749
msgid ""
@@ -1319,21 +1781,6 @@ msgstr "Nessun archivio selezionato."
1781
msgid "Scanning %s..."
1782
msgstr "Analisi in corso %s..."
1783
1322
-#: lib/remote.tcl:162
1323
-#, tcl-format
1324
-msgid "Fetch from %s..."
1325
-msgstr "Preleva da %s..."
1326
-
1327
-#: lib/remote.tcl:172
1328
-#, tcl-format
1329
-msgid "Prune from %s..."
1330
-msgstr "Effettua potatura da %s..."
1331
-
1332
-#: lib/remote.tcl:206
1333
-#, tcl-format
1334
-msgid "Push to %s..."
1335
-msgstr "Propaga verso %s..."
1336
-
1784
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1785
msgid "Cannot write script:"
1786
msgstr "Impossibile scrivere script:"
@@ -1342,52 +1789,79 @@ msgstr "Impossibile scrivere script:"
1789
msgid "Cannot write icon:"
1790
msgstr "Impossibile scrivere icona:"
1791
1345
-#: lib/status_bar.tcl:58
1792
+#: lib/status_bar.tcl:83
1793
#, tcl-format
1794
msgid "%s ... %*i of %*i %s (%3i%%)"
1795
msgstr "%s ... %*i di %*i %s (%3i%%)"
1796
1797
+#: lib/transport.tcl:6
1798
+#, fuzzy, tcl-format
1799
+msgid "fetch %s"
1800
+msgstr "Preleva (Fetch)"
1801
+
1802
#: lib/transport.tcl:7
1803
#, tcl-format
1804
msgid "Fetching new changes from %s"
1805
msgstr "Recupero nuove modifiche da %s"
1806
1807
+#: lib/transport.tcl:18
1808
+#, tcl-format
1809
+msgid "remote prune %s"
1810
+msgstr ""
1811
+
1812
#: lib/transport.tcl:19
1813
#, tcl-format
1814
msgid "Pruning tracking branches deleted from %s"
1815
msgstr "Effettua potatura dei rami in 'tracking' cancellati da %s"
1816
1817
+#: lib/transport.tcl:25 lib/transport.tcl:71
1818
+#, tcl-format
1819
+msgid "push %s"
1820
+msgstr ""
1821
+
1822
#: lib/transport.tcl:26
1823
#, tcl-format
1824
msgid "Pushing changes to %s"
1825
msgstr "Propagazione modifiche a %s"
1826
1365
-#: lib/transport.tcl:68
1827
+#: lib/transport.tcl:72
1828
#, tcl-format
1829
msgid "Pushing %s %s to %s"
1830
msgstr "Propagazione %s %s a %s"
1831
1370
-#: lib/transport.tcl:84
1832
+#: lib/transport.tcl:89
1833
msgid "Push Branches"
1834
msgstr "Propaga rami"
1835
1374
-#: lib/transport.tcl:98
1836
+#: lib/transport.tcl:103
1837
msgid "Source Branches"
1838
msgstr "Rami di origine"
1839
1378
-#: lib/transport.tcl:115
1840
+#: lib/transport.tcl:120
1841
msgid "Destination Repository"
1842
msgstr "Archivio di destinazione"
1843
1382
-#: lib/transport.tcl:153
1844
+#: lib/transport.tcl:158
1845
msgid "Transfer Options"
1846
msgstr "Opzioni di trasferimento"
1847
1386
-#: lib/transport.tcl:155
1848
+#: lib/transport.tcl:160
1849
+msgid "Force overwrite existing branch (may discard changes)"
1850
+msgstr ""
1851
+
1852
+#: lib/transport.tcl:164
1853
msgid "Use thin pack (for slow network connections)"
1854
msgstr "Utilizza 'thin pack' (per connessioni lente)"
1855
1390
-#: lib/transport.tcl:159
1856
+#: lib/transport.tcl:168
1857
msgid "Include tags"
1858
msgstr "Includi etichette"
1859
1860
+#~ msgid "Cannot find the git directory:"
1861
+#~ msgstr "Non posso trovare la directory di git:"
1862
+
1863
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
1864
+#~ msgstr "Modifiche non preparate (non ne verrà effettuato il commit)"
1865
+
1866
+#~ msgid "Push to %s..."
1867
+#~ msgstr "Propaga verso %s..."
po/ja.po
+657
-184
@@ -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-08-11 17:28+0200\n"
11
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
12
"PO-Revision-Date: 2007-08-14 18:49+0900\n"
13
"Last-Translator: しらいし ななこ <nanako3@bluebottle.com>\n"
14
"Language-Team: Japanese\n"
@@ -16,15 +16,33 @@ msgstr ""
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
-#: git-gui.sh:531
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:595
25
+#, fuzzy, tcl-format
26
+msgid "Invalid font specified in %s:"
27
+msgstr "gui.%s に無効なフォントが指定されています:"
28
+
29
+#: git-gui.sh:620
30
+msgid "Main Font"
31
+msgstr "主フォント"
32
+
33
+#: git-gui.sh:621
34
+msgid "Diff/Console Font"
35
+msgstr "diff/コンソール・フォント"
36
+
37
+#: git-gui.sh:635
38
msgid "Cannot find git in PATH."
39
msgstr "PATH 中に git が見つかりません"
40
23
-#: git-gui.sh:550
41
+#: git-gui.sh:662
42
msgid "Cannot parse Git version string:"
43
msgstr "Git バージョン名が理解できません:"
44
27
-#: git-gui.sh:567
45
+#: git-gui.sh:680
46
#, tcl-format
47
msgid ""
48
"Git version cannot be determined.\n"
@@ -43,79 +61,80 @@ msgstr ""
61
"\n"
62
"'%s' はバージョン 1.5.0 と思って良いですか?\n"
63
46
-#: git-gui.sh:689
47
-msgid "Cannot find the git directory:"
48
-msgstr "git ディレクトリが見つかりません:"
49
-
50
-#: git-gui.sh:697
64
+#: git-gui.sh:853
65
msgid "Git directory not found:"
66
msgstr "Git ディレクトリが見つかりません:"
67
54
-#: git-gui.sh:703
68
+#: git-gui.sh:860
69
+#, fuzzy
70
+msgid "Cannot move to top of working directory:"
71
+msgstr "変な .git ディレクトリは使えません"
72
+
73
+#: git-gui.sh:867
74
msgid "Cannot use funny .git directory:"
75
msgstr "変な .git ディレクトリは使えません"
76
58
-#: git-gui.sh:708
77
+#: git-gui.sh:872
78
msgid "No working directory"
79
msgstr "作業ディレクトリがありません"
80
62
-#: git-gui.sh:854
81
+#: git-gui.sh:1019
82
msgid "Refreshing file status..."
83
msgstr "ファイル状態を更新しています…"
84
66
-#: git-gui.sh:891
85
+#: git-gui.sh:1084
86
msgid "Scanning for modified files ..."
87
msgstr "変更されたファイルをスキャンしています…"
88
70
-#: git-gui.sh:1057 lib/browser.tcl:247
89
+#: git-gui.sh:1259 lib/browser.tcl:245
90
msgid "Ready."
91
msgstr "準備完了"
92
74
-#: git-gui.sh:1322
93
+#: git-gui.sh:1525
94
msgid "Unmodified"
95
msgstr "変更無し"
96
78
-#: git-gui.sh:1324
97
+#: git-gui.sh:1527
98
msgid "Modified, not staged"
99
msgstr "変更あり、コミット未予定"
100
82
-#: git-gui.sh:1325 git-gui.sh:1330
101
+#: git-gui.sh:1528 git-gui.sh:1533
102
msgid "Staged for commit"
103
msgstr "コミット予定済"
104
86
-#: git-gui.sh:1326 git-gui.sh:1331
105
+#: git-gui.sh:1529 git-gui.sh:1534
106
msgid "Portions staged for commit"
107
msgstr "部分的にコミット予定済"
108
90
-#: git-gui.sh:1327 git-gui.sh:1332
109
+#: git-gui.sh:1530 git-gui.sh:1535
110
msgid "Staged for commit, missing"
111
msgstr "コミット予定済、ファイル無し"
112
94
-#: git-gui.sh:1329
113
+#: git-gui.sh:1532
114
msgid "Untracked, not staged"
115
msgstr "管理外、コミット未予定"
116
98
-#: git-gui.sh:1334
117
+#: git-gui.sh:1537
118
msgid "Missing"
119
msgstr "ファイル無し"
120
102
-#: git-gui.sh:1335
121
+#: git-gui.sh:1538
122
msgid "Staged for removal"
123
msgstr "削除予定済"
124
106
-#: git-gui.sh:1336
125
+#: git-gui.sh:1539
126
msgid "Staged for removal, still present"
127
msgstr "削除予定済、ファイル未削除"
128
110
-#: git-gui.sh:1338 git-gui.sh:1339 git-gui.sh:1340 git-gui.sh:1341
129
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
130
msgid "Requires merge resolution"
131
msgstr "要マージ解決"
132
114
-#: git-gui.sh:1383
133
+#: git-gui.sh:1579
134
msgid "Starting gitk... please wait..."
135
msgstr "gitk を起動中…お待ち下さい…"
136
118
-#: git-gui.sh:1392
137
+#: git-gui.sh:1588
138
#, tcl-format
139
msgid ""
140
"Unable to start gitk:\n"
@@ -126,293 +145,332 @@ msgstr ""
145
"\n"
146
"%s がありません"
147
129
-#: git-gui.sh:1609
130
-#, tcl-format
131
-msgid "Invalid font specified in gui.%s:"
132
-msgstr "gui.%s に無効なフォントが指定されています:"
133
-
134
-#: git-gui.sh:1634
135
-msgid "Main Font"
136
-msgstr "主フォント"
137
-
138
-#: git-gui.sh:1635
139
-msgid "Diff/Console Font"
140
-msgstr "diff/コンソール・フォント"
141
-
142
-#: git-gui.sh:1649
148
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
149
msgid "Repository"
150
msgstr "リポジトリ"
151
146
-#: git-gui.sh:1650
152
+#: git-gui.sh:1789
153
msgid "Edit"
154
msgstr "編集"
155
150
-#: git-gui.sh:1652
156
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
157
msgid "Branch"
158
msgstr "ブランチ"
159
154
-#: git-gui.sh:1655 git-gui.sh:1842 git-gui.sh:2152
155
-msgid "Commit"
160
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
161
+#, fuzzy
162
+msgid "Commit@@noun"
163
msgstr "コミット"
164
158
-#: git-gui.sh:1658 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
165
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
166
msgid "Merge"
167
msgstr "マージ"
168
162
-#: git-gui.sh:1659
163
-msgid "Fetch"
164
-msgstr "フェッチ"
165
-
166
-#: git-gui.sh:1660 git-gui.sh:2158 lib/transport.tcl:88 lib/transport.tcl:172
167
-msgid "Push"
168
-msgstr "プッシュ"
169
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
170
+#, fuzzy
171
+msgid "Remote"
172
+msgstr "リモート:"
173
170
-#: git-gui.sh:1669
174
+#: git-gui.sh:1807
175
msgid "Browse Current Branch's Files"
176
msgstr "現在のブランチのファイルを見る"
177
174
-#: git-gui.sh:1673
178
+#: git-gui.sh:1811
179
msgid "Browse Branch Files..."
180
msgstr "ブランチのファイルを見る…"
181
178
-#: git-gui.sh:1678
182
+#: git-gui.sh:1816
183
msgid "Visualize Current Branch's History"
184
msgstr "現在のブランチの履歴を見る"
185
182
-#: git-gui.sh:1682
186
+#: git-gui.sh:1820
187
msgid "Visualize All Branch History"
188
msgstr "全てのブランチの履歴を見る"
189
186
-#: git-gui.sh:1689
190
+#: git-gui.sh:1827
191
#, tcl-format
192
msgid "Browse %s's Files"
193
msgstr "ブランチ %s のファイルを見る"
194
191
-#: git-gui.sh:1691
195
+#: git-gui.sh:1829
196
#, tcl-format
197
msgid "Visualize %s's History"
198
msgstr "ブランチ %s の履歴を見る"
199
196
-#: git-gui.sh:1696 lib/database.tcl:27 lib/database.tcl:67
200
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
201
msgid "Database Statistics"
202
msgstr "データベース統計"
203
200
-#: git-gui.sh:1699 lib/database.tcl:34
204
+#: git-gui.sh:1837 lib/database.tcl:34
205
msgid "Compress Database"
206
msgstr "データベース圧縮"
207
204
-#: git-gui.sh:1702
208
+#: git-gui.sh:1840
209
msgid "Verify Database"
210
msgstr "データベース検証"
211
208
-#: git-gui.sh:1709 git-gui.sh:1713 git-gui.sh:1717 lib/shortcut.tcl:9
212
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
213
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
214
msgid "Create Desktop Icon"
215
msgstr "デスクトップ・アイコンを作る"
216
213
-#: git-gui.sh:1722
217
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
218
msgid "Quit"
219
msgstr "終了"
220
217
-#: git-gui.sh:1729
221
+#: git-gui.sh:1867
222
msgid "Undo"
223
msgstr "元に戻す"
224
221
-#: git-gui.sh:1732
225
+#: git-gui.sh:1870
226
msgid "Redo"
227
msgstr "やり直し"
228
225
-#: git-gui.sh:1736 git-gui.sh:2222
229
+#: git-gui.sh:1874 git-gui.sh:2366
230
msgid "Cut"
231
msgstr "切り取り"
232
229
-#: git-gui.sh:1739 git-gui.sh:2225 git-gui.sh:2296 git-gui.sh:2368
230
-#: lib/console.tcl:69
233
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
234
+#: lib/console.tcl:67
235
msgid "Copy"
236
msgstr "コピー"
237
234
-#: git-gui.sh:1742 git-gui.sh:2228
238
+#: git-gui.sh:1880 git-gui.sh:2372
239
msgid "Paste"
240
msgstr "貼り付け"
241
238
-#: git-gui.sh:1745 git-gui.sh:2231 lib/branch_delete.tcl:26
242
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
243
#: lib/remote_branch_delete.tcl:38
244
msgid "Delete"
245
msgstr "削除"
246
243
-#: git-gui.sh:1749 git-gui.sh:2235 git-gui.sh:2372 lib/console.tcl:71
247
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
248
msgid "Select All"
249
msgstr "全て選択"
250
247
-#: git-gui.sh:1758
251
+#: git-gui.sh:1896
252
msgid "Create..."
253
msgstr "作成…"
254
251
-#: git-gui.sh:1764
255
+#: git-gui.sh:1902
256
msgid "Checkout..."
257
msgstr "チェックアウト"
258
255
-#: git-gui.sh:1770
259
+#: git-gui.sh:1908
260
msgid "Rename..."
261
msgstr "名前変更…"
262
259
-#: git-gui.sh:1775 git-gui.sh:1873
263
+#: git-gui.sh:1913 git-gui.sh:2012
264
msgid "Delete..."
265
msgstr "削除…"
266
263
-#: git-gui.sh:1780
267
+#: git-gui.sh:1918
268
msgid "Reset..."
269
msgstr "リセット…"
270
267
-#: git-gui.sh:1792 git-gui.sh:2169
271
+#: git-gui.sh:1930 git-gui.sh:2313
272
msgid "New Commit"
273
msgstr "新規コミット"
274
271
-#: git-gui.sh:1800 git-gui.sh:2176
275
+#: git-gui.sh:1938 git-gui.sh:2320
276
msgid "Amend Last Commit"
277
msgstr "最新コミットを訂正"
278
275
-#: git-gui.sh:1809 git-gui.sh:2136 lib/remote_branch_delete.tcl:99
279
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
280
msgid "Rescan"
281
msgstr "再スキャン"
282
279
-#: git-gui.sh:1815
283
+#: git-gui.sh:1953
284
msgid "Stage To Commit"
285
msgstr "コミット予定する"
286
283
-#: git-gui.sh:1820
287
+#: git-gui.sh:1958
288
msgid "Stage Changed Files To Commit"
289
msgstr "変更されたファイルをコミット予定"
290
287
-#: git-gui.sh:1826
291
+#: git-gui.sh:1964
292
msgid "Unstage From Commit"
293
msgstr "コミットから降ろす"
294
291
-#: git-gui.sh:1831 lib/index.tcl:376
295
+#: git-gui.sh:1969 lib/index.tcl:352
296
msgid "Revert Changes"
297
msgstr "変更を元に戻す"
298
295
-#: git-gui.sh:1838 git-gui.sh:2148 git-gui.sh:2246
299
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
300
msgid "Sign Off"
301
msgstr "署名"
302
299
-#: git-gui.sh:1853
303
+#: git-gui.sh:1980 git-gui.sh:2296
304
+#, fuzzy
305
+msgid "Commit@@verb"
306
+msgstr "コミット"
307
+
308
+#: git-gui.sh:1991
309
msgid "Local Merge..."
310
msgstr "ローカル・マージ…"
311
303
-#: git-gui.sh:1858
312
+#: git-gui.sh:1996
313
msgid "Abort Merge..."
314
msgstr "マージ中止…"
315
307
-#: git-gui.sh:1870
316
+#: git-gui.sh:2008
317
msgid "Push..."
318
msgstr "プッシュ…"
319
311
-#: git-gui.sh:1880
320
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
321
msgid "Apple"
322
msgstr "りんご"
323
315
-#: git-gui.sh:1883 git-gui.sh:1901 lib/option.tcl:65
324
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
325
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
326
#, tcl-format
327
msgid "About %s"
328
msgstr "%s について"
329
320
-#: git-gui.sh:1885 git-gui.sh:1891 git-gui.sh:2414
330
+#: git-gui.sh:2026
331
+msgid "Preferences..."
332
+msgstr ""
333
+
334
+#: git-gui.sh:2034 git-gui.sh:2558
335
msgid "Options..."
336
msgstr "オプション…"
337
324
-#: git-gui.sh:1897
338
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
339
msgid "Help"
340
msgstr "ヘルプ"
341
328
-#: git-gui.sh:1938
342
+#: git-gui.sh:2081
343
msgid "Online Documentation"
344
msgstr "オンライン・ドキュメント"
345
332
-#: git-gui.sh:2054
346
+#: git-gui.sh:2165
347
+#, tcl-format
348
+msgid "fatal: cannot stat path %s: No such file or directory"
349
+msgstr ""
350
+
351
+#: git-gui.sh:2198
352
msgid "Current Branch:"
353
msgstr "現在のブランチ"
354
336
-#: git-gui.sh:2075
337
-msgid "Staged Changes (Will Be Committed)"
355
+#: git-gui.sh:2219
356
+#, fuzzy
357
+msgid "Staged Changes (Will Commit)"
358
msgstr "ステージングされた(コミット予定済の)変更"
359
340
-#: git-gui.sh:2095
341
-msgid "Unstaged Changes (Will Not Be Committed)"
342
-msgstr "ステージングされていない(コミット未予定の)変更"
360
+#: git-gui.sh:2239
361
+#, fuzzy
362
+msgid "Unstaged Changes"
363
+msgstr "変更をコミット予定に入れる"
364
344
-#: git-gui.sh:2142
365
+#: git-gui.sh:2286
366
msgid "Stage Changed"
367
msgstr "変更をコミット予定に入れる"
368
348
-#: git-gui.sh:2188
369
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
370
+msgid "Push"
371
+msgstr "プッシュ"
372
+
373
+#: git-gui.sh:2332
374
msgid "Initial Commit Message:"
375
msgstr "最初のコミットメッセージ:"
376
352
-#: git-gui.sh:2189
377
+#: git-gui.sh:2333
378
msgid "Amended Commit Message:"
379
msgstr "訂正したコミットメッセージ:"
380
356
-#: git-gui.sh:2190
381
+#: git-gui.sh:2334
382
msgid "Amended Initial Commit Message:"
383
msgstr "訂正した最初のコミットメッセージ:"
384
360
-#: git-gui.sh:2191
385
+#: git-gui.sh:2335
386
msgid "Amended Merge Commit Message:"
387
msgstr "訂正したマージコミットメッセージ:"
388
364
-#: git-gui.sh:2192
389
+#: git-gui.sh:2336
390
msgid "Merge Commit Message:"
391
msgstr "マージコミットメッセージ:"
392
368
-#: git-gui.sh:2193
393
+#: git-gui.sh:2337
394
msgid "Commit Message:"
395
msgstr "コミットメッセージ:"
396
372
-#: git-gui.sh:2238 git-gui.sh:2376 lib/console.tcl:73
397
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
398
msgid "Copy All"
399
msgstr "全てコピー"
400
376
-#: git-gui.sh:2262 lib/blame.tcl:104
401
+#: git-gui.sh:2406 lib/blame.tcl:104
402
msgid "File:"
403
msgstr "ファイル:"
404
380
-#: git-gui.sh:2364
405
+#: git-gui.sh:2508
406
msgid "Refresh"
407
msgstr "再読み込み"
408
384
-#: git-gui.sh:2385
409
+#: git-gui.sh:2529
410
msgid "Apply/Reverse Hunk"
411
msgstr "パッチを適用/取り消す"
412
388
-#: git-gui.sh:2391
413
+#: git-gui.sh:2535
414
msgid "Decrease Font Size"
415
msgstr "フォントを小さく"
416
392
-#: git-gui.sh:2395
417
+#: git-gui.sh:2539
418
msgid "Increase Font Size"
419
msgstr "フォントを大きく"
420
396
-#: git-gui.sh:2400
421
+#: git-gui.sh:2544
422
msgid "Show Less Context"
423
msgstr "文脈を少なく"
424
400
-#: git-gui.sh:2407
425
+#: git-gui.sh:2551
426
msgid "Show More Context"
427
msgstr "文脈を多く"
428
404
-#: git-gui.sh:2422
429
+#: git-gui.sh:2565
430
msgid "Unstage Hunk From Commit"
431
msgstr "パッチをコミット予定から外す"
432
408
-#: git-gui.sh:2426 git-gui.sh:2430
433
+#: git-gui.sh:2567
434
msgid "Stage Hunk For Commit"
435
msgstr "パッチをコミット予定に加える"
436
412
-#: git-gui.sh:2440
437
+#: git-gui.sh:2586
438
msgid "Initializing..."
439
msgstr "初期化しています…"
440
441
+#: git-gui.sh:2677
442
+#, tcl-format
443
+msgid ""
444
+"Possible environment issues exist.\n"
445
+"\n"
446
+"The following environment variables are probably\n"
447
+"going to be ignored by any Git subprocess run\n"
448
+"by %s:\n"
449
+"\n"
450
+msgstr ""
451
+
452
+#: git-gui.sh:2707
453
+msgid ""
454
+"\n"
455
+"This is due to a known issue with the\n"
456
+"Tcl binary distributed by Cygwin."
457
+msgstr ""
458
+
459
+#: git-gui.sh:2712
460
+#, tcl-format
461
+msgid ""
462
+"\n"
463
+"\n"
464
+"A good replacement for %s\n"
465
+"is placing values for the user.name and\n"
466
+"user.email settings into your personal\n"
467
+"~/.gitconfig file.\n"
468
+msgstr ""
469
+
470
+#: lib/about.tcl:25
471
+msgid "git-gui - a graphical user interface for Git."
472
+msgstr "Git のグラフィカルUI git-gui"
473
+
474
#: lib/blame.tcl:77
475
msgid "File Viewer"
476
msgstr "ファイルピューワ"
@@ -430,6 +488,53 @@ msgstr "コミットをコピー"
488
msgid "Reading %s..."
489
msgstr "%s を読んでいます…"
490
491
+#: lib/blame.tcl:473
492
+msgid "Loading copy/move tracking annotations..."
493
+msgstr ""
494
+
495
+#: lib/blame.tcl:493
496
+msgid "lines annotated"
497
+msgstr ""
498
+
499
+#: lib/blame.tcl:674
500
+msgid "Loading original location annotations..."
501
+msgstr ""
502
+
503
+#: lib/blame.tcl:677
504
+msgid "Annotation complete."
505
+msgstr ""
506
+
507
+#: lib/blame.tcl:731
508
+#, fuzzy
509
+msgid "Loading annotation..."
510
+msgstr "%s をロード中…"
511
+
512
+#: lib/blame.tcl:787
513
+msgid "Author:"
514
+msgstr ""
515
+
516
+#: lib/blame.tcl:791
517
+#, fuzzy
518
+msgid "Committer:"
519
+msgstr "コミット:"
520
+
521
+#: lib/blame.tcl:796
522
+msgid "Original File:"
523
+msgstr ""
524
+
525
+#: lib/blame.tcl:910
526
+msgid "Originally By:"
527
+msgstr ""
528
+
529
+#: lib/blame.tcl:916
530
+#, fuzzy
531
+msgid "In File:"
532
+msgstr "ファイル:"
533
+
534
+#: lib/blame.tcl:921
535
+msgid "Copied Or Moved Here By:"
536
+msgstr ""
537
+
538
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
539
msgid "Checkout Branch"
540
msgstr "ブランチをチェックアウト"
@@ -439,18 +544,17 @@ msgid "Checkout"
544
msgstr "チェックアウト"
545
546
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
442
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:283
443
-#: lib/checkout_op.tcl:522 lib/merge.tcl:172 lib/option.tcl:172
444
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
547
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
548
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
549
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
550
msgid "Cancel"
551
msgstr "中止"
552
448
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:288
553
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
554
msgid "Revision"
555
msgstr "リビジョン"
556
452
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
453
-#: lib/option.tcl:274
557
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
558
msgid "Options"
559
msgstr "オプション"
560
@@ -470,7 +574,7 @@ msgstr "ブランチを作成"
574
msgid "Create New Branch"
575
msgstr "ブランチを新規作成"
576
473
-#: lib/branch_create.tcl:31
577
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
578
msgid "Create"
579
msgstr "作成"
580
@@ -610,20 +714,22 @@ msgstr "起動中…"
714
msgid "File Browser"
715
msgstr "ファイル・ブラウザ"
716
613
-#: lib/browser.tcl:127 lib/browser.tcl:144
717
+#: lib/browser.tcl:125 lib/browser.tcl:142
718
#, tcl-format
719
msgid "Loading %s..."
720
msgstr "%s をロード中…"
721
618
-#: lib/browser.tcl:188
722
+#: lib/browser.tcl:186
723
msgid "[Up To Parent]"
724
msgstr "[上位フォルダへ]"
725
622
-#: lib/browser.tcl:268 lib/browser.tcl:274
726
+#: lib/browser.tcl:266 lib/browser.tcl:272
727
msgid "Browse Branch Files"
728
msgstr "現在のブランチのファイルを見る"
729
626
-#: lib/browser.tcl:279
730
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
731
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
732
+#: lib/choose_repository.tcl:811
733
msgid "Browse"
734
msgstr "ブラウズ"
735
@@ -632,7 +738,12 @@ msgstr "ブラウズ"
738
msgid "Fetching %s from %s"
739
msgstr "%s から %s をフェッチしています"
740
635
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
741
+#: lib/checkout_op.tcl:127
742
+#, tcl-format
743
+msgid "fatal: Cannot resolve %s"
744
+msgstr ""
745
+
746
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
747
msgid "Close"
748
msgstr "閉じる"
749
@@ -684,6 +795,11 @@ msgstr ""
795
"\n"
796
"自動的に再スキャンを開始します。\n"
797
798
+#: lib/checkout_op.tcl:322
799
+#, fuzzy, tcl-format
800
+msgid "Updating working directory to '%s'..."
801
+msgstr "作業ディレクトリがありません"
802
+
803
#: lib/checkout_op.tcl:353
804
#, tcl-format
805
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -710,6 +826,11 @@ msgstr ""
826
"ブランチ上に滞まりたいときは、この「分離されたチェックアウト」から新規ブラン"
827
"チを開始してください。"
828
829
+#: lib/checkout_op.tcl:446
830
+#, fuzzy, tcl-format
831
+msgid "Checked out '%s'."
832
+msgstr "チェックアウト"
833
+
834
#: lib/checkout_op.tcl:478
835
#, tcl-format
836
msgid "Resetting '%s' to '%s' will lose the following commits:"
@@ -744,6 +865,246 @@ msgstr ""
865
"ましたが、 Git の内部データを更新できませんでした。\n"
866
"起こるはずのないエラーです。あきらめて %s を終了します。"
867
868
+#: lib/choose_font.tcl:39
869
+#, fuzzy
870
+msgid "Select"
871
+msgstr "全て選択"
872
+
873
+#: lib/choose_font.tcl:53
874
+msgid "Font Family"
875
+msgstr ""
876
+
877
+#: lib/choose_font.tcl:73
878
+#, fuzzy
879
+msgid "Font Size"
880
+msgstr "フォントを小さく"
881
+
882
+#: lib/choose_font.tcl:90
883
+msgid "Font Example"
884
+msgstr ""
885
+
886
+#: lib/choose_font.tcl:101
887
+msgid ""
888
+"This is example text.\n"
889
+"If you like this text, it can be your font."
890
+msgstr ""
891
+
892
+#: lib/choose_repository.tcl:25
893
+msgid "Git Gui"
894
+msgstr ""
895
+
896
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
897
+#, fuzzy
898
+msgid "Create New Repository"
899
+msgstr "元のリポジトリ"
900
+
901
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
902
+#, fuzzy
903
+msgid "Clone Existing Repository"
904
+msgstr "送り先リポジトリ"
905
+
906
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
907
+#, fuzzy
908
+msgid "Open Existing Repository"
909
+msgstr "送り先リポジトリ"
910
+
911
+#: lib/choose_repository.tcl:91
912
+msgid "Next >"
913
+msgstr ""
914
+
915
+#: lib/choose_repository.tcl:152
916
+#, fuzzy, tcl-format
917
+msgid "Location %s already exists."
918
+msgstr "'%s'というブランチは既に存在します。"
919
+
920
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
921
+#: lib/choose_repository.tcl:172
922
+#, fuzzy, tcl-format
923
+msgid "Failed to create repository %s:"
924
+msgstr "完全にオプションを保存できません:"
925
+
926
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
927
+msgid "Directory:"
928
+msgstr ""
929
+
930
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
931
+#: lib/choose_repository.tcl:834
932
+#, fuzzy
933
+msgid "Git Repository"
934
+msgstr "リポジトリ"
935
+
936
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
937
+#, fuzzy, tcl-format
938
+msgid "Directory %s already exists."
939
+msgstr "'%s'というブランチは既に存在します。"
940
+
941
+#: lib/choose_repository.tcl:265
942
+#, fuzzy, tcl-format
943
+msgid "File %s already exists."
944
+msgstr "'%s'というブランチは既に存在します。"
945
+
946
+#: lib/choose_repository.tcl:286
947
+#, fuzzy
948
+msgid "Clone"
949
+msgstr "閉じる"
950
+
951
+#: lib/choose_repository.tcl:299
952
+msgid "URL:"
953
+msgstr ""
954
+
955
+#: lib/choose_repository.tcl:319
956
+msgid "Clone Type:"
957
+msgstr ""
958
+
959
+#: lib/choose_repository.tcl:325
960
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
961
+msgstr ""
962
+
963
+#: lib/choose_repository.tcl:331
964
+msgid "Full Copy (Slower, Redundant Backup)"
965
+msgstr ""
966
+
967
+#: lib/choose_repository.tcl:337
968
+msgid "Shared (Fastest, Not Recommended, No Backup)"
969
+msgstr ""
970
+
971
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
972
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
973
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
974
+#, fuzzy, tcl-format
975
+msgid "Not a Git repository: %s"
976
+msgstr "リポジトリが選択されていません。"
977
+
978
+#: lib/choose_repository.tcl:405
979
+msgid "Standard only available for local repository."
980
+msgstr ""
981
+
982
+#: lib/choose_repository.tcl:409
983
+msgid "Shared only available for local repository."
984
+msgstr ""
985
+
986
+#: lib/choose_repository.tcl:439
987
+msgid "Failed to configure origin"
988
+msgstr ""
989
+
990
+#: lib/choose_repository.tcl:451
991
+msgid "Counting objects"
992
+msgstr ""
993
+
994
+#: lib/choose_repository.tcl:452
995
+msgid "buckets"
996
+msgstr ""
997
+
998
+#: lib/choose_repository.tcl:476
999
+#, tcl-format
1000
+msgid "Unable to copy objects/info/alternates: %s"
1001
+msgstr ""
1002
+
1003
+#: lib/choose_repository.tcl:512
1004
+#, fuzzy, tcl-format
1005
+msgid "Nothing to clone from %s."
1006
+msgstr "%s から新しい変更をフェッチしています"
1007
+
1008
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
1009
+#: lib/choose_repository.tcl:740
1010
+msgid "The 'master' branch has not been initialized."
1011
+msgstr ""
1012
+
1013
+#: lib/choose_repository.tcl:527
1014
+msgid "Hardlinks are unavailable. Falling back to copying."
1015
+msgstr ""
1016
+
1017
+#: lib/choose_repository.tcl:539
1018
+#, fuzzy, tcl-format
1019
+msgid "Cloning from %s"
1020
+msgstr "%s から %s をフェッチしています"
1021
+
1022
+#: lib/choose_repository.tcl:570
1023
+#, fuzzy
1024
+msgid "Copying objects"
1025
+msgstr "データベース圧縮"
1026
+
1027
+#: lib/choose_repository.tcl:571
1028
+msgid "KiB"
1029
+msgstr ""
1030
+
1031
+#: lib/choose_repository.tcl:595
1032
+#, tcl-format
1033
+msgid "Unable to copy object: %s"
1034
+msgstr ""
1035
+
1036
+#: lib/choose_repository.tcl:605
1037
+msgid "Linking objects"
1038
+msgstr ""
1039
+
1040
+#: lib/choose_repository.tcl:606
1041
+msgid "objects"
1042
+msgstr ""
1043
+
1044
+#: lib/choose_repository.tcl:614
1045
+#, tcl-format
1046
+msgid "Unable to hardlink object: %s"
1047
+msgstr ""
1048
+
1049
+#: lib/choose_repository.tcl:669
1050
+msgid "Cannot fetch branches and objects. See console output for details."
1051
+msgstr ""
1052
+
1053
+#: lib/choose_repository.tcl:680
1054
+msgid "Cannot fetch tags. See console output for details."
1055
+msgstr ""
1056
+
1057
+#: lib/choose_repository.tcl:704
1058
+msgid "Cannot determine HEAD. See console output for details."
1059
+msgstr ""
1060
+
1061
+#: lib/choose_repository.tcl:713
1062
+#, tcl-format
1063
+msgid "Unable to cleanup %s"
1064
+msgstr ""
1065
+
1066
+#: lib/choose_repository.tcl:719
1067
+#, fuzzy
1068
+msgid "Clone failed."
1069
+msgstr "中断に失敗しました。"
1070
+
1071
+#: lib/choose_repository.tcl:726
1072
+msgid "No default branch obtained."
1073
+msgstr ""
1074
+
1075
+#: lib/choose_repository.tcl:737
1076
+#, tcl-format
1077
+msgid "Cannot resolve %s as a commit."
1078
+msgstr ""
1079
+
1080
+#: lib/choose_repository.tcl:749
1081
+#, fuzzy
1082
+msgid "Creating working directory"
1083
+msgstr "作業ディレクトリがありません"
1084
+
1085
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1086
+#: lib/index.tcl:149
1087
+msgid "files"
1088
+msgstr ""
1089
+
1090
+#: lib/choose_repository.tcl:779
1091
+msgid "Initial file checkout failed."
1092
+msgstr ""
1093
+
1094
+#: lib/choose_repository.tcl:795
1095
+msgid "Open"
1096
+msgstr ""
1097
+
1098
+#: lib/choose_repository.tcl:805
1099
+#, fuzzy
1100
+msgid "Repository:"
1101
+msgstr "リポジトリ"
1102
+
1103
+#: lib/choose_repository.tcl:854
1104
+#, fuzzy, tcl-format
1105
+msgid "Failed to open repository %s:"
1106
+msgstr "完全にオプションを保存できません:"
1107
+
1108
#: lib/choose_rev.tcl:53
1109
msgid "This Detached Checkout"
1110
msgstr "分離されたチェックアウト"
@@ -760,7 +1121,7 @@ msgstr "ローカル・ブランチ"
1121
msgid "Tracking Branch"
1122
msgstr "トラッキング・ブランチ"
1123
763
-#: lib/choose_rev.tcl:84
1124
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1125
msgid "Tag"
1126
msgstr "タグ"
1127
@@ -777,6 +1138,14 @@ msgstr "リビジョンが未選択です。"
1138
msgid "Revision expression is empty."
1139
msgstr "リビジョン式が空です。"
1140
1141
+#: lib/choose_rev.tcl:530
1142
+msgid "Updated"
1143
+msgstr ""
1144
+
1145
+#: lib/choose_rev.tcl:558
1146
+msgid "URL"
1147
+msgstr ""
1148
+
1149
#: lib/commit.tcl:9
1150
msgid ""
1151
"There is nothing to amend.\n"
@@ -886,6 +1255,11 @@ msgstr ""
1255
msgid "write-tree failed:"
1256
msgstr "write-tree が失敗しました:"
1257
1258
+#: lib/commit.tcl:275
1259
+#, tcl-format
1260
+msgid "Commit %s appears to be corrupt"
1261
+msgstr ""
1262
+
1263
#: lib/commit.tcl:279
1264
msgid ""
1265
"No changes to commit.\n"
@@ -904,6 +1278,11 @@ msgstr ""
1278
msgid "No changes to commit."
1279
msgstr "コミットする変更がありません。"
1280
1281
+#: lib/commit.tcl:303
1282
+#, tcl-format
1283
+msgid "warning: Tcl does not support encoding '%s'."
1284
+msgstr ""
1285
+
1286
#: lib/commit.tcl:317
1287
msgid "commit-tree failed:"
1288
msgstr "commit-tree が失敗しました:"
@@ -917,15 +1296,15 @@ msgstr "update-ref が失敗しました:"
1296
msgid "Created commit %s: %s"
1297
msgstr "コミット %s を作成しました: %s"
1298
920
-#: lib/console.tcl:55
1299
+#: lib/console.tcl:57
1300
msgid "Working... please wait..."
1301
msgstr "実行中…お待ち下さい…"
1302
924
-#: lib/console.tcl:184
1303
+#: lib/console.tcl:183
1304
msgid "Success"
1305
msgstr "成功"
1306
928
-#: lib/console.tcl:194
1307
+#: lib/console.tcl:196
1308
msgid "Error: Command Failed"
1309
msgstr "エラー: コマンドが失敗しました"
1310
@@ -965,6 +1344,22 @@ msgstr "データベース圧縮"
1344
msgid "Verifying the object database with fsck-objects"
1345
msgstr "fsck-objects でオブジェクト・データベースを検証しています"
1346
1347
+#: lib/database.tcl:108
1348
+#, tcl-format
1349
+msgid ""
1350
+"This repository currently has approximately %i loose objects.\n"
1351
+"\n"
1352
+"To maintain optimal performance it is strongly recommended that you compress "
1353
+"the database when more than %i loose objects exist.\n"
1354
+"\n"
1355
+"Compress the database now?"
1356
+msgstr ""
1357
+
1358
+#: lib/date.tcl:25
1359
+#, fuzzy, tcl-format
1360
+msgid "Invalid date from Git: %s"
1361
+msgstr "無効なリビジョン: %s"
1362
+
1363
#: lib/diff.tcl:42
1364
#, tcl-format
1365
msgid ""
@@ -987,19 +1382,37 @@ msgstr ""
1382
"\n"
1383
"同様な状態のファイルを探すために、自動的に再スキャンを開始します。"
1384
990
-#: lib/diff.tcl:97
1385
+#: lib/diff.tcl:81
1386
+#, fuzzy, tcl-format
1387
+msgid "Loading diff of %s..."
1388
+msgstr "%s をロード中…"
1389
+
1390
+#: lib/diff.tcl:114 lib/diff.tcl:184
1391
+#, tcl-format
1392
+msgid "Unable to display %s"
1393
+msgstr ""
1394
+
1395
+#: lib/diff.tcl:115
1396
msgid "Error loading file:"
1397
msgstr "ファイルを読む際のエラーです:"
1398
994
-#: lib/diff.tcl:162
1399
+#: lib/diff.tcl:122
1400
+msgid "Git Repository (subproject)"
1401
+msgstr ""
1402
+
1403
+#: lib/diff.tcl:134
1404
+msgid "* Binary file (not showing content)."
1405
+msgstr ""
1406
+
1407
+#: lib/diff.tcl:185
1408
msgid "Error loading diff:"
1409
msgstr "diff を読む際のエラーです:"
1410
998
-#: lib/diff.tcl:278
1411
+#: lib/diff.tcl:302
1412
msgid "Failed to unstage selected hunk."
1413
msgstr "選択されたパッチをコミット予定から外せません。"
1414
1002
-#: lib/diff.tcl:285
1415
+#: lib/diff.tcl:309
1416
msgid "Failed to stage selected hunk."
1417
msgstr "選択されたパッチをコミット予定に加えられません。"
1418
@@ -1015,21 +1428,31 @@ msgstr "警告"
1428
msgid "You must correct the above errors before committing."
1429
msgstr "コミットする前に、以上のエラーを修正して下さい"
1430
1018
-#: lib/index.tcl:364
1431
+#: lib/index.tcl:241
1432
+#, fuzzy, tcl-format
1433
+msgid "Unstaging %s from commit"
1434
+msgstr "コミットから降ろす"
1435
+
1436
+#: lib/index.tcl:285
1437
+#, fuzzy, tcl-format
1438
+msgid "Adding %s"
1439
+msgstr "%s を読んでいます…"
1440
+
1441
+#: lib/index.tcl:340
1442
#, tcl-format
1443
msgid "Revert changes in file %s?"
1444
msgstr "ファイル %s にした変更を元に戻しますか?"
1445
1023
-#: lib/index.tcl:366
1446
+#: lib/index.tcl:342
1447
#, tcl-format
1448
msgid "Revert changes in these %i files?"
1449
msgstr "これら %i 個のファイルにした変更を元に戻しますか?"
1450
1028
-#: lib/index.tcl:372
1451
+#: lib/index.tcl:348
1452
msgid "Any unstaged changes will be permanently lost by the revert."
1453
msgstr "変更を元に戻すとコミット予定していない変更は全て失われます。"
1454
1032
-#: lib/index.tcl:375
1455
+#: lib/index.tcl:351
1456
msgid "Do Nothing"
1457
msgstr "何もしない"
1458
@@ -1170,71 +1593,100 @@ msgstr "中断に失敗しました。"
1593
msgid "Abort completed. Ready."
1594
msgstr "中断完了。"
1595
1173
-#: lib/option.tcl:77
1174
-msgid "git-gui - a graphical user interface for Git."
1175
-msgstr "Git のグラフィカルUI git-gui"
1176
-
1177
-#: lib/option.tcl:164
1596
+#: lib/option.tcl:82
1597
msgid "Restore Defaults"
1598
msgstr "既定値に戻す"
1599
1181
-#: lib/option.tcl:168
1600
+#: lib/option.tcl:86
1601
msgid "Save"
1602
msgstr "保存"
1603
1185
-#: lib/option.tcl:178
1604
+#: lib/option.tcl:96
1605
#, tcl-format
1606
msgid "%s Repository"
1607
msgstr "%s リポジトリ"
1608
1190
-#: lib/option.tcl:179
1609
+#: lib/option.tcl:97
1610
msgid "Global (All Repositories)"
1611
msgstr "大域(全てのリポジトリ)"
1612
1194
-#: lib/option.tcl:185
1613
+#: lib/option.tcl:103
1614
msgid "User Name"
1615
msgstr "ユーザ名"
1616
1198
-#: lib/option.tcl:186
1617
+#: lib/option.tcl:104
1618
msgid "Email Address"
1619
msgstr "電子メールアドレス"
1620
1202
-#: lib/option.tcl:188
1621
+#: lib/option.tcl:106
1622
msgid "Summarize Merge Commits"
1623
msgstr "マージコミットの要約"
1624
1206
-#: lib/option.tcl:189
1625
+#: lib/option.tcl:107
1626
msgid "Merge Verbosity"
1627
msgstr "マージの冗長度"
1628
1210
-#: lib/option.tcl:190
1629
+#: lib/option.tcl:108
1630
msgid "Show Diffstat After Merge"
1631
msgstr "マージ後に diffstat を表示"
1632
1214
-#: lib/option.tcl:192
1633
+#: lib/option.tcl:110
1634
msgid "Trust File Modification Timestamps"
1635
msgstr "ファイル変更時刻を信頼する"
1636
1218
-#: lib/option.tcl:193
1637
+#: lib/option.tcl:111
1638
msgid "Prune Tracking Branches During Fetch"
1639
msgstr "フェッチ中にトラッキングブランチを刈る"
1640
1222
-#: lib/option.tcl:194
1641
+#: lib/option.tcl:112
1642
msgid "Match Tracking Branches"
1643
msgstr "トラッキングブランチを合わせる"
1644
1226
-#: lib/option.tcl:195
1645
+#: lib/option.tcl:113
1646
msgid "Number of Diff Context Lines"
1647
msgstr "diff の文脈行数"
1648
1230
-#: lib/option.tcl:196
1649
+#: lib/option.tcl:114
1650
msgid "New Branch Name Template"
1651
msgstr "新しいブランチ名のテンプレート"
1652
1234
-#: lib/option.tcl:305
1653
+#: lib/option.tcl:176
1654
+#, fuzzy
1655
+msgid "Change Font"
1656
+msgstr "主フォント"
1657
+
1658
+#: lib/option.tcl:180
1659
+#, tcl-format
1660
+msgid "Choose %s"
1661
+msgstr ""
1662
+
1663
+#: lib/option.tcl:186
1664
+msgid "pt."
1665
+msgstr ""
1666
+
1667
+#: lib/option.tcl:200
1668
+msgid "Preferences"
1669
+msgstr ""
1670
+
1671
+#: lib/option.tcl:235
1672
msgid "Failed to completely save options:"
1673
msgstr "完全にオプションを保存できません:"
1674
1675
+#: lib/remote.tcl:165
1676
+#, fuzzy
1677
+msgid "Prune from"
1678
+msgstr "%s から刈る…"
1679
+
1680
+#: lib/remote.tcl:170
1681
+#, fuzzy
1682
+msgid "Fetch from"
1683
+msgstr "%s からフェッチ…"
1684
+
1685
+#: lib/remote.tcl:213
1686
+#, fuzzy
1687
+msgid "Push to"
1688
+msgstr "プッシュ"
1689
+
1690
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1691
msgid "Delete Remote Branch"
1692
msgstr "リモート・ブランチを削除"
@@ -1243,11 +1695,11 @@ msgstr "リモート・ブランチを削除"
1695
msgid "From Repository"
1696
msgstr "元のリポジトリ"
1697
1246
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
1698
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1699
msgid "Remote:"
1700
msgstr "リモート:"
1701
1250
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
1702
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1703
msgid "Arbitrary URL:"
1704
msgstr "任意の URL:"
1705
@@ -1271,6 +1723,14 @@ msgstr "無条件(マージ検査をしない)"
1723
msgid "A branch is required for 'Merged Into'."
1724
msgstr "'マージ先' にはブランチが必要です。"
1725
1726
+#: lib/remote_branch_delete.tcl:184
1727
+#, fuzzy, tcl-format
1728
+msgid ""
1729
+"The following branches are not completely merged into %s:\n"
1730
+"\n"
1731
+" - %s"
1732
+msgstr "以下のブランチは %s に完全にマージされていません:"
1733
+
1734
#: lib/remote_branch_delete.tcl:189
1735
#, tcl-format
1736
msgid ""
@@ -1308,21 +1768,6 @@ msgstr "リポジトリが選択されていません。"
1768
msgid "Scanning %s..."
1769
msgstr "%s をスキャンしています…"
1770
1311
-#: lib/remote.tcl:162
1312
-#, tcl-format
1313
-msgid "Fetch from %s..."
1314
-msgstr "%s からフェッチ…"
1315
-
1316
-#: lib/remote.tcl:172
1317
-#, tcl-format
1318
-msgid "Prune from %s..."
1319
-msgstr "%s から刈る…"
1320
-
1321
-#: lib/remote.tcl:206
1322
-#, tcl-format
1323
-msgid "Push to %s..."
1324
-msgstr "%s へプッシュ…"
1325
-
1771
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1772
msgid "Cannot write script:"
1773
msgstr "スクリプトが書けません:"
@@ -1331,51 +1776,79 @@ msgstr "スクリプトが書けません:"
1776
msgid "Cannot write icon:"
1777
msgstr "アイコンが書けません:"
1778
1334
-#: lib/status_bar.tcl:58
1779
+#: lib/status_bar.tcl:83
1780
#, tcl-format
1781
msgid "%s ... %*i of %*i %s (%3i%%)"
1782
msgstr "%1$s ... %3$*i %4$s 中の %$2*i (%5$3i%%)"
1783
1784
+#: lib/transport.tcl:6
1785
+#, fuzzy, tcl-format
1786
+msgid "fetch %s"
1787
+msgstr "フェッチ"
1788
+
1789
#: lib/transport.tcl:7
1790
#, tcl-format
1791
msgid "Fetching new changes from %s"
1792
msgstr "%s から新しい変更をフェッチしています"
1793
1794
+#: lib/transport.tcl:18
1795
+#, tcl-format
1796
+msgid "remote prune %s"
1797
+msgstr ""
1798
+
1799
#: lib/transport.tcl:19
1800
#, tcl-format
1801
msgid "Pruning tracking branches deleted from %s"
1802
msgstr "%s から削除されたトラッキング・ブランチを刈っています"
1803
1804
+#: lib/transport.tcl:25 lib/transport.tcl:71
1805
+#, tcl-format
1806
+msgid "push %s"
1807
+msgstr ""
1808
+
1809
#: lib/transport.tcl:26
1810
#, tcl-format
1811
msgid "Pushing changes to %s"
1812
msgstr "%s へ変更をプッシュしています"
1813
1354
-#: lib/transport.tcl:68
1814
+#: lib/transport.tcl:72
1815
#, tcl-format
1816
msgid "Pushing %s %s to %s"
1817
msgstr "%3$s へ %1$s %2$s をプッシュしています"
1818
1359
-#: lib/transport.tcl:84
1819
+#: lib/transport.tcl:89
1820
msgid "Push Branches"
1821
msgstr "ブランチをプッシュ"
1822
1363
-#: lib/transport.tcl:98
1823
+#: lib/transport.tcl:103
1824
msgid "Source Branches"
1825
msgstr "元のブランチ"
1826
1367
-#: lib/transport.tcl:115
1827
+#: lib/transport.tcl:120
1828
msgid "Destination Repository"
1829
msgstr "送り先リポジトリ"
1830
1371
-#: lib/transport.tcl:153
1831
+#: lib/transport.tcl:158
1832
msgid "Transfer Options"
1833
msgstr "通信オプション"
1834
1375
-#: lib/transport.tcl:155
1835
+#: lib/transport.tcl:160
1836
+msgid "Force overwrite existing branch (may discard changes)"
1837
+msgstr ""
1838
+
1839
+#: lib/transport.tcl:164
1840
msgid "Use thin pack (for slow network connections)"
1841
msgstr "Thin Pack を使う(遅いネットワーク接続)"
1842
1379
-#: lib/transport.tcl:159
1843
+#: lib/transport.tcl:168
1844
msgid "Include tags"
1845
msgstr "タグを含める"
1846
+
1847
+#~ msgid "Cannot find the git directory:"
1848
+#~ msgstr "git ディレクトリが見つかりません:"
1849
+
1850
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
1851
+#~ msgstr "ステージングされていない(コミット未予定の)変更"
1852
+
1853
+#~ msgid "Push to %s..."
1854
+#~ msgstr "%s へプッシュ…"
po/ru.po
+845
-441
@@ -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-07-27 19:33+0200\n"
10
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
11
"PO-Revision-Date: 2007-07-28 18:30+0200\n"
12
"Last-Translator: Irina Riesen <irina.riesen@gmail.com>\n"
13
"Language-Team: Russian Translation <git@vger.kernel.org>\n"
@@ -15,16 +15,33 @@ msgstr ""
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
18
-#: git-gui.sh:531
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 ""
22
+
23
+#: git-gui.sh:595
24
+#, fuzzy, tcl-format
25
+msgid "Invalid font specified in %s:"
26
+msgstr "В оболочке установлен неверный шрифт.%s:"
27
+
28
+#: git-gui.sh:620
29
+msgid "Main Font"
30
+msgstr "Шрифт интерфейса"
31
+
32
+#: git-gui.sh:621
33
+msgid "Diff/Console Font"
34
+msgstr "Шрифт в консоли diff"
35
+
36
+#: git-gui.sh:635
37
msgid "Cannot find git in PATH."
38
msgstr "git не найден в PATH."
39
22
-#: git-gui.sh:550
40
+#: git-gui.sh:662
41
msgid "Cannot parse Git version string:"
24
-msgstr ""
25
-"Невозможно распознать строку версии Git: "
42
+msgstr "Невозможно распознать строку версии Git: "
43
27
-#: git-gui.sh:567
44
+#: git-gui.sh:680
45
#, tcl-format
46
msgid ""
47
"Git version cannot be determined.\n"
@@ -36,85 +53,81 @@ msgid ""
53
"Assume '%s' is version 1.5.0?\n"
54
msgstr ""
55
39
-#: git-gui.sh:689
40
-msgid "Cannot find the git directory:"
41
-msgstr "Каталог Git не найден:"
42
-
43
-#: git-gui.sh:697
56
+#: git-gui.sh:853
57
msgid "Git directory not found:"
58
msgstr "Каталог Git не найден:"
59
47
-#: git-gui.sh:703
60
+#: git-gui.sh:860
61
+#, fuzzy
62
+msgid "Cannot move to top of working directory:"
63
+msgstr "Каталог.git испорчен: "
64
+
65
+#: git-gui.sh:867
66
msgid "Cannot use funny .git directory:"
67
msgstr "Каталог.git испорчен: "
68
51
-#: git-gui.sh:708
69
+#: git-gui.sh:872
70
msgid "No working directory"
71
msgstr "Отсутствует рабочий каталог"
72
55
-#: git-gui.sh:853
73
+#: git-gui.sh:1019
74
msgid "Refreshing file status..."
75
msgstr "Обновление состояния файлов проекта..."
76
59
-#: git-gui.sh:886
77
+#: git-gui.sh:1084
78
msgid "Scanning for modified files ..."
79
msgstr "Поиск измененных файлов..."
80
63
-#: git-gui.sh:1052 lib/browser.tcl:233
81
+#: git-gui.sh:1259 lib/browser.tcl:245
82
msgid "Ready."
83
msgstr "Готово."
84
67
-#: git-gui.sh:1343
85
+#: git-gui.sh:1525
86
msgid "Unmodified"
87
msgstr "Не изменено"
88
71
-#: git-gui.sh:1345
89
+#: git-gui.sh:1527
90
msgid "Modified, not staged"
91
msgstr "Изменено, но не включено"
92
75
-#: git-gui.sh:1346 git-gui.sh:1351
93
+#: git-gui.sh:1528 git-gui.sh:1533
94
msgid "Staged for commit"
95
msgstr "Подготовлено для сохранения"
96
79
-#: git-gui.sh:1347 git-gui.sh:1352
97
+#: git-gui.sh:1529 git-gui.sh:1534
98
msgid "Portions staged for commit"
99
msgstr "Части, подготовленные для сохранения"
100
83
-#: git-gui.sh:1348 git-gui.sh:1353
101
+#: git-gui.sh:1530 git-gui.sh:1535
102
#, fuzzy
103
msgid "Staged for commit, missing"
86
-msgstr ""
87
-"Подготовлено для сохранения, отсутствует"
104
+msgstr "Подготовлено для сохранения, отсутствует"
105
89
-#: git-gui.sh:1350
106
+#: git-gui.sh:1532
107
msgid "Untracked, not staged"
108
msgstr "Не отслеживается, не подготовлено"
109
93
-#: git-gui.sh:1355
110
+#: git-gui.sh:1537
111
msgid "Missing"
112
msgstr "Отсутствует"
113
97
-#: git-gui.sh:1356
114
+#: git-gui.sh:1538
115
msgid "Staged for removal"
116
msgstr "Подготовлено для удаления"
117
101
-#: git-gui.sh:1357
118
+#: git-gui.sh:1539
119
msgid "Staged for removal, still present"
103
-msgstr ""
104
-"Подготовлено для удаления, но еще не "
105
-"удалено"
120
+msgstr "Подготовлено для удаления, но еще не удалено"
121
107
-#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362
122
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
123
msgid "Requires merge resolution"
109
-msgstr ""
110
-"Требуется разрешение конфликта при "
111
-"объединении"
124
+msgstr "Требуется разрешение конфликта при объединении"
125
113
-#: git-gui.sh:1404
126
+#: git-gui.sh:1579
127
msgid "Starting gitk... please wait..."
128
msgstr "Запускается gitk... пожалуйста, ждите..."
129
117
-#: git-gui.sh:1413
130
+#: git-gui.sh:1588
131
#, tcl-format
132
msgid ""
133
"Unable to start gitk:\n"
@@ -125,308 +138,338 @@ msgstr ""
138
"\n"
139
"%s не существует"
140
128
-#: git-gui.sh:1630
129
-#, tcl-format
130
-msgid "Invalid font specified in gui.%s:"
131
-msgstr ""
132
-"В оболочке установлен неверный шрифт.%s:"
133
-
134
-#: git-gui.sh:1655
135
-msgid "Main Font"
136
-msgstr "Шрифт интерфейса"
137
-
138
-#: git-gui.sh:1656
139
-msgid "Diff/Console Font"
140
-msgstr "Шрифт в консоли diff"
141
-
142
-#: git-gui.sh:1670
141
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
142
msgid "Repository"
143
msgstr "Репозиторий"
144
146
-#: git-gui.sh:1671
145
+#: git-gui.sh:1789
146
msgid "Edit"
147
msgstr "Редактировать"
148
150
-#: git-gui.sh:1673
149
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
150
msgid "Branch"
151
msgstr "Ветвь"
152
154
-#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193
155
-msgid "Commit"
153
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
154
+#, fuzzy
155
+msgid "Commit@@noun"
156
msgstr "Сохранить"
157
158
-#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173
158
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
159
msgid "Merge"
160
msgstr "Объединить"
161
162
-#: git-gui.sh:1680
163
-msgid "Fetch"
164
-msgstr "Получить"
165
-
166
-#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172
167
-msgid "Push"
168
-msgstr "Отправить"
162
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
163
+#, fuzzy
164
+msgid "Remote"
165
+msgstr "внешний:"
166
170
-#: git-gui.sh:1690
167
+#: git-gui.sh:1807
168
msgid "Browse Current Branch's Files"
169
msgstr "Просмотреть файлы текущей ветви"
170
174
-#: git-gui.sh:1692
175
-#, fuzzy, tcl-format
176
-msgid "Browse %s's Files"
177
-msgstr "Показать файлы ветви"
178
-
179
-#: git-gui.sh:1694
171
+#: git-gui.sh:1811
172
#, fuzzy
173
msgid "Browse Branch Files..."
174
msgstr "Показать файлы ветви"
175
184
-#: git-gui.sh:1699
176
+#: git-gui.sh:1816
177
msgid "Visualize Current Branch's History"
178
msgstr "История текущей ветви наглядно"
179
188
-#: git-gui.sh:1701
189
-#, fuzzy, tcl-format
190
-msgid "Visualize %s's History"
180
+#: git-gui.sh:1820
181
+msgid "Visualize All Branch History"
182
msgstr "История всех ветвей наглядно"
183
193
-#: git-gui.sh:1703
194
-msgid "Visualize All Branch History"
184
+#: git-gui.sh:1827
185
+#, fuzzy, tcl-format
186
+msgid "Browse %s's Files"
187
+msgstr "Показать файлы ветви"
188
+
189
+#: git-gui.sh:1829
190
+#, fuzzy, tcl-format
191
+msgid "Visualize %s's History"
192
msgstr "История всех ветвей наглядно"
193
197
-#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67
194
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
195
msgid "Database Statistics"
196
msgstr "Статистика базы данных"
197
201
-#: git-gui.sh:1711 lib/database.tcl:34
198
+#: git-gui.sh:1837 lib/database.tcl:34
199
msgid "Compress Database"
200
msgstr "Сжать базу данных"
201
205
-#: git-gui.sh:1714
202
+#: git-gui.sh:1840
203
msgid "Verify Database"
204
msgstr "Проверить базу данных"
205
209
-#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9
206
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
207
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
208
msgid "Create Desktop Icon"
209
msgstr "Создать ярлык на рабочем столе"
210
214
-#: git-gui.sh:1734
211
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
212
msgid "Quit"
213
msgstr "Выход"
214
218
-#: git-gui.sh:1741
215
+#: git-gui.sh:1867
216
msgid "Undo"
217
msgstr "Отменить"
218
222
-#: git-gui.sh:1744
219
+#: git-gui.sh:1870
220
msgid "Redo"
221
msgstr "Повторить"
222
226
-#: git-gui.sh:1748 git-gui.sh:2263
223
+#: git-gui.sh:1874 git-gui.sh:2366
224
msgid "Cut"
225
msgstr "Вырезать"
226
230
-#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409
231
-#: lib/console.tcl:69
227
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
228
+#: lib/console.tcl:67
229
msgid "Copy"
230
msgstr "Копировать"
231
235
-#: git-gui.sh:1754 git-gui.sh:2269
232
+#: git-gui.sh:1880 git-gui.sh:2372
233
msgid "Paste"
234
msgstr "Вставить"
235
239
-#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26
236
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
237
#: lib/remote_branch_delete.tcl:38
238
msgid "Delete"
239
msgstr "Удалить"
240
244
-#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71
241
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
242
msgid "Select All"
243
msgstr "Выделить все"
244
248
-#: git-gui.sh:1770
245
+#: git-gui.sh:1896
246
msgid "Create..."
247
msgstr "Создать..."
248
252
-#: git-gui.sh:1776
249
+#: git-gui.sh:1902
250
msgid "Checkout..."
251
msgstr "Перейти..."
252
256
-#: git-gui.sh:1782
253
+#: git-gui.sh:1908
254
msgid "Rename..."
255
msgstr "Переименовать..."
256
260
-#: git-gui.sh:1787 git-gui.sh:1885
257
+#: git-gui.sh:1913 git-gui.sh:2012
258
msgid "Delete..."
259
msgstr "Удалить..."
260
264
-#: git-gui.sh:1792
261
+#: git-gui.sh:1918
262
msgid "Reset..."
263
msgstr "Сбросить..."
264
268
-#: git-gui.sh:1804 git-gui.sh:2210
265
+#: git-gui.sh:1930 git-gui.sh:2313
266
msgid "New Commit"
267
msgstr "Новое состояние"
268
272
-#: git-gui.sh:1812 git-gui.sh:2217
269
+#: git-gui.sh:1938 git-gui.sh:2320
270
msgid "Amend Last Commit"
271
msgstr "Исправить последнее состояние"
272
276
-#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99
273
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
274
msgid "Rescan"
275
msgstr "Перечитать"
276
280
-#: git-gui.sh:1827
281
-msgid "Add To Commit"
282
-msgstr "Подготовить к сохранению"
277
+#: git-gui.sh:1953
278
+#, fuzzy
279
+msgid "Stage To Commit"
280
+msgstr "Подготовлено для сохранения"
281
284
-#: git-gui.sh:1832
285
-msgid "Add Existing To Commit"
286
-msgstr ""
287
-"Подготовить имеющиеся файлы к сохранению"
282
+#: git-gui.sh:1958
283
+#, fuzzy
284
+msgid "Stage Changed Files To Commit"
285
+msgstr "Подготовлено (будет сохранено)"
286
289
-#: git-gui.sh:1838
287
+#: git-gui.sh:1964
288
msgid "Unstage From Commit"
289
msgstr "Убрать из подготовленного"
290
293
-#: git-gui.sh:1843 lib/index.tcl:376
291
+#: git-gui.sh:1969 lib/index.tcl:352
292
msgid "Revert Changes"
293
msgstr "Отменить изменения"
294
297
-#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287
295
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
296
msgid "Sign Off"
297
msgstr "Подписать"
298
301
-#: git-gui.sh:1865
299
+#: git-gui.sh:1980 git-gui.sh:2296
300
+#, fuzzy
301
+msgid "Commit@@verb"
302
+msgstr "Сохранить"
303
+
304
+#: git-gui.sh:1991
305
msgid "Local Merge..."
306
msgstr "Локальное объединение..."
307
305
-#: git-gui.sh:1870
308
+#: git-gui.sh:1996
309
msgid "Abort Merge..."
310
msgstr "Прервать объединение..."
311
309
-#: git-gui.sh:1882
312
+#: git-gui.sh:2008
313
msgid "Push..."
314
msgstr "Отправить..."
315
313
-#: git-gui.sh:1892
316
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
317
msgid "Apple"
318
msgstr ""
319
317
-#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65
320
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
321
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
322
#, tcl-format
323
msgid "About %s"
324
msgstr "О %s"
325
322
-#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455
326
+#: git-gui.sh:2026
327
+msgid "Preferences..."
328
+msgstr ""
329
+
330
+#: git-gui.sh:2034 git-gui.sh:2558
331
msgid "Options..."
332
msgstr "Настройки..."
333
326
-#: git-gui.sh:1917
327
-msgid "Running miga..."
328
-msgstr ""
329
-
330
-#: git-gui.sh:1938
334
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
335
msgid "Help"
336
msgstr "Помощь"
337
334
-#: git-gui.sh:1979
338
+#: git-gui.sh:2081
339
msgid "Online Documentation"
340
msgstr "Документация в интернете"
341
338
-#: git-gui.sh:2095
342
+#: git-gui.sh:2165
343
+#, tcl-format
344
+msgid "fatal: cannot stat path %s: No such file or directory"
345
+msgstr ""
346
+
347
+#: git-gui.sh:2198
348
msgid "Current Branch:"
349
msgstr "Текущая ветвь:"
350
342
-#: git-gui.sh:2116
343
-msgid "Staged Changes (Will Be Committed)"
351
+#: git-gui.sh:2219
352
+#, fuzzy
353
+msgid "Staged Changes (Will Commit)"
354
msgstr "Подготовлено (будет сохранено)"
355
346
-#: git-gui.sh:2136
347
-msgid "Unstaged Changes (Will Not Be Committed)"
348
-msgstr "Изменено (не будет сохранено)"
356
+#: git-gui.sh:2239
357
+msgid "Unstaged Changes"
358
+msgstr ""
359
+
360
+#: git-gui.sh:2286
361
+msgid "Stage Changed"
362
+msgstr ""
363
350
-#: git-gui.sh:2183
351
-msgid "Add Existing"
352
-msgstr "Добавить имеющиеся файлы"
364
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
365
+msgid "Push"
366
+msgstr "Отправить"
367
354
-#: git-gui.sh:2229
368
+#: git-gui.sh:2332
369
#, fuzzy
370
msgid "Initial Commit Message:"
357
-msgstr ""
358
-"Первоначальный комментарий к состоянию:"
371
+msgstr "Первоначальный комментарий к состоянию:"
372
360
-#: git-gui.sh:2230
373
+#: git-gui.sh:2333
374
#, fuzzy
375
msgid "Amended Commit Message:"
376
msgstr "Исправленный комментарий к состоянию:"
377
365
-#: git-gui.sh:2231
378
+#: git-gui.sh:2334
379
#, fuzzy
380
msgid "Amended Initial Commit Message:"
368
-msgstr ""
369
-"Первоначальный комментарий к "
370
-"исправленному состоянию:"
381
+msgstr "Первоначальный комментарий к исправленному состоянию:"
382
372
-#: git-gui.sh:2232
383
+#: git-gui.sh:2335
384
#, fuzzy
385
msgid "Amended Merge Commit Message:"
375
-msgstr ""
376
-"Комментарий к исправленному объединению:"
386
+msgstr "Комментарий к исправленному объединению:"
387
378
-#: git-gui.sh:2233
388
+#: git-gui.sh:2336
389
msgid "Merge Commit Message:"
390
msgstr "Комментарий к объединению:"
391
382
-#: git-gui.sh:2234
392
+#: git-gui.sh:2337
393
msgid "Commit Message:"
394
msgstr "Комментарий к состоянию:"
395
386
-#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73
396
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
397
msgid "Copy All"
398
msgstr "Копировать все"
399
390
-#: git-gui.sh:2303 lib/blame.tcl:104
400
+#: git-gui.sh:2406 lib/blame.tcl:104
401
msgid "File:"
402
msgstr "Файл:"
403
394
-#: git-gui.sh:2405
404
+#: git-gui.sh:2508
405
msgid "Refresh"
406
msgstr "Обновить"
407
398
-#: git-gui.sh:2426
408
+#: git-gui.sh:2529
409
msgid "Apply/Reverse Hunk"
410
msgstr "Применить/Убрать изменение"
411
402
-#: git-gui.sh:2432
412
+#: git-gui.sh:2535
413
msgid "Decrease Font Size"
414
msgstr "Уменьшить размер шрифта"
415
406
-#: git-gui.sh:2436
416
+#: git-gui.sh:2539
417
msgid "Increase Font Size"
418
msgstr "Увеличить размер шрифта"
419
410
-#: git-gui.sh:2441
420
+#: git-gui.sh:2544
421
msgid "Show Less Context"
422
msgstr "Меньше контекста"
423
414
-#: git-gui.sh:2448
424
+#: git-gui.sh:2551
425
msgid "Show More Context"
426
msgstr "Больше контекста"
427
418
-#: git-gui.sh:2461
428
+#: git-gui.sh:2565
429
msgid "Unstage Hunk From Commit"
430
msgstr "Не сохранять часть"
431
422
-#: git-gui.sh:2463
432
+#: git-gui.sh:2567
433
msgid "Stage Hunk For Commit"
434
msgstr "Подготовить часть для сохранения"
435
426
-#: git-gui.sh:2473
436
+#: git-gui.sh:2586
437
msgid "Initializing..."
438
msgstr "Инициализация..."
439
440
+#: git-gui.sh:2677
441
+#, tcl-format
442
+msgid ""
443
+"Possible environment issues exist.\n"
444
+"\n"
445
+"The following environment variables are probably\n"
446
+"going to be ignored by any Git subprocess run\n"
447
+"by %s:\n"
448
+"\n"
449
+msgstr ""
450
+
451
+#: git-gui.sh:2707
452
+msgid ""
453
+"\n"
454
+"This is due to a known issue with the\n"
455
+"Tcl binary distributed by Cygwin."
456
+msgstr ""
457
+
458
+#: git-gui.sh:2712
459
+#, tcl-format
460
+msgid ""
461
+"\n"
462
+"\n"
463
+"A good replacement for %s\n"
464
+"is placing values for the user.name and\n"
465
+"user.email settings into your personal\n"
466
+"~/.gitconfig file.\n"
467
+msgstr ""
468
+
469
+#: lib/about.tcl:25
470
+msgid "git-gui - a graphical user interface for Git."
471
+msgstr "git-gui - графический пользовательский интерфейс к Git."
472
+
473
#: lib/blame.tcl:77
474
msgid "File Viewer"
475
msgstr "Просмотр файла"
@@ -444,6 +487,53 @@ msgstr "Копировать сохраненное состояние"
487
msgid "Reading %s..."
488
msgstr "Чтение %s..."
489
490
+#: lib/blame.tcl:473
491
+msgid "Loading copy/move tracking annotations..."
492
+msgstr ""
493
+
494
+#: lib/blame.tcl:493
495
+msgid "lines annotated"
496
+msgstr ""
497
+
498
+#: lib/blame.tcl:674
499
+msgid "Loading original location annotations..."
500
+msgstr ""
501
+
502
+#: lib/blame.tcl:677
503
+msgid "Annotation complete."
504
+msgstr ""
505
+
506
+#: lib/blame.tcl:731
507
+#, fuzzy
508
+msgid "Loading annotation..."
509
+msgstr "Загрузка %s..."
510
+
511
+#: lib/blame.tcl:787
512
+msgid "Author:"
513
+msgstr ""
514
+
515
+#: lib/blame.tcl:791
516
+#, fuzzy
517
+msgid "Committer:"
518
+msgstr "Сохраненное состояние:"
519
+
520
+#: lib/blame.tcl:796
521
+msgid "Original File:"
522
+msgstr ""
523
+
524
+#: lib/blame.tcl:910
525
+msgid "Originally By:"
526
+msgstr ""
527
+
528
+#: lib/blame.tcl:916
529
+#, fuzzy
530
+msgid "In File:"
531
+msgstr "Файл:"
532
+
533
+#: lib/blame.tcl:921
534
+msgid "Copied Or Moved Here By:"
535
+msgstr ""
536
+
537
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
538
msgid "Checkout Branch"
539
msgstr "Перейти на ветвь"
@@ -453,18 +543,17 @@ msgid "Checkout"
543
msgstr "Перейти"
544
545
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
456
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:269
457
-#: lib/checkout_op.tcl:519 lib/merge.tcl:176 lib/option.tcl:172
458
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
546
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
547
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
548
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
549
msgid "Cancel"
550
msgstr "Отменить"
551
462
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:274
552
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
553
msgid "Revision"
554
msgstr "Версия"
555
466
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
467
-#: lib/option.tcl:274
556
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
557
msgid "Options"
558
msgstr "Настройки"
559
@@ -484,7 +573,7 @@ msgstr "Создание ветви"
573
msgid "Create New Branch"
574
msgstr "Создать новую ветвь"
575
487
-#: lib/branch_create.tcl:31
576
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
577
msgid "Create"
578
msgstr "Создать"
579
@@ -516,7 +605,7 @@ msgstr "Нет"
605
msgid "Fast Forward Only"
606
msgstr "Только Fast Forward"
607
519
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511
608
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
609
msgid "Reset"
610
msgstr "Сброс"
611
@@ -531,9 +620,7 @@ msgstr "Укажите ветвь слежения."
620
#: lib/branch_create.tcl:140
621
#, tcl-format
622
msgid "Tracking branch %s is not a branch in the remote repository."
534
-msgstr ""
535
-"Ветвь слежения %s не является ветвью во "
536
-"внешнем репозитории."
623
+msgstr "Ветвь слежения %s не является ветвью во внешнем репозитории."
624
625
#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
626
msgid "Please supply a branch name."
@@ -558,22 +645,16 @@ msgstr "Локальные ветви"
645
646
#: lib/branch_delete.tcl:52
647
msgid "Delete Only If Merged Into"
561
-msgstr ""
562
-"Удалить только в случае, если было "
563
-"объединение с"
648
+msgstr "Удалить только в случае, если было объединение с"
649
650
#: lib/branch_delete.tcl:54
651
msgid "Always (Do not perform merge test.)"
567
-msgstr ""
568
-"Всегда (не выполнять проверку на "
569
-"объединение)"
652
+msgstr "Всегда (не выполнять проверку на объединение)"
653
654
#: lib/branch_delete.tcl:103
655
#, tcl-format
656
msgid "The following branches are not completely merged into %s:"
574
-msgstr ""
575
-"Следующие ветви объединены с %s не "
576
-"полностью:"
657
+msgstr "Следующие ветви объединены с %s не полностью:"
658
659
#: lib/branch_delete.tcl:115
660
msgid ""
@@ -624,24 +705,30 @@ msgstr "Ветвь '%s' уже существует."
705
msgid "Failed to rename '%s'."
706
msgstr "Не удалось переименовать '%s'. "
707
627
-#: lib/browser.tcl:10
708
+#: lib/browser.tcl:17
709
msgid "Starting..."
710
msgstr "Запуск..."
711
631
-#: lib/browser.tcl:19
712
+#: lib/browser.tcl:26
713
msgid "File Browser"
714
msgstr "Просмотр списка файлов"
715
635
-#: lib/browser.tcl:120 lib/browser.tcl:137
716
+#: lib/browser.tcl:125 lib/browser.tcl:142
717
#, tcl-format
718
msgid "Loading %s..."
719
msgstr "Загрузка %s..."
720
640
-#: lib/browser.tcl:254 lib/browser.tcl:260
721
+#: lib/browser.tcl:186
722
+msgid "[Up To Parent]"
723
+msgstr ""
724
+
725
+#: lib/browser.tcl:266 lib/browser.tcl:272
726
msgid "Browse Branch Files"
727
msgstr "Показать файлы ветви"
728
644
-#: lib/browser.tcl:265
729
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
730
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
731
+#: lib/choose_repository.tcl:811
732
msgid "Browse"
733
msgstr "Показать"
734
@@ -650,7 +737,12 @@ msgstr "Показать"
737
msgid "Fetching %s from %s"
738
msgstr "Получение изменений из %s "
739
653
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
740
+#: lib/checkout_op.tcl:127
741
+#, tcl-format
742
+msgid "fatal: Cannot resolve %s"
743
+msgstr ""
744
+
745
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
746
msgid "Close"
747
msgstr "Закрыть"
748
@@ -659,7 +751,7 @@ msgstr "Закрыть"
751
msgid "Branch '%s' does not exist."
752
msgstr "Ветвь '%s' не существует "
753
662
-#: lib/checkout_op.tcl:205
754
+#: lib/checkout_op.tcl:206
755
#, tcl-format
756
msgid ""
757
"Branch '%s' already exists.\n"
@@ -672,23 +764,22 @@ msgstr ""
764
"Она не может быть прокручена(fast-forward) к %s.\n"
765
"Требуется объединение."
766
675
-#: lib/checkout_op.tcl:219
767
+#: lib/checkout_op.tcl:220
768
#, tcl-format
769
msgid "Merge strategy '%s' not supported."
678
-msgstr ""
679
-"Операция объединения '%s' не "
680
-"поддерживается."
770
+msgstr "Операция объединения '%s' не поддерживается."
771
682
-#: lib/checkout_op.tcl:238
772
+#: lib/checkout_op.tcl:239
773
#, tcl-format
774
msgid "Failed to update '%s'."
775
msgstr "Не удалось обновить '%s'."
776
687
-#: lib/checkout_op.tcl:250
688
-msgid "Index is already locked."
777
+#: lib/checkout_op.tcl:251
778
+#, fuzzy
779
+msgid "Staging area (index) is already locked."
780
msgstr "Индекс заблокирован."
781
691
-#: lib/checkout_op.tcl:265
782
+#: lib/checkout_op.tcl:266
783
msgid ""
784
"Last scanned state does not match repository state.\n"
785
"\n"
@@ -697,34 +788,33 @@ msgid ""
788
"\n"
789
"The rescan will be automatically started now.\n"
790
msgstr ""
700
-"Последнее прочитанное состояние "
701
-"репозитория не соответствует текущему.\n"
791
+"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
792
"\n"
703
-"С момента последней проверки репозиторий "
704
-"был изменен другой программой "
705
-"Git.Необходимо перечитать репозиторий, "
706
-"прежде чем изменять текущую ветвь. \n"
793
+"С момента последней проверки репозиторий был изменен другой программой Git."
794
+"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
795
"\n"
796
"Это будет сделано сейчас автоматически.\n"
797
710
-#: lib/checkout_op.tcl:352
798
+#: lib/checkout_op.tcl:322
799
+#, fuzzy, tcl-format
800
+msgid "Updating working directory to '%s'..."
801
+msgstr "Отсутствует рабочий каталог"
802
+
803
+#: lib/checkout_op.tcl:353
804
#, tcl-format
805
msgid "Aborted checkout of '%s' (file level merging is required)."
713
-msgstr ""
714
-"Прерван переход на '%s' (требуется "
715
-"объединение на уровне файлов)"
806
+msgstr "Прерван переход на '%s' (требуется объединение на уровне файлов)"
807
717
-#: lib/checkout_op.tcl:353
808
+#: lib/checkout_op.tcl:354
809
msgid "File level merge required."
719
-msgstr ""
720
-"Требуется объединение на уровне файлов."
810
+msgstr "Требуется объединение на уровне файлов."
811
722
-#: lib/checkout_op.tcl:357
812
+#: lib/checkout_op.tcl:358
813
#, tcl-format
814
msgid "Staying on branch '%s'."
815
msgstr "Ветвь '%s' остается текущей."
816
727
-#: lib/checkout_op.tcl:426
817
+#: lib/checkout_op.tcl:429
818
msgid ""
819
"You are no longer on a local branch.\n"
820
"\n"
@@ -733,34 +823,33 @@ msgid ""
823
msgstr ""
824
"Вы находитесь не в локальной ветви.\n"
825
"\n"
736
-"Если вы хотите снова вернуться к "
737
-"какой-нибудь ветви, создайте ее сейчас, "
738
-"начиная с 'Текущего отсоединенного "
739
-"состояния'."
826
+"Если вы хотите снова вернуться к какой-нибудь ветви, создайте ее сейчас, "
827
+"начиная с 'Текущего отсоединенного состояния'."
828
741
-#: lib/checkout_op.tcl:475
829
+#: lib/checkout_op.tcl:446
830
+#, fuzzy, tcl-format
831
+msgid "Checked out '%s'."
832
+msgstr "Перейти..."
833
+
834
+#: lib/checkout_op.tcl:478
835
#, tcl-format
836
msgid "Resetting '%s' to '%s' will lose the following commits:"
744
-msgstr ""
745
-"Сброс '%s' в '%s' приведет к потере следующих "
746
-"сохраненных состояний: "
837
+msgstr "Сброс '%s' в '%s' приведет к потере следующих сохраненных состояний: "
838
748
-#: lib/checkout_op.tcl:497
839
+#: lib/checkout_op.tcl:500
840
msgid "Recovering lost commits may not be easy."
750
-msgstr ""
751
-"Восстановить потерянные сохраненные "
752
-"состояния будет сложно."
841
+msgstr "Восстановить потерянные сохраненные состояния будет сложно."
842
754
-#: lib/checkout_op.tcl:502
843
+#: lib/checkout_op.tcl:505
844
#, tcl-format
845
msgid "Reset '%s'?"
846
msgstr "Сбросить '%s'?"
847
759
-#: lib/checkout_op.tcl:507 lib/merge.tcl:171
848
+#: lib/checkout_op.tcl:510 lib/merge.tcl:164
849
msgid "Visualize"
850
msgstr "Наглядно"
851
763
-#: lib/checkout_op.tcl:575
852
+#: lib/checkout_op.tcl:578
853
#, tcl-format
854
msgid ""
855
"Failed to set current branch.\n"
@@ -772,46 +861,290 @@ msgid ""
861
msgstr ""
862
"Не удалось установить текущую ветвь.\n"
863
"\n"
775
-"Ваш рабочий каталог обновлен только "
776
-"частично. Были обновлены все файлы кроме "
864
+"Ваш рабочий каталог обновлен только частично. Были обновлены все файлы кроме "
865
"служебных файлов Git. \n"
866
"\n"
779
-"Этого не должно было произойти. %s "
780
-"завершается."
867
+"Этого не должно было произойти. %s завершается."
868
+
869
+#: lib/choose_font.tcl:39
870
+#, fuzzy
871
+msgid "Select"
872
+msgstr "Выделить все"
873
+
874
+#: lib/choose_font.tcl:53
875
+msgid "Font Family"
876
+msgstr ""
877
+
878
+#: lib/choose_font.tcl:73
879
+#, fuzzy
880
+msgid "Font Size"
881
+msgstr "Уменьшить размер шрифта"
882
+
883
+#: lib/choose_font.tcl:90
884
+msgid "Font Example"
885
+msgstr ""
886
+
887
+#: lib/choose_font.tcl:101
888
+msgid ""
889
+"This is example text.\n"
890
+"If you like this text, it can be your font."
891
+msgstr ""
892
+
893
+#: lib/choose_repository.tcl:25
894
+msgid "Git Gui"
895
+msgstr ""
896
+
897
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
898
+#, fuzzy
899
+msgid "Create New Repository"
900
+msgstr "Из репозитория"
901
+
902
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
903
+#, fuzzy
904
+msgid "Clone Existing Repository"
905
+msgstr "Репозиторий назначения"
906
+
907
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
908
+#, fuzzy
909
+msgid "Open Existing Repository"
910
+msgstr "Репозиторий назначения"
911
+
912
+#: lib/choose_repository.tcl:91
913
+msgid "Next >"
914
+msgstr ""
915
+
916
+#: lib/choose_repository.tcl:152
917
+#, fuzzy, tcl-format
918
+msgid "Location %s already exists."
919
+msgstr "Ветвь '%s' уже существует."
920
+
921
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
922
+#: lib/choose_repository.tcl:172
923
+#, fuzzy, tcl-format
924
+msgid "Failed to create repository %s:"
925
+msgstr "Не удалось полностью сохранить настройки:"
926
+
927
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
928
+msgid "Directory:"
929
+msgstr ""
930
+
931
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
932
+#: lib/choose_repository.tcl:834
933
+#, fuzzy
934
+msgid "Git Repository"
935
+msgstr "Репозиторий"
936
+
937
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
938
+#, fuzzy, tcl-format
939
+msgid "Directory %s already exists."
940
+msgstr "Ветвь '%s' уже существует."
941
+
942
+#: lib/choose_repository.tcl:265
943
+#, fuzzy, tcl-format
944
+msgid "File %s already exists."
945
+msgstr "Ветвь '%s' уже существует."
946
+
947
+#: lib/choose_repository.tcl:286
948
+#, fuzzy
949
+msgid "Clone"
950
+msgstr "Закрыть"
951
+
952
+#: lib/choose_repository.tcl:299
953
+msgid "URL:"
954
+msgstr ""
955
+
956
+#: lib/choose_repository.tcl:319
957
+msgid "Clone Type:"
958
+msgstr ""
959
+
960
+#: lib/choose_repository.tcl:325
961
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
962
+msgstr ""
963
+
964
+#: lib/choose_repository.tcl:331
965
+msgid "Full Copy (Slower, Redundant Backup)"
966
+msgstr ""
967
+
968
+#: lib/choose_repository.tcl:337
969
+msgid "Shared (Fastest, Not Recommended, No Backup)"
970
+msgstr ""
971
+
972
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
973
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
974
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
975
+#, fuzzy, tcl-format
976
+msgid "Not a Git repository: %s"
977
+msgstr "Не указан репозиторий"
978
+
979
+#: lib/choose_repository.tcl:405
980
+msgid "Standard only available for local repository."
981
+msgstr ""
982
+
983
+#: lib/choose_repository.tcl:409
984
+msgid "Shared only available for local repository."
985
+msgstr ""
986
+
987
+#: lib/choose_repository.tcl:439
988
+msgid "Failed to configure origin"
989
+msgstr ""
990
+
991
+#: lib/choose_repository.tcl:451
992
+msgid "Counting objects"
993
+msgstr ""
994
+
995
+#: lib/choose_repository.tcl:452
996
+msgid "buckets"
997
+msgstr ""
998
+
999
+#: lib/choose_repository.tcl:476
1000
+#, tcl-format
1001
+msgid "Unable to copy objects/info/alternates: %s"
1002
+msgstr ""
1003
+
1004
+#: lib/choose_repository.tcl:512
1005
+#, fuzzy, tcl-format
1006
+msgid "Nothing to clone from %s."
1007
+msgstr "Получение изменений из %s "
1008
782
-#: lib/choose_rev.tcl:35
1009
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
1010
+#: lib/choose_repository.tcl:740
1011
+msgid "The 'master' branch has not been initialized."
1012
+msgstr ""
1013
+
1014
+#: lib/choose_repository.tcl:527
1015
+msgid "Hardlinks are unavailable. Falling back to copying."
1016
+msgstr ""
1017
+
1018
+#: lib/choose_repository.tcl:539
1019
+#, fuzzy, tcl-format
1020
+msgid "Cloning from %s"
1021
+msgstr "Получение изменений из %s "
1022
+
1023
+#: lib/choose_repository.tcl:570
1024
+#, fuzzy
1025
+msgid "Copying objects"
1026
+msgstr "Сжатие базы объектов"
1027
+
1028
+#: lib/choose_repository.tcl:571
1029
+msgid "KiB"
1030
+msgstr ""
1031
+
1032
+#: lib/choose_repository.tcl:595
1033
+#, tcl-format
1034
+msgid "Unable to copy object: %s"
1035
+msgstr ""
1036
+
1037
+#: lib/choose_repository.tcl:605
1038
+msgid "Linking objects"
1039
+msgstr ""
1040
+
1041
+#: lib/choose_repository.tcl:606
1042
+msgid "objects"
1043
+msgstr ""
1044
+
1045
+#: lib/choose_repository.tcl:614
1046
+#, tcl-format
1047
+msgid "Unable to hardlink object: %s"
1048
+msgstr ""
1049
+
1050
+#: lib/choose_repository.tcl:669
1051
+msgid "Cannot fetch branches and objects. See console output for details."
1052
+msgstr ""
1053
+
1054
+#: lib/choose_repository.tcl:680
1055
+msgid "Cannot fetch tags. See console output for details."
1056
+msgstr ""
1057
+
1058
+#: lib/choose_repository.tcl:704
1059
+msgid "Cannot determine HEAD. See console output for details."
1060
+msgstr ""
1061
+
1062
+#: lib/choose_repository.tcl:713
1063
+#, tcl-format
1064
+msgid "Unable to cleanup %s"
1065
+msgstr ""
1066
+
1067
+#: lib/choose_repository.tcl:719
1068
+msgid "Clone failed."
1069
+msgstr ""
1070
+
1071
+#: lib/choose_repository.tcl:726
1072
+msgid "No default branch obtained."
1073
+msgstr ""
1074
+
1075
+#: lib/choose_repository.tcl:737
1076
+#, tcl-format
1077
+msgid "Cannot resolve %s as a commit."
1078
+msgstr ""
1079
+
1080
+#: lib/choose_repository.tcl:749
1081
+#, fuzzy
1082
+msgid "Creating working directory"
1083
+msgstr "Отсутствует рабочий каталог"
1084
+
1085
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1086
+#: lib/index.tcl:149
1087
+msgid "files"
1088
+msgstr ""
1089
+
1090
+#: lib/choose_repository.tcl:779
1091
+msgid "Initial file checkout failed."
1092
+msgstr ""
1093
+
1094
+#: lib/choose_repository.tcl:795
1095
+msgid "Open"
1096
+msgstr ""
1097
+
1098
+#: lib/choose_repository.tcl:805
1099
+#, fuzzy
1100
+msgid "Repository:"
1101
+msgstr "Репозиторий"
1102
+
1103
+#: lib/choose_repository.tcl:854
1104
+#, fuzzy, tcl-format
1105
+msgid "Failed to open repository %s:"
1106
+msgstr "Не удалось полностью сохранить настройки:"
1107
+
1108
+#: lib/choose_rev.tcl:53
1109
msgid "This Detached Checkout"
1110
msgstr "Текущее отсоединенное состояние"
1111
786
-#: lib/choose_rev.tcl:42
1112
+#: lib/choose_rev.tcl:60
1113
msgid "Revision Expression:"
1114
msgstr "Выражение для определения версии:"
1115
790
-#: lib/choose_rev.tcl:56
1116
+#: lib/choose_rev.tcl:74
1117
msgid "Local Branch"
1118
msgstr "Локальная ветвь:"
1119
794
-#: lib/choose_rev.tcl:61
1120
+#: lib/choose_rev.tcl:79
1121
msgid "Tracking Branch"
1122
msgstr "Ветвь слежения"
1123
798
-#: lib/choose_rev.tcl:66
1124
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1125
msgid "Tag"
1126
msgstr "Метка"
1127
802
-#: lib/choose_rev.tcl:227
1128
+#: lib/choose_rev.tcl:317
1129
#, tcl-format
1130
msgid "Invalid revision: %s"
1131
msgstr "Неверная версия: %s"
1132
807
-#: lib/choose_rev.tcl:248
1133
+#: lib/choose_rev.tcl:338
1134
msgid "No revision selected."
1135
msgstr "Версия не указана."
1136
811
-#: lib/choose_rev.tcl:256
1137
+#: lib/choose_rev.tcl:346
1138
msgid "Revision expression is empty."
1139
+msgstr "Пустое выражения для определения версии."
1140
+
1141
+#: lib/choose_rev.tcl:530
1142
+msgid "Updated"
1143
+msgstr ""
1144
+
1145
+#: lib/choose_rev.tcl:558
1146
+msgid "URL"
1147
msgstr ""
814
-"Пустое выражения для определения версии."
1148
1149
#: lib/commit.tcl:9
1150
msgid ""
@@ -822,8 +1155,7 @@ msgid ""
1155
msgstr ""
1156
"Отсутствует состояние для исправления.\n"
1157
"\n"
825
-"Вы можете создать начальное сохраненное "
826
-"состояние. Других состояний для "
1158
+"Вы можете создать начальное сохраненное состояние. Других состояний для "
1159
"исправления нет.\n"
1160
1161
#: lib/commit.tcl:18
@@ -834,25 +1166,18 @@ msgid ""
1166
"completed. You cannot amend the prior commit unless you first abort the "
1167
"current merge activity.\n"
1168
msgstr ""
837
-"Невозможно исправить состояние во время "
838
-"объединения.\n"
1169
+"Невозможно исправить состояние во время объединения.\n"
1170
"\n"
840
-"Текущее объединение не завершено. "
841
-"Невозможно исправить предыдущее "
842
-"сохраненное состояние не прерывая "
843
-"текущее объединение.\n"
1171
+"Текущее объединение не завершено. Невозможно исправить предыдущее "
1172
+"сохраненное состояние не прерывая текущее объединение.\n"
1173
1174
#: lib/commit.tcl:49
1175
msgid "Error loading commit data for amend:"
847
-msgstr ""
848
-"Ошибка при загрузке данных для "
849
-"исправления сохраненного состояния:"
1176
+msgstr "Ошибка при загрузке данных для исправления сохраненного состояния:"
1177
1178
#: lib/commit.tcl:76
1179
msgid "Unable to obtain your identity:"
853
-msgstr ""
854
-"Невозможно получить информацию об "
855
-"авторстве:"
1180
+msgstr "Невозможно получить информацию об авторстве:"
1181
1182
#: lib/commit.tcl:81
1183
msgid "Invalid GIT_COMMITTER_IDENT:"
@@ -867,30 +1192,25 @@ msgid ""
1192
"\n"
1193
"The rescan will be automatically started now.\n"
1194
msgstr ""
870
-"Последнее прочитанное состояние "
871
-"репозитория не соответствует текущему.\n"
1195
+"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
1196
"\n"
873
-"С момента последней проверки репозиторий "
874
-"был изменен другой программой "
875
-"Git.Необходимо перечитать репозиторий, "
876
-"прежде чем изменять текущую ветвь. \n"
1197
+"С момента последней проверки репозиторий был изменен другой программой Git."
1198
+"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
1199
"\n"
1200
"Это будет сделано сейчас автоматически.\n"
1201
1202
#: lib/commit.tcl:154
881
-#, tcl-format
1203
+#, fuzzy, tcl-format
1204
msgid ""
1205
"Unmerged files cannot be committed.\n"
1206
"\n"
885
-"File %s has merge conflicts. You must resolve them and add the file before "
886
-"committing.\n"
1207
+"File %s has merge conflicts. You must resolve them and stage the file "
1208
+"before committing.\n"
1209
msgstr ""
1210
"Нельзя сохранить необъединенные файлы.\n"
1211
"\n"
890
-"Для файла %s возник конфликт объединения. "
891
-"Разрешите конфликт и добавьте к "
892
-"подготовленным файлам перед "
893
-"сохранением.\n"
1212
+"Для файла %s возник конфликт объединения. Разрешите конфликт и добавьте к "
1213
+"подготовленным файлам перед сохранением.\n"
1214
1215
#: lib/commit.tcl:162
1216
#, tcl-format
@@ -899,22 +1219,20 @@ msgid ""
1219
"\n"
1220
"File %s cannot be committed by this program.\n"
1221
msgstr ""
902
-"Обнаружено неизвестное состояние файла "
903
-"%s.\n"
1222
+"Обнаружено неизвестное состояние файла %s.\n"
1223
"\n"
905
-"Файл %s не может быть сохранен данной "
906
-"программой.\n"
1224
+"Файл %s не может быть сохранен данной программой.\n"
1225
1226
#: lib/commit.tcl:170
1227
+#, fuzzy
1228
msgid ""
1229
"No changes to commit.\n"
1230
"\n"
912
-"You must add at least 1 file before you can commit.\n"
1231
+"You must stage at least 1 file before you can commit.\n"
1232
msgstr ""
1233
"Отсутствуют изменения для сохранения.\n"
1234
"\n"
916
-"Подготовьте хотя бы один файл до создания "
917
-"сохраненного состояния.\n"
1235
+"Подготовьте хотя бы один файл до создания сохраненного состояния.\n"
1236
1237
#: lib/commit.tcl:183
1238
msgid ""
@@ -926,22 +1244,22 @@ msgid ""
1244
"- Second line: Blank\n"
1245
"- Remaining lines: Describe why this change is good.\n"
1246
msgstr ""
929
-"Напишите комментарий к сохраненному "
930
-"состоянию.\n"
1247
+"Напишите комментарий к сохраненному состоянию.\n"
1248
"\n"
932
-"Рекомендуется следующий формат "
933
-"комментария:\n"
1249
+"Рекомендуется следующий формат комментария:\n"
1250
"\n"
935
-"- первая строка: краткое описание "
936
-"сделанных изменений.\n"
1251
+"- первая строка: краткое описание сделанных изменений.\n"
1252
"- вторая строка пустая\n"
938
-"- оставшиеся строки: опишите, что дают "
939
-"ваши изменения.\n"
1253
+"- оставшиеся строки: опишите, что дают ваши изменения.\n"
1254
1255
#: lib/commit.tcl:257
1256
msgid "write-tree failed:"
1257
+msgstr "Программа write-tree завершилась с ошибкой:"
1258
+
1259
+#: lib/commit.tcl:275
1260
+#, tcl-format
1261
+msgid "Commit %s appears to be corrupt"
1262
msgstr ""
944
-"Программа write-tree завершилась с ошибкой:"
1263
1264
#: lib/commit.tcl:279
1265
msgid ""
@@ -953,40 +1271,41 @@ msgid ""
1271
msgstr ""
1272
"Отсутствуют изменения для сохранения.\n"
1273
"\n"
956
-"Ни один файл не был изменен и не было "
957
-"объединения.\n"
1274
+"Ни один файл не был изменен и не было объединения.\n"
1275
"\n"
959
-"Сейчас автоматически запустится "
960
-"перечитывание репозитория.\n"
1276
+"Сейчас автоматически запустится перечитывание репозитория.\n"
1277
1278
#: lib/commit.tcl:286
1279
msgid "No changes to commit."
1280
msgstr "Отуствуют измения для сохранения."
1281
1282
+#: lib/commit.tcl:303
1283
+#, tcl-format
1284
+msgid "warning: Tcl does not support encoding '%s'."
1285
+msgstr ""
1286
+
1287
#: lib/commit.tcl:317
1288
msgid "commit-tree failed:"
968
-msgstr ""
969
-"Программа commit-tree завершилась с ошибкой:"
1289
+msgstr "Программа commit-tree завершилась с ошибкой:"
1290
1291
#: lib/commit.tcl:339
1292
msgid "update-ref failed:"
973
-msgstr ""
974
-"Программа update-ref завершилась с ошибкой:"
1293
+msgstr "Программа update-ref завершилась с ошибкой:"
1294
1295
#: lib/commit.tcl:430
1296
#, tcl-format
1297
msgid "Created commit %s: %s"
1298
msgstr "Создано состояние %s: %s "
1299
981
-#: lib/console.tcl:55
1300
+#: lib/console.tcl:57
1301
msgid "Working... please wait..."
1302
msgstr "В процессе... пожалуйста, ждите..."
1303
985
-#: lib/console.tcl:184
1304
+#: lib/console.tcl:183
1305
msgid "Success"
1306
msgstr "Процесс успешно завершен"
1307
989
-#: lib/console.tcl:194
1308
+#: lib/console.tcl:196
1309
msgid "Error: Command Failed"
1310
msgstr "Ошибка: не удалось выполнить команду"
1311
@@ -996,9 +1315,7 @@ msgstr "Количество несвязанных объектов"
1315
1316
#: lib/database.tcl:44
1317
msgid "Disk space used by loose objects"
999
-msgstr ""
1000
-"Объем дискового пространства, занятый "
1001
-"несвязанными объектами"
1318
+msgstr "Объем дискового пространства, занятый несвязанными объектами"
1319
1320
#: lib/database.tcl:45
1321
msgid "Number of packed objects"
@@ -1010,15 +1327,11 @@ msgstr "Количество pack-файлов"
1327
1328
#: lib/database.tcl:47
1329
msgid "Disk space used by packed objects"
1013
-msgstr ""
1014
-"Объем дискового пространства, занятый "
1015
-"упакованными объектами"
1330
+msgstr "Объем дискового пространства, занятый упакованными объектами"
1331
1332
#: lib/database.tcl:48
1333
msgid "Packed objects waiting for pruning"
1019
-msgstr ""
1020
-"Несвязанные объекты, которые можно "
1021
-"удалить"
1334
+msgstr "Несвязанные объекты, которые можно удалить"
1335
1336
#: lib/database.tcl:49
1337
msgid "Garbage files"
@@ -1032,6 +1345,22 @@ msgstr "Сжатие базы объектов"
1345
msgid "Verifying the object database with fsck-objects"
1346
msgstr "Проверка базы объектов при помощи fsck"
1347
1348
+#: lib/database.tcl:108
1349
+#, tcl-format
1350
+msgid ""
1351
+"This repository currently has approximately %i loose objects.\n"
1352
+"\n"
1353
+"To maintain optimal performance it is strongly recommended that you compress "
1354
+"the database when more than %i loose objects exist.\n"
1355
+"\n"
1356
+"Compress the database now?"
1357
+msgstr ""
1358
+
1359
+#: lib/date.tcl:25
1360
+#, fuzzy, tcl-format
1361
+msgid "Invalid date from Git: %s"
1362
+msgstr "Неверная версия: %s"
1363
+
1364
#: lib/diff.tcl:42
1365
#, tcl-format
1366
msgid ""
@@ -1049,30 +1378,44 @@ msgstr ""
1378
"\n"
1379
"в %s отутствуют изменения.\n"
1380
"\n"
1052
-"Дата изменения файла была обновлена "
1053
-"другой программой, но содержимое файла "
1381
+"Дата изменения файла была обновлена другой программой, но содержимое файла "
1382
"осталось прежним.\n"
1383
"\n"
1056
-"Сейчас будет запущено перечитывание "
1057
-"репозитория, чтобы найти подобные файлы."
1384
+"Сейчас будет запущено перечитывание репозитория, чтобы найти подобные файлы."
1385
+
1386
+#: lib/diff.tcl:81
1387
+#, fuzzy, tcl-format
1388
+msgid "Loading diff of %s..."
1389
+msgstr "Загрузка %s..."
1390
1059
-#: lib/diff.tcl:97
1391
+#: lib/diff.tcl:114 lib/diff.tcl:184
1392
+#, tcl-format
1393
+msgid "Unable to display %s"
1394
+msgstr ""
1395
+
1396
+#: lib/diff.tcl:115
1397
msgid "Error loading file:"
1398
msgstr "Ошибка загрузки файла:"
1399
1063
-#: lib/diff.tcl:162
1400
+#: lib/diff.tcl:122
1401
+msgid "Git Repository (subproject)"
1402
+msgstr ""
1403
+
1404
+#: lib/diff.tcl:134
1405
+msgid "* Binary file (not showing content)."
1406
+msgstr ""
1407
+
1408
+#: lib/diff.tcl:185
1409
msgid "Error loading diff:"
1410
msgstr "Ошибка загрузки diff:"
1411
1067
-#: lib/diff.tcl:278
1412
+#: lib/diff.tcl:302
1413
msgid "Failed to unstage selected hunk."
1414
msgstr "Не удалось исключить выбранную часть"
1415
1071
-#: lib/diff.tcl:285
1416
+#: lib/diff.tcl:309
1417
msgid "Failed to stage selected hunk."
1073
-msgstr ""
1074
-"Не удалось подготовить к сохранению "
1075
-"выбранную часть"
1418
+msgstr "Не удалось подготовить к сохранению выбранную часть"
1419
1420
#: lib/error.tcl:12 lib/error.tcl:102
1421
msgid "error"
@@ -1084,47 +1427,53 @@ msgstr "предупреждение"
1427
1428
#: lib/error.tcl:81
1429
msgid "You must correct the above errors before committing."
1087
-msgstr ""
1088
-"Прежде чем сохранить, исправьте "
1089
-"вышеуказанные ошибки."
1430
+msgstr "Прежде чем сохранить, исправьте вышеуказанные ошибки."
1431
+
1432
+#: lib/index.tcl:241
1433
+#, fuzzy, tcl-format
1434
+msgid "Unstaging %s from commit"
1435
+msgstr "Убрать из подготовленного"
1436
+
1437
+#: lib/index.tcl:285
1438
+#, fuzzy, tcl-format
1439
+msgid "Adding %s"
1440
+msgstr "Чтение %s..."
1441
1091
-#: lib/index.tcl:364
1442
+#: lib/index.tcl:340
1443
#, fuzzy, tcl-format
1444
msgid "Revert changes in file %s?"
1445
msgstr "Отменить изменения"
1446
1096
-#: lib/index.tcl:366
1447
+#: lib/index.tcl:342
1448
#, tcl-format
1449
msgid "Revert changes in these %i files?"
1450
msgstr "Отменить изменения в %i файле(-ах)?"
1451
1101
-#: lib/index.tcl:372
1452
+#: lib/index.tcl:348
1453
#, fuzzy
1103
-msgid "Any unadded changes will be permanently lost by the revert."
1454
+msgid "Any unstaged changes will be permanently lost by the revert."
1455
msgstr ""
1456
"Отменить изменения в %s?\n"
1457
"\n"
1107
-"Любые изменения, не подготовленные к "
1108
-"сохранению, будут потеряны при данной "
1458
+"Любые изменения, не подготовленные к сохранению, будут потеряны при данной "
1459
"операции."
1460
1111
-#: lib/index.tcl:375
1461
+#: lib/index.tcl:351
1462
msgid "Do Nothing"
1463
msgstr "Ничего не делать"
1464
1115
-#: lib/merge.tcl:14
1465
+#: lib/merge.tcl:13
1466
msgid ""
1467
"Cannot merge while amending.\n"
1468
"\n"
1469
"You must finish amending this commit before starting any type of merge.\n"
1470
msgstr ""
1121
-"Невозможно выполнить объединение во "
1122
-"время исправления.\n"
1471
+"Невозможно выполнить объединение во время исправления.\n"
1472
"\n"
1124
-"Завершите исправление данного состояния "
1125
-"перед выполнением операции объединения.\n"
1473
+"Завершите исправление данного состояния перед выполнением операции "
1474
+"объединения.\n"
1475
1127
-#: lib/merge.tcl:28
1476
+#: lib/merge.tcl:27
1477
msgid ""
1478
"Last scanned state does not match repository state.\n"
1479
"\n"
@@ -1133,35 +1482,30 @@ msgid ""
1482
"\n"
1483
"The rescan will be automatically started now.\n"
1484
msgstr ""
1136
-"Последнее прочитанное состояние "
1137
-"репозитория не соответствует текущему.\n"
1485
+"Последнее прочитанное состояние репозитория не соответствует текущему.\n"
1486
"\n"
1139
-"С момента последней проверки репозиторий "
1140
-"был изменен другой программой "
1141
-"Git.Необходимо перечитать репозиторий, "
1142
-"прежде чем изменять текущую ветвь. \n"
1487
+"С момента последней проверки репозиторий был изменен другой программой Git."
1488
+"Необходимо перечитать репозиторий, прежде чем изменять текущую ветвь. \n"
1489
"\n"
1490
"Это будет сделано сейчас автоматически.\n"
1491
1146
-#: lib/merge.tcl:45
1147
-#, tcl-format
1492
+#: lib/merge.tcl:44
1493
+#, fuzzy, tcl-format
1494
msgid ""
1495
"You are in the middle of a conflicted merge.\n"
1496
"\n"
1497
"File %s has merge conflicts.\n"
1498
"\n"
1153
-"You must resolve them, add the file, and commit to complete the current "
1499
+"You must resolve them, stage the file, and commit to complete the current "
1500
"merge. Only then can you begin another merge.\n"
1501
msgstr ""
1156
-"Предыдущее объединение не завершено "
1157
-"из-за конфликта.\n"
1502
+"Предыдущее объединение не завершено из-за конфликта.\n"
1503
"\n"
1504
"Для файла %s возник конфликт объединения.\n"
1160
-"Разрешите конфликт, подготовьте файл и "
1161
-"сохраните. Только после этого можно "
1505
+"Разрешите конфликт, подготовьте файл и сохраните. Только после этого можно "
1506
"начать следующее объединение.\n"
1507
1164
-#: lib/merge.tcl:55
1508
+#: lib/merge.tcl:54
1509
#, tcl-format
1510
msgid ""
1511
"You are in the middle of a change.\n"
@@ -1175,36 +1519,38 @@ msgstr ""
1519
"\n"
1520
"Файл %s изменен.\n"
1521
"\n"
1178
-"Подготовьте и сохраните измения перед "
1179
-"началом объединения. В случае "
1180
-"необходимости это позволит прервать "
1181
-"операцию объединения.\n"
1522
+"Подготовьте и сохраните измения перед началом объединения. В случае "
1523
+"необходимости это позволит прервать операцию объединения.\n"
1524
1183
-#: lib/merge.tcl:94
1525
+#: lib/merge.tcl:106
1526
+#, tcl-format
1527
+msgid "%s of %s"
1528
+msgstr ""
1529
+
1530
+#: lib/merge.tcl:119
1531
#, tcl-format
1532
msgid "Merging %s and %s"
1533
msgstr "Объединение %s и %s"
1534
1188
-#: lib/merge.tcl:106
1535
+#: lib/merge.tcl:131
1536
msgid "Merge completed successfully."
1537
msgstr "Объединение успешно завершено."
1538
1192
-#: lib/merge.tcl:108
1539
+#: lib/merge.tcl:133
1540
msgid "Merge failed. Conflict resolution is required."
1194
-msgstr ""
1195
-"Не удалось завершить объединение. "
1196
-"Требуется разрешение конфликта."
1541
+msgstr "Не удалось завершить объединение. Требуется разрешение конфликта."
1542
1198
-#: lib/merge.tcl:166
1543
+#: lib/merge.tcl:158
1544
#, tcl-format
1545
msgid "Merge Into %s"
1546
msgstr "Объединить с %s"
1547
1203
-#: lib/merge.tcl:181 lib/transport.tcl:98
1204
-msgid "Source Branches"
1205
-msgstr "Исходные ветви"
1548
+#: lib/merge.tcl:177
1549
+#, fuzzy
1550
+msgid "Revision To Merge"
1551
+msgstr "Версия"
1552
1207
-#: lib/merge.tcl:240
1553
+#: lib/merge.tcl:212
1554
msgid ""
1555
"Cannot abort while amending.\n"
1556
"\n"
@@ -1212,10 +1558,9 @@ msgid ""
1558
msgstr ""
1559
"Невозможно прервать исправление.\n"
1560
"\n"
1215
-"Завершите текущее исправление "
1216
-"сохраненного состояния.\n"
1561
+"Завершите текущее исправление сохраненного состояния.\n"
1562
1218
-#: lib/merge.tcl:250
1563
+#: lib/merge.tcl:222
1564
msgid ""
1565
"Abort merge?\n"
1566
"\n"
@@ -1224,113 +1569,129 @@ msgid ""
1569
"Continue with aborting the current merge?"
1570
msgstr ""
1571
"Прервать объединение?\n"
1227
-"Прерывание объединения приведет к потере "
1228
-"*ВСЕХ* несохраненных изменений.\n"
1572
+"Прерывание объединения приведет к потере *ВСЕХ* несохраненных изменений.\n"
1573
"\n"
1574
"Продолжить?"
1575
1232
-#: lib/merge.tcl:256
1576
+#: lib/merge.tcl:228
1577
+#, fuzzy
1578
msgid ""
1234
-"Abort commit?\n"
1579
+"Reset changes?\n"
1580
"\n"
1236
-"Aborting the current commit will cause *ALL* uncommitted changes to be "
1237
-"lost.\n"
1581
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1582
"\n"
1239
-"Continue with aborting the current commit?"
1583
+"Continue with resetting the current changes?"
1584
msgstr ""
1241
-"Отменить изменения?\n"
1242
-"\n"
1243
-"Вызванная операция приведет к потере "
1244
-"*ВСЕХ* несохраненных изменений.\n"
1585
+"Прервать объединение?\n"
1586
+"Прерывание объединения приведет к потере *ВСЕХ* несохраненных изменений.\n"
1587
"\n"
1588
"Продолжить?"
1589
1248
-#: lib/merge.tcl:267
1249
-msgid "Aborting... please wait..."
1590
+#: lib/merge.tcl:239
1591
+msgid "Aborting"
1592
+msgstr ""
1593
+
1594
+#: lib/merge.tcl:266
1595
+msgid "Abort failed."
1596
msgstr ""
1251
-"Прерывание выполнения... Пожалуйста, "
1252
-"ждите..."
1597
1254
-#: lib/merge.tcl:290
1598
+#: lib/merge.tcl:268
1599
msgid "Abort completed. Ready."
1600
msgstr "Прервано."
1601
1258
-#: lib/option.tcl:77
1259
-msgid "git-gui - a graphical user interface for Git."
1260
-msgstr ""
1261
-"git-gui - графический пользовательский "
1262
-"интерфейс к Git."
1263
-
1264
-#: lib/option.tcl:164
1602
+#: lib/option.tcl:82
1603
msgid "Restore Defaults"
1604
msgstr "Восстановить настройки по умолчанию"
1605
1268
-#: lib/option.tcl:168
1606
+#: lib/option.tcl:86
1607
msgid "Save"
1608
msgstr "Сохранить"
1609
1272
-#: lib/option.tcl:178
1610
+#: lib/option.tcl:96
1611
#, tcl-format
1612
msgid "%s Repository"
1613
msgstr "для репозитория %s "
1614
1277
-#: lib/option.tcl:179
1615
+#: lib/option.tcl:97
1616
msgid "Global (All Repositories)"
1617
msgstr "Общие (для всех репозиториев)"
1618
1281
-#: lib/option.tcl:185
1619
+#: lib/option.tcl:103
1620
msgid "User Name"
1621
msgstr "Имя пользователя"
1622
1285
-#: lib/option.tcl:186
1623
+#: lib/option.tcl:104
1624
msgid "Email Address"
1625
msgstr "Адес электронной почты"
1626
1289
-#: lib/option.tcl:188
1627
+#: lib/option.tcl:106
1628
msgid "Summarize Merge Commits"
1291
-msgstr ""
1292
-"Суммарный комментарий при объединении"
1629
+msgstr "Суммарный комментарий при объединении"
1630
1294
-#: lib/option.tcl:189
1631
+#: lib/option.tcl:107
1632
msgid "Merge Verbosity"
1296
-msgstr ""
1297
-"Уровень детальности сообщений при "
1298
-"объединении"
1633
+msgstr "Уровень детальности сообщений при объединении"
1634
1300
-#: lib/option.tcl:190
1635
+#: lib/option.tcl:108
1636
msgid "Show Diffstat After Merge"
1302
-msgstr ""
1303
-"Показать отчет об изменениях после "
1304
-"объединения"
1637
+msgstr "Показать отчет об изменениях после объединения"
1638
1306
-#: lib/option.tcl:192
1639
+#: lib/option.tcl:110
1640
msgid "Trust File Modification Timestamps"
1641
msgstr "Доверять времени модификации файла"
1642
1310
-#: lib/option.tcl:193
1643
+#: lib/option.tcl:111
1644
msgid "Prune Tracking Branches During Fetch"
1312
-msgstr ""
1313
-"Чистка ветвей слежения при получении "
1314
-"изменений"
1645
+msgstr "Чистка ветвей слежения при получении изменений"
1646
1316
-#: lib/option.tcl:194
1647
+#: lib/option.tcl:112
1648
msgid "Match Tracking Branches"
1318
-msgstr ""
1319
-"Имя новой ветви взять из имен ветвей "
1320
-"слежения"
1649
+msgstr "Имя новой ветви взять из имен ветвей слежения"
1650
1322
-#: lib/option.tcl:195
1651
+#: lib/option.tcl:113
1652
msgid "Number of Diff Context Lines"
1653
msgstr "Число строк в контексте diff"
1654
1326
-#: lib/option.tcl:196
1655
+#: lib/option.tcl:114
1656
msgid "New Branch Name Template"
1657
msgstr "Шаблон для имени новой ветви"
1658
1330
-#: lib/option.tcl:305
1331
-msgid "Failed to completely save options:"
1659
+#: lib/option.tcl:176
1660
+#, fuzzy
1661
+msgid "Change Font"
1662
+msgstr "Шрифт интерфейса"
1663
+
1664
+#: lib/option.tcl:180
1665
+#, tcl-format
1666
+msgid "Choose %s"
1667
+msgstr ""
1668
+
1669
+#: lib/option.tcl:186
1670
+msgid "pt."
1671
msgstr ""
1333
-"Не удалось полностью сохранить настройки:"
1672
+
1673
+#: lib/option.tcl:200
1674
+msgid "Preferences"
1675
+msgstr ""
1676
+
1677
+#: lib/option.tcl:235
1678
+msgid "Failed to completely save options:"
1679
+msgstr "Не удалось полностью сохранить настройки:"
1680
+
1681
+#: lib/remote.tcl:165
1682
+#, fuzzy
1683
+msgid "Prune from"
1684
+msgstr "Чистка %s... "
1685
+
1686
+#: lib/remote.tcl:170
1687
+#, fuzzy
1688
+msgid "Fetch from"
1689
+msgstr "Чистка %s... "
1690
+
1691
+#: lib/remote.tcl:213
1692
+#, fuzzy
1693
+msgid "Push to"
1694
+msgstr "Отправить"
1695
1696
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1697
msgid "Delete Remote Branch"
@@ -1340,11 +1701,11 @@ msgstr "Удалить внешнюю ветвь"
1701
msgid "From Repository"
1702
msgstr "Из репозитория"
1703
1343
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
1704
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1705
msgid "Remote:"
1706
msgstr "внешний:"
1707
1347
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
1708
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1709
msgid "Arbitrary URL:"
1710
msgstr "по указанному URL:"
1711
@@ -1362,15 +1723,19 @@ msgstr "Объединено с:"
1723
1724
#: lib/remote_branch_delete.tcl:119
1725
msgid "Always (Do not perform merge checks)"
1365
-msgstr ""
1366
-"Всегда (не выполнять проверку "
1367
-"объединений)"
1726
+msgstr "Всегда (не выполнять проверку объединений)"
1727
1728
#: lib/remote_branch_delete.tcl:152
1729
msgid "A branch is required for 'Merged Into'."
1371
-msgstr ""
1372
-"Для опции 'Объединено с' требуется "
1373
-"указать ветвь."
1730
+msgstr "Для опции 'Объединено с' требуется указать ветвь."
1731
+
1732
+#: lib/remote_branch_delete.tcl:184
1733
+#, fuzzy, tcl-format
1734
+msgid ""
1735
+"The following branches are not completely merged into %s:\n"
1736
+"\n"
1737
+" - %s"
1738
+msgstr "Следующие ветви объединены с %s не полностью:"
1739
1740
#: lib/remote_branch_delete.tcl:189
1741
#, tcl-format
@@ -1381,9 +1746,7 @@ msgstr ""
1746
1747
#: lib/remote_branch_delete.tcl:207
1748
msgid "Please select one or more branches to delete."
1384
-msgstr ""
1385
-"Укажите одну или несколько ветвей для "
1386
-"удаления."
1749
+msgstr "Укажите одну или несколько ветвей для удаления."
1750
1751
#: lib/remote_branch_delete.tcl:216
1752
msgid ""
@@ -1409,21 +1772,6 @@ msgstr "Не указан репозиторий"
1772
msgid "Scanning %s..."
1773
msgstr "Перечитывание %s... "
1774
1412
-#: lib/remote.tcl:156
1413
-#, fuzzy, tcl-format
1414
-msgid "Fetch from %s..."
1415
-msgstr "Чистка %s... "
1416
-
1417
-#: lib/remote.tcl:166
1418
-#, tcl-format
1419
-msgid "Prune from %s..."
1420
-msgstr "Чистка %s... "
1421
-
1422
-#: lib/remote.tcl:200
1423
-#, tcl-format
1424
-msgid "Push to %s..."
1425
-msgstr "Отправка в %s..."
1426
-
1775
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1776
msgid "Cannot write script:"
1777
msgstr "Невозможно записать скрипт:"
@@ -1432,49 +1780,105 @@ msgstr "Невозможно записать скрипт:"
1780
msgid "Cannot write icon:"
1781
msgstr "Невозможно записать значок:"
1782
1435
-#: lib/status_bar.tcl:58
1783
+#: lib/status_bar.tcl:83
1784
#, tcl-format
1785
msgid "%s ... %*i of %*i %s (%3i%%)"
1786
msgstr "%s ... %*i из %*i %s (%3i%%)"
1787
1788
+#: lib/transport.tcl:6
1789
+#, fuzzy, tcl-format
1790
+msgid "fetch %s"
1791
+msgstr "Получить"
1792
+
1793
#: lib/transport.tcl:7
1794
#, tcl-format
1795
msgid "Fetching new changes from %s"
1796
msgstr "Получение изменений из %s "
1797
1798
+#: lib/transport.tcl:18
1799
+#, tcl-format
1800
+msgid "remote prune %s"
1801
+msgstr ""
1802
+
1803
#: lib/transport.tcl:19
1804
#, tcl-format
1805
msgid "Pruning tracking branches deleted from %s"
1806
msgstr "Чистка ветвей слежения, удаленных из %s"
1807
1808
+#: lib/transport.tcl:25 lib/transport.tcl:71
1809
+#, tcl-format
1810
+msgid "push %s"
1811
+msgstr ""
1812
+
1813
#: lib/transport.tcl:26
1814
#, tcl-format
1815
msgid "Pushing changes to %s"
1816
msgstr "Отправка изменений в %s "
1817
1455
-#: lib/transport.tcl:68
1818
+#: lib/transport.tcl:72
1819
#, tcl-format
1820
msgid "Pushing %s %s to %s"
1821
msgstr "Отправка %s %s в %s"
1822
1460
-#: lib/transport.tcl:84
1823
+#: lib/transport.tcl:89
1824
msgid "Push Branches"
1825
msgstr "Отправить изменения"
1826
1464
-#: lib/transport.tcl:115
1827
+#: lib/transport.tcl:103
1828
+msgid "Source Branches"
1829
+msgstr "Исходные ветви"
1830
+
1831
+#: lib/transport.tcl:120
1832
msgid "Destination Repository"
1833
msgstr "Репозиторий назначения"
1834
1468
-#: lib/transport.tcl:153
1835
+#: lib/transport.tcl:158
1836
msgid "Transfer Options"
1837
msgstr "Настройки передачи"
1838
1472
-#: lib/transport.tcl:155
1473
-msgid "Use thin pack (for slow network connections)"
1839
+#: lib/transport.tcl:160
1840
+msgid "Force overwrite existing branch (may discard changes)"
1841
msgstr ""
1475
-"Использовать thin pack (для медленных сетевых "
1476
-"подключений)"
1842
1478
-#: lib/transport.tcl:159
1843
+#: lib/transport.tcl:164
1844
+msgid "Use thin pack (for slow network connections)"
1845
+msgstr "Использовать thin pack (для медленных сетевых подключений)"
1846
+
1847
+#: lib/transport.tcl:168
1848
msgid "Include tags"
1849
msgstr "Включить метки"
1850
+
1851
+#~ msgid "Cannot find the git directory:"
1852
+#~ msgstr "Каталог Git не найден:"
1853
+
1854
+#~ msgid "Add To Commit"
1855
+#~ msgstr "Подготовить к сохранению"
1856
+
1857
+#~ msgid "Add Existing To Commit"
1858
+#~ msgstr "Подготовить имеющиеся файлы к сохранению"
1859
+
1860
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
1861
+#~ msgstr "Изменено (не будет сохранено)"
1862
+
1863
+#~ msgid "Add Existing"
1864
+#~ msgstr "Добавить имеющиеся файлы"
1865
+
1866
+#~ msgid ""
1867
+#~ "Abort commit?\n"
1868
+#~ "\n"
1869
+#~ "Aborting the current commit will cause *ALL* uncommitted changes to be "
1870
+#~ "lost.\n"
1871
+#~ "\n"
1872
+#~ "Continue with aborting the current commit?"
1873
+#~ msgstr ""
1874
+#~ "Отменить изменения?\n"
1875
+#~ "\n"
1876
+#~ "Вызванная операция приведет к потере *ВСЕХ* несохраненных изменений.\n"
1877
+#~ "\n"
1878
+#~ "Продолжить?"
1879
+
1880
+#~ msgid "Aborting... please wait..."
1881
+#~ msgstr "Прерывание выполнения... Пожалуйста, ждите..."
1882
+
1883
+#~ msgid "Push to %s..."
1884
+#~ msgstr "Отправка в %s..."
po/zh_cn.po
+734
-249
@@ -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-07-27 19:33+0200\n"
11
+"POT-Creation-Date: 2007-10-10 04:04-0400\n"
12
"PO-Revision-Date: 2007-07-21 01:23-0700\n"
13
"Last-Translator: Xudong Guan <xudong.guan@gmail.com>\n"
14
"Language-Team: Chinese\n"
@@ -16,15 +16,33 @@ msgstr ""
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
-#: git-gui.sh:531
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:595
25
+#, tcl-format
26
+msgid "Invalid font specified in %s:"
27
+msgstr ""
28
+
29
+#: git-gui.sh:620
30
+msgid "Main Font"
31
+msgstr ""
32
+
33
+#: git-gui.sh:621
34
+msgid "Diff/Console Font"
35
+msgstr ""
36
+
37
+#: git-gui.sh:635
38
msgid "Cannot find git in PATH."
39
msgstr ""
40
23
-#: git-gui.sh:550
41
+#: git-gui.sh:662
42
msgid "Cannot parse Git version string:"
43
msgstr ""
44
27
-#: git-gui.sh:567
45
+#: git-gui.sh:680
46
#, tcl-format
47
msgid ""
48
"Git version cannot be determined.\n"
@@ -36,82 +54,82 @@ msgid ""
54
"Assume '%s' is version 1.5.0?\n"
55
msgstr ""
56
39
-#: git-gui.sh:689
40
-msgid "Cannot find the git directory:"
57
+#: git-gui.sh:853
58
+msgid "Git directory not found:"
59
msgstr ""
60
43
-#: git-gui.sh:697
44
-msgid "Git directory not found:"
61
+#: git-gui.sh:860
62
+msgid "Cannot move to top of working directory:"
63
msgstr ""
64
47
-#: git-gui.sh:703
65
+#: git-gui.sh:867
66
msgid "Cannot use funny .git directory:"
67
msgstr ""
68
51
-#: git-gui.sh:708
69
+#: git-gui.sh:872
70
msgid "No working directory"
71
msgstr ""
72
55
-#: git-gui.sh:853
73
+#: git-gui.sh:1019
74
msgid "Refreshing file status..."
75
msgstr ""
76
59
-#: git-gui.sh:886
77
+#: git-gui.sh:1084
78
msgid "Scanning for modified files ..."
79
msgstr ""
80
63
-#: git-gui.sh:1052 lib/browser.tcl:233
81
+#: git-gui.sh:1259 lib/browser.tcl:245
82
#, fuzzy
83
msgid "Ready."
84
msgstr "重做"
85
68
-#: git-gui.sh:1343
86
+#: git-gui.sh:1525
87
msgid "Unmodified"
88
msgstr ""
89
72
-#: git-gui.sh:1345
90
+#: git-gui.sh:1527
91
msgid "Modified, not staged"
92
msgstr ""
93
76
-#: git-gui.sh:1346 git-gui.sh:1351
94
+#: git-gui.sh:1528 git-gui.sh:1533
95
#, fuzzy
96
msgid "Staged for commit"
97
msgstr "从本次提交移除"
98
81
-#: git-gui.sh:1347 git-gui.sh:1352
99
+#: git-gui.sh:1529 git-gui.sh:1534
100
#, fuzzy
101
msgid "Portions staged for commit"
102
msgstr "从本次提交移除"
103
86
-#: git-gui.sh:1348 git-gui.sh:1353
104
+#: git-gui.sh:1530 git-gui.sh:1535
105
msgid "Staged for commit, missing"
106
msgstr ""
107
90
-#: git-gui.sh:1350
108
+#: git-gui.sh:1532
109
msgid "Untracked, not staged"
110
msgstr ""
111
94
-#: git-gui.sh:1355
112
+#: git-gui.sh:1537
113
msgid "Missing"
114
msgstr ""
115
98
-#: git-gui.sh:1356
116
+#: git-gui.sh:1538
117
msgid "Staged for removal"
118
msgstr ""
119
102
-#: git-gui.sh:1357
120
+#: git-gui.sh:1539
121
msgid "Staged for removal, still present"
122
msgstr ""
123
106
-#: git-gui.sh:1359 git-gui.sh:1360 git-gui.sh:1361 git-gui.sh:1362
124
+#: git-gui.sh:1541 git-gui.sh:1542 git-gui.sh:1543 git-gui.sh:1544
125
msgid "Requires merge resolution"
126
msgstr ""
127
110
-#: git-gui.sh:1404
128
+#: git-gui.sh:1579
129
msgid "Starting gitk... please wait..."
130
msgstr ""
131
114
-#: git-gui.sh:1413
132
+#: git-gui.sh:1588
133
#, tcl-format
134
msgid ""
135
"Unable to start gitk:\n"
@@ -119,300 +137,336 @@ msgid ""
137
"%s does not exist"
138
msgstr ""
139
122
-#: git-gui.sh:1630
123
-#, tcl-format
124
-msgid "Invalid font specified in gui.%s:"
125
-msgstr ""
126
-
127
-#: git-gui.sh:1655
128
-msgid "Main Font"
129
-msgstr ""
130
-
131
-#: git-gui.sh:1656
132
-msgid "Diff/Console Font"
133
-msgstr ""
134
-
135
-#: git-gui.sh:1670
140
+#: git-gui.sh:1788 lib/choose_repository.tcl:32
141
msgid "Repository"
142
msgstr "版本树"
143
139
-#: git-gui.sh:1671
144
+#: git-gui.sh:1789
145
msgid "Edit"
146
msgstr "编辑"
147
143
-#: git-gui.sh:1673
148
+#: git-gui.sh:1791 lib/choose_rev.tcl:560
149
msgid "Branch"
150
msgstr "分支"
151
147
-#: git-gui.sh:1676 git-gui.sh:1854 git-gui.sh:2193
148
-msgid "Commit"
152
+#: git-gui.sh:1794 lib/choose_rev.tcl:547
153
+#, fuzzy
154
+msgid "Commit@@noun"
155
msgstr "提交"
156
151
-#: git-gui.sh:1679 lib/merge.tcl:96 lib/merge.tcl:157 lib/merge.tcl:173
157
+#: git-gui.sh:1797 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
158
msgid "Merge"
159
msgstr "合并"
160
155
-#: git-gui.sh:1680
156
-msgid "Fetch"
157
-msgstr "导入"
158
-
159
-#: git-gui.sh:1681 git-gui.sh:2199 lib/transport.tcl:88 lib/transport.tcl:172
160
-msgid "Push"
161
-msgstr "上传"
161
+#: git-gui.sh:1798 lib/choose_rev.tcl:556
162
+#, fuzzy
163
+msgid "Remote"
164
+msgstr "改名..."
165
163
-#: git-gui.sh:1690
166
+#: git-gui.sh:1807
167
msgid "Browse Current Branch's Files"
168
msgstr "浏览当前分支文件"
169
167
-#: git-gui.sh:1692
168
-#, fuzzy, tcl-format
169
-msgid "Browse %s's Files"
170
-msgstr "浏览当前分支文件"
171
-
172
-#: git-gui.sh:1694
170
+#: git-gui.sh:1811
171
#, fuzzy
172
msgid "Browse Branch Files..."
173
msgstr "浏览当前分支文件"
174
177
-#: git-gui.sh:1699
175
+#: git-gui.sh:1816
176
msgid "Visualize Current Branch's History"
177
msgstr "调用gitk显示当前分支"
178
181
-#: git-gui.sh:1701
182
-#, fuzzy, tcl-format
183
-msgid "Visualize %s's History"
179
+#: git-gui.sh:1820
180
+msgid "Visualize All Branch History"
181
msgstr "调用gitk显示所有分支"
182
186
-#: git-gui.sh:1703
187
-msgid "Visualize All Branch History"
183
+#: git-gui.sh:1827
184
+#, fuzzy, tcl-format
185
+msgid "Browse %s's Files"
186
+msgstr "浏览当前分支文件"
187
+
188
+#: git-gui.sh:1829
189
+#, fuzzy, tcl-format
190
+msgid "Visualize %s's History"
191
msgstr "调用gitk显示所有分支"
192
190
-#: git-gui.sh:1708 lib/database.tcl:27 lib/database.tcl:67
193
+#: git-gui.sh:1834 lib/database.tcl:27 lib/database.tcl:67
194
msgid "Database Statistics"
195
msgstr "数据库统计数据"
196
194
-#: git-gui.sh:1711 lib/database.tcl:34
197
+#: git-gui.sh:1837 lib/database.tcl:34
198
msgid "Compress Database"
199
msgstr "压缩数据库"
200
198
-#: git-gui.sh:1714
201
+#: git-gui.sh:1840
202
msgid "Verify Database"
203
msgstr "验证数据库"
204
202
-#: git-gui.sh:1721 git-gui.sh:1725 git-gui.sh:1729 lib/shortcut.tcl:9
205
+#: git-gui.sh:1847 git-gui.sh:1851 git-gui.sh:1855 lib/shortcut.tcl:9
206
#: lib/shortcut.tcl:45 lib/shortcut.tcl:84
207
msgid "Create Desktop Icon"
208
msgstr "创建桌面图标"
209
207
-#: git-gui.sh:1734
210
+#: git-gui.sh:1860 lib/choose_repository.tcl:36 lib/choose_repository.tcl:95
211
msgid "Quit"
212
msgstr "退出"
213
211
-#: git-gui.sh:1741
214
+#: git-gui.sh:1867
215
msgid "Undo"
216
msgstr "撤销"
217
215
-#: git-gui.sh:1744
218
+#: git-gui.sh:1870
219
msgid "Redo"
220
msgstr "重做"
221
219
-#: git-gui.sh:1748 git-gui.sh:2263
222
+#: git-gui.sh:1874 git-gui.sh:2366
223
msgid "Cut"
224
msgstr "剪切"
225
223
-#: git-gui.sh:1751 git-gui.sh:2266 git-gui.sh:2337 git-gui.sh:2409
224
-#: lib/console.tcl:69
226
+#: git-gui.sh:1877 git-gui.sh:2369 git-gui.sh:2440 git-gui.sh:2512
227
+#: lib/console.tcl:67
228
msgid "Copy"
229
msgstr "复制"
230
228
-#: git-gui.sh:1754 git-gui.sh:2269
231
+#: git-gui.sh:1880 git-gui.sh:2372
232
msgid "Paste"
233
msgstr "粘贴"
234
232
-#: git-gui.sh:1757 git-gui.sh:2272 lib/branch_delete.tcl:26
235
+#: git-gui.sh:1883 git-gui.sh:2375 lib/branch_delete.tcl:26
236
#: lib/remote_branch_delete.tcl:38
237
msgid "Delete"
238
msgstr "删除"
239
237
-#: git-gui.sh:1761 git-gui.sh:2276 git-gui.sh:2413 lib/console.tcl:71
240
+#: git-gui.sh:1887 git-gui.sh:2379 git-gui.sh:2516 lib/console.tcl:69
241
msgid "Select All"
242
msgstr "全选"
243
241
-#: git-gui.sh:1770
244
+#: git-gui.sh:1896
245
msgid "Create..."
246
msgstr "新建..."
247
245
-#: git-gui.sh:1776
248
+#: git-gui.sh:1902
249
msgid "Checkout..."
250
msgstr "切换..."
251
249
-#: git-gui.sh:1782
252
+#: git-gui.sh:1908
253
msgid "Rename..."
254
msgstr "改名..."
255
253
-#: git-gui.sh:1787 git-gui.sh:1885
256
+#: git-gui.sh:1913 git-gui.sh:2012
257
msgid "Delete..."
258
msgstr "删除..."
259
257
-#: git-gui.sh:1792
260
+#: git-gui.sh:1918
261
msgid "Reset..."
262
msgstr "重置所有修动..."
263
261
-#: git-gui.sh:1804 git-gui.sh:2210
264
+#: git-gui.sh:1930 git-gui.sh:2313
265
msgid "New Commit"
266
msgstr "新提交"
267
265
-#: git-gui.sh:1812 git-gui.sh:2217
268
+#: git-gui.sh:1938 git-gui.sh:2320
269
msgid "Amend Last Commit"
270
msgstr "修订上次提交"
271
269
-#: git-gui.sh:1821 git-gui.sh:2177 lib/remote_branch_delete.tcl:99
272
+#: git-gui.sh:1947 git-gui.sh:2280 lib/remote_branch_delete.tcl:99
273
msgid "Rescan"
274
msgstr "重新扫描"
275
273
-#: git-gui.sh:1827
274
-msgid "Add To Commit"
275
-msgstr "添加到本次提交"
276
+#: git-gui.sh:1953
277
+#, fuzzy
278
+msgid "Stage To Commit"
279
+msgstr "从本次提交移除"
280
277
-#: git-gui.sh:1832
278
-msgid "Add Existing To Commit"
279
-msgstr "添加默认修改文件"
281
+#: git-gui.sh:1958
282
+#, fuzzy
283
+msgid "Stage Changed Files To Commit"
284
+msgstr "将被提交的修改"
285
281
-#: git-gui.sh:1838
286
+#: git-gui.sh:1964
287
msgid "Unstage From Commit"
288
msgstr "从本次提交移除"
289
285
-#: git-gui.sh:1843 lib/index.tcl:376
290
+#: git-gui.sh:1969 lib/index.tcl:352
291
msgid "Revert Changes"
292
msgstr "恢复修改"
293
289
-#: git-gui.sh:1850 git-gui.sh:2189 git-gui.sh:2287
294
+#: git-gui.sh:1976 git-gui.sh:2292 git-gui.sh:2390
295
msgid "Sign Off"
296
msgstr "签名"
297
293
-#: git-gui.sh:1865
298
+#: git-gui.sh:1980 git-gui.sh:2296
299
+#, fuzzy
300
+msgid "Commit@@verb"
301
+msgstr "提交"
302
+
303
+#: git-gui.sh:1991
304
msgid "Local Merge..."
305
msgstr "本地合并..."
306
297
-#: git-gui.sh:1870
307
+#: git-gui.sh:1996
308
msgid "Abort Merge..."
309
msgstr "取消合并..."
310
301
-#: git-gui.sh:1882
311
+#: git-gui.sh:2008
312
msgid "Push..."
313
msgstr "上传..."
314
305
-#: git-gui.sh:1892
315
+#: git-gui.sh:2019 lib/choose_repository.tcl:41
316
msgid "Apple"
317
msgstr "苹果"
318
309
-#: git-gui.sh:1895 git-gui.sh:1942 lib/option.tcl:65
319
+#: git-gui.sh:2022 git-gui.sh:2044 lib/about.tcl:13
320
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:50
321
#, tcl-format
322
msgid "About %s"
323
msgstr "关于%s"
324
314
-#: git-gui.sh:1897 git-gui.sh:1903 git-gui.sh:2455
325
+#: git-gui.sh:2026
326
+msgid "Preferences..."
327
+msgstr ""
328
+
329
+#: git-gui.sh:2034 git-gui.sh:2558
330
msgid "Options..."
331
msgstr "选项..."
332
318
-#: git-gui.sh:1917
319
-msgid "Running miga..."
320
-msgstr ""
321
-
322
-#: git-gui.sh:1938
333
+#: git-gui.sh:2040 lib/choose_repository.tcl:47
334
msgid "Help"
335
msgstr "帮助"
336
326
-#: git-gui.sh:1979
337
+#: git-gui.sh:2081
338
msgid "Online Documentation"
339
msgstr "在线文档"
340
330
-#: git-gui.sh:2095
341
+#: git-gui.sh:2165
342
+#, tcl-format
343
+msgid "fatal: cannot stat path %s: No such file or directory"
344
+msgstr ""
345
+
346
+#: git-gui.sh:2198
347
msgid "Current Branch:"
348
msgstr "当前分支:"
349
334
-#: git-gui.sh:2116
335
-msgid "Staged Changes (Will Be Committed)"
350
+#: git-gui.sh:2219
351
+#, fuzzy
352
+msgid "Staged Changes (Will Commit)"
353
msgstr "将被提交的修改"
354
338
-#: git-gui.sh:2136
339
-msgid "Unstaged Changes (Will Not Be Committed)"
340
-msgstr "不被提交的修改"
355
+#: git-gui.sh:2239
356
+msgid "Unstaged Changes"
357
+msgstr ""
358
+
359
+#: git-gui.sh:2286
360
+msgid "Stage Changed"
361
+msgstr ""
362
342
-#: git-gui.sh:2183
343
-msgid "Add Existing"
344
-msgstr "添加默认修改文件"
363
+#: git-gui.sh:2302 lib/transport.tcl:93 lib/transport.tcl:182
364
+msgid "Push"
365
+msgstr "上传"
366
346
-#: git-gui.sh:2229
367
+#: git-gui.sh:2332
368
msgid "Initial Commit Message:"
369
msgstr "初始提交描述:"
370
350
-#: git-gui.sh:2230
371
+#: git-gui.sh:2333
372
msgid "Amended Commit Message:"
373
msgstr "修订提交描述:"
374
354
-#: git-gui.sh:2231
375
+#: git-gui.sh:2334
376
msgid "Amended Initial Commit Message:"
377
msgstr "修订初始提交描述:"
378
358
-#: git-gui.sh:2232
379
+#: git-gui.sh:2335
380
msgid "Amended Merge Commit Message:"
381
msgstr "修订合并提交描述:"
382
362
-#: git-gui.sh:2233
383
+#: git-gui.sh:2336
384
msgid "Merge Commit Message:"
385
msgstr "合并提交描述:"
386
366
-#: git-gui.sh:2234
387
+#: git-gui.sh:2337
388
msgid "Commit Message:"
389
msgstr "提交描述:"
390
370
-#: git-gui.sh:2279 git-gui.sh:2417 lib/console.tcl:73
391
+#: git-gui.sh:2382 git-gui.sh:2520 lib/console.tcl:71
392
msgid "Copy All"
393
msgstr "全部复制"
394
374
-#: git-gui.sh:2303 lib/blame.tcl:104
395
+#: git-gui.sh:2406 lib/blame.tcl:104
396
msgid "File:"
397
msgstr ""
398
378
-#: git-gui.sh:2405
399
+#: git-gui.sh:2508
400
msgid "Refresh"
401
msgstr "刷新"
402
382
-#: git-gui.sh:2426
403
+#: git-gui.sh:2529
404
msgid "Apply/Reverse Hunk"
405
msgstr "应用/撤消此修改块"
406
386
-#: git-gui.sh:2432
407
+#: git-gui.sh:2535
408
msgid "Decrease Font Size"
409
msgstr "缩小字体"
410
390
-#: git-gui.sh:2436
411
+#: git-gui.sh:2539
412
msgid "Increase Font Size"
413
msgstr "放大字体"
414
394
-#: git-gui.sh:2441
415
+#: git-gui.sh:2544
416
msgid "Show Less Context"
417
msgstr "显示更多diff上下文"
418
398
-#: git-gui.sh:2448
419
+#: git-gui.sh:2551
420
msgid "Show More Context"
421
msgstr "显示更少diff上下文"
422
402
-#: git-gui.sh:2461
423
+#: git-gui.sh:2565
424
#, fuzzy
425
msgid "Unstage Hunk From Commit"
426
msgstr "从本次提交移除"
427
407
-#: git-gui.sh:2463
428
+#: git-gui.sh:2567
429
#, fuzzy
430
msgid "Stage Hunk For Commit"
431
msgstr "从本次提交移除"
432
412
-#: git-gui.sh:2473
433
+#: git-gui.sh:2586
434
msgid "Initializing..."
435
msgstr ""
436
437
+#: git-gui.sh:2677
438
+#, tcl-format
439
+msgid ""
440
+"Possible environment issues exist.\n"
441
+"\n"
442
+"The following environment variables are probably\n"
443
+"going to be ignored by any Git subprocess run\n"
444
+"by %s:\n"
445
+"\n"
446
+msgstr ""
447
+
448
+#: git-gui.sh:2707
449
+msgid ""
450
+"\n"
451
+"This is due to a known issue with the\n"
452
+"Tcl binary distributed by Cygwin."
453
+msgstr ""
454
+
455
+#: git-gui.sh:2712
456
+#, tcl-format
457
+msgid ""
458
+"\n"
459
+"\n"
460
+"A good replacement for %s\n"
461
+"is placing values for the user.name and\n"
462
+"user.email settings into your personal\n"
463
+"~/.gitconfig file.\n"
464
+msgstr ""
465
+
466
+#: lib/about.tcl:25
467
+msgid "git-gui - a graphical user interface for Git."
468
+msgstr ""
469
+
470
#: lib/blame.tcl:77
471
msgid "File Viewer"
472
msgstr ""
@@ -432,6 +486,51 @@ msgstr "提交"
486
msgid "Reading %s..."
487
msgstr ""
488
489
+#: lib/blame.tcl:473
490
+msgid "Loading copy/move tracking annotations..."
491
+msgstr ""
492
+
493
+#: lib/blame.tcl:493
494
+msgid "lines annotated"
495
+msgstr ""
496
+
497
+#: lib/blame.tcl:674
498
+msgid "Loading original location annotations..."
499
+msgstr ""
500
+
501
+#: lib/blame.tcl:677
502
+msgid "Annotation complete."
503
+msgstr ""
504
+
505
+#: lib/blame.tcl:731
506
+msgid "Loading annotation..."
507
+msgstr ""
508
+
509
+#: lib/blame.tcl:787
510
+msgid "Author:"
511
+msgstr ""
512
+
513
+#: lib/blame.tcl:791
514
+#, fuzzy
515
+msgid "Committer:"
516
+msgstr "提交"
517
+
518
+#: lib/blame.tcl:796
519
+msgid "Original File:"
520
+msgstr ""
521
+
522
+#: lib/blame.tcl:910
523
+msgid "Originally By:"
524
+msgstr ""
525
+
526
+#: lib/blame.tcl:916
527
+msgid "In File:"
528
+msgstr ""
529
+
530
+#: lib/blame.tcl:921
531
+msgid "Copied Or Moved Here By:"
532
+msgstr ""
533
+
534
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
535
#, fuzzy
536
msgid "Checkout Branch"
@@ -443,18 +542,17 @@ msgid "Checkout"
542
msgstr "切换..."
543
544
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
446
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:269
447
-#: lib/checkout_op.tcl:519 lib/merge.tcl:176 lib/option.tcl:172
448
-#: lib/remote_branch_delete.tcl:42 lib/transport.tcl:92
545
+#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:281
546
+#: lib/checkout_op.tcl:522 lib/choose_font.tcl:43 lib/merge.tcl:172
547
+#: lib/option.tcl:90 lib/remote_branch_delete.tcl:42 lib/transport.tcl:97
548
msgid "Cancel"
549
msgstr ""
550
452
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:274
551
+#: lib/branch_checkout.tcl:32 lib/browser.tcl:286
552
msgid "Revision"
553
msgstr ""
554
456
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:159
457
-#: lib/option.tcl:274
555
+#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:202
556
#, fuzzy
557
msgid "Options"
558
msgstr "选项..."
@@ -477,7 +575,7 @@ msgstr "当前分支:"
575
msgid "Create New Branch"
576
msgstr "当前分支:"
577
480
-#: lib/branch_create.tcl:31
578
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:199
579
#, fuzzy
580
msgid "Create"
581
msgstr "新建..."
@@ -511,7 +609,7 @@ msgstr ""
609
msgid "Fast Forward Only"
610
msgstr ""
611
514
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:511
612
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:514
613
#, fuzzy
614
msgid "Reset"
615
msgstr "重置所有修动..."
@@ -612,25 +710,31 @@ msgstr ""
710
msgid "Failed to rename '%s'."
711
msgstr ""
712
615
-#: lib/browser.tcl:10
713
+#: lib/browser.tcl:17
714
msgid "Starting..."
715
msgstr ""
716
619
-#: lib/browser.tcl:19
717
+#: lib/browser.tcl:26
718
msgid "File Browser"
719
msgstr ""
720
623
-#: lib/browser.tcl:120 lib/browser.tcl:137
721
+#: lib/browser.tcl:125 lib/browser.tcl:142
722
#, tcl-format
723
msgid "Loading %s..."
724
msgstr ""
725
628
-#: lib/browser.tcl:254 lib/browser.tcl:260
726
+#: lib/browser.tcl:186
727
+msgid "[Up To Parent]"
728
+msgstr ""
729
+
730
+#: lib/browser.tcl:266 lib/browser.tcl:272
731
#, fuzzy
732
msgid "Browse Branch Files"
733
msgstr "浏览当前分支文件"
734
633
-#: lib/browser.tcl:265
735
+#: lib/browser.tcl:277 lib/choose_repository.tcl:215
736
+#: lib/choose_repository.tcl:305 lib/choose_repository.tcl:315
737
+#: lib/choose_repository.tcl:811
738
msgid "Browse"
739
msgstr ""
740
@@ -639,7 +743,12 @@ msgstr ""
743
msgid "Fetching %s from %s"
744
msgstr ""
745
642
-#: lib/checkout_op.tcl:140 lib/console.tcl:81 lib/database.tcl:31
746
+#: lib/checkout_op.tcl:127
747
+#, tcl-format
748
+msgid "fatal: Cannot resolve %s"
749
+msgstr ""
750
+
751
+#: lib/checkout_op.tcl:140 lib/console.tcl:79 lib/database.tcl:31
752
msgid "Close"
753
msgstr ""
754
@@ -648,7 +757,7 @@ msgstr ""
757
msgid "Branch '%s' does not exist."
758
msgstr ""
759
651
-#: lib/checkout_op.tcl:205
760
+#: lib/checkout_op.tcl:206
761
#, tcl-format
762
msgid ""
763
"Branch '%s' already exists.\n"
@@ -657,21 +766,21 @@ msgid ""
766
"A merge is required."
767
msgstr ""
768
660
-#: lib/checkout_op.tcl:219
769
+#: lib/checkout_op.tcl:220
770
#, tcl-format
771
msgid "Merge strategy '%s' not supported."
772
msgstr ""
773
665
-#: lib/checkout_op.tcl:238
774
+#: lib/checkout_op.tcl:239
775
#, tcl-format
776
msgid "Failed to update '%s'."
777
msgstr ""
778
670
-#: lib/checkout_op.tcl:250
671
-msgid "Index is already locked."
779
+#: lib/checkout_op.tcl:251
780
+msgid "Staging area (index) is already locked."
781
msgstr ""
782
674
-#: lib/checkout_op.tcl:265
783
+#: lib/checkout_op.tcl:266
784
msgid ""
785
"Last scanned state does not match repository state.\n"
786
"\n"
@@ -681,21 +790,26 @@ msgid ""
790
"The rescan will be automatically started now.\n"
791
msgstr ""
792
684
-#: lib/checkout_op.tcl:352
793
+#: lib/checkout_op.tcl:322
794
#, tcl-format
686
-msgid "Aborted checkout of '%s' (file level merging is required)."
795
+msgid "Updating working directory to '%s'..."
796
msgstr ""
797
798
#: lib/checkout_op.tcl:353
799
+#, tcl-format
800
+msgid "Aborted checkout of '%s' (file level merging is required)."
801
+msgstr ""
802
+
803
+#: lib/checkout_op.tcl:354
804
msgid "File level merge required."
805
msgstr ""
806
693
-#: lib/checkout_op.tcl:357
807
+#: lib/checkout_op.tcl:358
808
#, tcl-format
809
msgid "Staying on branch '%s'."
810
msgstr ""
811
698
-#: lib/checkout_op.tcl:426
812
+#: lib/checkout_op.tcl:429
813
msgid ""
814
"You are no longer on a local branch.\n"
815
"\n"
@@ -703,25 +817,30 @@ msgid ""
817
"Checkout'."
818
msgstr ""
819
706
-#: lib/checkout_op.tcl:475
820
+#: lib/checkout_op.tcl:446
821
+#, fuzzy, tcl-format
822
+msgid "Checked out '%s'."
823
+msgstr "切换..."
824
+
825
+#: lib/checkout_op.tcl:478
826
#, tcl-format
827
msgid "Resetting '%s' to '%s' will lose the following commits:"
828
msgstr ""
829
711
-#: lib/checkout_op.tcl:497
830
+#: lib/checkout_op.tcl:500
831
msgid "Recovering lost commits may not be easy."
832
msgstr ""
833
715
-#: lib/checkout_op.tcl:502
834
+#: lib/checkout_op.tcl:505
835
#, tcl-format
836
msgid "Reset '%s'?"
837
msgstr ""
838
720
-#: lib/checkout_op.tcl:507 lib/merge.tcl:171
839
+#: lib/checkout_op.tcl:510 lib/merge.tcl:164
840
msgid "Visualize"
841
msgstr ""
842
724
-#: lib/checkout_op.tcl:575
843
+#: lib/checkout_op.tcl:578
844
#, tcl-format
845
msgid ""
846
"Failed to set current branch.\n"
@@ -732,41 +851,286 @@ msgid ""
851
"This should not have occurred. %s will now close and give up."
852
msgstr ""
853
735
-#: lib/choose_rev.tcl:35
854
+#: lib/choose_font.tcl:39
855
+#, fuzzy
856
+msgid "Select"
857
+msgstr "全选"
858
+
859
+#: lib/choose_font.tcl:53
860
+msgid "Font Family"
861
+msgstr ""
862
+
863
+#: lib/choose_font.tcl:73
864
+#, fuzzy
865
+msgid "Font Size"
866
+msgstr "缩小字体"
867
+
868
+#: lib/choose_font.tcl:90
869
+msgid "Font Example"
870
+msgstr ""
871
+
872
+#: lib/choose_font.tcl:101
873
+msgid ""
874
+"This is example text.\n"
875
+"If you like this text, it can be your font."
876
+msgstr ""
877
+
878
+#: lib/choose_repository.tcl:25
879
+msgid "Git Gui"
880
+msgstr ""
881
+
882
+#: lib/choose_repository.tcl:69 lib/choose_repository.tcl:204
883
+#, fuzzy
884
+msgid "Create New Repository"
885
+msgstr "版本树"
886
+
887
+#: lib/choose_repository.tcl:74 lib/choose_repository.tcl:291
888
+#, fuzzy
889
+msgid "Clone Existing Repository"
890
+msgstr "版本树"
891
+
892
+#: lib/choose_repository.tcl:79 lib/choose_repository.tcl:800
893
+#, fuzzy
894
+msgid "Open Existing Repository"
895
+msgstr "版本树"
896
+
897
+#: lib/choose_repository.tcl:91
898
+msgid "Next >"
899
+msgstr ""
900
+
901
+#: lib/choose_repository.tcl:152
902
+#, tcl-format
903
+msgid "Location %s already exists."
904
+msgstr ""
905
+
906
+#: lib/choose_repository.tcl:158 lib/choose_repository.tcl:165
907
+#: lib/choose_repository.tcl:172
908
+#, tcl-format
909
+msgid "Failed to create repository %s:"
910
+msgstr ""
911
+
912
+#: lib/choose_repository.tcl:209 lib/choose_repository.tcl:309
913
+msgid "Directory:"
914
+msgstr ""
915
+
916
+#: lib/choose_repository.tcl:238 lib/choose_repository.tcl:363
917
+#: lib/choose_repository.tcl:834
918
+#, fuzzy
919
+msgid "Git Repository"
920
+msgstr "版本树"
921
+
922
+#: lib/choose_repository.tcl:253 lib/choose_repository.tcl:260
923
+#, tcl-format
924
+msgid "Directory %s already exists."
925
+msgstr ""
926
+
927
+#: lib/choose_repository.tcl:265
928
+#, tcl-format
929
+msgid "File %s already exists."
930
+msgstr ""
931
+
932
+#: lib/choose_repository.tcl:286
933
+msgid "Clone"
934
+msgstr ""
935
+
936
+#: lib/choose_repository.tcl:299
937
+msgid "URL:"
938
+msgstr ""
939
+
940
+#: lib/choose_repository.tcl:319
941
+msgid "Clone Type:"
942
+msgstr ""
943
+
944
+#: lib/choose_repository.tcl:325
945
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
946
+msgstr ""
947
+
948
+#: lib/choose_repository.tcl:331
949
+msgid "Full Copy (Slower, Redundant Backup)"
950
+msgstr ""
951
+
952
+#: lib/choose_repository.tcl:337
953
+msgid "Shared (Fastest, Not Recommended, No Backup)"
954
+msgstr ""
955
+
956
+#: lib/choose_repository.tcl:369 lib/choose_repository.tcl:418
957
+#: lib/choose_repository.tcl:560 lib/choose_repository.tcl:630
958
+#: lib/choose_repository.tcl:840 lib/choose_repository.tcl:848
959
+#, tcl-format
960
+msgid "Not a Git repository: %s"
961
+msgstr ""
962
+
963
+#: lib/choose_repository.tcl:405
964
+msgid "Standard only available for local repository."
965
+msgstr ""
966
+
967
+#: lib/choose_repository.tcl:409
968
+msgid "Shared only available for local repository."
969
+msgstr ""
970
+
971
+#: lib/choose_repository.tcl:439
972
+msgid "Failed to configure origin"
973
+msgstr ""
974
+
975
+#: lib/choose_repository.tcl:451
976
+msgid "Counting objects"
977
+msgstr ""
978
+
979
+#: lib/choose_repository.tcl:452
980
+msgid "buckets"
981
+msgstr ""
982
+
983
+#: lib/choose_repository.tcl:476
984
+#, tcl-format
985
+msgid "Unable to copy objects/info/alternates: %s"
986
+msgstr ""
987
+
988
+#: lib/choose_repository.tcl:512
989
+#, tcl-format
990
+msgid "Nothing to clone from %s."
991
+msgstr ""
992
+
993
+#: lib/choose_repository.tcl:514 lib/choose_repository.tcl:728
994
+#: lib/choose_repository.tcl:740
995
+msgid "The 'master' branch has not been initialized."
996
+msgstr ""
997
+
998
+#: lib/choose_repository.tcl:527
999
+msgid "Hardlinks are unavailable. Falling back to copying."
1000
+msgstr ""
1001
+
1002
+#: lib/choose_repository.tcl:539
1003
+#, tcl-format
1004
+msgid "Cloning from %s"
1005
+msgstr ""
1006
+
1007
+#: lib/choose_repository.tcl:570
1008
+#, fuzzy
1009
+msgid "Copying objects"
1010
+msgstr "压缩数据库"
1011
+
1012
+#: lib/choose_repository.tcl:571
1013
+msgid "KiB"
1014
+msgstr ""
1015
+
1016
+#: lib/choose_repository.tcl:595
1017
+#, tcl-format
1018
+msgid "Unable to copy object: %s"
1019
+msgstr ""
1020
+
1021
+#: lib/choose_repository.tcl:605
1022
+msgid "Linking objects"
1023
+msgstr ""
1024
+
1025
+#: lib/choose_repository.tcl:606
1026
+msgid "objects"
1027
+msgstr ""
1028
+
1029
+#: lib/choose_repository.tcl:614
1030
+#, tcl-format
1031
+msgid "Unable to hardlink object: %s"
1032
+msgstr ""
1033
+
1034
+#: lib/choose_repository.tcl:669
1035
+msgid "Cannot fetch branches and objects. See console output for details."
1036
+msgstr ""
1037
+
1038
+#: lib/choose_repository.tcl:680
1039
+msgid "Cannot fetch tags. See console output for details."
1040
+msgstr ""
1041
+
1042
+#: lib/choose_repository.tcl:704
1043
+msgid "Cannot determine HEAD. See console output for details."
1044
+msgstr ""
1045
+
1046
+#: lib/choose_repository.tcl:713
1047
+#, tcl-format
1048
+msgid "Unable to cleanup %s"
1049
+msgstr ""
1050
+
1051
+#: lib/choose_repository.tcl:719
1052
+msgid "Clone failed."
1053
+msgstr ""
1054
+
1055
+#: lib/choose_repository.tcl:726
1056
+msgid "No default branch obtained."
1057
+msgstr ""
1058
+
1059
+#: lib/choose_repository.tcl:737
1060
+#, tcl-format
1061
+msgid "Cannot resolve %s as a commit."
1062
+msgstr ""
1063
+
1064
+#: lib/choose_repository.tcl:749
1065
+msgid "Creating working directory"
1066
+msgstr ""
1067
+
1068
+#: lib/choose_repository.tcl:750 lib/index.tcl:15 lib/index.tcl:80
1069
+#: lib/index.tcl:149
1070
+msgid "files"
1071
+msgstr ""
1072
+
1073
+#: lib/choose_repository.tcl:779
1074
+msgid "Initial file checkout failed."
1075
+msgstr ""
1076
+
1077
+#: lib/choose_repository.tcl:795
1078
+msgid "Open"
1079
+msgstr ""
1080
+
1081
+#: lib/choose_repository.tcl:805
1082
+#, fuzzy
1083
+msgid "Repository:"
1084
+msgstr "版本树"
1085
+
1086
+#: lib/choose_repository.tcl:854
1087
+#, tcl-format
1088
+msgid "Failed to open repository %s:"
1089
+msgstr ""
1090
+
1091
+#: lib/choose_rev.tcl:53
1092
msgid "This Detached Checkout"
1093
msgstr ""
1094
739
-#: lib/choose_rev.tcl:42
1095
+#: lib/choose_rev.tcl:60
1096
msgid "Revision Expression:"
1097
msgstr ""
1098
743
-#: lib/choose_rev.tcl:56
1099
+#: lib/choose_rev.tcl:74
1100
#, fuzzy
1101
msgid "Local Branch"
1102
msgstr "分支"
1103
748
-#: lib/choose_rev.tcl:61
1104
+#: lib/choose_rev.tcl:79
1105
#, fuzzy
1106
msgid "Tracking Branch"
1107
msgstr "当前分支:"
1108
753
-#: lib/choose_rev.tcl:66
1109
+#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:537
1110
msgid "Tag"
1111
msgstr ""
1112
757
-#: lib/choose_rev.tcl:227
1113
+#: lib/choose_rev.tcl:317
1114
#, tcl-format
1115
msgid "Invalid revision: %s"
1116
msgstr ""
1117
762
-#: lib/choose_rev.tcl:248
1118
+#: lib/choose_rev.tcl:338
1119
msgid "No revision selected."
1120
msgstr ""
1121
766
-#: lib/choose_rev.tcl:256
1122
+#: lib/choose_rev.tcl:346
1123
msgid "Revision expression is empty."
1124
msgstr ""
1125
1126
+#: lib/choose_rev.tcl:530
1127
+msgid "Updated"
1128
+msgstr ""
1129
+
1130
+#: lib/choose_rev.tcl:558
1131
+msgid "URL"
1132
+msgstr ""
1133
+
1134
#: lib/commit.tcl:9
1135
msgid ""
1136
"There is nothing to amend.\n"
@@ -811,8 +1175,8 @@ msgstr ""
1175
msgid ""
1176
"Unmerged files cannot be committed.\n"
1177
"\n"
814
-"File %s has merge conflicts. You must resolve them and add the file before "
815
-"committing.\n"
1178
+"File %s has merge conflicts. You must resolve them and stage the file "
1179
+"before committing.\n"
1180
msgstr ""
1181
1182
#: lib/commit.tcl:162
@@ -827,7 +1191,7 @@ msgstr ""
1191
msgid ""
1192
"No changes to commit.\n"
1193
"\n"
830
-"You must add at least 1 file before you can commit.\n"
1194
+"You must stage at least 1 file before you can commit.\n"
1195
msgstr ""
1196
1197
#: lib/commit.tcl:183
@@ -845,6 +1209,11 @@ msgstr ""
1209
msgid "write-tree failed:"
1210
msgstr ""
1211
1212
+#: lib/commit.tcl:275
1213
+#, tcl-format
1214
+msgid "Commit %s appears to be corrupt"
1215
+msgstr ""
1216
+
1217
#: lib/commit.tcl:279
1218
msgid ""
1219
"No changes to commit.\n"
@@ -858,6 +1227,11 @@ msgstr ""
1227
msgid "No changes to commit."
1228
msgstr ""
1229
1230
+#: lib/commit.tcl:303
1231
+#, tcl-format
1232
+msgid "warning: Tcl does not support encoding '%s'."
1233
+msgstr ""
1234
+
1235
#: lib/commit.tcl:317
1236
msgid "commit-tree failed:"
1237
msgstr ""
@@ -871,15 +1245,15 @@ msgstr ""
1245
msgid "Created commit %s: %s"
1246
msgstr ""
1247
874
-#: lib/console.tcl:55
1248
+#: lib/console.tcl:57
1249
msgid "Working... please wait..."
1250
msgstr ""
1251
878
-#: lib/console.tcl:184
1252
+#: lib/console.tcl:183
1253
msgid "Success"
1254
msgstr ""
1255
882
-#: lib/console.tcl:194
1256
+#: lib/console.tcl:196
1257
msgid "Error: Command Failed"
1258
msgstr ""
1259
@@ -920,6 +1294,22 @@ msgstr "压缩数据库"
1294
msgid "Verifying the object database with fsck-objects"
1295
msgstr ""
1296
1297
+#: lib/database.tcl:108
1298
+#, tcl-format
1299
+msgid ""
1300
+"This repository currently has approximately %i loose objects.\n"
1301
+"\n"
1302
+"To maintain optimal performance it is strongly recommended that you compress "
1303
+"the database when more than %i loose objects exist.\n"
1304
+"\n"
1305
+"Compress the database now?"
1306
+msgstr ""
1307
+
1308
+#: lib/date.tcl:25
1309
+#, tcl-format
1310
+msgid "Invalid date from Git: %s"
1311
+msgstr ""
1312
+
1313
#: lib/diff.tcl:42
1314
#, tcl-format
1315
msgid ""
@@ -934,19 +1324,37 @@ msgid ""
1324
"the same state."
1325
msgstr ""
1326
937
-#: lib/diff.tcl:97
1327
+#: lib/diff.tcl:81
1328
+#, tcl-format
1329
+msgid "Loading diff of %s..."
1330
+msgstr ""
1331
+
1332
+#: lib/diff.tcl:114 lib/diff.tcl:184
1333
+#, tcl-format
1334
+msgid "Unable to display %s"
1335
+msgstr ""
1336
+
1337
+#: lib/diff.tcl:115
1338
msgid "Error loading file:"
1339
msgstr ""
1340
941
-#: lib/diff.tcl:162
1341
+#: lib/diff.tcl:122
1342
+msgid "Git Repository (subproject)"
1343
+msgstr ""
1344
+
1345
+#: lib/diff.tcl:134
1346
+msgid "* Binary file (not showing content)."
1347
+msgstr ""
1348
+
1349
+#: lib/diff.tcl:185
1350
msgid "Error loading diff:"
1351
msgstr ""
1352
945
-#: lib/diff.tcl:278
1353
+#: lib/diff.tcl:302
1354
msgid "Failed to unstage selected hunk."
1355
msgstr ""
1356
949
-#: lib/diff.tcl:285
1357
+#: lib/diff.tcl:309
1358
msgid "Failed to stage selected hunk."
1359
msgstr ""
1360
@@ -962,32 +1370,42 @@ msgstr ""
1370
msgid "You must correct the above errors before committing."
1371
msgstr ""
1372
965
-#: lib/index.tcl:364
1373
+#: lib/index.tcl:241
1374
+#, fuzzy, tcl-format
1375
+msgid "Unstaging %s from commit"
1376
+msgstr "从本次提交移除"
1377
+
1378
+#: lib/index.tcl:285
1379
+#, tcl-format
1380
+msgid "Adding %s"
1381
+msgstr ""
1382
+
1383
+#: lib/index.tcl:340
1384
#, fuzzy, tcl-format
1385
msgid "Revert changes in file %s?"
1386
msgstr "恢复修改"
1387
970
-#: lib/index.tcl:366
1388
+#: lib/index.tcl:342
1389
#, tcl-format
1390
msgid "Revert changes in these %i files?"
1391
msgstr ""
1392
975
-#: lib/index.tcl:372
976
-msgid "Any unadded changes will be permanently lost by the revert."
1393
+#: lib/index.tcl:348
1394
+msgid "Any unstaged changes will be permanently lost by the revert."
1395
msgstr ""
1396
979
-#: lib/index.tcl:375
1397
+#: lib/index.tcl:351
1398
msgid "Do Nothing"
1399
msgstr ""
1400
983
-#: lib/merge.tcl:14
1401
+#: lib/merge.tcl:13
1402
msgid ""
1403
"Cannot merge while amending.\n"
1404
"\n"
1405
"You must finish amending this commit before starting any type of merge.\n"
1406
msgstr ""
1407
990
-#: lib/merge.tcl:28
1408
+#: lib/merge.tcl:27
1409
msgid ""
1410
"Last scanned state does not match repository state.\n"
1411
"\n"
@@ -997,18 +1415,18 @@ msgid ""
1415
"The rescan will be automatically started now.\n"
1416
msgstr ""
1417
1000
-#: lib/merge.tcl:45
1418
+#: lib/merge.tcl:44
1419
#, tcl-format
1420
msgid ""
1421
"You are in the middle of a conflicted merge.\n"
1422
"\n"
1423
"File %s has merge conflicts.\n"
1424
"\n"
1007
-"You must resolve them, add the file, and commit to complete the current "
1425
+"You must resolve them, stage the file, and commit to complete the current "
1426
"merge. Only then can you begin another merge.\n"
1427
msgstr ""
1428
1011
-#: lib/merge.tcl:55
1429
+#: lib/merge.tcl:54
1430
#, tcl-format
1431
msgid ""
1432
"You are in the middle of a change.\n"
@@ -1019,37 +1437,41 @@ msgid ""
1437
"will help you abort a failed merge, should the need arise.\n"
1438
msgstr ""
1439
1022
-#: lib/merge.tcl:94
1440
+#: lib/merge.tcl:106
1441
+#, tcl-format
1442
+msgid "%s of %s"
1443
+msgstr ""
1444
+
1445
+#: lib/merge.tcl:119
1446
#, tcl-format
1447
msgid "Merging %s and %s"
1448
msgstr ""
1449
1027
-#: lib/merge.tcl:106
1450
+#: lib/merge.tcl:131
1451
msgid "Merge completed successfully."
1452
msgstr ""
1453
1031
-#: lib/merge.tcl:108
1454
+#: lib/merge.tcl:133
1455
msgid "Merge failed. Conflict resolution is required."
1456
msgstr ""
1457
1035
-#: lib/merge.tcl:166
1458
+#: lib/merge.tcl:158
1459
#, tcl-format
1460
msgid "Merge Into %s"
1461
msgstr ""
1462
1040
-#: lib/merge.tcl:181 lib/transport.tcl:98
1041
-#, fuzzy
1042
-msgid "Source Branches"
1043
-msgstr "当前分支:"
1463
+#: lib/merge.tcl:177
1464
+msgid "Revision To Merge"
1465
+msgstr ""
1466
1045
-#: lib/merge.tcl:240
1467
+#: lib/merge.tcl:212
1468
msgid ""
1469
"Cannot abort while amending.\n"
1470
"\n"
1471
"You must finish amending this commit.\n"
1472
msgstr ""
1473
1052
-#: lib/merge.tcl:250
1474
+#: lib/merge.tcl:222
1475
msgid ""
1476
"Abort merge?\n"
1477
"\n"
@@ -1058,90 +1480,120 @@ msgid ""
1480
"Continue with aborting the current merge?"
1481
msgstr ""
1482
1061
-#: lib/merge.tcl:256
1483
+#: lib/merge.tcl:228
1484
msgid ""
1063
-"Abort commit?\n"
1485
+"Reset changes?\n"
1486
"\n"
1065
-"Aborting the current commit will cause *ALL* uncommitted changes to be "
1066
-"lost.\n"
1487
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1488
"\n"
1068
-"Continue with aborting the current commit?"
1489
+"Continue with resetting the current changes?"
1490
msgstr ""
1491
1071
-#: lib/merge.tcl:267
1072
-msgid "Aborting... please wait..."
1492
+#: lib/merge.tcl:239
1493
+msgid "Aborting"
1494
msgstr ""
1495
1075
-#: lib/merge.tcl:290
1076
-msgid "Abort completed. Ready."
1496
+#: lib/merge.tcl:266
1497
+msgid "Abort failed."
1498
msgstr ""
1499
1079
-#: lib/option.tcl:77
1080
-msgid "git-gui - a graphical user interface for Git."
1500
+#: lib/merge.tcl:268
1501
+msgid "Abort completed. Ready."
1502
msgstr ""
1503
1083
-#: lib/option.tcl:164
1504
+#: lib/option.tcl:82
1505
msgid "Restore Defaults"
1506
msgstr ""
1507
1087
-#: lib/option.tcl:168
1508
+#: lib/option.tcl:86
1509
msgid "Save"
1510
msgstr ""
1511
1091
-#: lib/option.tcl:178
1512
+#: lib/option.tcl:96
1513
#, fuzzy, tcl-format
1514
msgid "%s Repository"
1515
msgstr "版本树"
1516
1096
-#: lib/option.tcl:179
1517
+#: lib/option.tcl:97
1518
msgid "Global (All Repositories)"
1519
msgstr ""
1520
1100
-#: lib/option.tcl:185
1521
+#: lib/option.tcl:103
1522
msgid "User Name"
1523
msgstr ""
1524
1104
-#: lib/option.tcl:186
1525
+#: lib/option.tcl:104
1526
msgid "Email Address"
1527
msgstr ""
1528
1108
-#: lib/option.tcl:188
1529
+#: lib/option.tcl:106
1530
#, fuzzy
1531
msgid "Summarize Merge Commits"
1532
msgstr "修订合并提交描述:"
1533
1113
-#: lib/option.tcl:189
1534
+#: lib/option.tcl:107
1535
msgid "Merge Verbosity"
1536
msgstr ""
1537
1117
-#: lib/option.tcl:190
1538
+#: lib/option.tcl:108
1539
msgid "Show Diffstat After Merge"
1540
msgstr ""
1541
1121
-#: lib/option.tcl:192
1542
+#: lib/option.tcl:110
1543
msgid "Trust File Modification Timestamps"
1544
msgstr ""
1545
1125
-#: lib/option.tcl:193
1546
+#: lib/option.tcl:111
1547
msgid "Prune Tracking Branches During Fetch"
1548
msgstr ""
1549
1129
-#: lib/option.tcl:194
1550
+#: lib/option.tcl:112
1551
msgid "Match Tracking Branches"
1552
msgstr ""
1553
1133
-#: lib/option.tcl:195
1554
+#: lib/option.tcl:113
1555
msgid "Number of Diff Context Lines"
1556
msgstr ""
1557
1137
-#: lib/option.tcl:196
1558
+#: lib/option.tcl:114
1559
msgid "New Branch Name Template"
1560
msgstr ""
1561
1141
-#: lib/option.tcl:305
1562
+#: lib/option.tcl:176
1563
+msgid "Change Font"
1564
+msgstr ""
1565
+
1566
+#: lib/option.tcl:180
1567
+#, tcl-format
1568
+msgid "Choose %s"
1569
+msgstr ""
1570
+
1571
+#: lib/option.tcl:186
1572
+msgid "pt."
1573
+msgstr ""
1574
+
1575
+#: lib/option.tcl:200
1576
+msgid "Preferences"
1577
+msgstr ""
1578
+
1579
+#: lib/option.tcl:235
1580
msgid "Failed to completely save options:"
1581
msgstr ""
1582
1583
+#: lib/remote.tcl:165
1584
+msgid "Prune from"
1585
+msgstr ""
1586
+
1587
+#: lib/remote.tcl:170
1588
+#, fuzzy
1589
+msgid "Fetch from"
1590
+msgstr "导入"
1591
+
1592
+#: lib/remote.tcl:213
1593
+#, fuzzy
1594
+msgid "Push to"
1595
+msgstr "上传"
1596
+
1597
#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1598
msgid "Delete Remote Branch"
1599
msgstr ""
@@ -1151,11 +1603,11 @@ msgstr ""
1603
msgid "From Repository"
1604
msgstr "版本树"
1605
1154
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:118
1606
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:123
1607
msgid "Remote:"
1608
msgstr ""
1609
1158
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:133
1610
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:138
1611
msgid "Arbitrary URL:"
1612
msgstr ""
1613
@@ -1181,6 +1633,14 @@ msgstr ""
1633
msgid "A branch is required for 'Merged Into'."
1634
msgstr ""
1635
1636
+#: lib/remote_branch_delete.tcl:184
1637
+#, tcl-format
1638
+msgid ""
1639
+"The following branches are not completely merged into %s:\n"
1640
+"\n"
1641
+" - %s"
1642
+msgstr ""
1643
+
1644
#: lib/remote_branch_delete.tcl:189
1645
#, tcl-format
1646
msgid ""
@@ -1213,21 +1673,6 @@ msgstr ""
1673
msgid "Scanning %s..."
1674
msgstr ""
1675
1216
-#: lib/remote.tcl:156
1217
-#, tcl-format
1218
-msgid "Fetch from %s..."
1219
-msgstr ""
1220
-
1221
-#: lib/remote.tcl:166
1222
-#, tcl-format
1223
-msgid "Prune from %s..."
1224
-msgstr ""
1225
-
1226
-#: lib/remote.tcl:200
1227
-#, fuzzy, tcl-format
1228
-msgid "Push to %s..."
1229
-msgstr "上传..."
1230
-
1676
#: lib/shortcut.tcl:26 lib/shortcut.tcl:74
1677
msgid "Cannot write script:"
1678
msgstr ""
@@ -1236,49 +1681,89 @@ msgstr ""
1681
msgid "Cannot write icon:"
1682
msgstr ""
1683
1239
-#: lib/status_bar.tcl:58
1684
+#: lib/status_bar.tcl:83
1685
#, tcl-format
1686
msgid "%s ... %*i of %*i %s (%3i%%)"
1687
msgstr ""
1688
1689
+#: lib/transport.tcl:6
1690
+#, fuzzy, tcl-format
1691
+msgid "fetch %s"
1692
+msgstr "导入"
1693
+
1694
#: lib/transport.tcl:7
1695
#, tcl-format
1696
msgid "Fetching new changes from %s"
1697
msgstr ""
1698
1699
+#: lib/transport.tcl:18
1700
+#, tcl-format
1701
+msgid "remote prune %s"
1702
+msgstr ""
1703
+
1704
#: lib/transport.tcl:19
1705
#, tcl-format
1706
msgid "Pruning tracking branches deleted from %s"
1707
msgstr ""
1708
1709
+#: lib/transport.tcl:25 lib/transport.tcl:71
1710
+#, tcl-format
1711
+msgid "push %s"
1712
+msgstr ""
1713
+
1714
#: lib/transport.tcl:26
1715
#, tcl-format
1716
msgid "Pushing changes to %s"
1717
msgstr ""
1718
1259
-#: lib/transport.tcl:68
1719
+#: lib/transport.tcl:72
1720
#, tcl-format
1721
msgid "Pushing %s %s to %s"
1722
msgstr ""
1723
1264
-#: lib/transport.tcl:84
1724
+#: lib/transport.tcl:89
1725
#, fuzzy
1726
msgid "Push Branches"
1727
msgstr "分支"
1728
1269
-#: lib/transport.tcl:115
1729
+#: lib/transport.tcl:103
1730
+#, fuzzy
1731
+msgid "Source Branches"
1732
+msgstr "当前分支:"
1733
+
1734
+#: lib/transport.tcl:120
1735
#, fuzzy
1736
msgid "Destination Repository"
1737
msgstr "版本树"
1738
1274
-#: lib/transport.tcl:153
1739
+#: lib/transport.tcl:158
1740
msgid "Transfer Options"
1741
msgstr ""
1742
1278
-#: lib/transport.tcl:155
1743
+#: lib/transport.tcl:160
1744
+msgid "Force overwrite existing branch (may discard changes)"
1745
+msgstr ""
1746
+
1747
+#: lib/transport.tcl:164
1748
msgid "Use thin pack (for slow network connections)"
1749
msgstr ""
1750
1282
-#: lib/transport.tcl:159
1751
+#: lib/transport.tcl:168
1752
msgid "Include tags"
1753
msgstr ""
1754
+
1755
+#~ msgid "Add To Commit"
1756
+#~ msgstr "添加到本次提交"
1757
+
1758
+#~ msgid "Add Existing To Commit"
1759
+#~ msgstr "添加默认修改文件"
1760
+
1761
+#~ msgid "Unstaged Changes (Will Not Be Committed)"
1762
+#~ msgstr "不被提交的修改"
1763
+
1764
+#~ msgid "Add Existing"
1765
+#~ msgstr "添加默认修改文件"
1766
+
1767
+#, fuzzy
1768
+#~ msgid "Push to %s..."
1769
+#~ msgstr "上传..."