git-gui: update pot template and German translation to current source code
No content changes so far, only the preparation for subsequent edits. Signed-off-by: Christian Stimming <christian@cstimming.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
Christian Stimming committed
Feb 9, 2020 at 22:00 UTC
8b85bb1b70fb515a0be4a27ca5043092c92e4032
2 files changed
+3312
-2734
po/de.po
+1913
-1607
@@ -7,41 +7,42 @@ msgid ""
7
msgstr ""
8
"Project-Id-Version: git-gui\n"
9
"Report-Msgid-Bugs-To: \n"
10
-"POT-Creation-Date: 2010-01-26 22:22+0100\n"
10
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
11
"PO-Revision-Date: 2010-01-26 22:25+0100\n"
12
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
13
"Language-Team: German\n"
14
+"Language: \n"
15
"MIME-Version: 1.0\n"
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
18
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
19
-#: git-gui.sh:922
20
-msgid "git-gui: fatal error"
21
-msgstr "git-gui: Programmfehler"
22
-
23
-#: git-gui.sh:743
19
+#: git-gui.sh:847
20
#, tcl-format
21
msgid "Invalid font specified in %s:"
22
msgstr "Ungültige Zeichensatz-Angabe in %s:"
23
28
-#: git-gui.sh:779
24
+#: git-gui.sh:901
25
msgid "Main Font"
26
msgstr "Programmschriftart"
27
32
-#: git-gui.sh:780
28
+#: git-gui.sh:902
29
msgid "Diff/Console Font"
30
msgstr "Vergleich-Schriftart"
31
36
-#: git-gui.sh:794
32
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
33
+#: git-gui.sh:3212
34
+msgid "git-gui: fatal error"
35
+msgstr "git-gui: Programmfehler"
36
+
37
+#: git-gui.sh:918
38
msgid "Cannot find git in PATH."
39
msgstr "Git kann im PATH nicht gefunden werden."
40
40
-#: git-gui.sh:821
41
+#: git-gui.sh:945
42
msgid "Cannot parse Git version string:"
43
msgstr "Git Versionsangabe kann nicht erkannt werden:"
44
44
-#: git-gui.sh:839
45
+#: git-gui.sh:970
46
#, tcl-format
47
msgid ""
48
"Git version cannot be determined.\n"
@@ -60,479 +61,532 @@ msgstr ""
61
"\n"
62
"Soll angenommen werden, »%s« sei Version 1.5.0?\n"
63
63
-#: git-gui.sh:1128
64
+#: git-gui.sh:1267
65
msgid "Git directory not found:"
66
msgstr "Git-Verzeichnis nicht gefunden:"
67
67
-#: git-gui.sh:1146
68
+#: git-gui.sh:1301
69
msgid "Cannot move to top of working directory:"
70
msgstr ""
71
"Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
72
"werden:"
73
73
-#: git-gui.sh:1154
74
+#: git-gui.sh:1309
75
msgid "Cannot use bare repository:"
76
msgstr "Bloßes Projektarchiv kann nicht benutzt werden:"
77
77
-#: git-gui.sh:1162
78
+#: git-gui.sh:1317
79
msgid "No working directory"
80
msgstr "Kein Arbeitsverzeichnis"
81
81
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
82
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
83
msgid "Refreshing file status..."
84
msgstr "Dateistatus aktualisieren..."
85
85
-#: git-gui.sh:1390
86
+#: git-gui.sh:1551
87
msgid "Scanning for modified files ..."
88
msgstr "Nach geänderten Dateien suchen..."
89
89
-#: git-gui.sh:1454
90
+#: git-gui.sh:1629
91
msgid "Calling prepare-commit-msg hook..."
91
-msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)..."
92
+msgstr ""
93
+"Aufrufen der Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)..."
94
93
-#: git-gui.sh:1471
95
+#: git-gui.sh:1646
96
msgid "Commit declined by prepare-commit-msg hook."
97
msgstr ""
98
"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit "
99
"hook«)."
100
99
-#: git-gui.sh:1629 lib/browser.tcl:246
101
+#: git-gui.sh:1804 lib/browser.tcl:252
102
msgid "Ready."
103
msgstr "Bereit."
104
103
-#: git-gui.sh:1787
105
+#: git-gui.sh:1968
106
#, tcl-format
105
-msgid "Displaying only %s of %s files."
106
-msgstr "Nur %s von %s Dateien werden angezeigt."
107
+msgid ""
108
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
109
+msgstr ""
110
108
-#: git-gui.sh:1913
111
+#: git-gui.sh:2091
112
msgid "Unmodified"
113
msgstr "Unverändert"
114
112
-#: git-gui.sh:1915
115
+#: git-gui.sh:2093
116
msgid "Modified, not staged"
117
msgstr "Verändert, nicht bereitgestellt"
118
116
-#: git-gui.sh:1916 git-gui.sh:1924
119
+#: git-gui.sh:2094 git-gui.sh:2106
120
msgid "Staged for commit"
121
msgstr "Bereitgestellt zum Eintragen"
122
120
-#: git-gui.sh:1917 git-gui.sh:1925
123
+#: git-gui.sh:2095 git-gui.sh:2107
124
msgid "Portions staged for commit"
125
msgstr "Teilweise bereitgestellt zum Eintragen"
126
124
-#: git-gui.sh:1918 git-gui.sh:1926
127
+#: git-gui.sh:2096 git-gui.sh:2108
128
msgid "Staged for commit, missing"
129
msgstr "Bereitgestellt zum Eintragen, fehlend"
130
128
-#: git-gui.sh:1920
131
+#: git-gui.sh:2098
132
msgid "File type changed, not staged"
133
msgstr "Dateityp geändert, nicht bereitgestellt"
134
132
-#: git-gui.sh:1921
135
+#: git-gui.sh:2099 git-gui.sh:2100
136
+#, fuzzy
137
+msgid "File type changed, old type staged for commit"
138
+msgstr "Dateityp geändert, nicht bereitgestellt"
139
+
140
+#: git-gui.sh:2101
141
msgid "File type changed, staged"
142
msgstr "Dateityp geändert, bereitgestellt"
143
136
-#: git-gui.sh:1923
144
+#: git-gui.sh:2102
145
+#, fuzzy
146
+msgid "File type change staged, modification not staged"
147
+msgstr "Dateityp geändert, nicht bereitgestellt"
148
+
149
+#: git-gui.sh:2103
150
+#, fuzzy
151
+msgid "File type change staged, file missing"
152
+msgstr "Dateityp geändert, bereitgestellt"
153
+
154
+#: git-gui.sh:2105
155
msgid "Untracked, not staged"
156
msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
157
140
-#: git-gui.sh:1928
158
+#: git-gui.sh:2110
159
msgid "Missing"
160
msgstr "Fehlend"
161
144
-#: git-gui.sh:1929
162
+#: git-gui.sh:2111
163
msgid "Staged for removal"
164
msgstr "Bereitgestellt zum Löschen"
165
148
-#: git-gui.sh:1930
166
+#: git-gui.sh:2112
167
msgid "Staged for removal, still present"
168
msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
169
152
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
153
-#: git-gui.sh:1936 git-gui.sh:1937
170
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
171
+#: git-gui.sh:2118 git-gui.sh:2119
172
msgid "Requires merge resolution"
173
msgstr "Konfliktauflösung nötig"
174
157
-#: git-gui.sh:1972
158
-msgid "Starting gitk... please wait..."
159
-msgstr "Gitk wird gestartet... bitte warten."
160
-
161
-#: git-gui.sh:1984
175
+#: git-gui.sh:2164
176
msgid "Couldn't find gitk in PATH"
177
msgstr "Gitk kann im PATH nicht gefunden werden."
178
165
-#: git-gui.sh:2043
179
+#: git-gui.sh:2210 git-gui.sh:2245
180
+#, fuzzy, tcl-format
181
+msgid "Starting %s... please wait..."
182
+msgstr "Gitk wird gestartet... bitte warten."
183
+
184
+#: git-gui.sh:2224
185
msgid "Couldn't find git gui in PATH"
186
msgstr "»Git gui« kann im PATH nicht gefunden werden."
187
169
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
188
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
189
msgid "Repository"
190
msgstr "Projektarchiv"
191
173
-#: git-gui.sh:2456
192
+#: git-gui.sh:2727
193
msgid "Edit"
194
msgstr "Bearbeiten"
195
177
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
196
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
197
msgid "Branch"
198
msgstr "Zweig"
199
181
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
200
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
201
msgid "Commit@@noun"
202
msgstr "Version"
203
185
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
204
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
205
msgid "Merge"
206
msgstr "Zusammenführen"
207
189
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
208
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
209
msgid "Remote"
210
msgstr "Externe Archive"
211
193
-#: git-gui.sh:2468
212
+#: git-gui.sh:2739
213
msgid "Tools"
214
msgstr "Werkzeuge"
215
197
-#: git-gui.sh:2477
216
+#: git-gui.sh:2748
217
msgid "Explore Working Copy"
218
msgstr "Arbeitskopie im Dateimanager"
219
201
-#: git-gui.sh:2483
220
+#: git-gui.sh:2763
221
+msgid "Git Bash"
222
+msgstr ""
223
+
224
+#: git-gui.sh:2772
225
msgid "Browse Current Branch's Files"
226
msgstr "Aktuellen Zweig durchblättern"
227
205
-#: git-gui.sh:2487
228
+#: git-gui.sh:2776
229
msgid "Browse Branch Files..."
230
msgstr "Einen Zweig durchblättern..."
231
209
-#: git-gui.sh:2492
232
+#: git-gui.sh:2781
233
msgid "Visualize Current Branch's History"
234
msgstr "Aktuellen Zweig darstellen"
235
213
-#: git-gui.sh:2496
236
+#: git-gui.sh:2785
237
msgid "Visualize All Branch History"
238
msgstr "Alle Zweige darstellen"
239
217
-#: git-gui.sh:2503
240
+#: git-gui.sh:2792
241
#, tcl-format
242
msgid "Browse %s's Files"
243
msgstr "Zweig »%s« durchblättern"
244
222
-#: git-gui.sh:2505
245
+#: git-gui.sh:2794
246
#, tcl-format
247
msgid "Visualize %s's History"
248
msgstr "Historie von »%s« darstellen"
249
227
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
250
+#: git-gui.sh:2799 lib/database.tcl:40
251
msgid "Database Statistics"
252
msgstr "Datenbankstatistik"
253
231
-#: git-gui.sh:2513 lib/database.tcl:34
254
+#: git-gui.sh:2802 lib/database.tcl:33
255
msgid "Compress Database"
256
msgstr "Datenbank komprimieren"
257
235
-#: git-gui.sh:2516
258
+#: git-gui.sh:2805
259
msgid "Verify Database"
260
msgstr "Datenbank überprüfen"
261
239
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
240
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
262
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
263
msgid "Create Desktop Icon"
264
msgstr "Desktop-Icon erstellen"
265
244
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
266
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
267
msgid "Quit"
268
msgstr "Beenden"
269
248
-#: git-gui.sh:2547
270
+#: git-gui.sh:2836
271
msgid "Undo"
272
msgstr "Rückgängig"
273
252
-#: git-gui.sh:2550
274
+#: git-gui.sh:2839
275
msgid "Redo"
276
msgstr "Wiederholen"
277
256
-#: git-gui.sh:2554 git-gui.sh:3109
278
+#: git-gui.sh:2843 git-gui.sh:3461
279
msgid "Cut"
280
msgstr "Ausschneiden"
281
260
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
282
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
283
#: lib/console.tcl:69
284
msgid "Copy"
285
msgstr "Kopieren"
286
265
-#: git-gui.sh:2560 git-gui.sh:3115
287
+#: git-gui.sh:2849 git-gui.sh:3467
288
msgid "Paste"
289
msgstr "Einfügen"
290
269
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
270
-#: lib/remote_branch_delete.tcl:38
291
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
292
+#: lib/branch_delete.tcl:28
293
msgid "Delete"
294
msgstr "Löschen"
295
274
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
296
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
297
msgid "Select All"
298
msgstr "Alle auswählen"
299
278
-#: git-gui.sh:2576
300
+#: git-gui.sh:2865
301
msgid "Create..."
302
msgstr "Erstellen..."
303
282
-#: git-gui.sh:2582
304
+#: git-gui.sh:2871
305
msgid "Checkout..."
306
msgstr "Umstellen..."
307
286
-#: git-gui.sh:2588
308
+#: git-gui.sh:2877
309
msgid "Rename..."
310
msgstr "Umbenennen..."
311
290
-#: git-gui.sh:2593
312
+#: git-gui.sh:2882
313
msgid "Delete..."
314
msgstr "Löschen..."
315
294
-#: git-gui.sh:2598
316
+#: git-gui.sh:2887
317
msgid "Reset..."
318
msgstr "Zurücksetzen..."
319
298
-#: git-gui.sh:2608
320
+#: git-gui.sh:2897
321
msgid "Done"
322
msgstr "Fertig"
323
302
-#: git-gui.sh:2610
324
+#: git-gui.sh:2899
325
msgid "Commit@@verb"
326
msgstr "Eintragen"
327
306
-#: git-gui.sh:2619 git-gui.sh:3050
307
-msgid "New Commit"
308
-msgstr "Neue Version"
309
-
310
-#: git-gui.sh:2627 git-gui.sh:3057
328
+#: git-gui.sh:2908 git-gui.sh:3400
329
msgid "Amend Last Commit"
330
msgstr "Letzte nachbessern"
331
314
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
332
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
333
msgid "Rescan"
334
msgstr "Neu laden"
335
318
-#: git-gui.sh:2643
336
+#: git-gui.sh:2924
337
msgid "Stage To Commit"
338
msgstr "Zum Eintragen bereitstellen"
339
322
-#: git-gui.sh:2649
340
+#: git-gui.sh:2930
341
msgid "Stage Changed Files To Commit"
342
msgstr "Geänderte Dateien bereitstellen"
343
326
-#: git-gui.sh:2655
344
+#: git-gui.sh:2936
345
msgid "Unstage From Commit"
346
msgstr "Aus der Bereitstellung herausnehmen"
347
330
-#: git-gui.sh:2661 lib/index.tcl:412
348
+#: git-gui.sh:2942 lib/index.tcl:521
349
msgid "Revert Changes"
350
msgstr "Änderungen verwerfen"
351
334
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
352
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
353
msgid "Show Less Context"
354
msgstr "Weniger Zeilen anzeigen"
355
338
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
356
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
357
msgid "Show More Context"
358
msgstr "Mehr Zeilen anzeigen"
359
342
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
360
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
361
msgid "Sign Off"
362
msgstr "Abzeichnen"
363
346
-#: git-gui.sh:2696
364
+#: git-gui.sh:2977
365
msgid "Local Merge..."
366
msgstr "Lokales Zusammenführen..."
367
350
-#: git-gui.sh:2701
368
+#: git-gui.sh:2982
369
msgid "Abort Merge..."
370
msgstr "Zusammenführen abbrechen..."
371
354
-#: git-gui.sh:2713 git-gui.sh:2741
372
+#: git-gui.sh:2994 git-gui.sh:3022
373
msgid "Add..."
374
msgstr "Hinzufügen..."
375
358
-#: git-gui.sh:2717
376
+#: git-gui.sh:2998
377
msgid "Push..."
378
msgstr "Versenden..."
379
362
-#: git-gui.sh:2721
380
+#: git-gui.sh:3002
381
msgid "Delete Branch..."
382
msgstr "Zweig löschen..."
383
366
-#: git-gui.sh:2731 git-gui.sh:3292
384
+#: git-gui.sh:3012 git-gui.sh:3666
385
msgid "Options..."
386
msgstr "Optionen..."
387
370
-#: git-gui.sh:2742
388
+#: git-gui.sh:3023
389
msgid "Remove..."
390
msgstr "Entfernen..."
391
374
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
392
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
393
msgid "Help"
394
msgstr "Hilfe"
395
378
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
379
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
396
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
397
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
398
#, tcl-format
399
msgid "About %s"
400
msgstr "Über %s"
401
384
-#: git-gui.sh:2783
402
+#: git-gui.sh:3064
403
msgid "Online Documentation"
404
msgstr "Online-Dokumentation"
405
388
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
406
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
407
msgid "Show SSH Key"
408
msgstr "SSH-Schlüssel anzeigen"
409
392
-#: git-gui.sh:2893
410
+#: git-gui.sh:3097 git-gui.sh:3229
411
+msgid "usage:"
412
+msgstr ""
413
+
414
+#: git-gui.sh:3101 git-gui.sh:3233
415
+msgid "Usage"
416
+msgstr ""
417
+
418
+#: git-gui.sh:3182 lib/blame.tcl:575
419
+#, fuzzy
420
+msgid "Error"
421
+msgstr "Fehler"
422
+
423
+#: git-gui.sh:3213
424
#, tcl-format
425
msgid "fatal: cannot stat path %s: No such file or directory"
426
msgstr ""
427
"Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
428
"nicht gefunden"
429
399
-#: git-gui.sh:2926
430
+#: git-gui.sh:3246
431
msgid "Current Branch:"
432
msgstr "Aktueller Zweig:"
433
403
-#: git-gui.sh:2947
404
-msgid "Staged Changes (Will Commit)"
405
-msgstr "Bereitstellung (zum Eintragen)"
406
-
407
-#: git-gui.sh:2967
434
+#: git-gui.sh:3271
435
msgid "Unstaged Changes"
436
msgstr "Nicht bereitgestellte Änderungen"
437
411
-#: git-gui.sh:3017
438
+#: git-gui.sh:3293
439
+msgid "Staged Changes (Will Commit)"
440
+msgstr "Bereitstellung (zum Eintragen)"
441
+
442
+#: git-gui.sh:3367
443
msgid "Stage Changed"
444
msgstr "Alles bereitstellen"
445
415
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
446
+#: git-gui.sh:3386 lib/transport.tcl:137
447
msgid "Push"
448
msgstr "Versenden"
449
419
-#: git-gui.sh:3071
450
+#: git-gui.sh:3413
451
msgid "Initial Commit Message:"
452
msgstr "Erste Versionsbeschreibung:"
453
423
-#: git-gui.sh:3072
454
+#: git-gui.sh:3414
455
msgid "Amended Commit Message:"
456
msgstr "Nachgebesserte Beschreibung:"
457
427
-#: git-gui.sh:3073
458
+#: git-gui.sh:3415
459
msgid "Amended Initial Commit Message:"
460
msgstr "Nachgebesserte erste Beschreibung:"
461
431
-#: git-gui.sh:3074
462
+#: git-gui.sh:3416
463
msgid "Amended Merge Commit Message:"
464
msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
465
435
-#: git-gui.sh:3075
466
+#: git-gui.sh:3417
467
msgid "Merge Commit Message:"
468
msgstr "Zusammenführungs-Beschreibung:"
469
439
-#: git-gui.sh:3076
470
+#: git-gui.sh:3418
471
msgid "Commit Message:"
472
msgstr "Versionsbeschreibung:"
473
443
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
474
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
475
msgid "Copy All"
476
msgstr "Alle kopieren"
477
447
-#: git-gui.sh:3149 lib/blame.tcl:104
478
+#: git-gui.sh:3501 lib/blame.tcl:106
479
msgid "File:"
480
msgstr "Datei:"
481
451
-#: git-gui.sh:3255
482
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
483
+msgid "Open"
484
+msgstr "Öffnen"
485
+
486
+#: git-gui.sh:3629
487
msgid "Refresh"
488
msgstr "Aktualisieren"
489
455
-#: git-gui.sh:3276
490
+#: git-gui.sh:3650
491
msgid "Decrease Font Size"
492
msgstr "Schriftgröße verkleinern"
493
459
-#: git-gui.sh:3280
494
+#: git-gui.sh:3654
495
msgid "Increase Font Size"
496
msgstr "Schriftgröße vergrößern"
497
463
-#: git-gui.sh:3288 lib/blame.tcl:281
498
+#: git-gui.sh:3662 lib/blame.tcl:296
499
msgid "Encoding"
500
msgstr "Zeichenkodierung"
501
467
-#: git-gui.sh:3299
502
+#: git-gui.sh:3673
503
msgid "Apply/Reverse Hunk"
504
msgstr "Kontext anwenden/umkehren"
505
471
-#: git-gui.sh:3304
506
+#: git-gui.sh:3678
507
msgid "Apply/Reverse Line"
508
msgstr "Zeile anwenden/umkehren"
509
475
-#: git-gui.sh:3323
510
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
511
+#, fuzzy
512
+msgid "Revert Hunk"
513
+msgstr "Kontext anwenden/umkehren"
514
+
515
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
516
+#, fuzzy
517
+msgid "Revert Line"
518
+msgstr "Änderungen verwerfen"
519
+
520
+#: git-gui.sh:3694 git-gui.sh:3791
521
+msgid "Undo Last Revert"
522
+msgstr ""
523
+
524
+#: git-gui.sh:3713
525
msgid "Run Merge Tool"
526
msgstr "Zusammenführungswerkzeug"
527
479
-#: git-gui.sh:3328
528
+#: git-gui.sh:3718
529
msgid "Use Remote Version"
530
msgstr "Externe Version benutzen"
531
483
-#: git-gui.sh:3332
532
+#: git-gui.sh:3722
533
msgid "Use Local Version"
534
msgstr "Lokale Version benutzen"
535
487
-#: git-gui.sh:3336
536
+#: git-gui.sh:3726
537
msgid "Revert To Base"
538
msgstr "Ursprüngliche Version benutzen"
539
491
-#: git-gui.sh:3354
540
+#: git-gui.sh:3744
541
msgid "Visualize These Changes In The Submodule"
542
msgstr "Diese Änderungen im Untermodul darstellen"
543
495
-#: git-gui.sh:3358
544
+#: git-gui.sh:3748
545
msgid "Visualize Current Branch History In The Submodule"
546
msgstr "Aktuellen Zweig im Untermodul darstellen"
547
499
-#: git-gui.sh:3362
548
+#: git-gui.sh:3752
549
msgid "Visualize All Branch History In The Submodule"
550
msgstr "Alle Zweige im Untermodul darstellen"
551
503
-#: git-gui.sh:3367
552
+#: git-gui.sh:3757
553
msgid "Start git gui In The Submodule"
554
msgstr "Git gui im Untermodul starten"
555
507
-#: git-gui.sh:3389
556
+#: git-gui.sh:3793
557
msgid "Unstage Hunk From Commit"
558
msgstr "Kontext aus Bereitstellung herausnehmen"
559
511
-#: git-gui.sh:3391
560
+#: git-gui.sh:3797
561
msgid "Unstage Lines From Commit"
562
msgstr "Zeilen aus der Bereitstellung herausnehmen"
563
515
-#: git-gui.sh:3393
564
+#: git-gui.sh:3798 git-gui.sh:3809
565
+#, fuzzy
566
+msgid "Revert Lines"
567
+msgstr "Änderungen verwerfen"
568
+
569
+#: git-gui.sh:3800
570
msgid "Unstage Line From Commit"
571
msgstr "Zeile aus der Bereitstellung herausnehmen"
572
519
-#: git-gui.sh:3396
573
+#: git-gui.sh:3804
574
msgid "Stage Hunk For Commit"
575
msgstr "Kontext zur Bereitstellung hinzufügen"
576
523
-#: git-gui.sh:3398
577
+#: git-gui.sh:3808
578
msgid "Stage Lines For Commit"
579
msgstr "Zeilen zur Bereitstellung hinzufügen"
580
527
-#: git-gui.sh:3400
581
+#: git-gui.sh:3811
582
msgid "Stage Line For Commit"
583
msgstr "Zeile zur Bereitstellung hinzufügen"
584
531
-#: git-gui.sh:3424
585
+#: git-gui.sh:3861
586
msgid "Initializing..."
587
msgstr "Initialisieren..."
588
535
-#: git-gui.sh:3541
589
+#: git-gui.sh:4017
590
#, tcl-format
591
msgid ""
592
"Possible environment issues exist.\n"
@@ -548,7 +602,7 @@ msgstr ""
602
"von %s an Git weitergegeben werden:\n"
603
"\n"
604
551
-#: git-gui.sh:3570
605
+#: git-gui.sh:4046
606
msgid ""
607
"\n"
608
"This is due to a known issue with the\n"
@@ -558,7 +612,7 @@ msgstr ""
612
"Dies ist ein bekanntes Problem der Tcl-Version, die\n"
613
"in Cygwin mitgeliefert wird."
614
561
-#: git-gui.sh:3575
615
+#: git-gui.sh:4051
616
#, tcl-format
617
msgid ""
618
"\n"
@@ -574,341 +628,183 @@ msgstr ""
628
"gewünschten Werte für die Einstellung user.name und \n"
629
"user.email in Ihre Datei ~/.gitconfig einfügen.\n"
630
577
-#: lib/about.tcl:26
578
-msgid "git-gui - a graphical user interface for Git."
579
-msgstr "git-gui - eine grafische Oberfläche für Git."
580
-
581
-#: lib/blame.tcl:72
582
-msgid "File Viewer"
583
-msgstr "Datei-Browser"
584
-
585
-#: lib/blame.tcl:78
586
-msgid "Commit:"
587
-msgstr "Version:"
588
-
589
-#: lib/blame.tcl:271
590
-msgid "Copy Commit"
591
-msgstr "Version kopieren"
592
-
593
-#: lib/blame.tcl:275
594
-msgid "Find Text..."
595
-msgstr "Text suchen..."
596
-
597
-#: lib/blame.tcl:284
598
-msgid "Do Full Copy Detection"
599
-msgstr "Volle Kopie-Erkennung"
631
+#: lib/spellcheck.tcl:57
632
+msgid "Unsupported spell checker"
633
+msgstr "Rechtschreibprüfungsprogramm nicht unterstützt"
634
601
-#: lib/blame.tcl:288
602
-msgid "Show History Context"
603
-msgstr "Historien-Kontext anzeigen"
635
+#: lib/spellcheck.tcl:65
636
+msgid "Spell checking is unavailable"
637
+msgstr "Rechtschreibprüfung nicht verfügbar"
638
605
-#: lib/blame.tcl:291
606
-msgid "Blame Parent Commit"
607
-msgstr "Elternversion annotieren"
639
+#: lib/spellcheck.tcl:68
640
+msgid "Invalid spell checking configuration"
641
+msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung"
642
609
-#: lib/blame.tcl:450
643
+#: lib/spellcheck.tcl:70
644
#, tcl-format
611
-msgid "Reading %s..."
612
-msgstr "%s lesen..."
613
-
614
-#: lib/blame.tcl:557
615
-msgid "Loading copy/move tracking annotations..."
616
-msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
617
-
618
-#: lib/blame.tcl:577
619
-msgid "lines annotated"
620
-msgstr "Zeilen annotiert"
645
+msgid "Reverting dictionary to %s."
646
+msgstr "Wörterbuch auf %s zurückgesetzt."
647
622
-#: lib/blame.tcl:769
623
-msgid "Loading original location annotations..."
624
-msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
648
+#: lib/spellcheck.tcl:73
649
+msgid "Spell checker silently failed on startup"
650
+msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
651
626
-#: lib/blame.tcl:772
627
-msgid "Annotation complete."
628
-msgstr "Annotierung vollständig."
652
+#: lib/spellcheck.tcl:80
653
+msgid "Unrecognized spell checker"
654
+msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
655
630
-#: lib/blame.tcl:802
631
-msgid "Busy"
632
-msgstr "Verarbeitung läuft"
656
+#: lib/spellcheck.tcl:186
657
+msgid "No Suggestions"
658
+msgstr "Keine Vorschläge"
659
634
-#: lib/blame.tcl:803
635
-msgid "Annotation process is already running."
636
-msgstr "Annotierung läuft bereits."
660
+#: lib/spellcheck.tcl:388
661
+msgid "Unexpected EOF from spell checker"
662
+msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
663
638
-#: lib/blame.tcl:842
639
-msgid "Running thorough copy detection..."
640
-msgstr "Intensive Kopie-Erkennung läuft..."
664
+#: lib/spellcheck.tcl:392
665
+msgid "Spell Checker Failed"
666
+msgstr "Rechtschreibprüfung fehlgeschlagen"
667
642
-#: lib/blame.tcl:910
643
-msgid "Loading annotation..."
644
-msgstr "Annotierung laden..."
668
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
669
+#, tcl-format
670
+msgid "fetch %s"
671
+msgstr "»%s« anfordern"
672
646
-#: lib/blame.tcl:963
647
-msgid "Author:"
648
-msgstr "Autor:"
673
+#: lib/transport.tcl:7
674
+#, tcl-format
675
+msgid "Fetching new changes from %s"
676
+msgstr "Neue Änderungen von »%s« holen"
677
650
-#: lib/blame.tcl:967
651
-msgid "Committer:"
652
-msgstr "Eintragender:"
678
+#: lib/transport.tcl:18
679
+#, tcl-format
680
+msgid "remote prune %s"
681
+msgstr "Aufräumen von »%s«"
682
654
-#: lib/blame.tcl:972
655
-msgid "Original File:"
656
-msgstr "Ursprüngliche Datei:"
683
+#: lib/transport.tcl:19
684
+#, tcl-format
685
+msgid "Pruning tracking branches deleted from %s"
686
+msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden"
687
658
-#: lib/blame.tcl:1020
659
-msgid "Cannot find HEAD commit:"
660
-msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:"
688
+#: lib/transport.tcl:25
689
+msgid "fetch all remotes"
690
+msgstr ""
691
662
-#: lib/blame.tcl:1075
663
-msgid "Cannot find parent commit:"
664
-msgstr "Elternversion kann nicht gefunden werden:"
692
+#: lib/transport.tcl:26
693
+#, fuzzy
694
+msgid "Fetching new changes from all remotes"
695
+msgstr "Neue Änderungen von »%s« holen"
696
666
-#: lib/blame.tcl:1090
667
-msgid "Unable to display parent"
668
-msgstr "Elternversion kann nicht angezeigt werden"
697
+#: lib/transport.tcl:40
698
+#, fuzzy
699
+msgid "remote prune all remotes"
700
+msgstr "Aufräumen von »%s«"
701
670
-#: lib/blame.tcl:1091 lib/diff.tcl:320
671
-msgid "Error loading diff:"
672
-msgstr "Fehler beim Laden des Vergleichs:"
702
+#: lib/transport.tcl:41
703
+#, fuzzy
704
+msgid "Pruning tracking branches deleted from all remotes"
705
+msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden"
706
674
-#: lib/blame.tcl:1231
675
-msgid "Originally By:"
676
-msgstr "Ursprünglich von:"
707
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
708
+#: lib/remote_add.tcl:162
709
+#, tcl-format
710
+msgid "push %s"
711
+msgstr "»%s« versenden..."
712
678
-#: lib/blame.tcl:1237
679
-msgid "In File:"
680
-msgstr "In Datei:"
713
+#: lib/transport.tcl:55
714
+#, tcl-format
715
+msgid "Pushing changes to %s"
716
+msgstr "Änderungen nach »%s« versenden"
717
682
-#: lib/blame.tcl:1242
683
-msgid "Copied Or Moved Here By:"
684
-msgstr "Kopiert oder verschoben durch:"
718
+#: lib/transport.tcl:93
719
+#, tcl-format
720
+msgid "Mirroring to %s"
721
+msgstr "Spiegeln nach %s"
722
686
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
687
-msgid "Checkout Branch"
688
-msgstr "Auf Zweig umstellen"
723
+#: lib/transport.tcl:111
724
+#, tcl-format
725
+msgid "Pushing %s %s to %s"
726
+msgstr "%s %s nach %s versenden"
727
690
-#: lib/branch_checkout.tcl:23
691
-msgid "Checkout"
692
-msgstr "Umstellen"
728
+#: lib/transport.tcl:132
729
+msgid "Push Branches"
730
+msgstr "Zweige versenden"
731
694
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
695
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
696
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
697
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
698
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
699
-#: lib/transport.tcl:108
732
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
733
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
734
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
735
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
736
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
737
msgid "Cancel"
738
msgstr "Abbrechen"
739
703
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
704
-msgid "Revision"
705
-msgstr "Version"
706
-
707
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
708
-msgid "Options"
709
-msgstr "Optionen"
710
-
711
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
712
-msgid "Fetch Tracking Branch"
713
-msgstr "Übernahmezweig anfordern"
714
-
715
-#: lib/branch_checkout.tcl:44
716
-msgid "Detach From Local Branch"
717
-msgstr "Verbindung zu lokalem Zweig lösen"
718
-
719
-#: lib/branch_create.tcl:22
720
-msgid "Create Branch"
721
-msgstr "Zweig erstellen"
722
-
723
-#: lib/branch_create.tcl:27
724
-msgid "Create New Branch"
725
-msgstr "Neuen Zweig erstellen"
740
+#: lib/transport.tcl:147
741
+msgid "Source Branches"
742
+msgstr "Lokale Zweige"
743
727
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
728
-msgid "Create"
729
-msgstr "Erstellen"
744
+#: lib/transport.tcl:162
745
+msgid "Destination Repository"
746
+msgstr "Ziel-Projektarchiv"
747
731
-#: lib/branch_create.tcl:40
732
-msgid "Branch Name"
733
-msgstr "Zweigname"
748
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
749
+msgid "Remote:"
750
+msgstr "Externes Archiv:"
751
735
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
736
-msgid "Name:"
737
-msgstr "Name:"
752
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
753
+msgid "Arbitrary Location:"
754
+msgstr "Adresse:"
755
739
-#: lib/branch_create.tcl:58
740
-msgid "Match Tracking Branch Name"
741
-msgstr "Passend zu Übernahmezweig-Name"
756
+#: lib/transport.tcl:205
757
+msgid "Transfer Options"
758
+msgstr "Netzwerk-Einstellungen"
759
743
-#: lib/branch_create.tcl:66
744
-msgid "Starting Revision"
745
-msgstr "Anfangsversion"
760
+#: lib/transport.tcl:207
761
+msgid "Force overwrite existing branch (may discard changes)"
762
+msgstr ""
763
+"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
764
747
-#: lib/branch_create.tcl:72
748
-msgid "Update Existing Branch:"
749
-msgstr "Existierenden Zweig aktualisieren:"
765
+#: lib/transport.tcl:211
766
+msgid "Use thin pack (for slow network connections)"
767
+msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
768
751
-#: lib/branch_create.tcl:75
752
-msgid "No"
753
-msgstr "Nein"
769
+#: lib/transport.tcl:215
770
+msgid "Include tags"
771
+msgstr "Mit Markierungen übertragen"
772
755
-#: lib/branch_create.tcl:80
756
-msgid "Fast Forward Only"
757
-msgstr "Nur Schnellzusammenführung"
773
+#: lib/transport.tcl:229
774
+#, tcl-format
775
+msgid "%s (%s): Push"
776
+msgstr ""
777
759
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
760
-msgid "Reset"
761
-msgstr "Zurücksetzen"
778
+#: lib/checkout_op.tcl:85
779
+#, tcl-format
780
+msgid "Fetching %s from %s"
781
+msgstr "Änderungen »%s« von »%s« anfordern"
782
763
-#: lib/branch_create.tcl:97
764
-msgid "Checkout After Creation"
765
-msgstr "Arbeitskopie umstellen nach Erstellen"
783
+#: lib/checkout_op.tcl:133
784
+#, tcl-format
785
+msgid "fatal: Cannot resolve %s"
786
+msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
787
767
-#: lib/branch_create.tcl:131
768
-msgid "Please select a tracking branch."
769
-msgstr "Bitte wählen Sie einen Übernahmezweig."
788
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
789
+#: lib/database.tcl:30
790
+msgid "Close"
791
+msgstr "Schließen"
792
771
-#: lib/branch_create.tcl:140
793
+#: lib/checkout_op.tcl:175
794
#, tcl-format
773
-msgid "Tracking branch %s is not a branch in the remote repository."
774
-msgstr "Übernahmezweig »%s« ist kein Zweig im externen Projektarchiv."
795
+msgid "Branch '%s' does not exist."
796
+msgstr "Zweig »%s« existiert nicht."
797
776
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
777
-msgid "Please supply a branch name."
778
-msgstr "Bitte geben Sie einen Zweignamen an."
798
+#: lib/checkout_op.tcl:194
799
+#, tcl-format
800
+msgid "Failed to configure simplified git-pull for '%s'."
801
+msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«."
802
780
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
781
-#, tcl-format
782
-msgid "'%s' is not an acceptable branch name."
783
-msgstr "»%s« ist kein zulässiger Zweigname."
784
-
785
-#: lib/branch_delete.tcl:15
786
-msgid "Delete Branch"
787
-msgstr "Zweig löschen"
788
-
789
-#: lib/branch_delete.tcl:20
790
-msgid "Delete Local Branch"
791
-msgstr "Lokalen Zweig löschen"
792
-
793
-#: lib/branch_delete.tcl:37
794
-msgid "Local Branches"
795
-msgstr "Lokale Zweige"
796
-
797
-#: lib/branch_delete.tcl:52
798
-msgid "Delete Only If Merged Into"
799
-msgstr "Nur löschen, wenn zusammengeführt nach"
800
-
801
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
802
-msgid "Always (Do not perform merge checks)"
803
-msgstr "Immer (Keine Zusammenführungsprüfung)"
804
-
805
-#: lib/branch_delete.tcl:103
806
-#, tcl-format
807
-msgid "The following branches are not completely merged into %s:"
808
-msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
809
-
810
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
811
-msgid ""
812
-"Recovering deleted branches is difficult.\n"
813
-"\n"
814
-"Delete the selected branches?"
815
-msgstr ""
816
-"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
817
-"möglich.\n"
818
-"\n"
819
-"Sollen die ausgewählten Zweige gelöscht werden?"
820
-
821
-#: lib/branch_delete.tcl:141
822
-#, tcl-format
823
-msgid ""
824
-"Failed to delete branches:\n"
825
-"%s"
826
-msgstr ""
827
-"Fehler beim Löschen der Zweige:\n"
828
-"%s"
829
-
830
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
831
-msgid "Rename Branch"
832
-msgstr "Zweig umbenennen"
833
-
834
-#: lib/branch_rename.tcl:26
835
-msgid "Rename"
836
-msgstr "Umbenennen"
837
-
838
-#: lib/branch_rename.tcl:36
839
-msgid "Branch:"
840
-msgstr "Zweig:"
841
-
842
-#: lib/branch_rename.tcl:39
843
-msgid "New Name:"
844
-msgstr "Neuer Name:"
845
-
846
-#: lib/branch_rename.tcl:75
847
-msgid "Please select a branch to rename."
848
-msgstr "Bitte wählen Sie einen Zweig zum umbenennen."
849
-
850
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
803
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
804
#, tcl-format
805
msgid "Branch '%s' already exists."
806
msgstr "Zweig »%s« existiert bereits."
807
855
-#: lib/branch_rename.tcl:117
856
-#, tcl-format
857
-msgid "Failed to rename '%s'."
858
-msgstr "Fehler beim Umbenennen von »%s«."
859
-
860
-#: lib/browser.tcl:17
861
-msgid "Starting..."
862
-msgstr "Starten..."
863
-
864
-#: lib/browser.tcl:26
865
-msgid "File Browser"
866
-msgstr "Datei-Browser"
867
-
868
-#: lib/browser.tcl:126 lib/browser.tcl:143
869
-#, tcl-format
870
-msgid "Loading %s..."
871
-msgstr "%s laden..."
872
-
873
-#: lib/browser.tcl:187
874
-msgid "[Up To Parent]"
875
-msgstr "[Nach oben]"
876
-
877
-#: lib/browser.tcl:267 lib/browser.tcl:273
878
-msgid "Browse Branch Files"
879
-msgstr "Dateien des Zweigs durchblättern"
880
-
881
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
882
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
883
-#: lib/choose_repository.tcl:1028
884
-msgid "Browse"
885
-msgstr "Blättern"
886
-
887
-#: lib/checkout_op.tcl:85
888
-#, tcl-format
889
-msgid "Fetching %s from %s"
890
-msgstr "Änderungen »%s« von »%s« anfordern"
891
-
892
-#: lib/checkout_op.tcl:133
893
-#, tcl-format
894
-msgid "fatal: Cannot resolve %s"
895
-msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
896
-
897
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
898
-#: lib/sshkey.tcl:53
899
-msgid "Close"
900
-msgstr "Schließen"
901
-
902
-#: lib/checkout_op.tcl:175
903
-#, tcl-format
904
-msgid "Branch '%s' does not exist."
905
-msgstr "Zweig »%s« existiert nicht."
906
-
907
-#: lib/checkout_op.tcl:194
908
-#, tcl-format
909
-msgid "Failed to configure simplified git-pull for '%s'."
910
-msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«."
911
-
808
#: lib/checkout_op.tcl:229
809
#, tcl-format
810
msgid ""
@@ -961,23 +857,23 @@ msgstr "Arbeitskopie umstellen auf »%s«..."
857
msgid "files checked out"
858
msgstr "Dateien aktualisiert"
859
964
-#: lib/checkout_op.tcl:376
860
+#: lib/checkout_op.tcl:377
861
#, tcl-format
862
msgid "Aborted checkout of '%s' (file level merging is required)."
863
msgstr ""
864
"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist "
865
"notwendig)."
866
971
-#: lib/checkout_op.tcl:377
867
+#: lib/checkout_op.tcl:378
868
msgid "File level merge required."
869
msgstr "Zusammenführen der Dateien ist notwendig."
870
975
-#: lib/checkout_op.tcl:381
871
+#: lib/checkout_op.tcl:382
872
#, tcl-format
873
msgid "Staying on branch '%s'."
874
msgstr "Es wird auf Zweig »%s« verblieben."
875
980
-#: lib/checkout_op.tcl:452
876
+#: lib/checkout_op.tcl:453
877
msgid ""
878
"You are no longer on a local branch.\n"
879
"\n"
@@ -989,32 +885,36 @@ msgstr ""
885
"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
886
"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
887
992
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
888
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
889
#, tcl-format
890
msgid "Checked out '%s'."
891
msgstr "Umgestellt auf »%s«."
892
997
-#: lib/checkout_op.tcl:535
893
+#: lib/checkout_op.tcl:536
894
#, tcl-format
895
msgid "Resetting '%s' to '%s' will lose the following commits:"
896
msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:"
897
1002
-#: lib/checkout_op.tcl:557
898
+#: lib/checkout_op.tcl:558
899
msgid "Recovering lost commits may not be easy."
900
msgstr ""
901
"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt "
902
"werden."
903
1008
-#: lib/checkout_op.tcl:562
904
+#: lib/checkout_op.tcl:563
905
#, tcl-format
906
msgid "Reset '%s'?"
907
msgstr "»%s« zurücksetzen?"
908
1013
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
909
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
910
msgid "Visualize"
911
msgstr "Darstellen"
912
1017
-#: lib/checkout_op.tcl:635
913
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
914
+msgid "Reset"
915
+msgstr "Zurücksetzen"
916
+
917
+#: lib/checkout_op.tcl:636
918
#, tcl-format
919
msgid ""
920
"Failed to set current branch.\n"
@@ -1032,658 +932,511 @@ msgstr ""
932
"\n"
933
"Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
934
1035
-#: lib/choose_font.tcl:39
1036
-msgid "Select"
1037
-msgstr "Auswählen"
1038
-
1039
-#: lib/choose_font.tcl:53
1040
-msgid "Font Family"
1041
-msgstr "Schriftfamilie"
1042
-
1043
-#: lib/choose_font.tcl:74
1044
-msgid "Font Size"
1045
-msgstr "Schriftgröße"
1046
-
1047
-#: lib/choose_font.tcl:91
1048
-msgid "Font Example"
1049
-msgstr "Schriftbeispiel"
935
+#: lib/remote_add.tcl:20
936
+#, fuzzy, tcl-format
937
+msgid "%s (%s): Add Remote"
938
+msgstr "Externes Archiv hinzufügen"
939
1051
-#: lib/choose_font.tcl:103
1052
-msgid ""
1053
-"This is example text.\n"
1054
-"If you like this text, it can be your font."
1055
-msgstr ""
1056
-"Dies ist ein Beispieltext.\n"
1057
-"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
940
+#: lib/remote_add.tcl:25
941
+msgid "Add New Remote"
942
+msgstr "Neues externes Archiv hinzufügen"
943
1059
-#: lib/choose_repository.tcl:28
1060
-msgid "Git Gui"
1061
-msgstr "Git Gui"
944
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
945
+msgid "Add"
946
+msgstr "Hinzufügen"
947
1063
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
1064
-msgid "Create New Repository"
1065
-msgstr "Neues Projektarchiv"
948
+#: lib/remote_add.tcl:39
949
+msgid "Remote Details"
950
+msgstr "Einzelheiten des externen Archivs"
951
1067
-#: lib/choose_repository.tcl:93
1068
-msgid "New..."
1069
-msgstr "Neu..."
952
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
953
+msgid "Name:"
954
+msgstr "Name:"
955
1071
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
1072
-msgid "Clone Existing Repository"
1073
-msgstr "Projektarchiv klonen"
956
+#: lib/remote_add.tcl:50
957
+msgid "Location:"
958
+msgstr "Adresse:"
959
1075
-#: lib/choose_repository.tcl:106
1076
-msgid "Clone..."
1077
-msgstr "Klonen..."
960
+#: lib/remote_add.tcl:60
961
+msgid "Further Action"
962
+msgstr "Weitere Aktion jetzt"
963
1079
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
1080
-msgid "Open Existing Repository"
1081
-msgstr "Projektarchiv öffnen"
964
+#: lib/remote_add.tcl:63
965
+msgid "Fetch Immediately"
966
+msgstr "Gleich anfordern"
967
1083
-#: lib/choose_repository.tcl:119
1084
-msgid "Open..."
1085
-msgstr "Öffnen..."
968
+#: lib/remote_add.tcl:69
969
+msgid "Initialize Remote Repository and Push"
970
+msgstr "Externes Archiv initialisieren und dahin versenden"
971
1087
-#: lib/choose_repository.tcl:132
1088
-msgid "Recent Repositories"
1089
-msgstr "Zuletzt benutzte Projektarchive"
972
+#: lib/remote_add.tcl:75
973
+msgid "Do Nothing Else Now"
974
+msgstr "Nichts tun"
975
1091
-#: lib/choose_repository.tcl:138
1092
-msgid "Open Recent Repository:"
1093
-msgstr "Zuletzt benutztes Projektarchiv öffnen:"
976
+#: lib/remote_add.tcl:100
977
+msgid "Please supply a remote name."
978
+msgstr "Bitte geben Sie einen Namen des externen Archivs an."
979
1095
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
1096
-#: lib/choose_repository.tcl:320
980
+#: lib/remote_add.tcl:113
981
#, tcl-format
1098
-msgid "Failed to create repository %s:"
1099
-msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
982
+msgid "'%s' is not an acceptable remote name."
983
+msgstr "»%s« ist kein zulässiger Name eines externen Archivs."
984
1101
-#: lib/choose_repository.tcl:391
1102
-msgid "Directory:"
1103
-msgstr "Verzeichnis:"
985
+#: lib/remote_add.tcl:124
986
+#, tcl-format
987
+msgid "Failed to add remote '%s' of location '%s'."
988
+msgstr ""
989
+"Fehler beim Hinzufügen des externen Archivs »%s« aus Herkunftsort »%s«."
990
1105
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
1106
-#: lib/choose_repository.tcl:1052
1107
-msgid "Git Repository"
1108
-msgstr "Git Projektarchiv"
991
+#: lib/remote_add.tcl:133
992
+#, tcl-format
993
+msgid "Fetching the %s"
994
+msgstr "»%s« anfordern"
995
1110
-#: lib/choose_repository.tcl:448
996
+#: lib/remote_add.tcl:156
997
#, tcl-format
1112
-msgid "Directory %s already exists."
1113
-msgstr "Verzeichnis »%s« existiert bereits."
998
+msgid "Do not know how to initialize repository at location '%s'."
999
+msgstr ""
1000
+"Initialisieren eines externen Archivs an Adresse »%s« ist nicht möglich."
1001
1115
-#: lib/choose_repository.tcl:452
1002
+#: lib/remote_add.tcl:163
1003
#, tcl-format
1117
-msgid "File %s already exists."
1118
-msgstr "Datei »%s« existiert bereits."
1004
+msgid "Setting up the %s (at %s)"
1005
+msgstr "Einrichten von »%s« an »%s«"
1006
1120
-#: lib/choose_repository.tcl:466
1121
-msgid "Clone"
1122
-msgstr "Klonen"
1007
+#: lib/browser.tcl:17
1008
+msgid "Starting..."
1009
+msgstr "Starten..."
1010
1124
-#: lib/choose_repository.tcl:479
1125
-msgid "Source Location:"
1126
-msgstr "Herkunft:"
1011
+#: lib/browser.tcl:27
1012
+#, fuzzy, tcl-format
1013
+msgid "%s (%s): File Browser"
1014
+msgstr "Datei-Browser"
1015
1128
-#: lib/choose_repository.tcl:490
1129
-msgid "Target Directory:"
1130
-msgstr "Zielverzeichnis:"
1016
+#: lib/browser.tcl:132 lib/browser.tcl:149
1017
+#, tcl-format
1018
+msgid "Loading %s..."
1019
+msgstr "%s laden..."
1020
1132
-#: lib/choose_repository.tcl:502
1133
-msgid "Clone Type:"
1134
-msgstr "Art des Klonens:"
1021
+#: lib/browser.tcl:193
1022
+msgid "[Up To Parent]"
1023
+msgstr "[Nach oben]"
1024
1136
-#: lib/choose_repository.tcl:508
1137
-msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
1138
-msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
1025
+#: lib/browser.tcl:275
1026
+#, fuzzy, tcl-format
1027
+msgid "%s (%s): Browse Branch Files"
1028
+msgstr "Dateien des Zweigs durchblättern"
1029
1140
-#: lib/choose_repository.tcl:514
1141
-msgid "Full Copy (Slower, Redundant Backup)"
1142
-msgstr "Alles kopieren (langsamer, volle Redundanz)"
1030
+#: lib/browser.tcl:282
1031
+msgid "Browse Branch Files"
1032
+msgstr "Dateien des Zweigs durchblättern"
1033
1144
-#: lib/choose_repository.tcl:520
1145
-msgid "Shared (Fastest, Not Recommended, No Backup)"
1146
-msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
1034
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
1035
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
1036
+#: lib/choose_repository.tcl:1115
1037
+msgid "Browse"
1038
+msgstr "Blättern"
1039
1148
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
1149
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
1150
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
1151
-#, tcl-format
1152
-msgid "Not a Git repository: %s"
1153
-msgstr "Kein Git-Projektarchiv in »%s« gefunden."
1040
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
1041
+msgid "Revision"
1042
+msgstr "Version"
1043
1155
-#: lib/choose_repository.tcl:592
1156
-msgid "Standard only available for local repository."
1157
-msgstr "Standard ist nur für lokale Projektarchive verfügbar."
1044
+#: lib/index.tcl:6
1045
+msgid "Unable to unlock the index."
1046
+msgstr "Bereitstellung kann nicht wieder freigegeben werden."
1047
1159
-#: lib/choose_repository.tcl:596
1160
-msgid "Shared only available for local repository."
1161
-msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
1048
+#: lib/index.tcl:30
1049
+msgid "Index Error"
1050
+msgstr "Fehler in Bereitstellung"
1051
1163
-#: lib/choose_repository.tcl:617
1164
-#, tcl-format
1165
-msgid "Location %s already exists."
1166
-msgstr "Projektarchiv »%s« existiert bereits."
1052
+#: lib/index.tcl:32
1053
+msgid ""
1054
+"Updating the Git index failed. A rescan will be automatically started to "
1055
+"resynchronize git-gui."
1056
+msgstr ""
1057
+"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
1058
+"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
1059
+"synchronisieren."
1060
1168
-#: lib/choose_repository.tcl:628
1169
-msgid "Failed to configure origin"
1170
-msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
1061
+#: lib/index.tcl:43
1062
+msgid "Continue"
1063
+msgstr "Fortsetzen"
1064
1172
-#: lib/choose_repository.tcl:640
1173
-msgid "Counting objects"
1174
-msgstr "Objekte werden gezählt"
1065
+#: lib/index.tcl:46
1066
+msgid "Unlock Index"
1067
+msgstr "Bereitstellung freigeben"
1068
1176
-#: lib/choose_repository.tcl:641
1177
-msgid "buckets"
1178
-msgstr "Buckets"
1069
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
1070
+#: lib/choose_repository.tcl:999
1071
+msgid "files"
1072
+msgstr "Dateien"
1073
1180
-#: lib/choose_repository.tcl:665
1181
-#, tcl-format
1182
-msgid "Unable to copy objects/info/alternates: %s"
1183
-msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
1074
+#: lib/index.tcl:326
1075
+#, fuzzy
1076
+msgid "Unstaging selected files from commit"
1077
+msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
1078
1185
-#: lib/choose_repository.tcl:701
1079
+#: lib/index.tcl:330
1080
#, tcl-format
1187
-msgid "Nothing to clone from %s."
1188
-msgstr "Von »%s« konnte nichts geklont werden."
1081
+msgid "Unstaging %s from commit"
1082
+msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
1083
1190
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
1191
-#: lib/choose_repository.tcl:929
1192
-msgid "The 'master' branch has not been initialized."
1193
-msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
1084
+#: lib/index.tcl:369
1085
+msgid "Ready to commit."
1086
+msgstr "Bereit zum Eintragen."
1087
1195
-#: lib/choose_repository.tcl:716
1196
-msgid "Hardlinks are unavailable. Falling back to copying."
1197
-msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
1088
+#: lib/index.tcl:378
1089
+#, fuzzy
1090
+msgid "Adding selected files"
1091
+msgstr "Änderungen in gewählten Dateien verwerfen"
1092
1199
-#: lib/choose_repository.tcl:728
1093
+#: lib/index.tcl:382
1094
#, tcl-format
1201
-msgid "Cloning from %s"
1202
-msgstr "Kopieren von »%s«"
1203
-
1204
-#: lib/choose_repository.tcl:759
1205
-msgid "Copying objects"
1206
-msgstr "Objektdatenbank kopieren"
1207
-
1208
-#: lib/choose_repository.tcl:760
1209
-msgid "KiB"
1210
-msgstr "KB"
1095
+msgid "Adding %s"
1096
+msgstr "»%s« hinzufügen..."
1097
1212
-#: lib/choose_repository.tcl:784
1098
+#: lib/index.tcl:412
1099
#, tcl-format
1214
-msgid "Unable to copy object: %s"
1215
-msgstr "Objekt kann nicht kopiert werden: %s"
1100
+msgid "Stage %d untracked files?"
1101
+msgstr ""
1102
1217
-#: lib/choose_repository.tcl:794
1218
-msgid "Linking objects"
1219
-msgstr "Objekte verlinken"
1103
+#: lib/index.tcl:420
1104
+msgid "Adding all changed files"
1105
+msgstr ""
1106
1221
-#: lib/choose_repository.tcl:795
1222
-msgid "objects"
1223
-msgstr "Objekte"
1107
+#: lib/index.tcl:503
1108
+#, tcl-format
1109
+msgid "Revert changes in file %s?"
1110
+msgstr "Änderungen in Datei »%s« verwerfen?"
1111
1225
-#: lib/choose_repository.tcl:803
1112
+#: lib/index.tcl:508
1113
#, tcl-format
1227
-msgid "Unable to hardlink object: %s"
1228
-msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
1114
+msgid "Revert changes in these %i files?"
1115
+msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
1116
1230
-#: lib/choose_repository.tcl:858
1231
-msgid "Cannot fetch branches and objects. See console output for details."
1117
+#: lib/index.tcl:517
1118
+msgid "Any unstaged changes will be permanently lost by the revert."
1119
msgstr ""
1233
-"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die "
1234
-"Ausgaben auf der Konsole für weitere Angaben."
1120
+"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
1121
1236
-#: lib/choose_repository.tcl:869
1237
-msgid "Cannot fetch tags. See console output for details."
1122
+#: lib/index.tcl:520 lib/index.tcl:563
1123
+msgid "Do Nothing"
1124
+msgstr "Nichts tun"
1125
+
1126
+#: lib/index.tcl:545
1127
+#, fuzzy, tcl-format
1128
+msgid "Delete untracked file %s?"
1129
+msgstr "Zweige auf »%s« werden gelöscht"
1130
+
1131
+#: lib/index.tcl:550
1132
+#, fuzzy, tcl-format
1133
+msgid "Delete these %i untracked files?"
1134
+msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
1135
+
1136
+#: lib/index.tcl:560
1137
+msgid "Files will be permanently deleted."
1138
msgstr ""
1239
-"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die "
1240
-"Ausgaben auf der Konsole für weitere Angaben."
1139
1242
-#: lib/choose_repository.tcl:893
1243
-msgid "Cannot determine HEAD. See console output for details."
1140
+#: lib/index.tcl:564
1141
+#, fuzzy
1142
+msgid "Delete Files"
1143
+msgstr "Löschen"
1144
+
1145
+#: lib/index.tcl:586
1146
+#, fuzzy
1147
+msgid "Deleting"
1148
+msgstr "Löschen"
1149
+
1150
+#: lib/index.tcl:665
1151
+msgid "Encountered errors deleting files:\n"
1152
msgstr ""
1245
-"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die "
1246
-"Ausgaben auf der Konsole für weitere Angaben."
1153
1248
-#: lib/choose_repository.tcl:902
1154
+#: lib/index.tcl:674
1155
#, tcl-format
1250
-msgid "Unable to cleanup %s"
1251
-msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
1156
+msgid "None of the %d selected files could be deleted."
1157
+msgstr ""
1158
1253
-#: lib/choose_repository.tcl:908
1254
-msgid "Clone failed."
1255
-msgstr "Klonen fehlgeschlagen."
1159
+#: lib/index.tcl:679
1160
+#, tcl-format
1161
+msgid "%d of the %d selected files could not be deleted."
1162
+msgstr ""
1163
1257
-#: lib/choose_repository.tcl:915
1258
-msgid "No default branch obtained."
1259
-msgstr "Kein voreingestellter Zweig gefunden."
1164
+#: lib/index.tcl:726
1165
+msgid "Reverting selected files"
1166
+msgstr "Änderungen in gewählten Dateien verwerfen"
1167
1261
-#: lib/choose_repository.tcl:926
1168
+#: lib/index.tcl:730
1169
#, tcl-format
1263
-msgid "Cannot resolve %s as a commit."
1264
-msgstr "»%s« wurde nicht als Version gefunden."
1170
+msgid "Reverting %s"
1171
+msgstr "Änderungen in %s verwerfen"
1172
1266
-#: lib/choose_repository.tcl:938
1267
-msgid "Creating working directory"
1268
-msgstr "Arbeitskopie erstellen"
1173
+#: lib/branch_checkout.tcl:16
1174
+#, fuzzy, tcl-format
1175
+msgid "%s (%s): Checkout Branch"
1176
+msgstr "Auf Zweig umstellen"
1177
1270
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
1271
-#: lib/index.tcl:198
1272
-msgid "files"
1273
-msgstr "Dateien"
1178
+#: lib/branch_checkout.tcl:21
1179
+msgid "Checkout Branch"
1180
+msgstr "Auf Zweig umstellen"
1181
1275
-#: lib/choose_repository.tcl:968
1276
-msgid "Initial file checkout failed."
1277
-msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
1182
+#: lib/branch_checkout.tcl:26
1183
+msgid "Checkout"
1184
+msgstr "Umstellen"
1185
1279
-#: lib/choose_repository.tcl:1011
1280
-msgid "Open"
1281
-msgstr "Öffnen"
1186
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
1187
+msgid "Options"
1188
+msgstr "Optionen"
1189
1283
-#: lib/choose_repository.tcl:1021
1284
-msgid "Repository:"
1285
-msgstr "Projektarchiv:"
1190
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
1191
+msgid "Fetch Tracking Branch"
1192
+msgstr "Übernahmezweig anfordern"
1193
1287
-#: lib/choose_repository.tcl:1072
1194
+#: lib/branch_checkout.tcl:47
1195
+msgid "Detach From Local Branch"
1196
+msgstr "Verbindung zu lokalem Zweig lösen"
1197
+
1198
+#: lib/status_bar.tcl:263
1199
#, tcl-format
1289
-msgid "Failed to open repository %s:"
1290
-msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
1200
+msgid "%s ... %*i of %*i %s (%3i%%)"
1201
+msgstr "%s ... %*i von %*i %s (%3i%%)"
1202
1292
-#: lib/choose_rev.tcl:53
1293
-msgid "This Detached Checkout"
1294
-msgstr "Abgetrennte Arbeitskopie-Version"
1203
+#: lib/remote.tcl:200
1204
+msgid "Push to"
1205
+msgstr "Versenden nach"
1206
1296
-#: lib/choose_rev.tcl:60
1297
-msgid "Revision Expression:"
1298
-msgstr "Version Regexp-Ausdruck:"
1207
+#: lib/remote.tcl:218
1208
+msgid "Remove Remote"
1209
+msgstr "Externes Archiv entfernen"
1210
1300
-#: lib/choose_rev.tcl:74
1301
-msgid "Local Branch"
1302
-msgstr "Lokaler Zweig"
1211
+#: lib/remote.tcl:223
1212
+msgid "Prune from"
1213
+msgstr "Aufräumen von"
1214
1304
-#: lib/choose_rev.tcl:79
1305
-msgid "Tracking Branch"
1306
-msgstr "Übernahmezweig"
1215
+#: lib/remote.tcl:228
1216
+msgid "Fetch from"
1217
+msgstr "Anfordern von"
1218
1308
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1309
-msgid "Tag"
1310
-msgstr "Markierung"
1219
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
1220
+msgid "All"
1221
+msgstr ""
1222
1312
-#: lib/choose_rev.tcl:317
1313
-#, tcl-format
1314
-msgid "Invalid revision: %s"
1315
-msgstr "Ungültige Version: %s"
1223
+#: lib/branch_rename.tcl:15
1224
+#, fuzzy, tcl-format
1225
+msgid "%s (%s): Rename Branch"
1226
+msgstr "Zweig umbenennen"
1227
1317
-#: lib/choose_rev.tcl:338
1318
-msgid "No revision selected."
1319
-msgstr "Keine Version ausgewählt."
1228
+#: lib/branch_rename.tcl:23
1229
+msgid "Rename Branch"
1230
+msgstr "Zweig umbenennen"
1231
1321
-#: lib/choose_rev.tcl:346
1322
-msgid "Revision expression is empty."
1323
-msgstr "Versions-Ausdruck ist leer."
1232
+#: lib/branch_rename.tcl:28
1233
+msgid "Rename"
1234
+msgstr "Umbenennen"
1235
1325
-#: lib/choose_rev.tcl:531
1326
-msgid "Updated"
1327
-msgstr "Aktualisiert"
1236
+#: lib/branch_rename.tcl:38
1237
+msgid "Branch:"
1238
+msgstr "Zweig:"
1239
1329
-#: lib/choose_rev.tcl:559
1330
-msgid "URL"
1331
-msgstr "URL"
1240
+#: lib/branch_rename.tcl:46
1241
+msgid "New Name:"
1242
+msgstr "Neuer Name:"
1243
1333
-#: lib/commit.tcl:9
1334
-msgid ""
1335
-"There is nothing to amend.\n"
1336
-"\n"
1337
-"You are about to create the initial commit. There is no commit before this "
1338
-"to amend.\n"
1339
-msgstr ""
1340
-"Keine Version zur Nachbesserung vorhanden.\n"
1341
-"\n"
1342
-"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende "
1343
-"Version, die Sie nachbessern könnten.\n"
1244
+#: lib/branch_rename.tcl:81
1245
+msgid "Please select a branch to rename."
1246
+msgstr "Bitte wählen Sie einen Zweig zum umbenennen."
1247
1345
-#: lib/commit.tcl:18
1346
-msgid ""
1347
-"Cannot amend while merging.\n"
1348
-"\n"
1349
-"You are currently in the middle of a merge that has not been fully "
1350
-"completed. You cannot amend the prior commit unless you first abort the "
1351
-"current merge activity.\n"
1352
-msgstr ""
1353
-"Nachbesserung währen Zusammenführung nicht möglich.\n"
1354
-"\n"
1355
-"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht "
1356
-"beendet. Sie können keine vorige Übertragung nachbessern, solange eine "
1357
-"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung "
1358
-"beenden oder abbrechen.\n"
1248
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
1249
+msgid "Please supply a branch name."
1250
+msgstr "Bitte geben Sie einen Zweignamen an."
1251
1360
-#: lib/commit.tcl:48
1361
-msgid "Error loading commit data for amend:"
1362
-msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:"
1252
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
1253
+#, tcl-format
1254
+msgid "'%s' is not an acceptable branch name."
1255
+msgstr "»%s« ist kein zulässiger Zweigname."
1256
1364
-#: lib/commit.tcl:75
1365
-msgid "Unable to obtain your identity:"
1366
-msgstr "Benutzername konnte nicht bestimmt werden:"
1257
+#: lib/branch_rename.tcl:123
1258
+#, tcl-format
1259
+msgid "Failed to rename '%s'."
1260
+msgstr "Fehler beim Umbenennen von »%s«."
1261
1368
-#: lib/commit.tcl:80
1369
-msgid "Invalid GIT_COMMITTER_IDENT:"
1370
-msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:"
1262
+#: lib/choose_font.tcl:41
1263
+msgid "Select"
1264
+msgstr "Auswählen"
1265
1372
-#: lib/commit.tcl:129
1373
-#, tcl-format
1374
-msgid "warning: Tcl does not support encoding '%s'."
1375
-msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
1266
+#: lib/choose_font.tcl:55
1267
+msgid "Font Family"
1268
+msgstr "Schriftfamilie"
1269
+
1270
+#: lib/choose_font.tcl:76
1271
+msgid "Font Size"
1272
+msgstr "Schriftgröße"
1273
1377
-#: lib/commit.tcl:149
1274
+#: lib/choose_font.tcl:93
1275
+msgid "Font Example"
1276
+msgstr "Schriftbeispiel"
1277
+
1278
+#: lib/choose_font.tcl:105
1279
msgid ""
1379
-"Last scanned state does not match repository state.\n"
1380
-"\n"
1381
-"Another Git program has modified this repository since the last scan. A "
1382
-"rescan must be performed before another commit can be created.\n"
1383
-"\n"
1384
-"The rescan will be automatically started now.\n"
1280
+"This is example text.\n"
1281
+"If you like this text, it can be your font."
1282
msgstr ""
1386
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
1387
-"\n"
1388
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
1389
-"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
1390
-"\n"
1391
-"Es wird gleich neu geladen.\n"
1283
+"Dies ist ein Beispieltext.\n"
1284
+"Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
1285
1393
-#: lib/commit.tcl:172
1286
+#: lib/option.tcl:11
1287
#, tcl-format
1395
-msgid ""
1396
-"Unmerged files cannot be committed.\n"
1397
-"\n"
1398
-"File %s has merge conflicts. You must resolve them and stage the file "
1399
-"before committing.\n"
1400
-msgstr ""
1401
-"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
1402
-"\n"
1403
-"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
1404
-"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
1288
+msgid "Invalid global encoding '%s'"
1289
+msgstr "Ungültige globale Zeichenkodierung »%s«"
1290
1406
-#: lib/commit.tcl:180
1291
+#: lib/option.tcl:19
1292
#, tcl-format
1408
-msgid ""
1409
-"Unknown file state %s detected.\n"
1410
-"\n"
1411
-"File %s cannot be committed by this program.\n"
1412
-msgstr ""
1413
-"Unbekannter Dateizustand »%s«.\n"
1414
-"\n"
1415
-"Datei »%s« kann nicht eingetragen werden.\n"
1293
+msgid "Invalid repo encoding '%s'"
1294
+msgstr "Ungültige Archiv-Zeichenkodierung »%s«"
1295
1417
-#: lib/commit.tcl:188
1418
-msgid ""
1419
-"No changes to commit.\n"
1420
-"\n"
1421
-"You must stage at least 1 file before you can commit.\n"
1422
-msgstr ""
1423
-"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
1424
-"\n"
1425
-"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
1296
+#: lib/option.tcl:119
1297
+msgid "Restore Defaults"
1298
+msgstr "Voreinstellungen wiederherstellen"
1299
1427
-#: lib/commit.tcl:203
1428
-msgid ""
1429
-"Please supply a commit message.\n"
1430
-"\n"
1431
-"A good commit message has the following format:\n"
1432
-"\n"
1433
-"- First line: Describe in one sentence what you did.\n"
1434
-"- Second line: Blank\n"
1435
-"- Remaining lines: Describe why this change is good.\n"
1436
-msgstr ""
1437
-"Bitte geben Sie eine Versionsbeschreibung ein.\n"
1438
-"\n"
1439
-"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n"
1440
-"\n"
1441
-"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n"
1442
-"\n"
1443
-"- Zweite Zeile: Leerzeile\n"
1444
-"\n"
1445
-"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
1446
-
1447
-#: lib/commit.tcl:234
1448
-msgid "Calling pre-commit hook..."
1449
-msgstr "Aufrufen der Vor-Eintragen-Kontrolle (»pre-commit hook«)..."
1450
-
1451
-#: lib/commit.tcl:249
1452
-msgid "Commit declined by pre-commit hook."
1453
-msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
1454
-
1455
-#: lib/commit.tcl:272
1456
-msgid "Calling commit-msg hook..."
1457
-msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (»commit-message hook«)..."
1458
-
1459
-#: lib/commit.tcl:287
1460
-msgid "Commit declined by commit-msg hook."
1461
-msgstr ""
1462
-"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
1463
-"hook«)."
1464
-
1465
-#: lib/commit.tcl:300
1466
-msgid "Committing changes..."
1467
-msgstr "Änderungen eintragen..."
1468
-
1469
-#: lib/commit.tcl:316
1470
-msgid "write-tree failed:"
1471
-msgstr "write-tree fehlgeschlagen:"
1472
-
1473
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
1474
-msgid "Commit failed."
1475
-msgstr "Eintragen fehlgeschlagen."
1300
+#: lib/option.tcl:123
1301
+msgid "Save"
1302
+msgstr "Speichern"
1303
1477
-#: lib/commit.tcl:334
1304
+#: lib/option.tcl:133
1305
#, tcl-format
1479
-msgid "Commit %s appears to be corrupt"
1480
-msgstr "Version »%s« scheint beschädigt zu sein"
1481
-
1482
-#: lib/commit.tcl:339
1483
-msgid ""
1484
-"No changes to commit.\n"
1485
-"\n"
1486
-"No files were modified by this commit and it was not a merge commit.\n"
1487
-"\n"
1488
-"A rescan will be automatically started now.\n"
1489
-msgstr ""
1490
-"Keine Änderungen einzutragen.\n"
1491
-"\n"
1492
-"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
1493
-"zusammengeführt.\n"
1494
-"\n"
1495
-"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
1306
+msgid "%s Repository"
1307
+msgstr "Projektarchiv %s"
1308
1497
-#: lib/commit.tcl:346
1498
-msgid "No changes to commit."
1499
-msgstr "Keine Änderungen, die eingetragen werden können."
1309
+#: lib/option.tcl:134
1310
+msgid "Global (All Repositories)"
1311
+msgstr "Global (Alle Projektarchive)"
1312
1501
-#: lib/commit.tcl:360
1502
-msgid "commit-tree failed:"
1503
-msgstr "commit-tree fehlgeschlagen:"
1313
+#: lib/option.tcl:140
1314
+msgid "User Name"
1315
+msgstr "Benutzername"
1316
1505
-#: lib/commit.tcl:381
1506
-msgid "update-ref failed:"
1507
-msgstr "update-ref fehlgeschlagen:"
1317
+#: lib/option.tcl:141
1318
+msgid "Email Address"
1319
+msgstr "E-Mail-Adresse"
1320
1509
-#: lib/commit.tcl:469
1510
-#, tcl-format
1511
-msgid "Created commit %s: %s"
1512
-msgstr "Version %s übertragen: %s"
1321
+#: lib/option.tcl:143
1322
+msgid "Summarize Merge Commits"
1323
+msgstr "Zusammenführungs-Versionen zusammenfassen"
1324
1514
-#: lib/console.tcl:59
1515
-msgid "Working... please wait..."
1516
-msgstr "Verarbeitung. Bitte warten..."
1325
+#: lib/option.tcl:144
1326
+msgid "Merge Verbosity"
1327
+msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
1328
1518
-#: lib/console.tcl:186
1519
-msgid "Success"
1520
-msgstr "Erfolgreich"
1329
+#: lib/option.tcl:145
1330
+msgid "Show Diffstat After Merge"
1331
+msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
1332
1522
-#: lib/console.tcl:200
1523
-msgid "Error: Command Failed"
1524
-msgstr "Fehler: Kommando fehlgeschlagen"
1333
+#: lib/option.tcl:146
1334
+msgid "Use Merge Tool"
1335
+msgstr "Zusammenführungswerkzeug"
1336
1526
-#: lib/database.tcl:43
1527
-msgid "Number of loose objects"
1528
-msgstr "Anzahl unverknüpfter Objekte"
1337
+#: lib/option.tcl:148
1338
+msgid "Trust File Modification Timestamps"
1339
+msgstr "Auf Dateiänderungsdatum verlassen"
1340
1530
-#: lib/database.tcl:44
1531
-msgid "Disk space used by loose objects"
1532
-msgstr "Festplattenplatz von unverknüpften Objekten"
1341
+#: lib/option.tcl:149
1342
+msgid "Prune Tracking Branches During Fetch"
1343
+msgstr "Übernahmezweige aufräumen während Anforderung"
1344
1534
-#: lib/database.tcl:45
1535
-msgid "Number of packed objects"
1536
-msgstr "Anzahl komprimierter Objekte"
1345
+#: lib/option.tcl:150
1346
+msgid "Match Tracking Branches"
1347
+msgstr "Passend zu Übernahmezweig"
1348
1538
-#: lib/database.tcl:46
1539
-msgid "Number of packs"
1540
-msgstr "Anzahl Komprimierungseinheiten"
1349
+#: lib/option.tcl:151
1350
+msgid "Use Textconv For Diffs and Blames"
1351
+msgstr ""
1352
1542
-#: lib/database.tcl:47
1543
-msgid "Disk space used by packed objects"
1544
-msgstr "Festplattenplatz von komprimierten Objekten"
1353
+#: lib/option.tcl:152
1354
+msgid "Blame Copy Only On Changed Files"
1355
+msgstr "Kopie-Annotieren nur bei geänderten Dateien"
1356
1546
-#: lib/database.tcl:48
1547
-msgid "Packed objects waiting for pruning"
1548
-msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind"
1357
+#: lib/option.tcl:153
1358
+#, fuzzy
1359
+msgid "Maximum Length of Recent Repositories List"
1360
+msgstr "Zuletzt benutzte Projektarchive"
1361
1550
-#: lib/database.tcl:49
1551
-msgid "Garbage files"
1552
-msgstr "Dateien im Mülleimer"
1362
+#: lib/option.tcl:154
1363
+msgid "Minimum Letters To Blame Copy On"
1364
+msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
1365
1554
-#: lib/database.tcl:72
1555
-msgid "Compressing the object database"
1556
-msgstr "Objektdatenbank komprimieren"
1366
+#: lib/option.tcl:155
1367
+msgid "Blame History Context Radius (days)"
1368
+msgstr "Anzahl Tage für Historien-Kontext"
1369
1558
-#: lib/database.tcl:83
1559
-msgid "Verifying the object database with fsck-objects"
1560
-msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
1370
+#: lib/option.tcl:156
1371
+msgid "Number of Diff Context Lines"
1372
+msgstr "Anzahl der Kontextzeilen beim Vergleich"
1373
1562
-#: lib/database.tcl:107
1563
-#, tcl-format
1564
-msgid ""
1565
-"This repository currently has approximately %i loose objects.\n"
1566
-"\n"
1567
-"To maintain optimal performance it is strongly recommended that you compress "
1568
-"the database.\n"
1569
-"\n"
1570
-"Compress the database now?"
1374
+#: lib/option.tcl:157
1375
+msgid "Additional Diff Parameters"
1376
msgstr ""
1572
-"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
1573
-"\n"
1574
-"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n"
1575
-"\n"
1576
-"Soll die Datenbank jetzt komprimiert werden?"
1377
1578
-#: lib/date.tcl:25
1579
-#, tcl-format
1580
-msgid "Invalid date from Git: %s"
1581
-msgstr "Ungültiges Datum von Git: %s"
1378
+#: lib/option.tcl:158
1379
+msgid "Commit Message Text Width"
1380
+msgstr "Textbreite der Versionsbeschreibung"
1381
1583
-#: lib/diff.tcl:64
1584
-#, tcl-format
1585
-msgid ""
1586
-"No differences detected.\n"
1587
-"\n"
1588
-"%s has no changes.\n"
1589
-"\n"
1590
-"The modification date of this file was updated by another application, but "
1591
-"the content within the file was not changed.\n"
1592
-"\n"
1593
-"A rescan will be automatically started to find other files which may have "
1594
-"the same state."
1595
-msgstr ""
1596
-"Keine Änderungen feststellbar.\n"
1597
-"\n"
1598
-"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von "
1599
-"einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
1600
-"unverändert.\n"
1601
-"\n"
1602
-"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
1603
-"Dateien zu prüfen."
1382
+#: lib/option.tcl:159
1383
+msgid "New Branch Name Template"
1384
+msgstr "Namensvorschlag für neue Zweige"
1385
1605
-#: lib/diff.tcl:104
1606
-#, tcl-format
1607
-msgid "Loading diff of %s..."
1608
-msgstr "Vergleich von »%s« laden..."
1386
+#: lib/option.tcl:160
1387
+msgid "Default File Contents Encoding"
1388
+msgstr "Voreingestellte Zeichenkodierung"
1389
1610
-#: lib/diff.tcl:125
1611
-msgid ""
1612
-"LOCAL: deleted\n"
1613
-"REMOTE:\n"
1390
+#: lib/option.tcl:161
1391
+msgid "Warn before committing to a detached head"
1392
msgstr ""
1615
-"LOKAL: gelöscht\n"
1616
-"ANDERES:\n"
1393
1618
-#: lib/diff.tcl:130
1619
-msgid ""
1620
-"REMOTE: deleted\n"
1621
-"LOCAL:\n"
1394
+#: lib/option.tcl:162
1395
+msgid "Staging of untracked files"
1396
msgstr ""
1623
-"ANDERES: gelöscht\n"
1624
-"LOKAL:\n"
1397
1626
-#: lib/diff.tcl:137
1627
-msgid "LOCAL:\n"
1628
-msgstr "LOKAL:\n"
1398
+#: lib/option.tcl:163
1399
+msgid "Show untracked files"
1400
+msgstr ""
1401
1630
-#: lib/diff.tcl:140
1631
-msgid "REMOTE:\n"
1632
-msgstr "ANDERES:\n"
1402
+#: lib/option.tcl:164
1403
+msgid "Tab spacing"
1404
+msgstr ""
1405
1634
-#: lib/diff.tcl:202 lib/diff.tcl:319
1406
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
1407
+#: lib/database.tcl:57
1408
#, tcl-format
1636
-msgid "Unable to display %s"
1637
-msgstr "Datei »%s« kann nicht angezeigt werden"
1638
-
1639
-#: lib/diff.tcl:203
1640
-msgid "Error loading file:"
1641
-msgstr "Fehler beim Laden der Datei:"
1409
+msgid "%s:"
1410
+msgstr ""
1411
1643
-#: lib/diff.tcl:210
1644
-msgid "Git Repository (subproject)"
1645
-msgstr "Git-Projektarchiv (Unterprojekt)"
1412
+#: lib/option.tcl:210
1413
+msgid "Change"
1414
+msgstr "Ändern"
1415
1647
-#: lib/diff.tcl:222
1648
-msgid "* Binary file (not showing content)."
1649
-msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
1416
+#: lib/option.tcl:254
1417
+msgid "Spelling Dictionary:"
1418
+msgstr "Wörterbuch Rechtschreibprüfung:"
1419
1651
-#: lib/diff.tcl:227
1652
-#, tcl-format
1653
-msgid ""
1654
-"* Untracked file is %d bytes.\n"
1655
-"* Showing only first %d bytes.\n"
1656
-msgstr ""
1657
-"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n"
1658
-"* Nur erste %d Bytes werden angezeigt.\n"
1420
+#: lib/option.tcl:284
1421
+msgid "Change Font"
1422
+msgstr "Schriftart ändern"
1423
1660
-#: lib/diff.tcl:233
1424
+#: lib/option.tcl:288
1425
#, tcl-format
1662
-msgid ""
1663
-"\n"
1664
-"* Untracked file clipped here by %s.\n"
1665
-"* To see the entire file, use an external editor.\n"
1666
-msgstr ""
1667
-"\n"
1668
-"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n"
1669
-"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n"
1670
-
1671
-#: lib/diff.tcl:482
1672
-msgid "Failed to unstage selected hunk."
1673
-msgstr ""
1674
-"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
1426
+msgid "Choose %s"
1427
+msgstr "%s wählen"
1428
1676
-#: lib/diff.tcl:489
1677
-msgid "Failed to stage selected hunk."
1678
-msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
1429
+#: lib/option.tcl:294
1430
+msgid "pt."
1431
+msgstr "pt."
1432
1680
-#: lib/diff.tcl:568
1681
-msgid "Failed to unstage selected line."
1682
-msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
1433
+#: lib/option.tcl:308
1434
+msgid "Preferences"
1435
+msgstr "Einstellungen"
1436
1684
-#: lib/diff.tcl:576
1685
-msgid "Failed to stage selected line."
1686
-msgstr "Fehler beim Bereitstellen der gewählten Zeile."
1437
+#: lib/option.tcl:345
1438
+msgid "Failed to completely save options:"
1439
+msgstr "Optionen konnten nicht gespeichert werden:"
1440
1441
#: lib/encoding.tcl:443
1442
msgid "Default"
@@ -1698,229 +1451,40 @@ msgstr "Systemweit (%s)"
1451
msgid "Other"
1452
msgstr "Andere"
1453
1701
-#: lib/error.tcl:20 lib/error.tcl:114
1702
-msgid "error"
1703
-msgstr "Fehler"
1454
+#: lib/tools.tcl:76
1455
+#, tcl-format
1456
+msgid "Running %s requires a selected file."
1457
+msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein."
1458
1705
-#: lib/error.tcl:36
1706
-msgid "warning"
1707
-msgstr "Warnung"
1459
+#: lib/tools.tcl:92
1460
+#, fuzzy, tcl-format
1461
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
1462
+msgstr "Wollen Sie %s wirklich starten?"
1463
1709
-#: lib/error.tcl:94
1710
-msgid "You must correct the above errors before committing."
1711
-msgstr ""
1712
-"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
1713
-
1714
-#: lib/index.tcl:6
1715
-msgid "Unable to unlock the index."
1716
-msgstr "Bereitstellung kann nicht wieder freigegeben werden."
1717
-
1718
-#: lib/index.tcl:15
1719
-msgid "Index Error"
1720
-msgstr "Fehler in Bereitstellung"
1721
-
1722
-#: lib/index.tcl:17
1723
-msgid ""
1724
-"Updating the Git index failed. A rescan will be automatically started to "
1725
-"resynchronize git-gui."
1726
-msgstr ""
1727
-"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
1728
-"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
1729
-"synchronisieren."
1730
-
1731
-#: lib/index.tcl:28
1732
-msgid "Continue"
1733
-msgstr "Fortsetzen"
1734
-
1735
-#: lib/index.tcl:31
1736
-msgid "Unlock Index"
1737
-msgstr "Bereitstellung freigeben"
1738
-
1739
-#: lib/index.tcl:289
1740
-#, tcl-format
1741
-msgid "Unstaging %s from commit"
1742
-msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
1743
-
1744
-#: lib/index.tcl:328
1745
-msgid "Ready to commit."
1746
-msgstr "Bereit zum Eintragen."
1747
-
1748
-#: lib/index.tcl:341
1749
-#, tcl-format
1750
-msgid "Adding %s"
1751
-msgstr "»%s« hinzufügen..."
1752
-
1753
-#: lib/index.tcl:398
1754
-#, tcl-format
1755
-msgid "Revert changes in file %s?"
1756
-msgstr "Änderungen in Datei »%s« verwerfen?"
1757
-
1758
-#: lib/index.tcl:400
1759
-#, tcl-format
1760
-msgid "Revert changes in these %i files?"
1761
-msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
1762
-
1763
-#: lib/index.tcl:408
1764
-msgid "Any unstaged changes will be permanently lost by the revert."
1765
-msgstr ""
1766
-"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
1767
-
1768
-#: lib/index.tcl:411
1769
-msgid "Do Nothing"
1770
-msgstr "Nichts tun"
1771
-
1772
-#: lib/index.tcl:429
1773
-msgid "Reverting selected files"
1774
-msgstr "Änderungen in gewählten Dateien verwerfen"
1775
-
1776
-#: lib/index.tcl:433
1777
-#, tcl-format
1778
-msgid "Reverting %s"
1779
-msgstr "Änderungen in %s verwerfen"
1780
-
1781
-#: lib/merge.tcl:13
1782
-msgid ""
1783
-"Cannot merge while amending.\n"
1784
-"\n"
1785
-"You must finish amending this commit before starting any type of merge.\n"
1786
-msgstr ""
1787
-"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
1788
-"\n"
1789
-"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
1790
-"zusammenführen können.\n"
1791
-
1792
-#: lib/merge.tcl:27
1793
-msgid ""
1794
-"Last scanned state does not match repository state.\n"
1795
-"\n"
1796
-"Another Git program has modified this repository since the last scan. A "
1797
-"rescan must be performed before a merge can be performed.\n"
1798
-"\n"
1799
-"The rescan will be automatically started now.\n"
1800
-msgstr ""
1801
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
1802
-"\n"
1803
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
1804
-"geändert. Vor einem Zusammenführen muss neu geladen werden.\n"
1805
-"\n"
1806
-"Es wird gleich neu geladen.\n"
1807
-
1808
-#: lib/merge.tcl:45
1464
+#: lib/tools.tcl:96
1465
#, tcl-format
1810
-msgid ""
1811
-"You are in the middle of a conflicted merge.\n"
1812
-"\n"
1813
-"File %s has merge conflicts.\n"
1814
-"\n"
1815
-"You must resolve them, stage the file, and commit to complete the current "
1816
-"merge. Only then can you begin another merge.\n"
1817
-msgstr ""
1818
-"Zusammenführung mit Konflikten.\n"
1819
-"\n"
1820
-"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
1821
-"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
1822
-"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
1823
-"danach kann eine neue Zusammenführung begonnen werden.\n"
1466
+msgid "Are you sure you want to run %s?"
1467
+msgstr "Wollen Sie %s wirklich starten?"
1468
1825
-#: lib/merge.tcl:55
1469
+#: lib/tools.tcl:118
1470
#, tcl-format
1827
-msgid ""
1828
-"You are in the middle of a change.\n"
1829
-"\n"
1830
-"File %s is modified.\n"
1831
-"\n"
1832
-"You should complete the current commit before starting a merge. Doing so "
1833
-"will help you abort a failed merge, should the need arise.\n"
1834
-msgstr ""
1835
-"Es liegen Änderungen vor.\n"
1836
-"\n"
1837
-"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte "
1838
-"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser "
1839
-"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
1840
-"einfacher beheben oder abbrechen.\n"
1471
+msgid "Tool: %s"
1472
+msgstr "Werkzeug: %s"
1473
1842
-#: lib/merge.tcl:107
1474
+#: lib/tools.tcl:119
1475
#, tcl-format
1844
-msgid "%s of %s"
1845
-msgstr "%s von %s"
1476
+msgid "Running: %s"
1477
+msgstr "Starten: %s"
1478
1847
-#: lib/merge.tcl:120
1479
+#: lib/tools.tcl:158
1480
#, tcl-format
1849
-msgid "Merging %s and %s..."
1850
-msgstr "Zusammenführen von %s und %s..."
1851
-
1852
-#: lib/merge.tcl:131
1853
-msgid "Merge completed successfully."
1854
-msgstr "Zusammenführen erfolgreich abgeschlossen."
1855
-
1856
-#: lib/merge.tcl:133
1857
-msgid "Merge failed. Conflict resolution is required."
1858
-msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
1481
+msgid "Tool completed successfully: %s"
1482
+msgstr "Werkzeug erfolgreich abgeschlossen: %s"
1483
1860
-#: lib/merge.tcl:158
1484
+#: lib/tools.tcl:160
1485
#, tcl-format
1862
-msgid "Merge Into %s"
1863
-msgstr "Zusammenführen in »%s«"
1864
-
1865
-#: lib/merge.tcl:177
1866
-msgid "Revision To Merge"
1867
-msgstr "Zusammenzuführende Version"
1868
-
1869
-#: lib/merge.tcl:212
1870
-msgid ""
1871
-"Cannot abort while amending.\n"
1872
-"\n"
1873
-"You must finish amending this commit.\n"
1874
-msgstr ""
1875
-"Abbruch der Nachbesserung ist nicht möglich.\n"
1876
-"\n"
1877
-"Sie müssen die Nachbesserung der Version abschließen.\n"
1878
-
1879
-#: lib/merge.tcl:222
1880
-msgid ""
1881
-"Abort merge?\n"
1882
-"\n"
1883
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1884
-"\n"
1885
-"Continue with aborting the current merge?"
1886
-msgstr ""
1887
-"Zusammenführen abbrechen?\n"
1888
-"\n"
1889
-"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
1890
-"verloren.\n"
1891
-"\n"
1892
-"Zusammenführen jetzt abbrechen?"
1893
-
1894
-#: lib/merge.tcl:228
1895
-msgid ""
1896
-"Reset changes?\n"
1897
-"\n"
1898
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1899
-"\n"
1900
-"Continue with resetting the current changes?"
1901
-msgstr ""
1902
-"Änderungen zurücksetzen?\n"
1903
-"\n"
1904
-"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
1905
-"verloren.\n"
1906
-"\n"
1907
-"Änderungen jetzt zurücksetzen?"
1908
-
1909
-#: lib/merge.tcl:239
1910
-msgid "Aborting"
1911
-msgstr "Abbruch"
1912
-
1913
-#: lib/merge.tcl:239
1914
-msgid "files reset"
1915
-msgstr "Dateien zurückgesetzt"
1916
-
1917
-#: lib/merge.tcl:267
1918
-msgid "Abort failed."
1919
-msgstr "Abbruch fehlgeschlagen."
1920
-
1921
-#: lib/merge.tcl:269
1922
-msgid "Abort completed. Ready."
1923
-msgstr "Abbruch durchgeführt. Bereit."
1486
+msgid "Tool failed: %s"
1487
+msgstr "Werkzeug fehlgeschlagen: %s"
1488
1489
#: lib/mergetool.tcl:8
1490
msgid "Force resolution to the base version?"
@@ -1970,21 +1534,21 @@ msgstr ""
1534
msgid "Conflict file does not exist"
1535
msgstr "Konflikt-Datei existiert nicht"
1536
1973
-#: lib/mergetool.tcl:264
1537
+#: lib/mergetool.tcl:246
1538
#, tcl-format
1539
msgid "Not a GUI merge tool: '%s'"
1540
msgstr "Kein GUI Zusammenführungswerkzeug: »%s«"
1541
1978
-#: lib/mergetool.tcl:268
1542
+#: lib/mergetool.tcl:275
1543
#, tcl-format
1544
msgid "Unsupported merge tool '%s'"
1545
msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«"
1546
1983
-#: lib/mergetool.tcl:303
1547
+#: lib/mergetool.tcl:310
1548
msgid "Merge tool is already running, terminate it?"
1549
msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?"
1550
1987
-#: lib/mergetool.tcl:323
1551
+#: lib/mergetool.tcl:330
1552
#, tcl-format
1553
msgid ""
1554
"Error retrieving versions:\n"
@@ -1993,7 +1557,7 @@ msgstr ""
1557
"Fehler beim Abrufen der Dateiversionen:\n"
1558
"%s"
1559
1996
-#: lib/mergetool.tcl:343
1560
+#: lib/mergetool.tcl:350
1561
#, tcl-format
1562
msgid ""
1563
"Could not start the merge tool:\n"
@@ -2004,243 +1568,180 @@ msgstr ""
1568
"\n"
1569
"%s"
1570
2007
-#: lib/mergetool.tcl:347
1571
+#: lib/mergetool.tcl:354
1572
msgid "Running merge tool..."
1573
msgstr "Zusammenführungswerkzeug starten..."
1574
2011
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
1575
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
1576
msgid "Merge tool failed."
1577
msgstr "Zusammenführungswerkzeug fehlgeschlagen."
1578
2015
-#: lib/option.tcl:11
2016
-#, tcl-format
2017
-msgid "Invalid global encoding '%s'"
2018
-msgstr "Ungültige globale Zeichenkodierung »%s«"
2019
-
2020
-#: lib/option.tcl:19
2021
-#, tcl-format
2022
-msgid "Invalid repo encoding '%s'"
2023
-msgstr "Ungültige Archiv-Zeichenkodierung »%s«"
1579
+#: lib/tools_dlg.tcl:22
1580
+#, fuzzy, tcl-format
1581
+msgid "%s (%s): Add Tool"
1582
+msgstr "Werkzeug hinzufügen"
1583
2025
-#: lib/option.tcl:117
2026
-msgid "Restore Defaults"
2027
-msgstr "Voreinstellungen wiederherstellen"
1584
+#: lib/tools_dlg.tcl:28
1585
+msgid "Add New Tool Command"
1586
+msgstr "Neues Kommando für Werkzeug hinzufügen"
1587
2029
-#: lib/option.tcl:121
2030
-msgid "Save"
2031
-msgstr "Speichern"
1588
+#: lib/tools_dlg.tcl:34
1589
+msgid "Add globally"
1590
+msgstr "Global hinzufügen"
1591
2033
-#: lib/option.tcl:131
2034
-#, tcl-format
2035
-msgid "%s Repository"
2036
-msgstr "Projektarchiv %s"
1592
+#: lib/tools_dlg.tcl:46
1593
+msgid "Tool Details"
1594
+msgstr "Einzelheiten des Werkzeugs"
1595
2038
-#: lib/option.tcl:132
2039
-msgid "Global (All Repositories)"
2040
-msgstr "Global (Alle Projektarchive)"
1596
+#: lib/tools_dlg.tcl:49
1597
+msgid "Use '/' separators to create a submenu tree:"
1598
+msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:"
1599
2042
-#: lib/option.tcl:138
2043
-msgid "User Name"
2044
-msgstr "Benutzername"
1600
+#: lib/tools_dlg.tcl:60
1601
+msgid "Command:"
1602
+msgstr "Kommando:"
1603
2046
-#: lib/option.tcl:139
2047
-msgid "Email Address"
2048
-msgstr "E-Mail-Adresse"
1604
+#: lib/tools_dlg.tcl:71
1605
+msgid "Show a dialog before running"
1606
+msgstr "Bestätigungsfrage vor Starten anzeigen"
1607
2050
-#: lib/option.tcl:141
2051
-msgid "Summarize Merge Commits"
2052
-msgstr "Zusammenführungs-Versionen zusammenfassen"
1608
+#: lib/tools_dlg.tcl:77
1609
+msgid "Ask the user to select a revision (sets $REVISION)"
1610
+msgstr "Benutzer nach Version fragen (setzt $REVISION)"
1611
2054
-#: lib/option.tcl:142
2055
-msgid "Merge Verbosity"
2056
-msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
1612
+#: lib/tools_dlg.tcl:82
1613
+msgid "Ask the user for additional arguments (sets $ARGS)"
1614
+msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)"
1615
2058
-#: lib/option.tcl:143
2059
-msgid "Show Diffstat After Merge"
2060
-msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
1616
+#: lib/tools_dlg.tcl:89
1617
+msgid "Don't show the command output window"
1618
+msgstr "Kein Ausgabefenster zeigen"
1619
2062
-#: lib/option.tcl:144
2063
-msgid "Use Merge Tool"
2064
-msgstr "Zusammenführungswerkzeug"
1620
+#: lib/tools_dlg.tcl:94
1621
+msgid "Run only if a diff is selected ($FILENAME not empty)"
1622
+msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)"
1623
2066
-#: lib/option.tcl:146
2067
-msgid "Trust File Modification Timestamps"
2068
-msgstr "Auf Dateiänderungsdatum verlassen"
1624
+#: lib/tools_dlg.tcl:118
1625
+msgid "Please supply a name for the tool."
1626
+msgstr "Bitte geben Sie einen Werkzeugnamen an."
1627
2070
-#: lib/option.tcl:147
2071
-msgid "Prune Tracking Branches During Fetch"
2072
-msgstr "Übernahmezweige aufräumen während Anforderung"
1628
+#: lib/tools_dlg.tcl:126
1629
+#, tcl-format
1630
+msgid "Tool '%s' already exists."
1631
+msgstr "Werkzeug »%s« existiert bereits."
1632
2074
-#: lib/option.tcl:148
2075
-msgid "Match Tracking Branches"
2076
-msgstr "Passend zu Übernahmezweig"
2077
-
2078
-#: lib/option.tcl:149
2079
-msgid "Blame Copy Only On Changed Files"
2080
-msgstr "Kopie-Annotieren nur bei geänderten Dateien"
2081
-
2082
-#: lib/option.tcl:150
2083
-msgid "Minimum Letters To Blame Copy On"
2084
-msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
2085
-
2086
-#: lib/option.tcl:151
2087
-msgid "Blame History Context Radius (days)"
2088
-msgstr "Anzahl Tage für Historien-Kontext"
2089
-
2090
-#: lib/option.tcl:152
2091
-msgid "Number of Diff Context Lines"
2092
-msgstr "Anzahl der Kontextzeilen beim Vergleich"
2093
-
2094
-#: lib/option.tcl:153
2095
-msgid "Commit Message Text Width"
2096
-msgstr "Textbreite der Versionsbeschreibung"
2097
-
2098
-#: lib/option.tcl:154
2099
-msgid "New Branch Name Template"
2100
-msgstr "Namensvorschlag für neue Zweige"
2101
-
2102
-#: lib/option.tcl:155
2103
-msgid "Default File Contents Encoding"
2104
-msgstr "Voreingestellte Zeichenkodierung"
2105
-
2106
-#: lib/option.tcl:203
2107
-msgid "Change"
2108
-msgstr "Ändern"
2109
-
2110
-#: lib/option.tcl:230
2111
-msgid "Spelling Dictionary:"
2112
-msgstr "Wörterbuch Rechtschreibprüfung:"
2113
-
2114
-#: lib/option.tcl:254
2115
-msgid "Change Font"
2116
-msgstr "Schriftart ändern"
2117
-
2118
-#: lib/option.tcl:258
1633
+#: lib/tools_dlg.tcl:148
1634
#, tcl-format
2120
-msgid "Choose %s"
2121
-msgstr "%s wählen"
2122
-
2123
-#: lib/option.tcl:264
2124
-msgid "pt."
2125
-msgstr "pt."
2126
-
2127
-#: lib/option.tcl:278
2128
-msgid "Preferences"
2129
-msgstr "Einstellungen"
2130
-
2131
-#: lib/option.tcl:314
2132
-msgid "Failed to completely save options:"
2133
-msgstr "Optionen konnten nicht gespeichert werden:"
1635
+msgid ""
1636
+"Could not add tool:\n"
1637
+"%s"
1638
+msgstr ""
1639
+"Werkzeug konnte nicht hinzugefügt werden:\n"
1640
+"\n"
1641
+"%s"
1642
2135
-#: lib/remote_add.tcl:19
2136
-msgid "Add Remote"
2137
-msgstr "Externes Archiv hinzufügen"
1643
+#: lib/tools_dlg.tcl:187
1644
+#, fuzzy, tcl-format
1645
+msgid "%s (%s): Remove Tool"
1646
+msgstr "Werkzeug entfernen"
1647
2139
-#: lib/remote_add.tcl:24
2140
-msgid "Add New Remote"
2141
-msgstr "Neues externes Archiv hinzufügen"
1648
+#: lib/tools_dlg.tcl:193
1649
+msgid "Remove Tool Commands"
1650
+msgstr "Werkzeugkommandos entfernen"
1651
2143
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
2144
-msgid "Add"
2145
-msgstr "Hinzufügen"
1652
+#: lib/tools_dlg.tcl:198
1653
+msgid "Remove"
1654
+msgstr "Entfernen"
1655
2147
-#: lib/remote_add.tcl:37
2148
-msgid "Remote Details"
2149
-msgstr "Einzelheiten des externen Archivs"
1656
+#: lib/tools_dlg.tcl:231
1657
+msgid "(Blue denotes repository-local tools)"
1658
+msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)"
1659
2151
-#: lib/remote_add.tcl:50
2152
-msgid "Location:"
2153
-msgstr "Adresse:"
1660
+#: lib/tools_dlg.tcl:283
1661
+#, fuzzy, tcl-format
1662
+msgid "%s (%s):"
1663
+msgstr "Systemweit (%s)"
1664
2155
-#: lib/remote_add.tcl:62
2156
-msgid "Further Action"
2157
-msgstr "Weitere Aktion jetzt"
1665
+#: lib/tools_dlg.tcl:292
1666
+#, tcl-format
1667
+msgid "Run Command: %s"
1668
+msgstr "Kommando aufrufen: %s"
1669
2159
-#: lib/remote_add.tcl:65
2160
-msgid "Fetch Immediately"
2161
-msgstr "Gleich anfordern"
1670
+#: lib/tools_dlg.tcl:306
1671
+msgid "Arguments"
1672
+msgstr "Argumente"
1673
2163
-#: lib/remote_add.tcl:71
2164
-msgid "Initialize Remote Repository and Push"
2165
-msgstr "Externes Archiv initialisieren und dahin versenden"
1674
+#: lib/tools_dlg.tcl:341
1675
+msgid "OK"
1676
+msgstr "Ok"
1677
2167
-#: lib/remote_add.tcl:77
2168
-msgid "Do Nothing Else Now"
2169
-msgstr "Nichts tun"
1678
+#: lib/search.tcl:48
1679
+msgid "Find:"
1680
+msgstr "Suchen:"
1681
2171
-#: lib/remote_add.tcl:101
2172
-msgid "Please supply a remote name."
2173
-msgstr "Bitte geben Sie einen Namen des externen Archivs an."
1682
+#: lib/search.tcl:50
1683
+msgid "Next"
1684
+msgstr "Nächster"
1685
2175
-#: lib/remote_add.tcl:114
2176
-#, tcl-format
2177
-msgid "'%s' is not an acceptable remote name."
2178
-msgstr "»%s« ist kein zulässiger Name eines externen Archivs."
1686
+#: lib/search.tcl:51
1687
+msgid "Prev"
1688
+msgstr "Voriger"
1689
2180
-#: lib/remote_add.tcl:125
2181
-#, tcl-format
2182
-msgid "Failed to add remote '%s' of location '%s'."
2183
-msgstr "Fehler beim Hinzufügen des externen Archivs »%s« aus Herkunftsort »%s«."
1690
+#: lib/search.tcl:52
1691
+msgid "RegExp"
1692
+msgstr ""
1693
2185
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
2186
-#, tcl-format
2187
-msgid "fetch %s"
2188
-msgstr "»%s« anfordern"
1694
+#: lib/search.tcl:54
1695
+msgid "Case"
1696
+msgstr ""
1697
2190
-#: lib/remote_add.tcl:134
2191
-#, tcl-format
2192
-msgid "Fetching the %s"
2193
-msgstr "»%s« anfordern"
1698
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
1699
+#, fuzzy, tcl-format
1700
+msgid "%s (%s): Create Desktop Icon"
1701
+msgstr "Desktop-Icon erstellen"
1702
2195
-#: lib/remote_add.tcl:157
2196
-#, tcl-format
2197
-msgid "Do not know how to initialize repository at location '%s'."
2198
-msgstr "Initialisieren eines externen Archivs an Adresse »%s« ist nicht möglich."
1703
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
1704
+msgid "Cannot write shortcut:"
1705
+msgstr "Fehler beim Schreiben der Verknüpfung:"
1706
2200
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
2201
-#: lib/transport.tcl:81
2202
-#, tcl-format
2203
-msgid "push %s"
2204
-msgstr "»%s« versenden..."
1707
+#: lib/shortcut.tcl:140
1708
+msgid "Cannot write icon:"
1709
+msgstr "Fehler beim Erstellen des Icons:"
1710
2206
-#: lib/remote_add.tcl:164
2207
-#, tcl-format
2208
-msgid "Setting up the %s (at %s)"
2209
-msgstr "Einrichten von »%s« an »%s«"
1711
+#: lib/remote_branch_delete.tcl:29
1712
+#, fuzzy, tcl-format
1713
+msgid "%s (%s): Delete Branch Remotely"
1714
+msgstr "Zweig in externem Archiv löschen"
1715
2211
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
1716
+#: lib/remote_branch_delete.tcl:34
1717
msgid "Delete Branch Remotely"
1718
msgstr "Zweig in externem Archiv löschen"
1719
2215
-#: lib/remote_branch_delete.tcl:47
1720
+#: lib/remote_branch_delete.tcl:48
1721
msgid "From Repository"
1722
msgstr "In Projektarchiv"
1723
2219
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
2220
-msgid "Remote:"
2221
-msgstr "Externes Archiv:"
2222
-
2223
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
2224
-msgid "Arbitrary Location:"
2225
-msgstr "Adresse:"
2226
-
2227
-#: lib/remote_branch_delete.tcl:84
1724
+#: lib/remote_branch_delete.tcl:88
1725
msgid "Branches"
1726
msgstr "Zweige"
1727
2231
-#: lib/remote_branch_delete.tcl:109
1728
+#: lib/remote_branch_delete.tcl:110
1729
msgid "Delete Only If"
1730
msgstr "Nur löschen, wenn"
1731
2235
-#: lib/remote_branch_delete.tcl:111
1732
+#: lib/remote_branch_delete.tcl:112
1733
msgid "Merged Into:"
1734
msgstr "Zusammengeführt mit:"
1735
2239
-#: lib/remote_branch_delete.tcl:152
1736
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
1737
+msgid "Always (Do not perform merge checks)"
1738
+msgstr "Immer (Keine Zusammenführungsprüfung)"
1739
+
1740
+#: lib/remote_branch_delete.tcl:153
1741
msgid "A branch is required for 'Merged Into'."
1742
msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
1743
2243
-#: lib/remote_branch_delete.tcl:184
1744
+#: lib/remote_branch_delete.tcl:185
1745
#, tcl-format
1746
msgid ""
1747
"The following branches are not completely merged into %s:\n"
@@ -2251,7 +1752,7 @@ msgstr ""
1752
"\n"
1753
" - %s"
1754
2254
-#: lib/remote_branch_delete.tcl:189
1755
+#: lib/remote_branch_delete.tcl:190
1756
#, tcl-format
1757
msgid ""
1758
"One or more of the merge tests failed because you have not fetched the "
@@ -2261,332 +1762,1137 @@ msgstr ""
1762
"notwendigen Versionen vorher angefordert haben. Sie sollten versuchen, "
1763
"zuerst von »%s« anzufordern."
1764
2264
-#: lib/remote_branch_delete.tcl:207
1765
+#: lib/remote_branch_delete.tcl:208
1766
msgid "Please select one or more branches to delete."
1767
msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll."
1768
2268
-#: lib/remote_branch_delete.tcl:226
1769
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
1770
+msgid ""
1771
+"Recovering deleted branches is difficult.\n"
1772
+"\n"
1773
+"Delete the selected branches?"
1774
+msgstr ""
1775
+"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
1776
+"möglich.\n"
1777
+"\n"
1778
+"Sollen die ausgewählten Zweige gelöscht werden?"
1779
+
1780
+#: lib/remote_branch_delete.tcl:227
1781
#, tcl-format
1782
msgid "Deleting branches from %s"
1783
msgstr "Zweige auf »%s« werden gelöscht"
1784
2273
-#: lib/remote_branch_delete.tcl:292
1785
+#: lib/remote_branch_delete.tcl:300
1786
msgid "No repository selected."
1787
msgstr "Kein Projektarchiv ausgewählt."
1788
2277
-#: lib/remote_branch_delete.tcl:297
1789
+#: lib/remote_branch_delete.tcl:305
1790
#, tcl-format
1791
msgid "Scanning %s..."
1792
msgstr "»%s« laden..."
1793
2282
-#: lib/remote.tcl:163
2283
-msgid "Remove Remote"
2284
-msgstr "Externes Archiv entfernen"
1794
+#: lib/choose_repository.tcl:45
1795
+msgid "Git Gui"
1796
+msgstr "Git Gui"
1797
2286
-#: lib/remote.tcl:168
2287
-msgid "Prune from"
2288
-msgstr "Aufräumen von"
1798
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
1799
+msgid "Create New Repository"
1800
+msgstr "Neues Projektarchiv"
1801
2290
-#: lib/remote.tcl:173
2291
-msgid "Fetch from"
2292
-msgstr "Anfordern von"
1802
+#: lib/choose_repository.tcl:110
1803
+msgid "New..."
1804
+msgstr "Neu..."
1805
2294
-#: lib/remote.tcl:215
2295
-msgid "Push to"
2296
-msgstr "Versenden nach"
1806
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
1807
+msgid "Clone Existing Repository"
1808
+msgstr "Projektarchiv klonen"
1809
2298
-#: lib/search.tcl:21
2299
-msgid "Find:"
2300
-msgstr "Suchen:"
1810
+#: lib/choose_repository.tcl:128
1811
+msgid "Clone..."
1812
+msgstr "Klonen..."
1813
2302
-#: lib/search.tcl:23
2303
-msgid "Next"
2304
-msgstr "Nächster"
1814
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
1815
+msgid "Open Existing Repository"
1816
+msgstr "Projektarchiv öffnen"
1817
2306
-#: lib/search.tcl:24
2307
-msgid "Prev"
2308
-msgstr "Voriger"
1818
+#: lib/choose_repository.tcl:141
1819
+msgid "Open..."
1820
+msgstr "Öffnen..."
1821
2310
-#: lib/search.tcl:25
2311
-msgid "Case-Sensitive"
2312
-msgstr "Groß-/Kleinschreibung unterscheiden"
1822
+#: lib/choose_repository.tcl:154
1823
+msgid "Recent Repositories"
1824
+msgstr "Zuletzt benutzte Projektarchive"
1825
2314
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
2315
-msgid "Cannot write shortcut:"
2316
-msgstr "Fehler beim Schreiben der Verknüpfung:"
1826
+#: lib/choose_repository.tcl:164
1827
+msgid "Open Recent Repository:"
1828
+msgstr "Zuletzt benutztes Projektarchiv öffnen:"
1829
2318
-#: lib/shortcut.tcl:137
2319
-msgid "Cannot write icon:"
2320
-msgstr "Fehler beim Erstellen des Icons:"
1830
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
1831
+#: lib/choose_repository.tcl:345
1832
+#, tcl-format
1833
+msgid "Failed to create repository %s:"
1834
+msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
1835
2322
-#: lib/spellcheck.tcl:57
2323
-msgid "Unsupported spell checker"
2324
-msgstr "Rechtschreibprüfungsprogramm nicht unterstützt"
1836
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
1837
+msgid "Create"
1838
+msgstr "Erstellen"
1839
2326
-#: lib/spellcheck.tcl:65
2327
-msgid "Spell checking is unavailable"
2328
-msgstr "Rechtschreibprüfung nicht verfügbar"
1840
+#: lib/choose_repository.tcl:432
1841
+msgid "Directory:"
1842
+msgstr "Verzeichnis:"
1843
2330
-#: lib/spellcheck.tcl:68
2331
-msgid "Invalid spell checking configuration"
2332
-msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung"
1844
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
1845
+#: lib/choose_repository.tcl:1139
1846
+msgid "Git Repository"
1847
+msgstr "Git Projektarchiv"
1848
2334
-#: lib/spellcheck.tcl:70
1849
+#: lib/choose_repository.tcl:487
1850
#, tcl-format
2336
-msgid "Reverting dictionary to %s."
2337
-msgstr "Wörterbuch auf %s zurückgesetzt."
1851
+msgid "Directory %s already exists."
1852
+msgstr "Verzeichnis »%s« existiert bereits."
1853
2339
-#: lib/spellcheck.tcl:73
2340
-msgid "Spell checker silently failed on startup"
2341
-msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
1854
+#: lib/choose_repository.tcl:491
1855
+#, tcl-format
1856
+msgid "File %s already exists."
1857
+msgstr "Datei »%s« existiert bereits."
1858
2343
-#: lib/spellcheck.tcl:80
2344
-msgid "Unrecognized spell checker"
2345
-msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
1859
+#: lib/choose_repository.tcl:506
1860
+msgid "Clone"
1861
+msgstr "Klonen"
1862
2347
-#: lib/spellcheck.tcl:186
2348
-msgid "No Suggestions"
2349
-msgstr "Keine Vorschläge"
1863
+#: lib/choose_repository.tcl:519
1864
+msgid "Source Location:"
1865
+msgstr "Herkunft:"
1866
2351
-#: lib/spellcheck.tcl:388
2352
-msgid "Unexpected EOF from spell checker"
2353
-msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
1867
+#: lib/choose_repository.tcl:528
1868
+msgid "Target Directory:"
1869
+msgstr "Zielverzeichnis:"
1870
2355
-#: lib/spellcheck.tcl:392
2356
-msgid "Spell Checker Failed"
2357
-msgstr "Rechtschreibprüfung fehlgeschlagen"
1871
+#: lib/choose_repository.tcl:538
1872
+msgid "Clone Type:"
1873
+msgstr "Art des Klonens:"
1874
2359
-#: lib/sshkey.tcl:31
2360
-msgid "No keys found."
2361
-msgstr "Keine Schlüssel gefunden."
1875
+#: lib/choose_repository.tcl:543
1876
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
1877
+msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
1878
2363
-#: lib/sshkey.tcl:34
2364
-#, tcl-format
2365
-msgid "Found a public key in: %s"
2366
-msgstr "Öffentlicher Schlüssel gefunden in: %s"
1879
+#: lib/choose_repository.tcl:548
1880
+msgid "Full Copy (Slower, Redundant Backup)"
1881
+msgstr "Alles kopieren (langsamer, volle Redundanz)"
1882
2368
-#: lib/sshkey.tcl:40
2369
-msgid "Generate Key"
2370
-msgstr "Schlüssel erzeugen"
1883
+#: lib/choose_repository.tcl:553
1884
+msgid "Shared (Fastest, Not Recommended, No Backup)"
1885
+msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
1886
2372
-#: lib/sshkey.tcl:56
2373
-msgid "Copy To Clipboard"
2374
-msgstr "In Zwischenablage kopieren"
1887
+#: lib/choose_repository.tcl:560
1888
+msgid "Recursively clone submodules too"
1889
+msgstr ""
1890
2376
-#: lib/sshkey.tcl:70
2377
-msgid "Your OpenSSH Public Key"
2378
-msgstr "Ihr OpenSSH öffenlicher Schlüssel"
1891
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
1892
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
1893
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
1894
+#, tcl-format
1895
+msgid "Not a Git repository: %s"
1896
+msgstr "Kein Git-Projektarchiv in »%s« gefunden."
1897
2380
-#: lib/sshkey.tcl:78
2381
-msgid "Generating..."
2382
-msgstr "Erzeugen..."
1898
+#: lib/choose_repository.tcl:630
1899
+msgid "Standard only available for local repository."
1900
+msgstr "Standard ist nur für lokale Projektarchive verfügbar."
1901
2384
-#: lib/sshkey.tcl:84
2385
-#, tcl-format
2386
-msgid ""
2387
-"Could not start ssh-keygen:\n"
2388
-"\n"
2389
-"%s"
2390
-msgstr ""
2391
-"Konnte »ssh-keygen« nicht starten:\n"
2392
-"\n"
2393
-"%s"
1902
+#: lib/choose_repository.tcl:634
1903
+msgid "Shared only available for local repository."
1904
+msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
1905
2395
-#: lib/sshkey.tcl:111
2396
-msgid "Generation failed."
2397
-msgstr "Schlüsselerzeugung fehlgeschlagen."
1906
+#: lib/choose_repository.tcl:655
1907
+#, tcl-format
1908
+msgid "Location %s already exists."
1909
+msgstr "Projektarchiv »%s« existiert bereits."
1910
2399
-#: lib/sshkey.tcl:118
2400
-msgid "Generation succeeded, but no keys found."
2401
-msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden."
1911
+#: lib/choose_repository.tcl:666
1912
+msgid "Failed to configure origin"
1913
+msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
1914
+
1915
+#: lib/choose_repository.tcl:678
1916
+msgid "Counting objects"
1917
+msgstr "Objekte werden gezählt"
1918
+
1919
+#: lib/choose_repository.tcl:679
1920
+msgid "buckets"
1921
+msgstr "Buckets"
1922
2403
-#: lib/sshkey.tcl:121
1923
+#: lib/choose_repository.tcl:703
1924
#, tcl-format
2405
-msgid "Your key is in: %s"
2406
-msgstr "Ihr Schlüssel ist abgelegt in: %s"
1925
+msgid "Unable to copy objects/info/alternates: %s"
1926
+msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
1927
2408
-#: lib/status_bar.tcl:83
1928
+#: lib/choose_repository.tcl:740
1929
#, tcl-format
2410
-msgid "%s ... %*i of %*i %s (%3i%%)"
2411
-msgstr "%s ... %*i von %*i %s (%3i%%)"
1930
+msgid "Nothing to clone from %s."
1931
+msgstr "Von »%s« konnte nichts geklont werden."
1932
2413
-#: lib/tools_dlg.tcl:22
2414
-msgid "Add Tool"
2415
-msgstr "Werkzeug hinzufügen"
1933
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
1934
+#: lib/choose_repository.tcl:974
1935
+msgid "The 'master' branch has not been initialized."
1936
+msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
1937
2417
-#: lib/tools_dlg.tcl:28
2418
-msgid "Add New Tool Command"
2419
-msgstr "Neues Kommando für Werkzeug hinzufügen"
1938
+#: lib/choose_repository.tcl:755
1939
+msgid "Hardlinks are unavailable. Falling back to copying."
1940
+msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
1941
2421
-#: lib/tools_dlg.tcl:33
2422
-msgid "Add globally"
2423
-msgstr "Global hinzufügen"
1942
+#: lib/choose_repository.tcl:769
1943
+#, tcl-format
1944
+msgid "Cloning from %s"
1945
+msgstr "Kopieren von »%s«"
1946
2425
-#: lib/tools_dlg.tcl:45
2426
-msgid "Tool Details"
2427
-msgstr "Einzelheiten des Werkzeugs"
1947
+#: lib/choose_repository.tcl:800
1948
+msgid "Copying objects"
1949
+msgstr "Objektdatenbank kopieren"
1950
2429
-#: lib/tools_dlg.tcl:48
2430
-msgid "Use '/' separators to create a submenu tree:"
2431
-msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:"
1951
+#: lib/choose_repository.tcl:801
1952
+msgid "KiB"
1953
+msgstr "KB"
1954
2433
-#: lib/tools_dlg.tcl:61
2434
-msgid "Command:"
2435
-msgstr "Kommando:"
1955
+#: lib/choose_repository.tcl:825
1956
+#, tcl-format
1957
+msgid "Unable to copy object: %s"
1958
+msgstr "Objekt kann nicht kopiert werden: %s"
1959
2437
-#: lib/tools_dlg.tcl:74
2438
-msgid "Show a dialog before running"
2439
-msgstr "Bestätigungsfrage vor Starten anzeigen"
1960
+#: lib/choose_repository.tcl:837
1961
+msgid "Linking objects"
1962
+msgstr "Objekte verlinken"
1963
2441
-#: lib/tools_dlg.tcl:80
2442
-msgid "Ask the user to select a revision (sets $REVISION)"
2443
-msgstr "Benutzer nach Version fragen (setzt $REVISION)"
1964
+#: lib/choose_repository.tcl:838
1965
+msgid "objects"
1966
+msgstr "Objekte"
1967
2445
-#: lib/tools_dlg.tcl:85
2446
-msgid "Ask the user for additional arguments (sets $ARGS)"
2447
-msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)"
1968
+#: lib/choose_repository.tcl:846
1969
+#, tcl-format
1970
+msgid "Unable to hardlink object: %s"
1971
+msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
1972
2449
-#: lib/tools_dlg.tcl:92
2450
-msgid "Don't show the command output window"
2451
-msgstr "Kein Ausgabefenster zeigen"
1973
+#: lib/choose_repository.tcl:903
1974
+msgid "Cannot fetch branches and objects. See console output for details."
1975
+msgstr ""
1976
+"Zweige und Objekte konnten nicht angefordert werden. Kontrollieren Sie die "
1977
+"Ausgaben auf der Konsole für weitere Angaben."
1978
2453
-#: lib/tools_dlg.tcl:97
2454
-msgid "Run only if a diff is selected ($FILENAME not empty)"
2455
-msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)"
1979
+#: lib/choose_repository.tcl:914
1980
+msgid "Cannot fetch tags. See console output for details."
1981
+msgstr ""
1982
+"Markierungen konnten nicht angefordert werden. Kontrollieren Sie die "
1983
+"Ausgaben auf der Konsole für weitere Angaben."
1984
2457
-#: lib/tools_dlg.tcl:121
2458
-msgid "Please supply a name for the tool."
2459
-msgstr "Bitte geben Sie einen Werkzeugnamen an."
1985
+#: lib/choose_repository.tcl:938
1986
+msgid "Cannot determine HEAD. See console output for details."
1987
+msgstr ""
1988
+"Die Zweigspitze (HEAD) konnte nicht gefunden werden. Kontrollieren Sie die "
1989
+"Ausgaben auf der Konsole für weitere Angaben."
1990
2461
-#: lib/tools_dlg.tcl:129
1991
+#: lib/choose_repository.tcl:947
1992
#, tcl-format
2463
-msgid "Tool '%s' already exists."
2464
-msgstr "Werkzeug »%s« existiert bereits."
1993
+msgid "Unable to cleanup %s"
1994
+msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
1995
2466
-#: lib/tools_dlg.tcl:151
1996
+#: lib/choose_repository.tcl:953
1997
+msgid "Clone failed."
1998
+msgstr "Klonen fehlgeschlagen."
1999
+
2000
+#: lib/choose_repository.tcl:960
2001
+msgid "No default branch obtained."
2002
+msgstr "Kein voreingestellter Zweig gefunden."
2003
+
2004
+#: lib/choose_repository.tcl:971
2005
#, tcl-format
2468
-msgid ""
2469
-"Could not add tool:\n"
2470
-"%s"
2471
-msgstr ""
2472
-"Werkzeug konnte nicht hinzugefügt werden:\n"
2473
-"\n"
2474
-"%s"
2006
+msgid "Cannot resolve %s as a commit."
2007
+msgstr "»%s« wurde nicht als Version gefunden."
2008
2476
-#: lib/tools_dlg.tcl:190
2477
-msgid "Remove Tool"
2478
-msgstr "Werkzeug entfernen"
2009
+#: lib/choose_repository.tcl:998
2010
+msgid "Creating working directory"
2011
+msgstr "Arbeitskopie erstellen"
2012
2480
-#: lib/tools_dlg.tcl:196
2481
-msgid "Remove Tool Commands"
2482
-msgstr "Werkzeugkommandos entfernen"
2013
+#: lib/choose_repository.tcl:1028
2014
+msgid "Initial file checkout failed."
2015
+msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
2016
2484
-#: lib/tools_dlg.tcl:200
2485
-msgid "Remove"
2486
-msgstr "Entfernen"
2017
+#: lib/choose_repository.tcl:1072
2018
+#, fuzzy
2019
+msgid "Cloning submodules"
2020
+msgstr "Kopieren von »%s«"
2021
2488
-#: lib/tools_dlg.tcl:236
2489
-msgid "(Blue denotes repository-local tools)"
2490
-msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)"
2022
+#: lib/choose_repository.tcl:1087
2023
+msgid "Cannot clone submodules."
2024
+msgstr ""
2025
+
2026
+#: lib/choose_repository.tcl:1110
2027
+msgid "Repository:"
2028
+msgstr "Projektarchiv:"
2029
2492
-#: lib/tools_dlg.tcl:297
2030
+#: lib/choose_repository.tcl:1159
2031
#, tcl-format
2494
-msgid "Run Command: %s"
2495
-msgstr "Kommando aufrufen: %s"
2032
+msgid "Failed to open repository %s:"
2033
+msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
2034
2497
-#: lib/tools_dlg.tcl:311
2498
-msgid "Arguments"
2499
-msgstr "Argumente"
2035
+#: lib/about.tcl:26
2036
+msgid "git-gui - a graphical user interface for Git."
2037
+msgstr "git-gui - eine grafische Oberfläche für Git."
2038
2501
-#: lib/tools_dlg.tcl:348
2502
-msgid "OK"
2503
-msgstr "Ok"
2039
+#: lib/blame.tcl:74
2040
+#, fuzzy, tcl-format
2041
+msgid "%s (%s): File Viewer"
2042
+msgstr "Datei-Browser"
2043
2505
-#: lib/tools.tcl:75
2506
-#, tcl-format
2507
-msgid "Running %s requires a selected file."
2508
-msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein."
2044
+#: lib/blame.tcl:80
2045
+msgid "Commit:"
2046
+msgstr "Version:"
2047
2510
-#: lib/tools.tcl:90
2511
-#, tcl-format
2512
-msgid "Are you sure you want to run %s?"
2513
-msgstr "Wollen Sie %s wirklich starten?"
2048
+#: lib/blame.tcl:282
2049
+msgid "Copy Commit"
2050
+msgstr "Version kopieren"
2051
2515
-#: lib/tools.tcl:110
2516
-#, tcl-format
2517
-msgid "Tool: %s"
2518
-msgstr "Werkzeug: %s"
2052
+#: lib/blame.tcl:286
2053
+msgid "Find Text..."
2054
+msgstr "Text suchen..."
2055
2520
-#: lib/tools.tcl:111
2521
-#, tcl-format
2522
-msgid "Running: %s"
2523
-msgstr "Starten: %s"
2056
+#: lib/blame.tcl:290
2057
+#, fuzzy
2058
+msgid "Goto Line..."
2059
+msgstr "Klonen..."
2060
2525
-#: lib/tools.tcl:149
2526
-#, tcl-format
2527
-msgid "Tool completed successfully: %s"
2528
-msgstr "Werkzeug erfolgreich abgeschlossen: %s"
2061
+#: lib/blame.tcl:299
2062
+msgid "Do Full Copy Detection"
2063
+msgstr "Volle Kopie-Erkennung"
2064
2530
-#: lib/tools.tcl:151
2531
-#, tcl-format
2532
-msgid "Tool failed: %s"
2533
-msgstr "Werkzeug fehlgeschlagen: %s"
2065
+#: lib/blame.tcl:303
2066
+msgid "Show History Context"
2067
+msgstr "Historien-Kontext anzeigen"
2068
2535
-#: lib/transport.tcl:7
2536
-#, tcl-format
2537
-msgid "Fetching new changes from %s"
2538
-msgstr "Neue Änderungen von »%s« holen"
2069
+#: lib/blame.tcl:306
2070
+msgid "Blame Parent Commit"
2071
+msgstr "Elternversion annotieren"
2072
2540
-#: lib/transport.tcl:18
2073
+#: lib/blame.tcl:468
2074
#, tcl-format
2542
-msgid "remote prune %s"
2543
-msgstr "Aufräumen von »%s«"
2075
+msgid "Reading %s..."
2076
+msgstr "%s lesen..."
2077
2545
-#: lib/transport.tcl:19
2546
-#, tcl-format
2547
-msgid "Pruning tracking branches deleted from %s"
2548
-msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden"
2078
+#: lib/blame.tcl:596
2079
+msgid "Loading copy/move tracking annotations..."
2080
+msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
2081
2550
-#: lib/transport.tcl:26
2551
-#, tcl-format
2552
-msgid "Pushing changes to %s"
2553
-msgstr "Änderungen nach »%s« versenden"
2082
+#: lib/blame.tcl:613
2083
+msgid "lines annotated"
2084
+msgstr "Zeilen annotiert"
2085
2555
-#: lib/transport.tcl:64
2556
-#, tcl-format
2557
-msgid "Mirroring to %s"
2558
-msgstr "Spiegeln nach %s"
2086
+#: lib/blame.tcl:815
2087
+msgid "Loading original location annotations..."
2088
+msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
2089
2560
-#: lib/transport.tcl:82
2561
-#, tcl-format
2562
-msgid "Pushing %s %s to %s"
2563
-msgstr "%s %s nach %s versenden"
2090
+#: lib/blame.tcl:818
2091
+msgid "Annotation complete."
2092
+msgstr "Annotierung vollständig."
2093
2565
-#: lib/transport.tcl:100
2566
-msgid "Push Branches"
2567
-msgstr "Zweige versenden"
2094
+#: lib/blame.tcl:849
2095
+msgid "Busy"
2096
+msgstr "Verarbeitung läuft"
2097
2569
-#: lib/transport.tcl:114
2570
-msgid "Source Branches"
2571
-msgstr "Lokale Zweige"
2098
+#: lib/blame.tcl:850
2099
+msgid "Annotation process is already running."
2100
+msgstr "Annotierung läuft bereits."
2101
2573
-#: lib/transport.tcl:131
2574
-msgid "Destination Repository"
2575
-msgstr "Ziel-Projektarchiv"
2102
+#: lib/blame.tcl:889
2103
+msgid "Running thorough copy detection..."
2104
+msgstr "Intensive Kopie-Erkennung läuft..."
2105
2577
-#: lib/transport.tcl:169
2578
-msgid "Transfer Options"
2579
-msgstr "Netzwerk-Einstellungen"
2106
+#: lib/blame.tcl:957
2107
+msgid "Loading annotation..."
2108
+msgstr "Annotierung laden..."
2109
2581
-#: lib/transport.tcl:171
2582
-msgid "Force overwrite existing branch (may discard changes)"
2583
-msgstr ""
2584
-"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
2110
+#: lib/blame.tcl:1010
2111
+msgid "Author:"
2112
+msgstr "Autor:"
2113
2586
-#: lib/transport.tcl:175
2587
-msgid "Use thin pack (for slow network connections)"
2588
-msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
2114
+#: lib/blame.tcl:1014
2115
+msgid "Committer:"
2116
+msgstr "Eintragender:"
2117
2590
-#: lib/transport.tcl:179
2591
-msgid "Include tags"
2592
-msgstr "Mit Markierungen übertragen"
2118
+#: lib/blame.tcl:1019
2119
+msgid "Original File:"
2120
+msgstr "Ursprüngliche Datei:"
2121
+
2122
+#: lib/blame.tcl:1067
2123
+msgid "Cannot find HEAD commit:"
2124
+msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:"
2125
+
2126
+#: lib/blame.tcl:1122
2127
+msgid "Cannot find parent commit:"
2128
+msgstr "Elternversion kann nicht gefunden werden:"
2129
+
2130
+#: lib/blame.tcl:1137
2131
+msgid "Unable to display parent"
2132
+msgstr "Elternversion kann nicht angezeigt werden"
2133
+
2134
+#: lib/blame.tcl:1138 lib/diff.tcl:345
2135
+msgid "Error loading diff:"
2136
+msgstr "Fehler beim Laden des Vergleichs:"
2137
+
2138
+#: lib/blame.tcl:1279
2139
+msgid "Originally By:"
2140
+msgstr "Ursprünglich von:"
2141
+
2142
+#: lib/blame.tcl:1285
2143
+msgid "In File:"
2144
+msgstr "In Datei:"
2145
+
2146
+#: lib/blame.tcl:1290
2147
+msgid "Copied Or Moved Here By:"
2148
+msgstr "Kopiert oder verschoben durch:"
2149
+
2150
+#: lib/diff.tcl:77
2151
+#, tcl-format
2152
+msgid ""
2153
+"No differences detected.\n"
2154
+"\n"
2155
+"%s has no changes.\n"
2156
+"\n"
2157
+"The modification date of this file was updated by another application, but "
2158
+"the content within the file was not changed.\n"
2159
+"\n"
2160
+"A rescan will be automatically started to find other files which may have "
2161
+"the same state."
2162
+msgstr ""
2163
+"Keine Änderungen feststellbar.\n"
2164
+"\n"
2165
+"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei "
2166
+"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
2167
+"unverändert.\n"
2168
+"\n"
2169
+"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
2170
+"Dateien zu prüfen."
2171
+
2172
+#: lib/diff.tcl:117
2173
+#, tcl-format
2174
+msgid "Loading diff of %s..."
2175
+msgstr "Vergleich von »%s« laden..."
2176
+
2177
+#: lib/diff.tcl:143
2178
+msgid ""
2179
+"LOCAL: deleted\n"
2180
+"REMOTE:\n"
2181
+msgstr ""
2182
+"LOKAL: gelöscht\n"
2183
+"ANDERES:\n"
2184
+
2185
+#: lib/diff.tcl:148
2186
+msgid ""
2187
+"REMOTE: deleted\n"
2188
+"LOCAL:\n"
2189
+msgstr ""
2190
+"ANDERES: gelöscht\n"
2191
+"LOKAL:\n"
2192
+
2193
+#: lib/diff.tcl:155
2194
+msgid "LOCAL:\n"
2195
+msgstr "LOKAL:\n"
2196
+
2197
+#: lib/diff.tcl:158
2198
+msgid "REMOTE:\n"
2199
+msgstr "ANDERES:\n"
2200
+
2201
+#: lib/diff.tcl:220 lib/diff.tcl:344
2202
+#, tcl-format
2203
+msgid "Unable to display %s"
2204
+msgstr "Datei »%s« kann nicht angezeigt werden"
2205
+
2206
+#: lib/diff.tcl:221
2207
+msgid "Error loading file:"
2208
+msgstr "Fehler beim Laden der Datei:"
2209
+
2210
+#: lib/diff.tcl:227
2211
+msgid "Git Repository (subproject)"
2212
+msgstr "Git-Projektarchiv (Unterprojekt)"
2213
+
2214
+#: lib/diff.tcl:239
2215
+msgid "* Binary file (not showing content)."
2216
+msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
2217
+
2218
+#: lib/diff.tcl:244
2219
+#, tcl-format
2220
+msgid ""
2221
+"* Untracked file is %d bytes.\n"
2222
+"* Showing only first %d bytes.\n"
2223
+msgstr ""
2224
+"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n"
2225
+"* Nur erste %d Bytes werden angezeigt.\n"
2226
+
2227
+#: lib/diff.tcl:250
2228
+#, tcl-format
2229
+msgid ""
2230
+"\n"
2231
+"* Untracked file clipped here by %s.\n"
2232
+"* To see the entire file, use an external editor.\n"
2233
+msgstr ""
2234
+"\n"
2235
+"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n"
2236
+"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n"
2237
+
2238
+#: lib/diff.tcl:583
2239
+msgid "Failed to unstage selected hunk."
2240
+msgstr ""
2241
+"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
2242
+
2243
+#: lib/diff.tcl:591
2244
+#, fuzzy
2245
+msgid "Failed to revert selected hunk."
2246
+msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
2247
+
2248
+#: lib/diff.tcl:594
2249
+msgid "Failed to stage selected hunk."
2250
+msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
2251
+
2252
+#: lib/diff.tcl:687
2253
+msgid "Failed to unstage selected line."
2254
+msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
2255
+
2256
+#: lib/diff.tcl:696
2257
+#, fuzzy
2258
+msgid "Failed to revert selected line."
2259
+msgstr "Fehler beim Bereitstellen der gewählten Zeile."
2260
+
2261
+#: lib/diff.tcl:700
2262
+msgid "Failed to stage selected line."
2263
+msgstr "Fehler beim Bereitstellen der gewählten Zeile."
2264
+
2265
+#: lib/diff.tcl:889
2266
+#, fuzzy
2267
+msgid "Failed to undo last revert."
2268
+msgstr "Aktualisieren von »%s« fehlgeschlagen."
2269
+
2270
+#: lib/sshkey.tcl:34
2271
+msgid "No keys found."
2272
+msgstr "Keine Schlüssel gefunden."
2273
+
2274
+#: lib/sshkey.tcl:37
2275
+#, tcl-format
2276
+msgid "Found a public key in: %s"
2277
+msgstr "Öffentlicher Schlüssel gefunden in: %s"
2278
+
2279
+#: lib/sshkey.tcl:43
2280
+msgid "Generate Key"
2281
+msgstr "Schlüssel erzeugen"
2282
+
2283
+#: lib/sshkey.tcl:61
2284
+msgid "Copy To Clipboard"
2285
+msgstr "In Zwischenablage kopieren"
2286
+
2287
+#: lib/sshkey.tcl:75
2288
+msgid "Your OpenSSH Public Key"
2289
+msgstr "Ihr OpenSSH öffenlicher Schlüssel"
2290
+
2291
+#: lib/sshkey.tcl:83
2292
+msgid "Generating..."
2293
+msgstr "Erzeugen..."
2294
+
2295
+#: lib/sshkey.tcl:89
2296
+#, tcl-format
2297
+msgid ""
2298
+"Could not start ssh-keygen:\n"
2299
+"\n"
2300
+"%s"
2301
+msgstr ""
2302
+"Konnte »ssh-keygen« nicht starten:\n"
2303
+"\n"
2304
+"%s"
2305
+
2306
+#: lib/sshkey.tcl:116
2307
+msgid "Generation failed."
2308
+msgstr "Schlüsselerzeugung fehlgeschlagen."
2309
+
2310
+#: lib/sshkey.tcl:123
2311
+msgid "Generation succeeded, but no keys found."
2312
+msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden."
2313
+
2314
+#: lib/sshkey.tcl:126
2315
+#, tcl-format
2316
+msgid "Your key is in: %s"
2317
+msgstr "Ihr Schlüssel ist abgelegt in: %s"
2318
+
2319
+#: lib/branch_create.tcl:23
2320
+#, fuzzy, tcl-format
2321
+msgid "%s (%s): Create Branch"
2322
+msgstr "Zweig erstellen"
2323
+
2324
+#: lib/branch_create.tcl:28
2325
+msgid "Create New Branch"
2326
+msgstr "Neuen Zweig erstellen"
2327
+
2328
+#: lib/branch_create.tcl:42
2329
+msgid "Branch Name"
2330
+msgstr "Zweigname"
2331
+
2332
+#: lib/branch_create.tcl:57
2333
+msgid "Match Tracking Branch Name"
2334
+msgstr "Passend zu Übernahmezweig-Name"
2335
+
2336
+#: lib/branch_create.tcl:66
2337
+msgid "Starting Revision"
2338
+msgstr "Anfangsversion"
2339
+
2340
+#: lib/branch_create.tcl:72
2341
+msgid "Update Existing Branch:"
2342
+msgstr "Existierenden Zweig aktualisieren:"
2343
+
2344
+#: lib/branch_create.tcl:75
2345
+msgid "No"
2346
+msgstr "Nein"
2347
+
2348
+#: lib/branch_create.tcl:80
2349
+msgid "Fast Forward Only"
2350
+msgstr "Nur Schnellzusammenführung"
2351
+
2352
+#: lib/branch_create.tcl:97
2353
+msgid "Checkout After Creation"
2354
+msgstr "Arbeitskopie umstellen nach Erstellen"
2355
+
2356
+#: lib/branch_create.tcl:132
2357
+msgid "Please select a tracking branch."
2358
+msgstr "Bitte wählen Sie einen Übernahmezweig."
2359
+
2360
+#: lib/branch_create.tcl:141
2361
+#, tcl-format
2362
+msgid "Tracking branch %s is not a branch in the remote repository."
2363
+msgstr "Übernahmezweig »%s« ist kein Zweig im externen Projektarchiv."
2364
+
2365
+#: lib/console.tcl:59
2366
+msgid "Working... please wait..."
2367
+msgstr "Verarbeitung. Bitte warten..."
2368
+
2369
+#: lib/console.tcl:186
2370
+msgid "Success"
2371
+msgstr "Erfolgreich"
2372
+
2373
+#: lib/console.tcl:200
2374
+msgid "Error: Command Failed"
2375
+msgstr "Fehler: Kommando fehlgeschlagen"
2376
+
2377
+#: lib/line.tcl:17
2378
+msgid "Goto Line:"
2379
+msgstr ""
2380
+
2381
+#: lib/line.tcl:23
2382
+msgid "Go"
2383
+msgstr ""
2384
+
2385
+#: lib/choose_rev.tcl:52
2386
+msgid "This Detached Checkout"
2387
+msgstr "Abgetrennte Arbeitskopie-Version"
2388
+
2389
+#: lib/choose_rev.tcl:60
2390
+msgid "Revision Expression:"
2391
+msgstr "Version Regexp-Ausdruck:"
2392
+
2393
+#: lib/choose_rev.tcl:72
2394
+msgid "Local Branch"
2395
+msgstr "Lokaler Zweig"
2396
+
2397
+#: lib/choose_rev.tcl:77
2398
+msgid "Tracking Branch"
2399
+msgstr "Übernahmezweig"
2400
+
2401
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
2402
+msgid "Tag"
2403
+msgstr "Markierung"
2404
+
2405
+#: lib/choose_rev.tcl:321
2406
+#, tcl-format
2407
+msgid "Invalid revision: %s"
2408
+msgstr "Ungültige Version: %s"
2409
+
2410
+#: lib/choose_rev.tcl:342
2411
+msgid "No revision selected."
2412
+msgstr "Keine Version ausgewählt."
2413
+
2414
+#: lib/choose_rev.tcl:350
2415
+msgid "Revision expression is empty."
2416
+msgstr "Versions-Ausdruck ist leer."
2417
+
2418
+#: lib/choose_rev.tcl:537
2419
+msgid "Updated"
2420
+msgstr "Aktualisiert"
2421
+
2422
+#: lib/choose_rev.tcl:565
2423
+msgid "URL"
2424
+msgstr "URL"
2425
+
2426
+#: lib/commit.tcl:9
2427
+msgid ""
2428
+"There is nothing to amend.\n"
2429
+"\n"
2430
+"You are about to create the initial commit. There is no commit before this "
2431
+"to amend.\n"
2432
+msgstr ""
2433
+"Keine Version zur Nachbesserung vorhanden.\n"
2434
+"\n"
2435
+"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende "
2436
+"Version, die Sie nachbessern könnten.\n"
2437
+
2438
+#: lib/commit.tcl:18
2439
+msgid ""
2440
+"Cannot amend while merging.\n"
2441
+"\n"
2442
+"You are currently in the middle of a merge that has not been fully "
2443
+"completed. You cannot amend the prior commit unless you first abort the "
2444
+"current merge activity.\n"
2445
+msgstr ""
2446
+"Nachbesserung währen Zusammenführung nicht möglich.\n"
2447
+"\n"
2448
+"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht "
2449
+"beendet. Sie können keine vorige Übertragung nachbessern, solange eine "
2450
+"unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung "
2451
+"beenden oder abbrechen.\n"
2452
+
2453
+#: lib/commit.tcl:56
2454
+msgid "Error loading commit data for amend:"
2455
+msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:"
2456
+
2457
+#: lib/commit.tcl:83
2458
+msgid "Unable to obtain your identity:"
2459
+msgstr "Benutzername konnte nicht bestimmt werden:"
2460
+
2461
+#: lib/commit.tcl:88
2462
+msgid "Invalid GIT_COMMITTER_IDENT:"
2463
+msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:"
2464
+
2465
+#: lib/commit.tcl:138
2466
+#, tcl-format
2467
+msgid "warning: Tcl does not support encoding '%s'."
2468
+msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
2469
+
2470
+#: lib/commit.tcl:158
2471
+msgid ""
2472
+"Last scanned state does not match repository state.\n"
2473
+"\n"
2474
+"Another Git program has modified this repository since the last scan. A "
2475
+"rescan must be performed before another commit can be created.\n"
2476
+"\n"
2477
+"The rescan will be automatically started now.\n"
2478
+msgstr ""
2479
+"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
2480
+"\n"
2481
+"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
2482
+"geändert. Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
2483
+"\n"
2484
+"Es wird gleich neu geladen.\n"
2485
+
2486
+#: lib/commit.tcl:182
2487
+#, tcl-format
2488
+msgid ""
2489
+"Unmerged files cannot be committed.\n"
2490
+"\n"
2491
+"File %s has merge conflicts. You must resolve them and stage the file "
2492
+"before committing.\n"
2493
+msgstr ""
2494
+"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
2495
+"\n"
2496
+"Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
2497
+"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
2498
+
2499
+#: lib/commit.tcl:190
2500
+#, tcl-format
2501
+msgid ""
2502
+"Unknown file state %s detected.\n"
2503
+"\n"
2504
+"File %s cannot be committed by this program.\n"
2505
+msgstr ""
2506
+"Unbekannter Dateizustand »%s«.\n"
2507
+"\n"
2508
+"Datei »%s« kann nicht eingetragen werden.\n"
2509
+
2510
+#: lib/commit.tcl:198
2511
+msgid ""
2512
+"No changes to commit.\n"
2513
+"\n"
2514
+"You must stage at least 1 file before you can commit.\n"
2515
+msgstr ""
2516
+"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
2517
+"\n"
2518
+"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
2519
+
2520
+#: lib/commit.tcl:213
2521
+msgid ""
2522
+"Please supply a commit message.\n"
2523
+"\n"
2524
+"A good commit message has the following format:\n"
2525
+"\n"
2526
+"- First line: Describe in one sentence what you did.\n"
2527
+"- Second line: Blank\n"
2528
+"- Remaining lines: Describe why this change is good.\n"
2529
+msgstr ""
2530
+"Bitte geben Sie eine Versionsbeschreibung ein.\n"
2531
+"\n"
2532
+"Eine gute Versionsbeschreibung enthält folgende Abschnitte:\n"
2533
+"\n"
2534
+"- Erste Zeile: Eine Zusammenfassung, was man gemacht hat.\n"
2535
+"\n"
2536
+"- Zweite Zeile: Leerzeile\n"
2537
+"\n"
2538
+"- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
2539
+
2540
+#: lib/commit.tcl:244
2541
+msgid "Calling pre-commit hook..."
2542
+msgstr "Aufrufen der Vor-Eintragen-Kontrolle (»pre-commit hook«)..."
2543
+
2544
+#: lib/commit.tcl:259
2545
+msgid "Commit declined by pre-commit hook."
2546
+msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
2547
+
2548
+#: lib/commit.tcl:278
2549
+msgid ""
2550
+"You are about to commit on a detached head. This is a potentially dangerous "
2551
+"thing to do because if you switch to another branch you will lose your "
2552
+"changes and it can be difficult to retrieve them later from the reflog. You "
2553
+"should probably cancel this commit and create a new branch to continue.\n"
2554
+" \n"
2555
+" Do you really want to proceed with your Commit?"
2556
+msgstr ""
2557
+
2558
+#: lib/commit.tcl:299
2559
+msgid "Calling commit-msg hook..."
2560
+msgstr ""
2561
+"Aufrufen der Versionsbeschreibungs-Kontrolle (»commit-message hook«)..."
2562
+
2563
+#: lib/commit.tcl:314
2564
+msgid "Commit declined by commit-msg hook."
2565
+msgstr ""
2566
+"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
2567
+"hook«)."
2568
+
2569
+#: lib/commit.tcl:327
2570
+msgid "Committing changes..."
2571
+msgstr "Änderungen eintragen..."
2572
+
2573
+#: lib/commit.tcl:344
2574
+msgid "write-tree failed:"
2575
+msgstr "write-tree fehlgeschlagen:"
2576
+
2577
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
2578
+msgid "Commit failed."
2579
+msgstr "Eintragen fehlgeschlagen."
2580
+
2581
+#: lib/commit.tcl:362
2582
+#, tcl-format
2583
+msgid "Commit %s appears to be corrupt"
2584
+msgstr "Version »%s« scheint beschädigt zu sein"
2585
+
2586
+#: lib/commit.tcl:367
2587
+msgid ""
2588
+"No changes to commit.\n"
2589
+"\n"
2590
+"No files were modified by this commit and it was not a merge commit.\n"
2591
+"\n"
2592
+"A rescan will be automatically started now.\n"
2593
+msgstr ""
2594
+"Keine Änderungen einzutragen.\n"
2595
+"\n"
2596
+"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
2597
+"zusammengeführt.\n"
2598
+"\n"
2599
+"Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
2600
+
2601
+#: lib/commit.tcl:374
2602
+msgid "No changes to commit."
2603
+msgstr "Keine Änderungen, die eingetragen werden können."
2604
+
2605
+#: lib/commit.tcl:394
2606
+msgid "commit-tree failed:"
2607
+msgstr "commit-tree fehlgeschlagen:"
2608
+
2609
+#: lib/commit.tcl:421
2610
+msgid "update-ref failed:"
2611
+msgstr "update-ref fehlgeschlagen:"
2612
+
2613
+#: lib/commit.tcl:514
2614
+#, tcl-format
2615
+msgid "Created commit %s: %s"
2616
+msgstr "Version %s übertragen: %s"
2617
+
2618
+#: lib/branch_delete.tcl:16
2619
+#, fuzzy, tcl-format
2620
+msgid "%s (%s): Delete Branch"
2621
+msgstr "Zweig löschen"
2622
+
2623
+#: lib/branch_delete.tcl:21
2624
+msgid "Delete Local Branch"
2625
+msgstr "Lokalen Zweig löschen"
2626
+
2627
+#: lib/branch_delete.tcl:39
2628
+msgid "Local Branches"
2629
+msgstr "Lokale Zweige"
2630
+
2631
+#: lib/branch_delete.tcl:51
2632
+msgid "Delete Only If Merged Into"
2633
+msgstr "Nur löschen, wenn zusammengeführt nach"
2634
+
2635
+#: lib/branch_delete.tcl:103
2636
+#, tcl-format
2637
+msgid "The following branches are not completely merged into %s:"
2638
+msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
2639
+
2640
+#: lib/branch_delete.tcl:131
2641
+#, tcl-format
2642
+msgid " - %s:"
2643
+msgstr ""
2644
+
2645
+#: lib/branch_delete.tcl:141
2646
+#, tcl-format
2647
+msgid ""
2648
+"Failed to delete branches:\n"
2649
+"%s"
2650
+msgstr ""
2651
+"Fehler beim Löschen der Zweige:\n"
2652
+"%s"
2653
+
2654
+#: lib/date.tcl:25
2655
+#, tcl-format
2656
+msgid "Invalid date from Git: %s"
2657
+msgstr "Ungültiges Datum von Git: %s"
2658
+
2659
+#: lib/database.tcl:42
2660
+msgid "Number of loose objects"
2661
+msgstr "Anzahl unverknüpfter Objekte"
2662
+
2663
+#: lib/database.tcl:43
2664
+msgid "Disk space used by loose objects"
2665
+msgstr "Festplattenplatz von unverknüpften Objekten"
2666
+
2667
+#: lib/database.tcl:44
2668
+msgid "Number of packed objects"
2669
+msgstr "Anzahl komprimierter Objekte"
2670
+
2671
+#: lib/database.tcl:45
2672
+msgid "Number of packs"
2673
+msgstr "Anzahl Komprimierungseinheiten"
2674
+
2675
+#: lib/database.tcl:46
2676
+msgid "Disk space used by packed objects"
2677
+msgstr "Festplattenplatz von komprimierten Objekten"
2678
+
2679
+#: lib/database.tcl:47
2680
+msgid "Packed objects waiting for pruning"
2681
+msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind"
2682
+
2683
+#: lib/database.tcl:48
2684
+msgid "Garbage files"
2685
+msgstr "Dateien im Mülleimer"
2686
+
2687
+#: lib/database.tcl:66
2688
+#, fuzzy, tcl-format
2689
+msgid "%s (%s): Database Statistics"
2690
+msgstr "Datenbankstatistik"
2691
+
2692
+#: lib/database.tcl:72
2693
+msgid "Compressing the object database"
2694
+msgstr "Objektdatenbank komprimieren"
2695
+
2696
+#: lib/database.tcl:83
2697
+msgid "Verifying the object database with fsck-objects"
2698
+msgstr "Die Objektdatenbank durch »fsck-objects« überprüfen lassen"
2699
+
2700
+#: lib/database.tcl:107
2701
+#, tcl-format
2702
+msgid ""
2703
+"This repository currently has approximately %i loose objects.\n"
2704
+"\n"
2705
+"To maintain optimal performance it is strongly recommended that you compress "
2706
+"the database.\n"
2707
+"\n"
2708
+"Compress the database now?"
2709
+msgstr ""
2710
+"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
2711
+"\n"
2712
+"Für eine optimale Performance wird empfohlen, die Datenbank des "
2713
+"Projektarchivs zu komprimieren.\n"
2714
+"\n"
2715
+"Soll die Datenbank jetzt komprimiert werden?"
2716
+
2717
+#: lib/error.tcl:20
2718
+#, fuzzy, tcl-format
2719
+msgid "%s: error"
2720
+msgstr "Fehler"
2721
+
2722
+#: lib/error.tcl:36
2723
+#, fuzzy, tcl-format
2724
+msgid "%s: warning"
2725
+msgstr "Warnung"
2726
+
2727
+#: lib/error.tcl:80
2728
+#, fuzzy, tcl-format
2729
+msgid "%s hook failed:"
2730
+msgstr "Werkzeug fehlgeschlagen: %s"
2731
+
2732
+#: lib/error.tcl:96
2733
+msgid "You must correct the above errors before committing."
2734
+msgstr ""
2735
+"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
2736
+
2737
+#: lib/error.tcl:116
2738
+#, tcl-format
2739
+msgid "%s (%s): error"
2740
+msgstr ""
2741
+
2742
+#: lib/merge.tcl:13
2743
+msgid ""
2744
+"Cannot merge while amending.\n"
2745
+"\n"
2746
+"You must finish amending this commit before starting any type of merge.\n"
2747
+msgstr ""
2748
+"Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
2749
+"\n"
2750
+"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
2751
+"zusammenführen können.\n"
2752
+
2753
+#: lib/merge.tcl:27
2754
+msgid ""
2755
+"Last scanned state does not match repository state.\n"
2756
+"\n"
2757
+"Another Git program has modified this repository since the last scan. A "
2758
+"rescan must be performed before a merge can be performed.\n"
2759
+"\n"
2760
+"The rescan will be automatically started now.\n"
2761
+msgstr ""
2762
+"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
2763
+"\n"
2764
+"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
2765
+"geändert. Vor einem Zusammenführen muss neu geladen werden.\n"
2766
+"\n"
2767
+"Es wird gleich neu geladen.\n"
2768
+
2769
+#: lib/merge.tcl:45
2770
+#, tcl-format
2771
+msgid ""
2772
+"You are in the middle of a conflicted merge.\n"
2773
+"\n"
2774
+"File %s has merge conflicts.\n"
2775
+"\n"
2776
+"You must resolve them, stage the file, and commit to complete the current "
2777
+"merge. Only then can you begin another merge.\n"
2778
+msgstr ""
2779
+"Zusammenführung mit Konflikten.\n"
2780
+"\n"
2781
+"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
2782
+"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
2783
+"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
2784
+"danach kann eine neue Zusammenführung begonnen werden.\n"
2785
+
2786
+#: lib/merge.tcl:55
2787
+#, tcl-format
2788
+msgid ""
2789
+"You are in the middle of a change.\n"
2790
+"\n"
2791
+"File %s is modified.\n"
2792
+"\n"
2793
+"You should complete the current commit before starting a merge. Doing so "
2794
+"will help you abort a failed merge, should the need arise.\n"
2795
+msgstr ""
2796
+"Es liegen Änderungen vor.\n"
2797
+"\n"
2798
+"Die Datei »%s« wurde geändert. Sie sollten zuerst die bereitgestellte "
2799
+"Version abschließen, bevor Sie eine Zusammenführung beginnen. Mit dieser "
2800
+"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
2801
+"einfacher beheben oder abbrechen.\n"
2802
+
2803
+#: lib/merge.tcl:108
2804
+#, tcl-format
2805
+msgid "%s of %s"
2806
+msgstr "%s von %s"
2807
+
2808
+#: lib/merge.tcl:126
2809
+#, tcl-format
2810
+msgid "Merging %s and %s..."
2811
+msgstr "Zusammenführen von %s und %s..."
2812
+
2813
+#: lib/merge.tcl:137
2814
+msgid "Merge completed successfully."
2815
+msgstr "Zusammenführen erfolgreich abgeschlossen."
2816
+
2817
+#: lib/merge.tcl:139
2818
+msgid "Merge failed. Conflict resolution is required."
2819
+msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
2820
+
2821
+#: lib/merge.tcl:156
2822
+#, tcl-format
2823
+msgid "%s (%s): Merge"
2824
+msgstr ""
2825
+
2826
+#: lib/merge.tcl:164
2827
+#, tcl-format
2828
+msgid "Merge Into %s"
2829
+msgstr "Zusammenführen in »%s«"
2830
+
2831
+#: lib/merge.tcl:183
2832
+msgid "Revision To Merge"
2833
+msgstr "Zusammenzuführende Version"
2834
+
2835
+#: lib/merge.tcl:218
2836
+msgid ""
2837
+"Cannot abort while amending.\n"
2838
+"\n"
2839
+"You must finish amending this commit.\n"
2840
+msgstr ""
2841
+"Abbruch der Nachbesserung ist nicht möglich.\n"
2842
+"\n"
2843
+"Sie müssen die Nachbesserung der Version abschließen.\n"
2844
+
2845
+#: lib/merge.tcl:228
2846
+msgid ""
2847
+"Abort merge?\n"
2848
+"\n"
2849
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
2850
+"\n"
2851
+"Continue with aborting the current merge?"
2852
+msgstr ""
2853
+"Zusammenführen abbrechen?\n"
2854
+"\n"
2855
+"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
2856
+"verloren.\n"
2857
+"\n"
2858
+"Zusammenführen jetzt abbrechen?"
2859
+
2860
+#: lib/merge.tcl:234
2861
+msgid ""
2862
+"Reset changes?\n"
2863
+"\n"
2864
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
2865
+"\n"
2866
+"Continue with resetting the current changes?"
2867
+msgstr ""
2868
+"Änderungen zurücksetzen?\n"
2869
+"\n"
2870
+"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
2871
+"verloren.\n"
2872
+"\n"
2873
+"Änderungen jetzt zurücksetzen?"
2874
+
2875
+#: lib/merge.tcl:246
2876
+msgid "Aborting"
2877
+msgstr "Abbruch"
2878
+
2879
+#: lib/merge.tcl:247
2880
+msgid "files reset"
2881
+msgstr "Dateien zurückgesetzt"
2882
+
2883
+#: lib/merge.tcl:277
2884
+msgid "Abort failed."
2885
+msgstr "Abbruch fehlgeschlagen."
2886
+
2887
+#: lib/merge.tcl:279
2888
+msgid "Abort completed. Ready."
2889
+msgstr "Abbruch durchgeführt. Bereit."
2890
+
2891
+#~ msgid "Displaying only %s of %s files."
2892
+#~ msgstr "Nur %s von %s Dateien werden angezeigt."
2893
+
2894
+#~ msgid "New Commit"
2895
+#~ msgstr "Neue Version"
2896
+
2897
+#~ msgid "Case-Sensitive"
2898
+#~ msgstr "Groß-/Kleinschreibung unterscheiden"
po/git-gui.pot
+1399
-1127
@@ -8,41 +8,42 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2010-01-26 15:47-0800\n"
11
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
15
+"Language: \n"
16
"MIME-Version: 1.0\n"
17
"Content-Type: text/plain; charset=CHARSET\n"
18
"Content-Transfer-Encoding: 8bit\n"
19
19
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
20
-#: git-gui.sh:922
21
-msgid "git-gui: fatal error"
22
-msgstr ""
23
-
24
-#: git-gui.sh:743
20
+#: git-gui.sh:847
21
#, tcl-format
22
msgid "Invalid font specified in %s:"
23
msgstr ""
24
29
-#: git-gui.sh:779
25
+#: git-gui.sh:901
26
msgid "Main Font"
27
msgstr ""
28
33
-#: git-gui.sh:780
29
+#: git-gui.sh:902
30
msgid "Diff/Console Font"
31
msgstr ""
32
37
-#: git-gui.sh:794
33
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
34
+#: git-gui.sh:3212
35
+msgid "git-gui: fatal error"
36
+msgstr ""
37
+
38
+#: git-gui.sh:918
39
msgid "Cannot find git in PATH."
40
msgstr ""
41
41
-#: git-gui.sh:821
42
+#: git-gui.sh:945
43
msgid "Cannot parse Git version string:"
44
msgstr ""
45
45
-#: git-gui.sh:839
46
+#: git-gui.sh:970
47
#, tcl-format
48
msgid ""
49
"Git version cannot be determined.\n"
@@ -54,473 +55,518 @@ msgid ""
55
"Assume '%s' is version 1.5.0?\n"
56
msgstr ""
57
57
-#: git-gui.sh:1128
58
+#: git-gui.sh:1267
59
msgid "Git directory not found:"
60
msgstr ""
61
61
-#: git-gui.sh:1146
62
+#: git-gui.sh:1301
63
msgid "Cannot move to top of working directory:"
64
msgstr ""
65
65
-#: git-gui.sh:1154
66
+#: git-gui.sh:1309
67
msgid "Cannot use bare repository:"
68
msgstr ""
69
69
-#: git-gui.sh:1162
70
+#: git-gui.sh:1317
71
msgid "No working directory"
72
msgstr ""
73
73
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
74
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
75
msgid "Refreshing file status..."
76
msgstr ""
77
77
-#: git-gui.sh:1390
78
+#: git-gui.sh:1551
79
msgid "Scanning for modified files ..."
80
msgstr ""
81
81
-#: git-gui.sh:1454
82
+#: git-gui.sh:1629
83
msgid "Calling prepare-commit-msg hook..."
84
msgstr ""
85
85
-#: git-gui.sh:1471
86
+#: git-gui.sh:1646
87
msgid "Commit declined by prepare-commit-msg hook."
88
msgstr ""
89
89
-#: git-gui.sh:1629 lib/browser.tcl:246
90
+#: git-gui.sh:1804 lib/browser.tcl:252
91
msgid "Ready."
92
msgstr ""
93
93
-#: git-gui.sh:1787
94
+#: git-gui.sh:1968
95
#, tcl-format
95
-msgid "Displaying only %s of %s files."
96
+msgid ""
97
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
98
msgstr ""
99
98
-#: git-gui.sh:1913
100
+#: git-gui.sh:2091
101
msgid "Unmodified"
102
msgstr ""
103
102
-#: git-gui.sh:1915
104
+#: git-gui.sh:2093
105
msgid "Modified, not staged"
106
msgstr ""
107
106
-#: git-gui.sh:1916 git-gui.sh:1924
108
+#: git-gui.sh:2094 git-gui.sh:2106
109
msgid "Staged for commit"
110
msgstr ""
111
110
-#: git-gui.sh:1917 git-gui.sh:1925
112
+#: git-gui.sh:2095 git-gui.sh:2107
113
msgid "Portions staged for commit"
114
msgstr ""
115
114
-#: git-gui.sh:1918 git-gui.sh:1926
116
+#: git-gui.sh:2096 git-gui.sh:2108
117
msgid "Staged for commit, missing"
118
msgstr ""
119
118
-#: git-gui.sh:1920
120
+#: git-gui.sh:2098
121
msgid "File type changed, not staged"
122
msgstr ""
123
122
-#: git-gui.sh:1921
124
+#: git-gui.sh:2099 git-gui.sh:2100
125
+msgid "File type changed, old type staged for commit"
126
+msgstr ""
127
+
128
+#: git-gui.sh:2101
129
msgid "File type changed, staged"
130
msgstr ""
131
126
-#: git-gui.sh:1923
132
+#: git-gui.sh:2102
133
+msgid "File type change staged, modification not staged"
134
+msgstr ""
135
+
136
+#: git-gui.sh:2103
137
+msgid "File type change staged, file missing"
138
+msgstr ""
139
+
140
+#: git-gui.sh:2105
141
msgid "Untracked, not staged"
142
msgstr ""
143
130
-#: git-gui.sh:1928
144
+#: git-gui.sh:2110
145
msgid "Missing"
146
msgstr ""
147
134
-#: git-gui.sh:1929
148
+#: git-gui.sh:2111
149
msgid "Staged for removal"
150
msgstr ""
151
138
-#: git-gui.sh:1930
152
+#: git-gui.sh:2112
153
msgid "Staged for removal, still present"
154
msgstr ""
155
142
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
143
-#: git-gui.sh:1936 git-gui.sh:1937
156
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
157
+#: git-gui.sh:2118 git-gui.sh:2119
158
msgid "Requires merge resolution"
159
msgstr ""
160
147
-#: git-gui.sh:1972
148
-msgid "Starting gitk... please wait..."
161
+#: git-gui.sh:2164
162
+msgid "Couldn't find gitk in PATH"
163
msgstr ""
164
151
-#: git-gui.sh:1984
152
-msgid "Couldn't find gitk in PATH"
165
+#: git-gui.sh:2210 git-gui.sh:2245
166
+#, tcl-format
167
+msgid "Starting %s... please wait..."
168
msgstr ""
169
155
-#: git-gui.sh:2043
170
+#: git-gui.sh:2224
171
msgid "Couldn't find git gui in PATH"
172
msgstr ""
173
159
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
174
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
175
msgid "Repository"
176
msgstr ""
177
163
-#: git-gui.sh:2456
178
+#: git-gui.sh:2727
179
msgid "Edit"
180
msgstr ""
181
167
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
182
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
183
msgid "Branch"
184
msgstr ""
185
171
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
186
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
187
msgid "Commit@@noun"
188
msgstr ""
189
175
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
190
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
191
msgid "Merge"
192
msgstr ""
193
179
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
194
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
195
msgid "Remote"
196
msgstr ""
197
183
-#: git-gui.sh:2468
198
+#: git-gui.sh:2739
199
msgid "Tools"
200
msgstr ""
201
187
-#: git-gui.sh:2477
202
+#: git-gui.sh:2748
203
msgid "Explore Working Copy"
204
msgstr ""
205
191
-#: git-gui.sh:2483
206
+#: git-gui.sh:2763
207
+msgid "Git Bash"
208
+msgstr ""
209
+
210
+#: git-gui.sh:2772
211
msgid "Browse Current Branch's Files"
212
msgstr ""
213
195
-#: git-gui.sh:2487
214
+#: git-gui.sh:2776
215
msgid "Browse Branch Files..."
216
msgstr ""
217
199
-#: git-gui.sh:2492
218
+#: git-gui.sh:2781
219
msgid "Visualize Current Branch's History"
220
msgstr ""
221
203
-#: git-gui.sh:2496
222
+#: git-gui.sh:2785
223
msgid "Visualize All Branch History"
224
msgstr ""
225
207
-#: git-gui.sh:2503
226
+#: git-gui.sh:2792
227
#, tcl-format
228
msgid "Browse %s's Files"
229
msgstr ""
230
212
-#: git-gui.sh:2505
231
+#: git-gui.sh:2794
232
#, tcl-format
233
msgid "Visualize %s's History"
234
msgstr ""
235
217
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
236
+#: git-gui.sh:2799 lib/database.tcl:40
237
msgid "Database Statistics"
238
msgstr ""
239
221
-#: git-gui.sh:2513 lib/database.tcl:34
240
+#: git-gui.sh:2802 lib/database.tcl:33
241
msgid "Compress Database"
242
msgstr ""
243
225
-#: git-gui.sh:2516
244
+#: git-gui.sh:2805
245
msgid "Verify Database"
246
msgstr ""
247
229
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
230
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
248
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
249
msgid "Create Desktop Icon"
250
msgstr ""
251
234
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
252
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
253
msgid "Quit"
254
msgstr ""
255
238
-#: git-gui.sh:2547
256
+#: git-gui.sh:2836
257
msgid "Undo"
258
msgstr ""
259
242
-#: git-gui.sh:2550
260
+#: git-gui.sh:2839
261
msgid "Redo"
262
msgstr ""
263
246
-#: git-gui.sh:2554 git-gui.sh:3109
264
+#: git-gui.sh:2843 git-gui.sh:3461
265
msgid "Cut"
266
msgstr ""
267
250
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
268
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
269
#: lib/console.tcl:69
270
msgid "Copy"
271
msgstr ""
272
255
-#: git-gui.sh:2560 git-gui.sh:3115
273
+#: git-gui.sh:2849 git-gui.sh:3467
274
msgid "Paste"
275
msgstr ""
276
259
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
260
-#: lib/remote_branch_delete.tcl:38
277
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
278
+#: lib/branch_delete.tcl:28
279
msgid "Delete"
280
msgstr ""
281
264
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
282
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
283
msgid "Select All"
284
msgstr ""
285
268
-#: git-gui.sh:2576
286
+#: git-gui.sh:2865
287
msgid "Create..."
288
msgstr ""
289
272
-#: git-gui.sh:2582
290
+#: git-gui.sh:2871
291
msgid "Checkout..."
292
msgstr ""
293
276
-#: git-gui.sh:2588
294
+#: git-gui.sh:2877
295
msgid "Rename..."
296
msgstr ""
297
280
-#: git-gui.sh:2593
298
+#: git-gui.sh:2882
299
msgid "Delete..."
300
msgstr ""
301
284
-#: git-gui.sh:2598
302
+#: git-gui.sh:2887
303
msgid "Reset..."
304
msgstr ""
305
288
-#: git-gui.sh:2608
306
+#: git-gui.sh:2897
307
msgid "Done"
308
msgstr ""
309
292
-#: git-gui.sh:2610
310
+#: git-gui.sh:2899
311
msgid "Commit@@verb"
312
msgstr ""
313
296
-#: git-gui.sh:2619 git-gui.sh:3050
297
-msgid "New Commit"
298
-msgstr ""
299
-
300
-#: git-gui.sh:2627 git-gui.sh:3057
314
+#: git-gui.sh:2908 git-gui.sh:3400
315
msgid "Amend Last Commit"
316
msgstr ""
317
304
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
318
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
319
msgid "Rescan"
320
msgstr ""
321
308
-#: git-gui.sh:2643
322
+#: git-gui.sh:2924
323
msgid "Stage To Commit"
324
msgstr ""
325
312
-#: git-gui.sh:2649
326
+#: git-gui.sh:2930
327
msgid "Stage Changed Files To Commit"
328
msgstr ""
329
316
-#: git-gui.sh:2655
330
+#: git-gui.sh:2936
331
msgid "Unstage From Commit"
332
msgstr ""
333
320
-#: git-gui.sh:2661 lib/index.tcl:412
334
+#: git-gui.sh:2942 lib/index.tcl:521
335
msgid "Revert Changes"
336
msgstr ""
337
324
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
338
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
339
msgid "Show Less Context"
340
msgstr ""
341
328
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
342
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
343
msgid "Show More Context"
344
msgstr ""
345
332
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
346
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
347
msgid "Sign Off"
348
msgstr ""
349
336
-#: git-gui.sh:2696
350
+#: git-gui.sh:2977
351
msgid "Local Merge..."
352
msgstr ""
353
340
-#: git-gui.sh:2701
354
+#: git-gui.sh:2982
355
msgid "Abort Merge..."
356
msgstr ""
357
344
-#: git-gui.sh:2713 git-gui.sh:2741
358
+#: git-gui.sh:2994 git-gui.sh:3022
359
msgid "Add..."
360
msgstr ""
361
348
-#: git-gui.sh:2717
362
+#: git-gui.sh:2998
363
msgid "Push..."
364
msgstr ""
365
352
-#: git-gui.sh:2721
366
+#: git-gui.sh:3002
367
msgid "Delete Branch..."
368
msgstr ""
369
356
-#: git-gui.sh:2731 git-gui.sh:3292
370
+#: git-gui.sh:3012 git-gui.sh:3666
371
msgid "Options..."
372
msgstr ""
373
360
-#: git-gui.sh:2742
374
+#: git-gui.sh:3023
375
msgid "Remove..."
376
msgstr ""
377
364
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
378
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
379
msgid "Help"
380
msgstr ""
381
368
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
369
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
382
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
383
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
384
#, tcl-format
385
msgid "About %s"
386
msgstr ""
387
374
-#: git-gui.sh:2783
388
+#: git-gui.sh:3064
389
msgid "Online Documentation"
390
msgstr ""
391
378
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
392
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
393
msgid "Show SSH Key"
394
msgstr ""
395
382
-#: git-gui.sh:2893
396
+#: git-gui.sh:3097 git-gui.sh:3229
397
+msgid "usage:"
398
+msgstr ""
399
+
400
+#: git-gui.sh:3101 git-gui.sh:3233
401
+msgid "Usage"
402
+msgstr ""
403
+
404
+#: git-gui.sh:3182 lib/blame.tcl:575
405
+msgid "Error"
406
+msgstr ""
407
+
408
+#: git-gui.sh:3213
409
#, tcl-format
410
msgid "fatal: cannot stat path %s: No such file or directory"
411
msgstr ""
412
387
-#: git-gui.sh:2926
413
+#: git-gui.sh:3246
414
msgid "Current Branch:"
415
msgstr ""
416
391
-#: git-gui.sh:2947
392
-msgid "Staged Changes (Will Commit)"
417
+#: git-gui.sh:3271
418
+msgid "Unstaged Changes"
419
msgstr ""
420
395
-#: git-gui.sh:2967
396
-msgid "Unstaged Changes"
421
+#: git-gui.sh:3293
422
+msgid "Staged Changes (Will Commit)"
423
msgstr ""
424
399
-#: git-gui.sh:3017
425
+#: git-gui.sh:3367
426
msgid "Stage Changed"
427
msgstr ""
428
403
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
429
+#: git-gui.sh:3386 lib/transport.tcl:137
430
msgid "Push"
431
msgstr ""
432
407
-#: git-gui.sh:3071
433
+#: git-gui.sh:3413
434
msgid "Initial Commit Message:"
435
msgstr ""
436
411
-#: git-gui.sh:3072
437
+#: git-gui.sh:3414
438
msgid "Amended Commit Message:"
439
msgstr ""
440
415
-#: git-gui.sh:3073
441
+#: git-gui.sh:3415
442
msgid "Amended Initial Commit Message:"
443
msgstr ""
444
419
-#: git-gui.sh:3074
445
+#: git-gui.sh:3416
446
msgid "Amended Merge Commit Message:"
447
msgstr ""
448
423
-#: git-gui.sh:3075
449
+#: git-gui.sh:3417
450
msgid "Merge Commit Message:"
451
msgstr ""
452
427
-#: git-gui.sh:3076
453
+#: git-gui.sh:3418
454
msgid "Commit Message:"
455
msgstr ""
456
431
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
457
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
458
msgid "Copy All"
459
msgstr ""
460
435
-#: git-gui.sh:3149 lib/blame.tcl:104
461
+#: git-gui.sh:3501 lib/blame.tcl:106
462
msgid "File:"
463
msgstr ""
464
439
-#: git-gui.sh:3255
465
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
466
+msgid "Open"
467
+msgstr ""
468
+
469
+#: git-gui.sh:3629
470
msgid "Refresh"
471
msgstr ""
472
443
-#: git-gui.sh:3276
473
+#: git-gui.sh:3650
474
msgid "Decrease Font Size"
475
msgstr ""
476
447
-#: git-gui.sh:3280
477
+#: git-gui.sh:3654
478
msgid "Increase Font Size"
479
msgstr ""
480
451
-#: git-gui.sh:3288 lib/blame.tcl:281
481
+#: git-gui.sh:3662 lib/blame.tcl:296
482
msgid "Encoding"
483
msgstr ""
484
455
-#: git-gui.sh:3299
485
+#: git-gui.sh:3673
486
msgid "Apply/Reverse Hunk"
487
msgstr ""
488
459
-#: git-gui.sh:3304
489
+#: git-gui.sh:3678
490
msgid "Apply/Reverse Line"
491
msgstr ""
492
463
-#: git-gui.sh:3323
493
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
494
+msgid "Revert Hunk"
495
+msgstr ""
496
+
497
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
498
+msgid "Revert Line"
499
+msgstr ""
500
+
501
+#: git-gui.sh:3694 git-gui.sh:3791
502
+msgid "Undo Last Revert"
503
+msgstr ""
504
+
505
+#: git-gui.sh:3713
506
msgid "Run Merge Tool"
507
msgstr ""
508
467
-#: git-gui.sh:3328
509
+#: git-gui.sh:3718
510
msgid "Use Remote Version"
511
msgstr ""
512
471
-#: git-gui.sh:3332
513
+#: git-gui.sh:3722
514
msgid "Use Local Version"
515
msgstr ""
516
475
-#: git-gui.sh:3336
517
+#: git-gui.sh:3726
518
msgid "Revert To Base"
519
msgstr ""
520
479
-#: git-gui.sh:3354
521
+#: git-gui.sh:3744
522
msgid "Visualize These Changes In The Submodule"
523
msgstr ""
524
483
-#: git-gui.sh:3358
525
+#: git-gui.sh:3748
526
msgid "Visualize Current Branch History In The Submodule"
527
msgstr ""
528
487
-#: git-gui.sh:3362
529
+#: git-gui.sh:3752
530
msgid "Visualize All Branch History In The Submodule"
531
msgstr ""
532
491
-#: git-gui.sh:3367
533
+#: git-gui.sh:3757
534
msgid "Start git gui In The Submodule"
535
msgstr ""
536
495
-#: git-gui.sh:3389
537
+#: git-gui.sh:3793
538
msgid "Unstage Hunk From Commit"
539
msgstr ""
540
499
-#: git-gui.sh:3391
541
+#: git-gui.sh:3797
542
msgid "Unstage Lines From Commit"
543
msgstr ""
544
503
-#: git-gui.sh:3393
545
+#: git-gui.sh:3798 git-gui.sh:3809
546
+msgid "Revert Lines"
547
+msgstr ""
548
+
549
+#: git-gui.sh:3800
550
msgid "Unstage Line From Commit"
551
msgstr ""
552
507
-#: git-gui.sh:3396
553
+#: git-gui.sh:3804
554
msgid "Stage Hunk For Commit"
555
msgstr ""
556
511
-#: git-gui.sh:3398
557
+#: git-gui.sh:3808
558
msgid "Stage Lines For Commit"
559
msgstr ""
560
515
-#: git-gui.sh:3400
561
+#: git-gui.sh:3811
562
msgid "Stage Line For Commit"
563
msgstr ""
564
519
-#: git-gui.sh:3424
565
+#: git-gui.sh:3861
566
msgid "Initializing..."
567
msgstr ""
568
523
-#: git-gui.sh:3541
569
+#: git-gui.sh:4017
570
#, tcl-format
571
msgid ""
572
"Possible environment issues exist.\n"
@@ -531,14 +577,14 @@ msgid ""
577
"\n"
578
msgstr ""
579
534
-#: git-gui.sh:3570
580
+#: git-gui.sh:4046
581
msgid ""
582
"\n"
583
"This is due to a known issue with the\n"
584
"Tcl binary distributed by Cygwin."
585
msgstr ""
586
541
-#: git-gui.sh:3575
587
+#: git-gui.sh:4051
588
#, tcl-format
589
msgid ""
590
"\n"
@@ -549,1846 +595,2072 @@ msgid ""
595
"~/.gitconfig file.\n"
596
msgstr ""
597
552
-#: lib/about.tcl:26
553
-msgid "git-gui - a graphical user interface for Git."
598
+#: lib/spellcheck.tcl:57
599
+msgid "Unsupported spell checker"
600
msgstr ""
601
556
-#: lib/blame.tcl:72
557
-msgid "File Viewer"
602
+#: lib/spellcheck.tcl:65
603
+msgid "Spell checking is unavailable"
604
msgstr ""
605
560
-#: lib/blame.tcl:78
561
-msgid "Commit:"
606
+#: lib/spellcheck.tcl:68
607
+msgid "Invalid spell checking configuration"
608
msgstr ""
609
564
-#: lib/blame.tcl:271
565
-msgid "Copy Commit"
610
+#: lib/spellcheck.tcl:70
611
+#, tcl-format
612
+msgid "Reverting dictionary to %s."
613
msgstr ""
614
568
-#: lib/blame.tcl:275
569
-msgid "Find Text..."
615
+#: lib/spellcheck.tcl:73
616
+msgid "Spell checker silently failed on startup"
617
msgstr ""
618
572
-#: lib/blame.tcl:284
573
-msgid "Do Full Copy Detection"
619
+#: lib/spellcheck.tcl:80
620
+msgid "Unrecognized spell checker"
621
msgstr ""
622
576
-#: lib/blame.tcl:288
577
-msgid "Show History Context"
623
+#: lib/spellcheck.tcl:186
624
+msgid "No Suggestions"
625
msgstr ""
626
580
-#: lib/blame.tcl:291
581
-msgid "Blame Parent Commit"
627
+#: lib/spellcheck.tcl:388
628
+msgid "Unexpected EOF from spell checker"
629
msgstr ""
630
584
-#: lib/blame.tcl:450
585
-#, tcl-format
586
-msgid "Reading %s..."
631
+#: lib/spellcheck.tcl:392
632
+msgid "Spell Checker Failed"
633
msgstr ""
634
589
-#: lib/blame.tcl:557
590
-msgid "Loading copy/move tracking annotations..."
635
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
636
+#, tcl-format
637
+msgid "fetch %s"
638
msgstr ""
639
593
-#: lib/blame.tcl:577
594
-msgid "lines annotated"
640
+#: lib/transport.tcl:7
641
+#, tcl-format
642
+msgid "Fetching new changes from %s"
643
msgstr ""
644
597
-#: lib/blame.tcl:769
598
-msgid "Loading original location annotations..."
645
+#: lib/transport.tcl:18
646
+#, tcl-format
647
+msgid "remote prune %s"
648
msgstr ""
649
601
-#: lib/blame.tcl:772
602
-msgid "Annotation complete."
650
+#: lib/transport.tcl:19
651
+#, tcl-format
652
+msgid "Pruning tracking branches deleted from %s"
653
msgstr ""
654
605
-#: lib/blame.tcl:802
606
-msgid "Busy"
655
+#: lib/transport.tcl:25
656
+msgid "fetch all remotes"
657
msgstr ""
658
609
-#: lib/blame.tcl:803
610
-msgid "Annotation process is already running."
659
+#: lib/transport.tcl:26
660
+msgid "Fetching new changes from all remotes"
661
msgstr ""
662
613
-#: lib/blame.tcl:842
614
-msgid "Running thorough copy detection..."
663
+#: lib/transport.tcl:40
664
+msgid "remote prune all remotes"
665
msgstr ""
666
617
-#: lib/blame.tcl:910
618
-msgid "Loading annotation..."
667
+#: lib/transport.tcl:41
668
+msgid "Pruning tracking branches deleted from all remotes"
669
msgstr ""
670
621
-#: lib/blame.tcl:963
622
-msgid "Author:"
671
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
672
+#: lib/remote_add.tcl:162
673
+#, tcl-format
674
+msgid "push %s"
675
msgstr ""
676
625
-#: lib/blame.tcl:967
626
-msgid "Committer:"
677
+#: lib/transport.tcl:55
678
+#, tcl-format
679
+msgid "Pushing changes to %s"
680
msgstr ""
681
629
-#: lib/blame.tcl:972
630
-msgid "Original File:"
682
+#: lib/transport.tcl:93
683
+#, tcl-format
684
+msgid "Mirroring to %s"
685
msgstr ""
686
633
-#: lib/blame.tcl:1020
634
-msgid "Cannot find HEAD commit:"
687
+#: lib/transport.tcl:111
688
+#, tcl-format
689
+msgid "Pushing %s %s to %s"
690
msgstr ""
691
637
-#: lib/blame.tcl:1075
638
-msgid "Cannot find parent commit:"
692
+#: lib/transport.tcl:132
693
+msgid "Push Branches"
694
msgstr ""
695
641
-#: lib/blame.tcl:1090
642
-msgid "Unable to display parent"
696
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
697
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
698
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
699
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
700
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
701
+msgid "Cancel"
702
msgstr ""
703
645
-#: lib/blame.tcl:1091 lib/diff.tcl:320
646
-msgid "Error loading diff:"
704
+#: lib/transport.tcl:147
705
+msgid "Source Branches"
706
msgstr ""
707
649
-#: lib/blame.tcl:1231
650
-msgid "Originally By:"
708
+#: lib/transport.tcl:162
709
+msgid "Destination Repository"
710
msgstr ""
711
653
-#: lib/blame.tcl:1237
654
-msgid "In File:"
712
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
713
+msgid "Remote:"
714
msgstr ""
715
657
-#: lib/blame.tcl:1242
658
-msgid "Copied Or Moved Here By:"
716
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
717
+msgid "Arbitrary Location:"
718
msgstr ""
719
661
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
662
-msgid "Checkout Branch"
720
+#: lib/transport.tcl:205
721
+msgid "Transfer Options"
722
msgstr ""
723
665
-#: lib/branch_checkout.tcl:23
666
-msgid "Checkout"
724
+#: lib/transport.tcl:207
725
+msgid "Force overwrite existing branch (may discard changes)"
726
msgstr ""
727
669
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
670
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
671
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
672
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
673
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
674
-#: lib/transport.tcl:108
675
-msgid "Cancel"
728
+#: lib/transport.tcl:211
729
+msgid "Use thin pack (for slow network connections)"
730
msgstr ""
731
678
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
679
-msgid "Revision"
732
+#: lib/transport.tcl:215
733
+msgid "Include tags"
734
msgstr ""
735
682
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
683
-msgid "Options"
736
+#: lib/transport.tcl:229
737
+#, tcl-format
738
+msgid "%s (%s): Push"
739
msgstr ""
740
686
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
687
-msgid "Fetch Tracking Branch"
741
+#: lib/checkout_op.tcl:85
742
+#, tcl-format
743
+msgid "Fetching %s from %s"
744
msgstr ""
745
690
-#: lib/branch_checkout.tcl:44
691
-msgid "Detach From Local Branch"
746
+#: lib/checkout_op.tcl:133
747
+#, tcl-format
748
+msgid "fatal: Cannot resolve %s"
749
msgstr ""
750
694
-#: lib/branch_create.tcl:22
695
-msgid "Create Branch"
751
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
752
+#: lib/database.tcl:30
753
+msgid "Close"
754
msgstr ""
755
698
-#: lib/branch_create.tcl:27
699
-msgid "Create New Branch"
756
+#: lib/checkout_op.tcl:175
757
+#, tcl-format
758
+msgid "Branch '%s' does not exist."
759
msgstr ""
760
702
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
703
-msgid "Create"
761
+#: lib/checkout_op.tcl:194
762
+#, tcl-format
763
+msgid "Failed to configure simplified git-pull for '%s'."
764
msgstr ""
765
706
-#: lib/branch_create.tcl:40
707
-msgid "Branch Name"
766
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
767
+#, tcl-format
768
+msgid "Branch '%s' already exists."
769
msgstr ""
770
710
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
711
-msgid "Name:"
771
+#: lib/checkout_op.tcl:229
772
+#, tcl-format
773
+msgid ""
774
+"Branch '%s' already exists.\n"
775
+"\n"
776
+"It cannot fast-forward to %s.\n"
777
+"A merge is required."
778
msgstr ""
779
714
-#: lib/branch_create.tcl:58
715
-msgid "Match Tracking Branch Name"
780
+#: lib/checkout_op.tcl:243
781
+#, tcl-format
782
+msgid "Merge strategy '%s' not supported."
783
msgstr ""
784
718
-#: lib/branch_create.tcl:66
719
-msgid "Starting Revision"
785
+#: lib/checkout_op.tcl:262
786
+#, tcl-format
787
+msgid "Failed to update '%s'."
788
msgstr ""
789
722
-#: lib/branch_create.tcl:72
723
-msgid "Update Existing Branch:"
790
+#: lib/checkout_op.tcl:274
791
+msgid "Staging area (index) is already locked."
792
msgstr ""
793
726
-#: lib/branch_create.tcl:75
727
-msgid "No"
794
+#: lib/checkout_op.tcl:289
795
+msgid ""
796
+"Last scanned state does not match repository state.\n"
797
+"\n"
798
+"Another Git program has modified this repository since the last scan. A "
799
+"rescan must be performed before the current branch can be changed.\n"
800
+"\n"
801
+"The rescan will be automatically started now.\n"
802
msgstr ""
803
730
-#: lib/branch_create.tcl:80
731
-msgid "Fast Forward Only"
804
+#: lib/checkout_op.tcl:345
805
+#, tcl-format
806
+msgid "Updating working directory to '%s'..."
807
msgstr ""
808
734
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
735
-msgid "Reset"
809
+#: lib/checkout_op.tcl:346
810
+msgid "files checked out"
811
msgstr ""
812
738
-#: lib/branch_create.tcl:97
739
-msgid "Checkout After Creation"
813
+#: lib/checkout_op.tcl:377
814
+#, tcl-format
815
+msgid "Aborted checkout of '%s' (file level merging is required)."
816
msgstr ""
817
742
-#: lib/branch_create.tcl:131
743
-msgid "Please select a tracking branch."
818
+#: lib/checkout_op.tcl:378
819
+msgid "File level merge required."
820
msgstr ""
821
746
-#: lib/branch_create.tcl:140
822
+#: lib/checkout_op.tcl:382
823
#, tcl-format
748
-msgid "Tracking branch %s is not a branch in the remote repository."
824
+msgid "Staying on branch '%s'."
825
msgstr ""
826
751
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
752
-msgid "Please supply a branch name."
827
+#: lib/checkout_op.tcl:453
828
+msgid ""
829
+"You are no longer on a local branch.\n"
830
+"\n"
831
+"If you wanted to be on a branch, create one now starting from 'This Detached "
832
+"Checkout'."
833
msgstr ""
834
755
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
835
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
836
#, tcl-format
757
-msgid "'%s' is not an acceptable branch name."
837
+msgid "Checked out '%s'."
838
msgstr ""
839
760
-#: lib/branch_delete.tcl:15
761
-msgid "Delete Branch"
840
+#: lib/checkout_op.tcl:536
841
+#, tcl-format
842
+msgid "Resetting '%s' to '%s' will lose the following commits:"
843
msgstr ""
844
764
-#: lib/branch_delete.tcl:20
765
-msgid "Delete Local Branch"
845
+#: lib/checkout_op.tcl:558
846
+msgid "Recovering lost commits may not be easy."
847
msgstr ""
848
768
-#: lib/branch_delete.tcl:37
769
-msgid "Local Branches"
849
+#: lib/checkout_op.tcl:563
850
+#, tcl-format
851
+msgid "Reset '%s'?"
852
msgstr ""
853
772
-#: lib/branch_delete.tcl:52
773
-msgid "Delete Only If Merged Into"
854
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
855
+msgid "Visualize"
856
msgstr ""
857
776
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
777
-msgid "Always (Do not perform merge checks)"
858
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
859
+msgid "Reset"
860
msgstr ""
861
780
-#: lib/branch_delete.tcl:103
862
+#: lib/checkout_op.tcl:636
863
#, tcl-format
782
-msgid "The following branches are not completely merged into %s:"
783
-msgstr ""
784
-
785
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
864
msgid ""
787
-"Recovering deleted branches is difficult.\n"
865
+"Failed to set current branch.\n"
866
"\n"
789
-"Delete the selected branches?"
867
+"This working directory is only partially switched. We successfully updated "
868
+"your files, but failed to update an internal Git file.\n"
869
+"\n"
870
+"This should not have occurred. %s will now close and give up."
871
msgstr ""
872
792
-#: lib/branch_delete.tcl:141
873
+#: lib/remote_add.tcl:20
874
#, tcl-format
794
-msgid ""
795
-"Failed to delete branches:\n"
796
-"%s"
875
+msgid "%s (%s): Add Remote"
876
msgstr ""
877
799
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
800
-msgid "Rename Branch"
878
+#: lib/remote_add.tcl:25
879
+msgid "Add New Remote"
880
msgstr ""
881
803
-#: lib/branch_rename.tcl:26
804
-msgid "Rename"
882
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
883
+msgid "Add"
884
msgstr ""
885
807
-#: lib/branch_rename.tcl:36
808
-msgid "Branch:"
886
+#: lib/remote_add.tcl:39
887
+msgid "Remote Details"
888
msgstr ""
889
811
-#: lib/branch_rename.tcl:39
812
-msgid "New Name:"
890
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
891
+msgid "Name:"
892
msgstr ""
893
815
-#: lib/branch_rename.tcl:75
816
-msgid "Please select a branch to rename."
894
+#: lib/remote_add.tcl:50
895
+msgid "Location:"
896
msgstr ""
897
819
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
820
-#, tcl-format
821
-msgid "Branch '%s' already exists."
898
+#: lib/remote_add.tcl:60
899
+msgid "Further Action"
900
msgstr ""
901
824
-#: lib/branch_rename.tcl:117
825
-#, tcl-format
826
-msgid "Failed to rename '%s'."
902
+#: lib/remote_add.tcl:63
903
+msgid "Fetch Immediately"
904
msgstr ""
905
829
-#: lib/browser.tcl:17
830
-msgid "Starting..."
906
+#: lib/remote_add.tcl:69
907
+msgid "Initialize Remote Repository and Push"
908
msgstr ""
909
833
-#: lib/browser.tcl:26
834
-msgid "File Browser"
910
+#: lib/remote_add.tcl:75
911
+msgid "Do Nothing Else Now"
912
msgstr ""
913
837
-#: lib/browser.tcl:126 lib/browser.tcl:143
838
-#, tcl-format
839
-msgid "Loading %s..."
914
+#: lib/remote_add.tcl:100
915
+msgid "Please supply a remote name."
916
msgstr ""
917
842
-#: lib/browser.tcl:187
843
-msgid "[Up To Parent]"
918
+#: lib/remote_add.tcl:113
919
+#, tcl-format
920
+msgid "'%s' is not an acceptable remote name."
921
msgstr ""
922
846
-#: lib/browser.tcl:267 lib/browser.tcl:273
847
-msgid "Browse Branch Files"
923
+#: lib/remote_add.tcl:124
924
+#, tcl-format
925
+msgid "Failed to add remote '%s' of location '%s'."
926
msgstr ""
927
850
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
851
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
852
-#: lib/choose_repository.tcl:1028
853
-msgid "Browse"
928
+#: lib/remote_add.tcl:133
929
+#, tcl-format
930
+msgid "Fetching the %s"
931
msgstr ""
932
856
-#: lib/checkout_op.tcl:85
933
+#: lib/remote_add.tcl:156
934
#, tcl-format
858
-msgid "Fetching %s from %s"
935
+msgid "Do not know how to initialize repository at location '%s'."
936
msgstr ""
937
861
-#: lib/checkout_op.tcl:133
938
+#: lib/remote_add.tcl:163
939
#, tcl-format
863
-msgid "fatal: Cannot resolve %s"
940
+msgid "Setting up the %s (at %s)"
941
msgstr ""
942
866
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
867
-#: lib/sshkey.tcl:53
868
-msgid "Close"
943
+#: lib/browser.tcl:17
944
+msgid "Starting..."
945
msgstr ""
946
871
-#: lib/checkout_op.tcl:175
947
+#: lib/browser.tcl:27
948
#, tcl-format
873
-msgid "Branch '%s' does not exist."
949
+msgid "%s (%s): File Browser"
950
msgstr ""
951
876
-#: lib/checkout_op.tcl:194
952
+#: lib/browser.tcl:132 lib/browser.tcl:149
953
#, tcl-format
878
-msgid "Failed to configure simplified git-pull for '%s'."
954
+msgid "Loading %s..."
955
msgstr ""
956
881
-#: lib/checkout_op.tcl:229
882
-#, tcl-format
883
-msgid ""
884
-"Branch '%s' already exists.\n"
885
-"\n"
886
-"It cannot fast-forward to %s.\n"
887
-"A merge is required."
957
+#: lib/browser.tcl:193
958
+msgid "[Up To Parent]"
959
msgstr ""
960
890
-#: lib/checkout_op.tcl:243
961
+#: lib/browser.tcl:275
962
#, tcl-format
892
-msgid "Merge strategy '%s' not supported."
963
+msgid "%s (%s): Browse Branch Files"
964
msgstr ""
965
895
-#: lib/checkout_op.tcl:262
896
-#, tcl-format
897
-msgid "Failed to update '%s'."
966
+#: lib/browser.tcl:282
967
+msgid "Browse Branch Files"
968
msgstr ""
969
900
-#: lib/checkout_op.tcl:274
901
-msgid "Staging area (index) is already locked."
970
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
971
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
972
+#: lib/choose_repository.tcl:1115
973
+msgid "Browse"
974
msgstr ""
975
904
-#: lib/checkout_op.tcl:289
905
-msgid ""
906
-"Last scanned state does not match repository state.\n"
907
-"\n"
908
-"Another Git program has modified this repository since the last scan. A "
909
-"rescan must be performed before the current branch can be changed.\n"
910
-"\n"
911
-"The rescan will be automatically started now.\n"
976
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
977
+msgid "Revision"
978
msgstr ""
979
914
-#: lib/checkout_op.tcl:345
915
-#, tcl-format
916
-msgid "Updating working directory to '%s'..."
980
+#: lib/index.tcl:6
981
+msgid "Unable to unlock the index."
982
msgstr ""
983
919
-#: lib/checkout_op.tcl:346
920
-msgid "files checked out"
984
+#: lib/index.tcl:30
985
+msgid "Index Error"
986
msgstr ""
987
923
-#: lib/checkout_op.tcl:376
924
-#, tcl-format
925
-msgid "Aborted checkout of '%s' (file level merging is required)."
988
+#: lib/index.tcl:32
989
+msgid ""
990
+"Updating the Git index failed. A rescan will be automatically started to "
991
+"resynchronize git-gui."
992
msgstr ""
993
928
-#: lib/checkout_op.tcl:377
929
-msgid "File level merge required."
994
+#: lib/index.tcl:43
995
+msgid "Continue"
996
msgstr ""
997
932
-#: lib/checkout_op.tcl:381
933
-#, tcl-format
934
-msgid "Staying on branch '%s'."
998
+#: lib/index.tcl:46
999
+msgid "Unlock Index"
1000
msgstr ""
1001
937
-#: lib/checkout_op.tcl:452
938
-msgid ""
939
-"You are no longer on a local branch.\n"
940
-"\n"
941
-"If you wanted to be on a branch, create one now starting from 'This Detached "
942
-"Checkout'."
1002
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
1003
+#: lib/choose_repository.tcl:999
1004
+msgid "files"
1005
msgstr ""
1006
945
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
946
-#, tcl-format
947
-msgid "Checked out '%s'."
1007
+#: lib/index.tcl:326
1008
+msgid "Unstaging selected files from commit"
1009
msgstr ""
1010
950
-#: lib/checkout_op.tcl:535
1011
+#: lib/index.tcl:330
1012
#, tcl-format
952
-msgid "Resetting '%s' to '%s' will lose the following commits:"
1013
+msgid "Unstaging %s from commit"
1014
msgstr ""
1015
955
-#: lib/checkout_op.tcl:557
956
-msgid "Recovering lost commits may not be easy."
1016
+#: lib/index.tcl:369
1017
+msgid "Ready to commit."
1018
msgstr ""
1019
959
-#: lib/checkout_op.tcl:562
960
-#, tcl-format
961
-msgid "Reset '%s'?"
1020
+#: lib/index.tcl:378
1021
+msgid "Adding selected files"
1022
msgstr ""
1023
964
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
965
-msgid "Visualize"
1024
+#: lib/index.tcl:382
1025
+#, tcl-format
1026
+msgid "Adding %s"
1027
msgstr ""
1028
968
-#: lib/checkout_op.tcl:635
1029
+#: lib/index.tcl:412
1030
#, tcl-format
970
-msgid ""
971
-"Failed to set current branch.\n"
972
-"\n"
973
-"This working directory is only partially switched. We successfully updated "
974
-"your files, but failed to update an internal Git file.\n"
975
-"\n"
976
-"This should not have occurred. %s will now close and give up."
1031
+msgid "Stage %d untracked files?"
1032
msgstr ""
1033
979
-#: lib/choose_font.tcl:39
980
-msgid "Select"
1034
+#: lib/index.tcl:420
1035
+msgid "Adding all changed files"
1036
msgstr ""
1037
983
-#: lib/choose_font.tcl:53
984
-msgid "Font Family"
1038
+#: lib/index.tcl:503
1039
+#, tcl-format
1040
+msgid "Revert changes in file %s?"
1041
msgstr ""
1042
987
-#: lib/choose_font.tcl:74
988
-msgid "Font Size"
1043
+#: lib/index.tcl:508
1044
+#, tcl-format
1045
+msgid "Revert changes in these %i files?"
1046
msgstr ""
1047
991
-#: lib/choose_font.tcl:91
992
-msgid "Font Example"
1048
+#: lib/index.tcl:517
1049
+msgid "Any unstaged changes will be permanently lost by the revert."
1050
msgstr ""
1051
995
-#: lib/choose_font.tcl:103
996
-msgid ""
997
-"This is example text.\n"
998
-"If you like this text, it can be your font."
1052
+#: lib/index.tcl:520 lib/index.tcl:563
1053
+msgid "Do Nothing"
1054
msgstr ""
1055
1001
-#: lib/choose_repository.tcl:28
1002
-msgid "Git Gui"
1056
+#: lib/index.tcl:545
1057
+#, tcl-format
1058
+msgid "Delete untracked file %s?"
1059
msgstr ""
1060
1005
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
1006
-msgid "Create New Repository"
1061
+#: lib/index.tcl:550
1062
+#, tcl-format
1063
+msgid "Delete these %i untracked files?"
1064
msgstr ""
1065
1009
-#: lib/choose_repository.tcl:93
1010
-msgid "New..."
1066
+#: lib/index.tcl:560
1067
+msgid "Files will be permanently deleted."
1068
msgstr ""
1069
1013
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
1014
-msgid "Clone Existing Repository"
1070
+#: lib/index.tcl:564
1071
+msgid "Delete Files"
1072
msgstr ""
1073
1017
-#: lib/choose_repository.tcl:106
1018
-msgid "Clone..."
1074
+#: lib/index.tcl:586
1075
+msgid "Deleting"
1076
msgstr ""
1077
1021
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
1022
-msgid "Open Existing Repository"
1078
+#: lib/index.tcl:665
1079
+msgid "Encountered errors deleting files:\n"
1080
msgstr ""
1081
1025
-#: lib/choose_repository.tcl:119
1026
-msgid "Open..."
1082
+#: lib/index.tcl:674
1083
+#, tcl-format
1084
+msgid "None of the %d selected files could be deleted."
1085
msgstr ""
1086
1029
-#: lib/choose_repository.tcl:132
1030
-msgid "Recent Repositories"
1087
+#: lib/index.tcl:679
1088
+#, tcl-format
1089
+msgid "%d of the %d selected files could not be deleted."
1090
msgstr ""
1091
1033
-#: lib/choose_repository.tcl:138
1034
-msgid "Open Recent Repository:"
1092
+#: lib/index.tcl:726
1093
+msgid "Reverting selected files"
1094
msgstr ""
1095
1037
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
1038
-#: lib/choose_repository.tcl:320
1096
+#: lib/index.tcl:730
1097
#, tcl-format
1040
-msgid "Failed to create repository %s:"
1098
+msgid "Reverting %s"
1099
msgstr ""
1100
1043
-#: lib/choose_repository.tcl:391
1044
-msgid "Directory:"
1101
+#: lib/branch_checkout.tcl:16
1102
+#, tcl-format
1103
+msgid "%s (%s): Checkout Branch"
1104
msgstr ""
1105
1047
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
1048
-#: lib/choose_repository.tcl:1052
1049
-msgid "Git Repository"
1106
+#: lib/branch_checkout.tcl:21
1107
+msgid "Checkout Branch"
1108
msgstr ""
1109
1052
-#: lib/choose_repository.tcl:448
1053
-#, tcl-format
1054
-msgid "Directory %s already exists."
1110
+#: lib/branch_checkout.tcl:26
1111
+msgid "Checkout"
1112
msgstr ""
1113
1057
-#: lib/choose_repository.tcl:452
1058
-#, tcl-format
1059
-msgid "File %s already exists."
1114
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
1115
+msgid "Options"
1116
msgstr ""
1117
1062
-#: lib/choose_repository.tcl:466
1063
-msgid "Clone"
1118
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
1119
+msgid "Fetch Tracking Branch"
1120
msgstr ""
1121
1066
-#: lib/choose_repository.tcl:479
1067
-msgid "Source Location:"
1122
+#: lib/branch_checkout.tcl:47
1123
+msgid "Detach From Local Branch"
1124
msgstr ""
1125
1070
-#: lib/choose_repository.tcl:490
1071
-msgid "Target Directory:"
1126
+#: lib/status_bar.tcl:263
1127
+#, tcl-format
1128
+msgid "%s ... %*i of %*i %s (%3i%%)"
1129
msgstr ""
1130
1074
-#: lib/choose_repository.tcl:502
1075
-msgid "Clone Type:"
1131
+#: lib/remote.tcl:200
1132
+msgid "Push to"
1133
msgstr ""
1134
1078
-#: lib/choose_repository.tcl:508
1079
-msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
1135
+#: lib/remote.tcl:218
1136
+msgid "Remove Remote"
1137
msgstr ""
1138
1082
-#: lib/choose_repository.tcl:514
1083
-msgid "Full Copy (Slower, Redundant Backup)"
1139
+#: lib/remote.tcl:223
1140
+msgid "Prune from"
1141
msgstr ""
1142
1086
-#: lib/choose_repository.tcl:520
1087
-msgid "Shared (Fastest, Not Recommended, No Backup)"
1143
+#: lib/remote.tcl:228
1144
+msgid "Fetch from"
1145
+msgstr ""
1146
+
1147
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
1148
+msgid "All"
1149
msgstr ""
1150
1090
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
1091
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
1092
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
1151
+#: lib/branch_rename.tcl:15
1152
#, tcl-format
1094
-msgid "Not a Git repository: %s"
1153
+msgid "%s (%s): Rename Branch"
1154
msgstr ""
1155
1097
-#: lib/choose_repository.tcl:592
1098
-msgid "Standard only available for local repository."
1156
+#: lib/branch_rename.tcl:23
1157
+msgid "Rename Branch"
1158
msgstr ""
1159
1101
-#: lib/choose_repository.tcl:596
1102
-msgid "Shared only available for local repository."
1160
+#: lib/branch_rename.tcl:28
1161
+msgid "Rename"
1162
msgstr ""
1163
1105
-#: lib/choose_repository.tcl:617
1106
-#, tcl-format
1107
-msgid "Location %s already exists."
1164
+#: lib/branch_rename.tcl:38
1165
+msgid "Branch:"
1166
msgstr ""
1167
1110
-#: lib/choose_repository.tcl:628
1111
-msgid "Failed to configure origin"
1168
+#: lib/branch_rename.tcl:46
1169
+msgid "New Name:"
1170
msgstr ""
1171
1114
-#: lib/choose_repository.tcl:640
1115
-msgid "Counting objects"
1172
+#: lib/branch_rename.tcl:81
1173
+msgid "Please select a branch to rename."
1174
msgstr ""
1175
1118
-#: lib/choose_repository.tcl:641
1119
-msgid "buckets"
1176
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
1177
+msgid "Please supply a branch name."
1178
msgstr ""
1179
1122
-#: lib/choose_repository.tcl:665
1180
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
1181
#, tcl-format
1124
-msgid "Unable to copy objects/info/alternates: %s"
1182
+msgid "'%s' is not an acceptable branch name."
1183
msgstr ""
1184
1127
-#: lib/choose_repository.tcl:701
1185
+#: lib/branch_rename.tcl:123
1186
#, tcl-format
1129
-msgid "Nothing to clone from %s."
1187
+msgid "Failed to rename '%s'."
1188
msgstr ""
1189
1132
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
1133
-#: lib/choose_repository.tcl:929
1134
-msgid "The 'master' branch has not been initialized."
1190
+#: lib/choose_font.tcl:41
1191
+msgid "Select"
1192
msgstr ""
1193
1137
-#: lib/choose_repository.tcl:716
1138
-msgid "Hardlinks are unavailable. Falling back to copying."
1194
+#: lib/choose_font.tcl:55
1195
+msgid "Font Family"
1196
msgstr ""
1197
1141
-#: lib/choose_repository.tcl:728
1142
-#, tcl-format
1143
-msgid "Cloning from %s"
1198
+#: lib/choose_font.tcl:76
1199
+msgid "Font Size"
1200
msgstr ""
1201
1146
-#: lib/choose_repository.tcl:759
1147
-msgid "Copying objects"
1202
+#: lib/choose_font.tcl:93
1203
+msgid "Font Example"
1204
msgstr ""
1205
1150
-#: lib/choose_repository.tcl:760
1151
-msgid "KiB"
1206
+#: lib/choose_font.tcl:105
1207
+msgid ""
1208
+"This is example text.\n"
1209
+"If you like this text, it can be your font."
1210
msgstr ""
1211
1154
-#: lib/choose_repository.tcl:784
1212
+#: lib/option.tcl:11
1213
#, tcl-format
1156
-msgid "Unable to copy object: %s"
1214
+msgid "Invalid global encoding '%s'"
1215
msgstr ""
1216
1159
-#: lib/choose_repository.tcl:794
1160
-msgid "Linking objects"
1217
+#: lib/option.tcl:19
1218
+#, tcl-format
1219
+msgid "Invalid repo encoding '%s'"
1220
msgstr ""
1221
1163
-#: lib/choose_repository.tcl:795
1164
-msgid "objects"
1222
+#: lib/option.tcl:119
1223
+msgid "Restore Defaults"
1224
+msgstr ""
1225
+
1226
+#: lib/option.tcl:123
1227
+msgid "Save"
1228
msgstr ""
1229
1167
-#: lib/choose_repository.tcl:803
1230
+#: lib/option.tcl:133
1231
#, tcl-format
1169
-msgid "Unable to hardlink object: %s"
1232
+msgid "%s Repository"
1233
msgstr ""
1234
1172
-#: lib/choose_repository.tcl:858
1173
-msgid "Cannot fetch branches and objects. See console output for details."
1235
+#: lib/option.tcl:134
1236
+msgid "Global (All Repositories)"
1237
msgstr ""
1238
1176
-#: lib/choose_repository.tcl:869
1177
-msgid "Cannot fetch tags. See console output for details."
1239
+#: lib/option.tcl:140
1240
+msgid "User Name"
1241
msgstr ""
1242
1180
-#: lib/choose_repository.tcl:893
1181
-msgid "Cannot determine HEAD. See console output for details."
1243
+#: lib/option.tcl:141
1244
+msgid "Email Address"
1245
msgstr ""
1246
1184
-#: lib/choose_repository.tcl:902
1185
-#, tcl-format
1186
-msgid "Unable to cleanup %s"
1247
+#: lib/option.tcl:143
1248
+msgid "Summarize Merge Commits"
1249
msgstr ""
1250
1189
-#: lib/choose_repository.tcl:908
1190
-msgid "Clone failed."
1251
+#: lib/option.tcl:144
1252
+msgid "Merge Verbosity"
1253
msgstr ""
1254
1193
-#: lib/choose_repository.tcl:915
1194
-msgid "No default branch obtained."
1255
+#: lib/option.tcl:145
1256
+msgid "Show Diffstat After Merge"
1257
msgstr ""
1258
1197
-#: lib/choose_repository.tcl:926
1198
-#, tcl-format
1199
-msgid "Cannot resolve %s as a commit."
1259
+#: lib/option.tcl:146
1260
+msgid "Use Merge Tool"
1261
msgstr ""
1262
1202
-#: lib/choose_repository.tcl:938
1203
-msgid "Creating working directory"
1263
+#: lib/option.tcl:148
1264
+msgid "Trust File Modification Timestamps"
1265
msgstr ""
1266
1206
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
1207
-#: lib/index.tcl:198
1208
-msgid "files"
1267
+#: lib/option.tcl:149
1268
+msgid "Prune Tracking Branches During Fetch"
1269
msgstr ""
1270
1211
-#: lib/choose_repository.tcl:968
1212
-msgid "Initial file checkout failed."
1271
+#: lib/option.tcl:150
1272
+msgid "Match Tracking Branches"
1273
msgstr ""
1274
1215
-#: lib/choose_repository.tcl:1011
1216
-msgid "Open"
1275
+#: lib/option.tcl:151
1276
+msgid "Use Textconv For Diffs and Blames"
1277
msgstr ""
1278
1219
-#: lib/choose_repository.tcl:1021
1220
-msgid "Repository:"
1279
+#: lib/option.tcl:152
1280
+msgid "Blame Copy Only On Changed Files"
1281
msgstr ""
1282
1223
-#: lib/choose_repository.tcl:1072
1224
-#, tcl-format
1225
-msgid "Failed to open repository %s:"
1283
+#: lib/option.tcl:153
1284
+msgid "Maximum Length of Recent Repositories List"
1285
msgstr ""
1286
1228
-#: lib/choose_rev.tcl:53
1229
-msgid "This Detached Checkout"
1287
+#: lib/option.tcl:154
1288
+msgid "Minimum Letters To Blame Copy On"
1289
msgstr ""
1290
1232
-#: lib/choose_rev.tcl:60
1233
-msgid "Revision Expression:"
1291
+#: lib/option.tcl:155
1292
+msgid "Blame History Context Radius (days)"
1293
msgstr ""
1294
1236
-#: lib/choose_rev.tcl:74
1237
-msgid "Local Branch"
1295
+#: lib/option.tcl:156
1296
+msgid "Number of Diff Context Lines"
1297
msgstr ""
1298
1240
-#: lib/choose_rev.tcl:79
1241
-msgid "Tracking Branch"
1299
+#: lib/option.tcl:157
1300
+msgid "Additional Diff Parameters"
1301
msgstr ""
1302
1244
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
1245
-msgid "Tag"
1303
+#: lib/option.tcl:158
1304
+msgid "Commit Message Text Width"
1305
msgstr ""
1306
1248
-#: lib/choose_rev.tcl:317
1249
-#, tcl-format
1250
-msgid "Invalid revision: %s"
1307
+#: lib/option.tcl:159
1308
+msgid "New Branch Name Template"
1309
msgstr ""
1310
1253
-#: lib/choose_rev.tcl:338
1254
-msgid "No revision selected."
1311
+#: lib/option.tcl:160
1312
+msgid "Default File Contents Encoding"
1313
msgstr ""
1314
1257
-#: lib/choose_rev.tcl:346
1258
-msgid "Revision expression is empty."
1315
+#: lib/option.tcl:161
1316
+msgid "Warn before committing to a detached head"
1317
msgstr ""
1318
1261
-#: lib/choose_rev.tcl:531
1262
-msgid "Updated"
1319
+#: lib/option.tcl:162
1320
+msgid "Staging of untracked files"
1321
msgstr ""
1322
1265
-#: lib/choose_rev.tcl:559
1266
-msgid "URL"
1323
+#: lib/option.tcl:163
1324
+msgid "Show untracked files"
1325
msgstr ""
1326
1269
-#: lib/commit.tcl:9
1270
-msgid ""
1271
-"There is nothing to amend.\n"
1272
-"\n"
1273
-"You are about to create the initial commit. There is no commit before this "
1274
-"to amend.\n"
1327
+#: lib/option.tcl:164
1328
+msgid "Tab spacing"
1329
msgstr ""
1330
1277
-#: lib/commit.tcl:18
1278
-msgid ""
1279
-"Cannot amend while merging.\n"
1280
-"\n"
1281
-"You are currently in the middle of a merge that has not been fully "
1282
-"completed. You cannot amend the prior commit unless you first abort the "
1283
-"current merge activity.\n"
1331
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
1332
+#: lib/database.tcl:57
1333
+#, tcl-format
1334
+msgid "%s:"
1335
msgstr ""
1336
1286
-#: lib/commit.tcl:48
1287
-msgid "Error loading commit data for amend:"
1337
+#: lib/option.tcl:210
1338
+msgid "Change"
1339
msgstr ""
1340
1290
-#: lib/commit.tcl:75
1291
-msgid "Unable to obtain your identity:"
1341
+#: lib/option.tcl:254
1342
+msgid "Spelling Dictionary:"
1343
msgstr ""
1344
1294
-#: lib/commit.tcl:80
1295
-msgid "Invalid GIT_COMMITTER_IDENT:"
1345
+#: lib/option.tcl:284
1346
+msgid "Change Font"
1347
msgstr ""
1348
1298
-#: lib/commit.tcl:129
1349
+#: lib/option.tcl:288
1350
#, tcl-format
1300
-msgid "warning: Tcl does not support encoding '%s'."
1351
+msgid "Choose %s"
1352
msgstr ""
1353
1303
-#: lib/commit.tcl:149
1304
-msgid ""
1305
-"Last scanned state does not match repository state.\n"
1306
-"\n"
1307
-"Another Git program has modified this repository since the last scan. A "
1308
-"rescan must be performed before another commit can be created.\n"
1309
-"\n"
1310
-"The rescan will be automatically started now.\n"
1354
+#: lib/option.tcl:294
1355
+msgid "pt."
1356
msgstr ""
1357
1313
-#: lib/commit.tcl:172
1358
+#: lib/option.tcl:308
1359
+msgid "Preferences"
1360
+msgstr ""
1361
+
1362
+#: lib/option.tcl:345
1363
+msgid "Failed to completely save options:"
1364
+msgstr ""
1365
+
1366
+#: lib/encoding.tcl:443
1367
+msgid "Default"
1368
+msgstr ""
1369
+
1370
+#: lib/encoding.tcl:448
1371
#, tcl-format
1315
-msgid ""
1316
-"Unmerged files cannot be committed.\n"
1317
-"\n"
1318
-"File %s has merge conflicts. You must resolve them and stage the file "
1319
-"before committing.\n"
1372
+msgid "System (%s)"
1373
+msgstr ""
1374
+
1375
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
1376
+msgid "Other"
1377
msgstr ""
1378
1322
-#: lib/commit.tcl:180
1379
+#: lib/tools.tcl:76
1380
#, tcl-format
1324
-msgid ""
1325
-"Unknown file state %s detected.\n"
1326
-"\n"
1327
-"File %s cannot be committed by this program.\n"
1381
+msgid "Running %s requires a selected file."
1382
msgstr ""
1383
1330
-#: lib/commit.tcl:188
1331
-msgid ""
1332
-"No changes to commit.\n"
1333
-"\n"
1334
-"You must stage at least 1 file before you can commit.\n"
1384
+#: lib/tools.tcl:92
1385
+#, tcl-format
1386
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
1387
+msgstr ""
1388
+
1389
+#: lib/tools.tcl:96
1390
+#, tcl-format
1391
+msgid "Are you sure you want to run %s?"
1392
+msgstr ""
1393
+
1394
+#: lib/tools.tcl:118
1395
+#, tcl-format
1396
+msgid "Tool: %s"
1397
msgstr ""
1398
1337
-#: lib/commit.tcl:203
1399
+#: lib/tools.tcl:119
1400
+#, tcl-format
1401
+msgid "Running: %s"
1402
+msgstr ""
1403
+
1404
+#: lib/tools.tcl:158
1405
+#, tcl-format
1406
+msgid "Tool completed successfully: %s"
1407
+msgstr ""
1408
+
1409
+#: lib/tools.tcl:160
1410
+#, tcl-format
1411
+msgid "Tool failed: %s"
1412
+msgstr ""
1413
+
1414
+#: lib/mergetool.tcl:8
1415
+msgid "Force resolution to the base version?"
1416
+msgstr ""
1417
+
1418
+#: lib/mergetool.tcl:9
1419
+msgid "Force resolution to this branch?"
1420
+msgstr ""
1421
+
1422
+#: lib/mergetool.tcl:10
1423
+msgid "Force resolution to the other branch?"
1424
+msgstr ""
1425
+
1426
+#: lib/mergetool.tcl:14
1427
+#, tcl-format
1428
msgid ""
1339
-"Please supply a commit message.\n"
1429
+"Note that the diff shows only conflicting changes.\n"
1430
"\n"
1341
-"A good commit message has the following format:\n"
1431
+"%s will be overwritten.\n"
1432
"\n"
1343
-"- First line: Describe in one sentence what you did.\n"
1344
-"- Second line: Blank\n"
1345
-"- Remaining lines: Describe why this change is good.\n"
1433
+"This operation can be undone only by restarting the merge."
1434
msgstr ""
1435
1348
-#: lib/commit.tcl:234
1349
-msgid "Calling pre-commit hook..."
1436
+#: lib/mergetool.tcl:45
1437
+#, tcl-format
1438
+msgid "File %s seems to have unresolved conflicts, still stage?"
1439
msgstr ""
1440
1352
-#: lib/commit.tcl:249
1353
-msgid "Commit declined by pre-commit hook."
1441
+#: lib/mergetool.tcl:60
1442
+#, tcl-format
1443
+msgid "Adding resolution for %s"
1444
msgstr ""
1445
1356
-#: lib/commit.tcl:272
1357
-msgid "Calling commit-msg hook..."
1446
+#: lib/mergetool.tcl:141
1447
+msgid "Cannot resolve deletion or link conflicts using a tool"
1448
msgstr ""
1449
1360
-#: lib/commit.tcl:287
1361
-msgid "Commit declined by commit-msg hook."
1450
+#: lib/mergetool.tcl:146
1451
+msgid "Conflict file does not exist"
1452
msgstr ""
1453
1364
-#: lib/commit.tcl:300
1365
-msgid "Committing changes..."
1454
+#: lib/mergetool.tcl:246
1455
+#, tcl-format
1456
+msgid "Not a GUI merge tool: '%s'"
1457
msgstr ""
1458
1368
-#: lib/commit.tcl:316
1369
-msgid "write-tree failed:"
1459
+#: lib/mergetool.tcl:275
1460
+#, tcl-format
1461
+msgid "Unsupported merge tool '%s'"
1462
msgstr ""
1463
1372
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
1373
-msgid "Commit failed."
1464
+#: lib/mergetool.tcl:310
1465
+msgid "Merge tool is already running, terminate it?"
1466
msgstr ""
1467
1376
-#: lib/commit.tcl:334
1468
+#: lib/mergetool.tcl:330
1469
#, tcl-format
1378
-msgid "Commit %s appears to be corrupt"
1470
+msgid ""
1471
+"Error retrieving versions:\n"
1472
+"%s"
1473
msgstr ""
1474
1381
-#: lib/commit.tcl:339
1475
+#: lib/mergetool.tcl:350
1476
+#, tcl-format
1477
msgid ""
1383
-"No changes to commit.\n"
1384
-"\n"
1385
-"No files were modified by this commit and it was not a merge commit.\n"
1478
+"Could not start the merge tool:\n"
1479
"\n"
1387
-"A rescan will be automatically started now.\n"
1388
-msgstr ""
1389
-
1390
-#: lib/commit.tcl:346
1391
-msgid "No changes to commit."
1480
+"%s"
1481
msgstr ""
1482
1394
-#: lib/commit.tcl:360
1395
-msgid "commit-tree failed:"
1483
+#: lib/mergetool.tcl:354
1484
+msgid "Running merge tool..."
1485
msgstr ""
1486
1398
-#: lib/commit.tcl:381
1399
-msgid "update-ref failed:"
1487
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
1488
+msgid "Merge tool failed."
1489
msgstr ""
1490
1402
-#: lib/commit.tcl:469
1491
+#: lib/tools_dlg.tcl:22
1492
#, tcl-format
1404
-msgid "Created commit %s: %s"
1493
+msgid "%s (%s): Add Tool"
1494
msgstr ""
1495
1407
-#: lib/console.tcl:59
1408
-msgid "Working... please wait..."
1496
+#: lib/tools_dlg.tcl:28
1497
+msgid "Add New Tool Command"
1498
msgstr ""
1499
1411
-#: lib/console.tcl:186
1412
-msgid "Success"
1500
+#: lib/tools_dlg.tcl:34
1501
+msgid "Add globally"
1502
msgstr ""
1503
1415
-#: lib/console.tcl:200
1416
-msgid "Error: Command Failed"
1504
+#: lib/tools_dlg.tcl:46
1505
+msgid "Tool Details"
1506
msgstr ""
1507
1419
-#: lib/database.tcl:43
1420
-msgid "Number of loose objects"
1508
+#: lib/tools_dlg.tcl:49
1509
+msgid "Use '/' separators to create a submenu tree:"
1510
msgstr ""
1511
1423
-#: lib/database.tcl:44
1424
-msgid "Disk space used by loose objects"
1512
+#: lib/tools_dlg.tcl:60
1513
+msgid "Command:"
1514
msgstr ""
1515
1427
-#: lib/database.tcl:45
1428
-msgid "Number of packed objects"
1516
+#: lib/tools_dlg.tcl:71
1517
+msgid "Show a dialog before running"
1518
msgstr ""
1519
1431
-#: lib/database.tcl:46
1432
-msgid "Number of packs"
1520
+#: lib/tools_dlg.tcl:77
1521
+msgid "Ask the user to select a revision (sets $REVISION)"
1522
msgstr ""
1523
1435
-#: lib/database.tcl:47
1436
-msgid "Disk space used by packed objects"
1524
+#: lib/tools_dlg.tcl:82
1525
+msgid "Ask the user for additional arguments (sets $ARGS)"
1526
msgstr ""
1527
1439
-#: lib/database.tcl:48
1440
-msgid "Packed objects waiting for pruning"
1528
+#: lib/tools_dlg.tcl:89
1529
+msgid "Don't show the command output window"
1530
msgstr ""
1531
1443
-#: lib/database.tcl:49
1444
-msgid "Garbage files"
1532
+#: lib/tools_dlg.tcl:94
1533
+msgid "Run only if a diff is selected ($FILENAME not empty)"
1534
msgstr ""
1535
1447
-#: lib/database.tcl:72
1448
-msgid "Compressing the object database"
1536
+#: lib/tools_dlg.tcl:118
1537
+msgid "Please supply a name for the tool."
1538
msgstr ""
1539
1451
-#: lib/database.tcl:83
1452
-msgid "Verifying the object database with fsck-objects"
1540
+#: lib/tools_dlg.tcl:126
1541
+#, tcl-format
1542
+msgid "Tool '%s' already exists."
1543
msgstr ""
1544
1455
-#: lib/database.tcl:107
1545
+#: lib/tools_dlg.tcl:148
1546
#, tcl-format
1547
msgid ""
1458
-"This repository currently has approximately %i loose objects.\n"
1459
-"\n"
1460
-"To maintain optimal performance it is strongly recommended that you compress "
1461
-"the database.\n"
1462
-"\n"
1463
-"Compress the database now?"
1548
+"Could not add tool:\n"
1549
+"%s"
1550
msgstr ""
1551
1466
-#: lib/date.tcl:25
1552
+#: lib/tools_dlg.tcl:187
1553
#, tcl-format
1468
-msgid "Invalid date from Git: %s"
1554
+msgid "%s (%s): Remove Tool"
1555
+msgstr ""
1556
+
1557
+#: lib/tools_dlg.tcl:193
1558
+msgid "Remove Tool Commands"
1559
+msgstr ""
1560
+
1561
+#: lib/tools_dlg.tcl:198
1562
+msgid "Remove"
1563
msgstr ""
1564
1471
-#: lib/diff.tcl:64
1565
+#: lib/tools_dlg.tcl:231
1566
+msgid "(Blue denotes repository-local tools)"
1567
+msgstr ""
1568
+
1569
+#: lib/tools_dlg.tcl:283
1570
#, tcl-format
1473
-msgid ""
1474
-"No differences detected.\n"
1475
-"\n"
1476
-"%s has no changes.\n"
1477
-"\n"
1478
-"The modification date of this file was updated by another application, but "
1479
-"the content within the file was not changed.\n"
1480
-"\n"
1481
-"A rescan will be automatically started to find other files which may have "
1482
-"the same state."
1571
+msgid "%s (%s):"
1572
msgstr ""
1573
1485
-#: lib/diff.tcl:104
1574
+#: lib/tools_dlg.tcl:292
1575
#, tcl-format
1487
-msgid "Loading diff of %s..."
1576
+msgid "Run Command: %s"
1577
msgstr ""
1578
1490
-#: lib/diff.tcl:125
1491
-msgid ""
1492
-"LOCAL: deleted\n"
1493
-"REMOTE:\n"
1579
+#: lib/tools_dlg.tcl:306
1580
+msgid "Arguments"
1581
msgstr ""
1582
1496
-#: lib/diff.tcl:130
1497
-msgid ""
1498
-"REMOTE: deleted\n"
1499
-"LOCAL:\n"
1583
+#: lib/tools_dlg.tcl:341
1584
+msgid "OK"
1585
msgstr ""
1586
1502
-#: lib/diff.tcl:137
1503
-msgid "LOCAL:\n"
1587
+#: lib/search.tcl:48
1588
+msgid "Find:"
1589
msgstr ""
1590
1506
-#: lib/diff.tcl:140
1507
-msgid "REMOTE:\n"
1591
+#: lib/search.tcl:50
1592
+msgid "Next"
1593
msgstr ""
1594
1510
-#: lib/diff.tcl:202 lib/diff.tcl:319
1511
-#, tcl-format
1512
-msgid "Unable to display %s"
1595
+#: lib/search.tcl:51
1596
+msgid "Prev"
1597
msgstr ""
1598
1515
-#: lib/diff.tcl:203
1516
-msgid "Error loading file:"
1599
+#: lib/search.tcl:52
1600
+msgid "RegExp"
1601
msgstr ""
1602
1519
-#: lib/diff.tcl:210
1520
-msgid "Git Repository (subproject)"
1603
+#: lib/search.tcl:54
1604
+msgid "Case"
1605
msgstr ""
1606
1523
-#: lib/diff.tcl:222
1524
-msgid "* Binary file (not showing content)."
1607
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
1608
+#, tcl-format
1609
+msgid "%s (%s): Create Desktop Icon"
1610
msgstr ""
1611
1527
-#: lib/diff.tcl:227
1612
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
1613
+msgid "Cannot write shortcut:"
1614
+msgstr ""
1615
+
1616
+#: lib/shortcut.tcl:140
1617
+msgid "Cannot write icon:"
1618
+msgstr ""
1619
+
1620
+#: lib/remote_branch_delete.tcl:29
1621
#, tcl-format
1529
-msgid ""
1530
-"* Untracked file is %d bytes.\n"
1531
-"* Showing only first %d bytes.\n"
1622
+msgid "%s (%s): Delete Branch Remotely"
1623
+msgstr ""
1624
+
1625
+#: lib/remote_branch_delete.tcl:34
1626
+msgid "Delete Branch Remotely"
1627
+msgstr ""
1628
+
1629
+#: lib/remote_branch_delete.tcl:48
1630
+msgid "From Repository"
1631
msgstr ""
1632
1534
-#: lib/diff.tcl:233
1633
+#: lib/remote_branch_delete.tcl:88
1634
+msgid "Branches"
1635
+msgstr ""
1636
+
1637
+#: lib/remote_branch_delete.tcl:110
1638
+msgid "Delete Only If"
1639
+msgstr ""
1640
+
1641
+#: lib/remote_branch_delete.tcl:112
1642
+msgid "Merged Into:"
1643
+msgstr ""
1644
+
1645
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
1646
+msgid "Always (Do not perform merge checks)"
1647
+msgstr ""
1648
+
1649
+#: lib/remote_branch_delete.tcl:153
1650
+msgid "A branch is required for 'Merged Into'."
1651
+msgstr ""
1652
+
1653
+#: lib/remote_branch_delete.tcl:185
1654
#, tcl-format
1655
msgid ""
1656
+"The following branches are not completely merged into %s:\n"
1657
"\n"
1538
-"* Untracked file clipped here by %s.\n"
1539
-"* To see the entire file, use an external editor.\n"
1658
+" - %s"
1659
msgstr ""
1660
1542
-#: lib/diff.tcl:482
1543
-msgid "Failed to unstage selected hunk."
1661
+#: lib/remote_branch_delete.tcl:190
1662
+#, tcl-format
1663
+msgid ""
1664
+"One or more of the merge tests failed because you have not fetched the "
1665
+"necessary commits. Try fetching from %s first."
1666
msgstr ""
1667
1546
-#: lib/diff.tcl:489
1547
-msgid "Failed to stage selected hunk."
1668
+#: lib/remote_branch_delete.tcl:208
1669
+msgid "Please select one or more branches to delete."
1670
msgstr ""
1671
1550
-#: lib/diff.tcl:568
1551
-msgid "Failed to unstage selected line."
1672
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
1673
+msgid ""
1674
+"Recovering deleted branches is difficult.\n"
1675
+"\n"
1676
+"Delete the selected branches?"
1677
msgstr ""
1678
1554
-#: lib/diff.tcl:576
1555
-msgid "Failed to stage selected line."
1679
+#: lib/remote_branch_delete.tcl:227
1680
+#, tcl-format
1681
+msgid "Deleting branches from %s"
1682
msgstr ""
1683
1558
-#: lib/encoding.tcl:443
1559
-msgid "Default"
1684
+#: lib/remote_branch_delete.tcl:300
1685
+msgid "No repository selected."
1686
msgstr ""
1687
1562
-#: lib/encoding.tcl:448
1688
+#: lib/remote_branch_delete.tcl:305
1689
#, tcl-format
1564
-msgid "System (%s)"
1690
+msgid "Scanning %s..."
1691
msgstr ""
1692
1567
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
1568
-msgid "Other"
1693
+#: lib/choose_repository.tcl:45
1694
+msgid "Git Gui"
1695
msgstr ""
1696
1571
-#: lib/error.tcl:20 lib/error.tcl:114
1572
-msgid "error"
1697
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
1698
+msgid "Create New Repository"
1699
msgstr ""
1700
1575
-#: lib/error.tcl:36
1576
-msgid "warning"
1701
+#: lib/choose_repository.tcl:110
1702
+msgid "New..."
1703
msgstr ""
1704
1579
-#: lib/error.tcl:94
1580
-msgid "You must correct the above errors before committing."
1705
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
1706
+msgid "Clone Existing Repository"
1707
msgstr ""
1708
1583
-#: lib/index.tcl:6
1584
-msgid "Unable to unlock the index."
1709
+#: lib/choose_repository.tcl:128
1710
+msgid "Clone..."
1711
msgstr ""
1712
1587
-#: lib/index.tcl:15
1588
-msgid "Index Error"
1713
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
1714
+msgid "Open Existing Repository"
1715
msgstr ""
1716
1591
-#: lib/index.tcl:17
1592
-msgid ""
1593
-"Updating the Git index failed. A rescan will be automatically started to "
1594
-"resynchronize git-gui."
1717
+#: lib/choose_repository.tcl:141
1718
+msgid "Open..."
1719
msgstr ""
1720
1597
-#: lib/index.tcl:28
1598
-msgid "Continue"
1721
+#: lib/choose_repository.tcl:154
1722
+msgid "Recent Repositories"
1723
msgstr ""
1724
1601
-#: lib/index.tcl:31
1602
-msgid "Unlock Index"
1725
+#: lib/choose_repository.tcl:164
1726
+msgid "Open Recent Repository:"
1727
msgstr ""
1728
1605
-#: lib/index.tcl:289
1729
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
1730
+#: lib/choose_repository.tcl:345
1731
#, tcl-format
1607
-msgid "Unstaging %s from commit"
1732
+msgid "Failed to create repository %s:"
1733
msgstr ""
1734
1610
-#: lib/index.tcl:328
1611
-msgid "Ready to commit."
1735
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
1736
+msgid "Create"
1737
msgstr ""
1738
1614
-#: lib/index.tcl:341
1615
-#, tcl-format
1616
-msgid "Adding %s"
1739
+#: lib/choose_repository.tcl:432
1740
+msgid "Directory:"
1741
+msgstr ""
1742
+
1743
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
1744
+#: lib/choose_repository.tcl:1139
1745
+msgid "Git Repository"
1746
msgstr ""
1747
1619
-#: lib/index.tcl:398
1748
+#: lib/choose_repository.tcl:487
1749
#, tcl-format
1621
-msgid "Revert changes in file %s?"
1750
+msgid "Directory %s already exists."
1751
msgstr ""
1752
1624
-#: lib/index.tcl:400
1753
+#: lib/choose_repository.tcl:491
1754
#, tcl-format
1626
-msgid "Revert changes in these %i files?"
1755
+msgid "File %s already exists."
1756
msgstr ""
1757
1629
-#: lib/index.tcl:408
1630
-msgid "Any unstaged changes will be permanently lost by the revert."
1758
+#: lib/choose_repository.tcl:506
1759
+msgid "Clone"
1760
msgstr ""
1761
1633
-#: lib/index.tcl:411
1634
-msgid "Do Nothing"
1762
+#: lib/choose_repository.tcl:519
1763
+msgid "Source Location:"
1764
msgstr ""
1765
1637
-#: lib/index.tcl:429
1638
-msgid "Reverting selected files"
1766
+#: lib/choose_repository.tcl:528
1767
+msgid "Target Directory:"
1768
+msgstr ""
1769
+
1770
+#: lib/choose_repository.tcl:538
1771
+msgid "Clone Type:"
1772
+msgstr ""
1773
+
1774
+#: lib/choose_repository.tcl:543
1775
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
1776
+msgstr ""
1777
+
1778
+#: lib/choose_repository.tcl:548
1779
+msgid "Full Copy (Slower, Redundant Backup)"
1780
+msgstr ""
1781
+
1782
+#: lib/choose_repository.tcl:553
1783
+msgid "Shared (Fastest, Not Recommended, No Backup)"
1784
+msgstr ""
1785
+
1786
+#: lib/choose_repository.tcl:560
1787
+msgid "Recursively clone submodules too"
1788
msgstr ""
1789
1641
-#: lib/index.tcl:433
1790
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
1791
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
1792
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
1793
#, tcl-format
1643
-msgid "Reverting %s"
1794
+msgid "Not a Git repository: %s"
1795
msgstr ""
1796
1646
-#: lib/merge.tcl:13
1647
-msgid ""
1648
-"Cannot merge while amending.\n"
1649
-"\n"
1650
-"You must finish amending this commit before starting any type of merge.\n"
1797
+#: lib/choose_repository.tcl:630
1798
+msgid "Standard only available for local repository."
1799
msgstr ""
1800
1653
-#: lib/merge.tcl:27
1654
-msgid ""
1655
-"Last scanned state does not match repository state.\n"
1656
-"\n"
1657
-"Another Git program has modified this repository since the last scan. A "
1658
-"rescan must be performed before a merge can be performed.\n"
1659
-"\n"
1660
-"The rescan will be automatically started now.\n"
1801
+#: lib/choose_repository.tcl:634
1802
+msgid "Shared only available for local repository."
1803
msgstr ""
1804
1663
-#: lib/merge.tcl:45
1805
+#: lib/choose_repository.tcl:655
1806
#, tcl-format
1665
-msgid ""
1666
-"You are in the middle of a conflicted merge.\n"
1667
-"\n"
1668
-"File %s has merge conflicts.\n"
1669
-"\n"
1670
-"You must resolve them, stage the file, and commit to complete the current "
1671
-"merge. Only then can you begin another merge.\n"
1807
+msgid "Location %s already exists."
1808
msgstr ""
1809
1674
-#: lib/merge.tcl:55
1810
+#: lib/choose_repository.tcl:666
1811
+msgid "Failed to configure origin"
1812
+msgstr ""
1813
+
1814
+#: lib/choose_repository.tcl:678
1815
+msgid "Counting objects"
1816
+msgstr ""
1817
+
1818
+#: lib/choose_repository.tcl:679
1819
+msgid "buckets"
1820
+msgstr ""
1821
+
1822
+#: lib/choose_repository.tcl:703
1823
#, tcl-format
1676
-msgid ""
1677
-"You are in the middle of a change.\n"
1678
-"\n"
1679
-"File %s is modified.\n"
1680
-"\n"
1681
-"You should complete the current commit before starting a merge. Doing so "
1682
-"will help you abort a failed merge, should the need arise.\n"
1824
+msgid "Unable to copy objects/info/alternates: %s"
1825
msgstr ""
1826
1685
-#: lib/merge.tcl:107
1827
+#: lib/choose_repository.tcl:740
1828
#, tcl-format
1687
-msgid "%s of %s"
1829
+msgid "Nothing to clone from %s."
1830
+msgstr ""
1831
+
1832
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
1833
+#: lib/choose_repository.tcl:974
1834
+msgid "The 'master' branch has not been initialized."
1835
msgstr ""
1836
1690
-#: lib/merge.tcl:120
1837
+#: lib/choose_repository.tcl:755
1838
+msgid "Hardlinks are unavailable. Falling back to copying."
1839
+msgstr ""
1840
+
1841
+#: lib/choose_repository.tcl:769
1842
#, tcl-format
1692
-msgid "Merging %s and %s..."
1843
+msgid "Cloning from %s"
1844
msgstr ""
1845
1695
-#: lib/merge.tcl:131
1696
-msgid "Merge completed successfully."
1846
+#: lib/choose_repository.tcl:800
1847
+msgid "Copying objects"
1848
msgstr ""
1849
1699
-#: lib/merge.tcl:133
1700
-msgid "Merge failed. Conflict resolution is required."
1850
+#: lib/choose_repository.tcl:801
1851
+msgid "KiB"
1852
msgstr ""
1853
1703
-#: lib/merge.tcl:158
1854
+#: lib/choose_repository.tcl:825
1855
#, tcl-format
1705
-msgid "Merge Into %s"
1856
+msgid "Unable to copy object: %s"
1857
msgstr ""
1858
1708
-#: lib/merge.tcl:177
1709
-msgid "Revision To Merge"
1859
+#: lib/choose_repository.tcl:837
1860
+msgid "Linking objects"
1861
msgstr ""
1862
1712
-#: lib/merge.tcl:212
1713
-msgid ""
1714
-"Cannot abort while amending.\n"
1715
-"\n"
1716
-"You must finish amending this commit.\n"
1863
+#: lib/choose_repository.tcl:838
1864
+msgid "objects"
1865
msgstr ""
1866
1719
-#: lib/merge.tcl:222
1720
-msgid ""
1721
-"Abort merge?\n"
1722
-"\n"
1723
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
1724
-"\n"
1725
-"Continue with aborting the current merge?"
1867
+#: lib/choose_repository.tcl:846
1868
+#, tcl-format
1869
+msgid "Unable to hardlink object: %s"
1870
msgstr ""
1871
1728
-#: lib/merge.tcl:228
1729
-msgid ""
1730
-"Reset changes?\n"
1731
-"\n"
1732
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
1733
-"\n"
1734
-"Continue with resetting the current changes?"
1872
+#: lib/choose_repository.tcl:903
1873
+msgid "Cannot fetch branches and objects. See console output for details."
1874
msgstr ""
1875
1737
-#: lib/merge.tcl:239
1738
-msgid "Aborting"
1876
+#: lib/choose_repository.tcl:914
1877
+msgid "Cannot fetch tags. See console output for details."
1878
msgstr ""
1879
1741
-#: lib/merge.tcl:239
1742
-msgid "files reset"
1880
+#: lib/choose_repository.tcl:938
1881
+msgid "Cannot determine HEAD. See console output for details."
1882
msgstr ""
1883
1745
-#: lib/merge.tcl:267
1746
-msgid "Abort failed."
1884
+#: lib/choose_repository.tcl:947
1885
+#, tcl-format
1886
+msgid "Unable to cleanup %s"
1887
msgstr ""
1888
1749
-#: lib/merge.tcl:269
1750
-msgid "Abort completed. Ready."
1889
+#: lib/choose_repository.tcl:953
1890
+msgid "Clone failed."
1891
msgstr ""
1892
1753
-#: lib/mergetool.tcl:8
1754
-msgid "Force resolution to the base version?"
1893
+#: lib/choose_repository.tcl:960
1894
+msgid "No default branch obtained."
1895
msgstr ""
1896
1757
-#: lib/mergetool.tcl:9
1758
-msgid "Force resolution to this branch?"
1897
+#: lib/choose_repository.tcl:971
1898
+#, tcl-format
1899
+msgid "Cannot resolve %s as a commit."
1900
+msgstr ""
1901
+
1902
+#: lib/choose_repository.tcl:998
1903
+msgid "Creating working directory"
1904
+msgstr ""
1905
+
1906
+#: lib/choose_repository.tcl:1028
1907
+msgid "Initial file checkout failed."
1908
+msgstr ""
1909
+
1910
+#: lib/choose_repository.tcl:1072
1911
+msgid "Cloning submodules"
1912
+msgstr ""
1913
+
1914
+#: lib/choose_repository.tcl:1087
1915
+msgid "Cannot clone submodules."
1916
+msgstr ""
1917
+
1918
+#: lib/choose_repository.tcl:1110
1919
+msgid "Repository:"
1920
+msgstr ""
1921
+
1922
+#: lib/choose_repository.tcl:1159
1923
+#, tcl-format
1924
+msgid "Failed to open repository %s:"
1925
msgstr ""
1926
1761
-#: lib/mergetool.tcl:10
1762
-msgid "Force resolution to the other branch?"
1927
+#: lib/about.tcl:26
1928
+msgid "git-gui - a graphical user interface for Git."
1929
msgstr ""
1930
1765
-#: lib/mergetool.tcl:14
1931
+#: lib/blame.tcl:74
1932
#, tcl-format
1767
-msgid ""
1768
-"Note that the diff shows only conflicting changes.\n"
1769
-"\n"
1770
-"%s will be overwritten.\n"
1771
-"\n"
1772
-"This operation can be undone only by restarting the merge."
1933
+msgid "%s (%s): File Viewer"
1934
msgstr ""
1935
1775
-#: lib/mergetool.tcl:45
1776
-#, tcl-format
1777
-msgid "File %s seems to have unresolved conflicts, still stage?"
1936
+#: lib/blame.tcl:80
1937
+msgid "Commit:"
1938
msgstr ""
1939
1780
-#: lib/mergetool.tcl:60
1781
-#, tcl-format
1782
-msgid "Adding resolution for %s"
1940
+#: lib/blame.tcl:282
1941
+msgid "Copy Commit"
1942
msgstr ""
1943
1785
-#: lib/mergetool.tcl:141
1786
-msgid "Cannot resolve deletion or link conflicts using a tool"
1944
+#: lib/blame.tcl:286
1945
+msgid "Find Text..."
1946
msgstr ""
1947
1789
-#: lib/mergetool.tcl:146
1790
-msgid "Conflict file does not exist"
1948
+#: lib/blame.tcl:290
1949
+msgid "Goto Line..."
1950
msgstr ""
1951
1793
-#: lib/mergetool.tcl:264
1794
-#, tcl-format
1795
-msgid "Not a GUI merge tool: '%s'"
1952
+#: lib/blame.tcl:299
1953
+msgid "Do Full Copy Detection"
1954
msgstr ""
1955
1798
-#: lib/mergetool.tcl:268
1799
-#, tcl-format
1800
-msgid "Unsupported merge tool '%s'"
1956
+#: lib/blame.tcl:303
1957
+msgid "Show History Context"
1958
msgstr ""
1959
1803
-#: lib/mergetool.tcl:303
1804
-msgid "Merge tool is already running, terminate it?"
1960
+#: lib/blame.tcl:306
1961
+msgid "Blame Parent Commit"
1962
msgstr ""
1963
1807
-#: lib/mergetool.tcl:323
1964
+#: lib/blame.tcl:468
1965
#, tcl-format
1809
-msgid ""
1810
-"Error retrieving versions:\n"
1811
-"%s"
1966
+msgid "Reading %s..."
1967
msgstr ""
1968
1814
-#: lib/mergetool.tcl:343
1815
-#, tcl-format
1816
-msgid ""
1817
-"Could not start the merge tool:\n"
1818
-"\n"
1819
-"%s"
1969
+#: lib/blame.tcl:596
1970
+msgid "Loading copy/move tracking annotations..."
1971
msgstr ""
1972
1822
-#: lib/mergetool.tcl:347
1823
-msgid "Running merge tool..."
1973
+#: lib/blame.tcl:613
1974
+msgid "lines annotated"
1975
msgstr ""
1976
1826
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
1827
-msgid "Merge tool failed."
1977
+#: lib/blame.tcl:815
1978
+msgid "Loading original location annotations..."
1979
msgstr ""
1980
1830
-#: lib/option.tcl:11
1831
-#, tcl-format
1832
-msgid "Invalid global encoding '%s'"
1981
+#: lib/blame.tcl:818
1982
+msgid "Annotation complete."
1983
msgstr ""
1984
1835
-#: lib/option.tcl:19
1836
-#, tcl-format
1837
-msgid "Invalid repo encoding '%s'"
1985
+#: lib/blame.tcl:849
1986
+msgid "Busy"
1987
msgstr ""
1988
1840
-#: lib/option.tcl:117
1841
-msgid "Restore Defaults"
1989
+#: lib/blame.tcl:850
1990
+msgid "Annotation process is already running."
1991
msgstr ""
1992
1844
-#: lib/option.tcl:121
1845
-msgid "Save"
1993
+#: lib/blame.tcl:889
1994
+msgid "Running thorough copy detection..."
1995
msgstr ""
1996
1848
-#: lib/option.tcl:131
1849
-#, tcl-format
1850
-msgid "%s Repository"
1997
+#: lib/blame.tcl:957
1998
+msgid "Loading annotation..."
1999
msgstr ""
2000
1853
-#: lib/option.tcl:132
1854
-msgid "Global (All Repositories)"
2001
+#: lib/blame.tcl:1010
2002
+msgid "Author:"
2003
msgstr ""
2004
1857
-#: lib/option.tcl:138
1858
-msgid "User Name"
2005
+#: lib/blame.tcl:1014
2006
+msgid "Committer:"
2007
msgstr ""
2008
1861
-#: lib/option.tcl:139
1862
-msgid "Email Address"
2009
+#: lib/blame.tcl:1019
2010
+msgid "Original File:"
2011
msgstr ""
2012
1865
-#: lib/option.tcl:141
1866
-msgid "Summarize Merge Commits"
2013
+#: lib/blame.tcl:1067
2014
+msgid "Cannot find HEAD commit:"
2015
msgstr ""
2016
1869
-#: lib/option.tcl:142
1870
-msgid "Merge Verbosity"
2017
+#: lib/blame.tcl:1122
2018
+msgid "Cannot find parent commit:"
2019
msgstr ""
2020
1873
-#: lib/option.tcl:143
1874
-msgid "Show Diffstat After Merge"
2021
+#: lib/blame.tcl:1137
2022
+msgid "Unable to display parent"
2023
msgstr ""
2024
1877
-#: lib/option.tcl:144
1878
-msgid "Use Merge Tool"
2025
+#: lib/blame.tcl:1138 lib/diff.tcl:345
2026
+msgid "Error loading diff:"
2027
msgstr ""
2028
1881
-#: lib/option.tcl:146
1882
-msgid "Trust File Modification Timestamps"
2029
+#: lib/blame.tcl:1279
2030
+msgid "Originally By:"
2031
msgstr ""
2032
1885
-#: lib/option.tcl:147
1886
-msgid "Prune Tracking Branches During Fetch"
2033
+#: lib/blame.tcl:1285
2034
+msgid "In File:"
2035
msgstr ""
2036
1889
-#: lib/option.tcl:148
1890
-msgid "Match Tracking Branches"
2037
+#: lib/blame.tcl:1290
2038
+msgid "Copied Or Moved Here By:"
2039
msgstr ""
2040
1893
-#: lib/option.tcl:149
1894
-msgid "Blame Copy Only On Changed Files"
2041
+#: lib/diff.tcl:77
2042
+#, tcl-format
2043
+msgid ""
2044
+"No differences detected.\n"
2045
+"\n"
2046
+"%s has no changes.\n"
2047
+"\n"
2048
+"The modification date of this file was updated by another application, but "
2049
+"the content within the file was not changed.\n"
2050
+"\n"
2051
+"A rescan will be automatically started to find other files which may have "
2052
+"the same state."
2053
msgstr ""
2054
1897
-#: lib/option.tcl:150
1898
-msgid "Minimum Letters To Blame Copy On"
2055
+#: lib/diff.tcl:117
2056
+#, tcl-format
2057
+msgid "Loading diff of %s..."
2058
msgstr ""
2059
1901
-#: lib/option.tcl:151
1902
-msgid "Blame History Context Radius (days)"
2060
+#: lib/diff.tcl:143
2061
+msgid ""
2062
+"LOCAL: deleted\n"
2063
+"REMOTE:\n"
2064
msgstr ""
2065
1905
-#: lib/option.tcl:152
1906
-msgid "Number of Diff Context Lines"
2066
+#: lib/diff.tcl:148
2067
+msgid ""
2068
+"REMOTE: deleted\n"
2069
+"LOCAL:\n"
2070
msgstr ""
2071
1909
-#: lib/option.tcl:153
1910
-msgid "Commit Message Text Width"
2072
+#: lib/diff.tcl:155
2073
+msgid "LOCAL:\n"
2074
msgstr ""
2075
1913
-#: lib/option.tcl:154
1914
-msgid "New Branch Name Template"
2076
+#: lib/diff.tcl:158
2077
+msgid "REMOTE:\n"
2078
msgstr ""
2079
1917
-#: lib/option.tcl:155
1918
-msgid "Default File Contents Encoding"
2080
+#: lib/diff.tcl:220 lib/diff.tcl:344
2081
+#, tcl-format
2082
+msgid "Unable to display %s"
2083
msgstr ""
2084
1921
-#: lib/option.tcl:203
1922
-msgid "Change"
2085
+#: lib/diff.tcl:221
2086
+msgid "Error loading file:"
2087
msgstr ""
2088
1925
-#: lib/option.tcl:230
1926
-msgid "Spelling Dictionary:"
2089
+#: lib/diff.tcl:227
2090
+msgid "Git Repository (subproject)"
2091
msgstr ""
2092
1929
-#: lib/option.tcl:254
1930
-msgid "Change Font"
2093
+#: lib/diff.tcl:239
2094
+msgid "* Binary file (not showing content)."
2095
msgstr ""
2096
1933
-#: lib/option.tcl:258
2097
+#: lib/diff.tcl:244
2098
#, tcl-format
1935
-msgid "Choose %s"
2099
+msgid ""
2100
+"* Untracked file is %d bytes.\n"
2101
+"* Showing only first %d bytes.\n"
2102
msgstr ""
2103
1938
-#: lib/option.tcl:264
1939
-msgid "pt."
2104
+#: lib/diff.tcl:250
2105
+#, tcl-format
2106
+msgid ""
2107
+"\n"
2108
+"* Untracked file clipped here by %s.\n"
2109
+"* To see the entire file, use an external editor.\n"
2110
msgstr ""
2111
1942
-#: lib/option.tcl:278
1943
-msgid "Preferences"
2112
+#: lib/diff.tcl:583
2113
+msgid "Failed to unstage selected hunk."
2114
msgstr ""
2115
1946
-#: lib/option.tcl:314
1947
-msgid "Failed to completely save options:"
2116
+#: lib/diff.tcl:591
2117
+msgid "Failed to revert selected hunk."
2118
msgstr ""
2119
1950
-#: lib/remote.tcl:163
1951
-msgid "Remove Remote"
2120
+#: lib/diff.tcl:594
2121
+msgid "Failed to stage selected hunk."
2122
msgstr ""
2123
1954
-#: lib/remote.tcl:168
1955
-msgid "Prune from"
2124
+#: lib/diff.tcl:687
2125
+msgid "Failed to unstage selected line."
2126
msgstr ""
2127
1958
-#: lib/remote.tcl:173
1959
-msgid "Fetch from"
2128
+#: lib/diff.tcl:696
2129
+msgid "Failed to revert selected line."
2130
msgstr ""
2131
1962
-#: lib/remote.tcl:215
1963
-msgid "Push to"
2132
+#: lib/diff.tcl:700
2133
+msgid "Failed to stage selected line."
2134
msgstr ""
2135
1966
-#: lib/remote_add.tcl:19
1967
-msgid "Add Remote"
2136
+#: lib/diff.tcl:889
2137
+msgid "Failed to undo last revert."
2138
msgstr ""
2139
1970
-#: lib/remote_add.tcl:24
1971
-msgid "Add New Remote"
2140
+#: lib/sshkey.tcl:34
2141
+msgid "No keys found."
2142
msgstr ""
2143
1974
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
1975
-msgid "Add"
2144
+#: lib/sshkey.tcl:37
2145
+#, tcl-format
2146
+msgid "Found a public key in: %s"
2147
msgstr ""
2148
1978
-#: lib/remote_add.tcl:37
1979
-msgid "Remote Details"
2149
+#: lib/sshkey.tcl:43
2150
+msgid "Generate Key"
2151
msgstr ""
2152
1982
-#: lib/remote_add.tcl:50
1983
-msgid "Location:"
2153
+#: lib/sshkey.tcl:61
2154
+msgid "Copy To Clipboard"
2155
msgstr ""
2156
1986
-#: lib/remote_add.tcl:62
1987
-msgid "Further Action"
2157
+#: lib/sshkey.tcl:75
2158
+msgid "Your OpenSSH Public Key"
2159
msgstr ""
2160
1990
-#: lib/remote_add.tcl:65
1991
-msgid "Fetch Immediately"
2161
+#: lib/sshkey.tcl:83
2162
+msgid "Generating..."
2163
msgstr ""
2164
1994
-#: lib/remote_add.tcl:71
1995
-msgid "Initialize Remote Repository and Push"
2165
+#: lib/sshkey.tcl:89
2166
+#, tcl-format
2167
+msgid ""
2168
+"Could not start ssh-keygen:\n"
2169
+"\n"
2170
+"%s"
2171
msgstr ""
2172
1998
-#: lib/remote_add.tcl:77
1999
-msgid "Do Nothing Else Now"
2173
+#: lib/sshkey.tcl:116
2174
+msgid "Generation failed."
2175
msgstr ""
2176
2002
-#: lib/remote_add.tcl:101
2003
-msgid "Please supply a remote name."
2177
+#: lib/sshkey.tcl:123
2178
+msgid "Generation succeeded, but no keys found."
2179
msgstr ""
2180
2006
-#: lib/remote_add.tcl:114
2181
+#: lib/sshkey.tcl:126
2182
#, tcl-format
2008
-msgid "'%s' is not an acceptable remote name."
2183
+msgid "Your key is in: %s"
2184
msgstr ""
2185
2011
-#: lib/remote_add.tcl:125
2186
+#: lib/branch_create.tcl:23
2187
#, tcl-format
2013
-msgid "Failed to add remote '%s' of location '%s'."
2188
+msgid "%s (%s): Create Branch"
2189
msgstr ""
2190
2016
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
2017
-#, tcl-format
2018
-msgid "fetch %s"
2191
+#: lib/branch_create.tcl:28
2192
+msgid "Create New Branch"
2193
msgstr ""
2194
2021
-#: lib/remote_add.tcl:134
2022
-#, tcl-format
2023
-msgid "Fetching the %s"
2195
+#: lib/branch_create.tcl:42
2196
+msgid "Branch Name"
2197
msgstr ""
2198
2026
-#: lib/remote_add.tcl:157
2027
-#, tcl-format
2028
-msgid "Do not know how to initialize repository at location '%s'."
2199
+#: lib/branch_create.tcl:57
2200
+msgid "Match Tracking Branch Name"
2201
msgstr ""
2202
2031
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
2032
-#: lib/transport.tcl:81
2033
-#, tcl-format
2034
-msgid "push %s"
2203
+#: lib/branch_create.tcl:66
2204
+msgid "Starting Revision"
2205
msgstr ""
2206
2037
-#: lib/remote_add.tcl:164
2038
-#, tcl-format
2039
-msgid "Setting up the %s (at %s)"
2207
+#: lib/branch_create.tcl:72
2208
+msgid "Update Existing Branch:"
2209
msgstr ""
2210
2042
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
2043
-msgid "Delete Branch Remotely"
2211
+#: lib/branch_create.tcl:75
2212
+msgid "No"
2213
msgstr ""
2214
2046
-#: lib/remote_branch_delete.tcl:47
2047
-msgid "From Repository"
2215
+#: lib/branch_create.tcl:80
2216
+msgid "Fast Forward Only"
2217
msgstr ""
2218
2050
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
2051
-msgid "Remote:"
2219
+#: lib/branch_create.tcl:97
2220
+msgid "Checkout After Creation"
2221
msgstr ""
2222
2054
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
2055
-msgid "Arbitrary Location:"
2223
+#: lib/branch_create.tcl:132
2224
+msgid "Please select a tracking branch."
2225
msgstr ""
2226
2058
-#: lib/remote_branch_delete.tcl:84
2059
-msgid "Branches"
2227
+#: lib/branch_create.tcl:141
2228
+#, tcl-format
2229
+msgid "Tracking branch %s is not a branch in the remote repository."
2230
msgstr ""
2231
2062
-#: lib/remote_branch_delete.tcl:109
2063
-msgid "Delete Only If"
2232
+#: lib/console.tcl:59
2233
+msgid "Working... please wait..."
2234
msgstr ""
2235
2066
-#: lib/remote_branch_delete.tcl:111
2067
-msgid "Merged Into:"
2236
+#: lib/console.tcl:186
2237
+msgid "Success"
2238
msgstr ""
2239
2070
-#: lib/remote_branch_delete.tcl:152
2071
-msgid "A branch is required for 'Merged Into'."
2240
+#: lib/console.tcl:200
2241
+msgid "Error: Command Failed"
2242
msgstr ""
2243
2074
-#: lib/remote_branch_delete.tcl:184
2075
-#, tcl-format
2076
-msgid ""
2077
-"The following branches are not completely merged into %s:\n"
2078
-"\n"
2079
-" - %s"
2244
+#: lib/line.tcl:17
2245
+msgid "Goto Line:"
2246
msgstr ""
2247
2082
-#: lib/remote_branch_delete.tcl:189
2083
-#, tcl-format
2084
-msgid ""
2085
-"One or more of the merge tests failed because you have not fetched the "
2086
-"necessary commits. Try fetching from %s first."
2248
+#: lib/line.tcl:23
2249
+msgid "Go"
2250
msgstr ""
2251
2089
-#: lib/remote_branch_delete.tcl:207
2090
-msgid "Please select one or more branches to delete."
2252
+#: lib/choose_rev.tcl:52
2253
+msgid "This Detached Checkout"
2254
msgstr ""
2255
2093
-#: lib/remote_branch_delete.tcl:226
2094
-#, tcl-format
2095
-msgid "Deleting branches from %s"
2256
+#: lib/choose_rev.tcl:60
2257
+msgid "Revision Expression:"
2258
msgstr ""
2259
2098
-#: lib/remote_branch_delete.tcl:292
2099
-msgid "No repository selected."
2260
+#: lib/choose_rev.tcl:72
2261
+msgid "Local Branch"
2262
+msgstr ""
2263
+
2264
+#: lib/choose_rev.tcl:77
2265
+msgid "Tracking Branch"
2266
+msgstr ""
2267
+
2268
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
2269
+msgid "Tag"
2270
msgstr ""
2271
2102
-#: lib/remote_branch_delete.tcl:297
2272
+#: lib/choose_rev.tcl:321
2273
#, tcl-format
2104
-msgid "Scanning %s..."
2274
+msgid "Invalid revision: %s"
2275
msgstr ""
2276
2107
-#: lib/search.tcl:21
2108
-msgid "Find:"
2277
+#: lib/choose_rev.tcl:342
2278
+msgid "No revision selected."
2279
msgstr ""
2280
2111
-#: lib/search.tcl:23
2112
-msgid "Next"
2281
+#: lib/choose_rev.tcl:350
2282
+msgid "Revision expression is empty."
2283
+msgstr ""
2284
+
2285
+#: lib/choose_rev.tcl:537
2286
+msgid "Updated"
2287
+msgstr ""
2288
+
2289
+#: lib/choose_rev.tcl:565
2290
+msgid "URL"
2291
msgstr ""
2292
2115
-#: lib/search.tcl:24
2116
-msgid "Prev"
2293
+#: lib/commit.tcl:9
2294
+msgid ""
2295
+"There is nothing to amend.\n"
2296
+"\n"
2297
+"You are about to create the initial commit. There is no commit before this "
2298
+"to amend.\n"
2299
msgstr ""
2300
2119
-#: lib/search.tcl:25
2120
-msgid "Case-Sensitive"
2301
+#: lib/commit.tcl:18
2302
+msgid ""
2303
+"Cannot amend while merging.\n"
2304
+"\n"
2305
+"You are currently in the middle of a merge that has not been fully "
2306
+"completed. You cannot amend the prior commit unless you first abort the "
2307
+"current merge activity.\n"
2308
msgstr ""
2309
2123
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
2124
-msgid "Cannot write shortcut:"
2310
+#: lib/commit.tcl:56
2311
+msgid "Error loading commit data for amend:"
2312
msgstr ""
2313
2127
-#: lib/shortcut.tcl:137
2128
-msgid "Cannot write icon:"
2314
+#: lib/commit.tcl:83
2315
+msgid "Unable to obtain your identity:"
2316
msgstr ""
2317
2131
-#: lib/spellcheck.tcl:57
2132
-msgid "Unsupported spell checker"
2318
+#: lib/commit.tcl:88
2319
+msgid "Invalid GIT_COMMITTER_IDENT:"
2320
msgstr ""
2321
2135
-#: lib/spellcheck.tcl:65
2136
-msgid "Spell checking is unavailable"
2322
+#: lib/commit.tcl:138
2323
+#, tcl-format
2324
+msgid "warning: Tcl does not support encoding '%s'."
2325
msgstr ""
2326
2139
-#: lib/spellcheck.tcl:68
2140
-msgid "Invalid spell checking configuration"
2327
+#: lib/commit.tcl:158
2328
+msgid ""
2329
+"Last scanned state does not match repository state.\n"
2330
+"\n"
2331
+"Another Git program has modified this repository since the last scan. A "
2332
+"rescan must be performed before another commit can be created.\n"
2333
+"\n"
2334
+"The rescan will be automatically started now.\n"
2335
msgstr ""
2336
2143
-#: lib/spellcheck.tcl:70
2337
+#: lib/commit.tcl:182
2338
#, tcl-format
2145
-msgid "Reverting dictionary to %s."
2339
+msgid ""
2340
+"Unmerged files cannot be committed.\n"
2341
+"\n"
2342
+"File %s has merge conflicts. You must resolve them and stage the file "
2343
+"before committing.\n"
2344
msgstr ""
2345
2148
-#: lib/spellcheck.tcl:73
2149
-msgid "Spell checker silently failed on startup"
2346
+#: lib/commit.tcl:190
2347
+#, tcl-format
2348
+msgid ""
2349
+"Unknown file state %s detected.\n"
2350
+"\n"
2351
+"File %s cannot be committed by this program.\n"
2352
msgstr ""
2353
2152
-#: lib/spellcheck.tcl:80
2153
-msgid "Unrecognized spell checker"
2354
+#: lib/commit.tcl:198
2355
+msgid ""
2356
+"No changes to commit.\n"
2357
+"\n"
2358
+"You must stage at least 1 file before you can commit.\n"
2359
msgstr ""
2360
2156
-#: lib/spellcheck.tcl:186
2157
-msgid "No Suggestions"
2361
+#: lib/commit.tcl:213
2362
+msgid ""
2363
+"Please supply a commit message.\n"
2364
+"\n"
2365
+"A good commit message has the following format:\n"
2366
+"\n"
2367
+"- First line: Describe in one sentence what you did.\n"
2368
+"- Second line: Blank\n"
2369
+"- Remaining lines: Describe why this change is good.\n"
2370
msgstr ""
2371
2160
-#: lib/spellcheck.tcl:388
2161
-msgid "Unexpected EOF from spell checker"
2372
+#: lib/commit.tcl:244
2373
+msgid "Calling pre-commit hook..."
2374
msgstr ""
2375
2164
-#: lib/spellcheck.tcl:392
2165
-msgid "Spell Checker Failed"
2376
+#: lib/commit.tcl:259
2377
+msgid "Commit declined by pre-commit hook."
2378
msgstr ""
2379
2168
-#: lib/sshkey.tcl:31
2169
-msgid "No keys found."
2380
+#: lib/commit.tcl:278
2381
+msgid ""
2382
+"You are about to commit on a detached head. This is a potentially dangerous "
2383
+"thing to do because if you switch to another branch you will lose your "
2384
+"changes and it can be difficult to retrieve them later from the reflog. You "
2385
+"should probably cancel this commit and create a new branch to continue.\n"
2386
+" \n"
2387
+" Do you really want to proceed with your Commit?"
2388
msgstr ""
2389
2172
-#: lib/sshkey.tcl:34
2173
-#, tcl-format
2174
-msgid "Found a public key in: %s"
2390
+#: lib/commit.tcl:299
2391
+msgid "Calling commit-msg hook..."
2392
msgstr ""
2393
2177
-#: lib/sshkey.tcl:40
2178
-msgid "Generate Key"
2394
+#: lib/commit.tcl:314
2395
+msgid "Commit declined by commit-msg hook."
2396
msgstr ""
2397
2181
-#: lib/sshkey.tcl:56
2182
-msgid "Copy To Clipboard"
2398
+#: lib/commit.tcl:327
2399
+msgid "Committing changes..."
2400
msgstr ""
2401
2185
-#: lib/sshkey.tcl:70
2186
-msgid "Your OpenSSH Public Key"
2402
+#: lib/commit.tcl:344
2403
+msgid "write-tree failed:"
2404
msgstr ""
2405
2189
-#: lib/sshkey.tcl:78
2190
-msgid "Generating..."
2406
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
2407
+msgid "Commit failed."
2408
msgstr ""
2409
2193
-#: lib/sshkey.tcl:84
2410
+#: lib/commit.tcl:362
2411
#, tcl-format
2412
+msgid "Commit %s appears to be corrupt"
2413
+msgstr ""
2414
+
2415
+#: lib/commit.tcl:367
2416
msgid ""
2196
-"Could not start ssh-keygen:\n"
2417
+"No changes to commit.\n"
2418
"\n"
2198
-"%s"
2419
+"No files were modified by this commit and it was not a merge commit.\n"
2420
+"\n"
2421
+"A rescan will be automatically started now.\n"
2422
msgstr ""
2423
2201
-#: lib/sshkey.tcl:111
2202
-msgid "Generation failed."
2424
+#: lib/commit.tcl:374
2425
+msgid "No changes to commit."
2426
msgstr ""
2427
2205
-#: lib/sshkey.tcl:118
2206
-msgid "Generation succeeded, but no keys found."
2428
+#: lib/commit.tcl:394
2429
+msgid "commit-tree failed:"
2430
msgstr ""
2431
2209
-#: lib/sshkey.tcl:121
2210
-#, tcl-format
2211
-msgid "Your key is in: %s"
2432
+#: lib/commit.tcl:421
2433
+msgid "update-ref failed:"
2434
msgstr ""
2435
2214
-#: lib/status_bar.tcl:83
2436
+#: lib/commit.tcl:514
2437
#, tcl-format
2216
-msgid "%s ... %*i of %*i %s (%3i%%)"
2438
+msgid "Created commit %s: %s"
2439
msgstr ""
2440
2219
-#: lib/tools.tcl:75
2441
+#: lib/branch_delete.tcl:16
2442
#, tcl-format
2221
-msgid "Running %s requires a selected file."
2443
+msgid "%s (%s): Delete Branch"
2444
msgstr ""
2445
2224
-#: lib/tools.tcl:90
2225
-#, tcl-format
2226
-msgid "Are you sure you want to run %s?"
2446
+#: lib/branch_delete.tcl:21
2447
+msgid "Delete Local Branch"
2448
+msgstr ""
2449
+
2450
+#: lib/branch_delete.tcl:39
2451
+msgid "Local Branches"
2452
+msgstr ""
2453
+
2454
+#: lib/branch_delete.tcl:51
2455
+msgid "Delete Only If Merged Into"
2456
msgstr ""
2457
2229
-#: lib/tools.tcl:110
2458
+#: lib/branch_delete.tcl:103
2459
#, tcl-format
2231
-msgid "Tool: %s"
2460
+msgid "The following branches are not completely merged into %s:"
2461
msgstr ""
2462
2234
-#: lib/tools.tcl:111
2463
+#: lib/branch_delete.tcl:131
2464
#, tcl-format
2236
-msgid "Running: %s"
2465
+msgid " - %s:"
2466
msgstr ""
2467
2239
-#: lib/tools.tcl:149
2468
+#: lib/branch_delete.tcl:141
2469
#, tcl-format
2241
-msgid "Tool completed successfully: %s"
2470
+msgid ""
2471
+"Failed to delete branches:\n"
2472
+"%s"
2473
msgstr ""
2474
2244
-#: lib/tools.tcl:151
2475
+#: lib/date.tcl:25
2476
#, tcl-format
2246
-msgid "Tool failed: %s"
2477
+msgid "Invalid date from Git: %s"
2478
msgstr ""
2479
2249
-#: lib/tools_dlg.tcl:22
2250
-msgid "Add Tool"
2480
+#: lib/database.tcl:42
2481
+msgid "Number of loose objects"
2482
msgstr ""
2483
2253
-#: lib/tools_dlg.tcl:28
2254
-msgid "Add New Tool Command"
2484
+#: lib/database.tcl:43
2485
+msgid "Disk space used by loose objects"
2486
msgstr ""
2487
2257
-#: lib/tools_dlg.tcl:33
2258
-msgid "Add globally"
2488
+#: lib/database.tcl:44
2489
+msgid "Number of packed objects"
2490
msgstr ""
2491
2261
-#: lib/tools_dlg.tcl:45
2262
-msgid "Tool Details"
2492
+#: lib/database.tcl:45
2493
+msgid "Number of packs"
2494
msgstr ""
2495
2265
-#: lib/tools_dlg.tcl:48
2266
-msgid "Use '/' separators to create a submenu tree:"
2496
+#: lib/database.tcl:46
2497
+msgid "Disk space used by packed objects"
2498
msgstr ""
2499
2269
-#: lib/tools_dlg.tcl:61
2270
-msgid "Command:"
2500
+#: lib/database.tcl:47
2501
+msgid "Packed objects waiting for pruning"
2502
msgstr ""
2503
2273
-#: lib/tools_dlg.tcl:74
2274
-msgid "Show a dialog before running"
2504
+#: lib/database.tcl:48
2505
+msgid "Garbage files"
2506
msgstr ""
2507
2277
-#: lib/tools_dlg.tcl:80
2278
-msgid "Ask the user to select a revision (sets $REVISION)"
2508
+#: lib/database.tcl:66
2509
+#, tcl-format
2510
+msgid "%s (%s): Database Statistics"
2511
msgstr ""
2512
2281
-#: lib/tools_dlg.tcl:85
2282
-msgid "Ask the user for additional arguments (sets $ARGS)"
2513
+#: lib/database.tcl:72
2514
+msgid "Compressing the object database"
2515
msgstr ""
2516
2285
-#: lib/tools_dlg.tcl:92
2286
-msgid "Don't show the command output window"
2517
+#: lib/database.tcl:83
2518
+msgid "Verifying the object database with fsck-objects"
2519
msgstr ""
2520
2289
-#: lib/tools_dlg.tcl:97
2290
-msgid "Run only if a diff is selected ($FILENAME not empty)"
2521
+#: lib/database.tcl:107
2522
+#, tcl-format
2523
+msgid ""
2524
+"This repository currently has approximately %i loose objects.\n"
2525
+"\n"
2526
+"To maintain optimal performance it is strongly recommended that you compress "
2527
+"the database.\n"
2528
+"\n"
2529
+"Compress the database now?"
2530
msgstr ""
2531
2293
-#: lib/tools_dlg.tcl:121
2294
-msgid "Please supply a name for the tool."
2532
+#: lib/error.tcl:20
2533
+#, tcl-format
2534
+msgid "%s: error"
2535
msgstr ""
2536
2297
-#: lib/tools_dlg.tcl:129
2537
+#: lib/error.tcl:36
2538
#, tcl-format
2299
-msgid "Tool '%s' already exists."
2539
+msgid "%s: warning"
2540
msgstr ""
2541
2302
-#: lib/tools_dlg.tcl:151
2542
+#: lib/error.tcl:80
2543
#, tcl-format
2304
-msgid ""
2305
-"Could not add tool:\n"
2306
-"%s"
2544
+msgid "%s hook failed:"
2545
msgstr ""
2546
2309
-#: lib/tools_dlg.tcl:190
2310
-msgid "Remove Tool"
2547
+#: lib/error.tcl:96
2548
+msgid "You must correct the above errors before committing."
2549
msgstr ""
2550
2313
-#: lib/tools_dlg.tcl:196
2314
-msgid "Remove Tool Commands"
2551
+#: lib/error.tcl:116
2552
+#, tcl-format
2553
+msgid "%s (%s): error"
2554
msgstr ""
2555
2317
-#: lib/tools_dlg.tcl:200
2318
-msgid "Remove"
2556
+#: lib/merge.tcl:13
2557
+msgid ""
2558
+"Cannot merge while amending.\n"
2559
+"\n"
2560
+"You must finish amending this commit before starting any type of merge.\n"
2561
msgstr ""
2562
2321
-#: lib/tools_dlg.tcl:236
2322
-msgid "(Blue denotes repository-local tools)"
2563
+#: lib/merge.tcl:27
2564
+msgid ""
2565
+"Last scanned state does not match repository state.\n"
2566
+"\n"
2567
+"Another Git program has modified this repository since the last scan. A "
2568
+"rescan must be performed before a merge can be performed.\n"
2569
+"\n"
2570
+"The rescan will be automatically started now.\n"
2571
msgstr ""
2572
2325
-#: lib/tools_dlg.tcl:297
2573
+#: lib/merge.tcl:45
2574
#, tcl-format
2327
-msgid "Run Command: %s"
2575
+msgid ""
2576
+"You are in the middle of a conflicted merge.\n"
2577
+"\n"
2578
+"File %s has merge conflicts.\n"
2579
+"\n"
2580
+"You must resolve them, stage the file, and commit to complete the current "
2581
+"merge. Only then can you begin another merge.\n"
2582
msgstr ""
2583
2330
-#: lib/tools_dlg.tcl:311
2331
-msgid "Arguments"
2584
+#: lib/merge.tcl:55
2585
+#, tcl-format
2586
+msgid ""
2587
+"You are in the middle of a change.\n"
2588
+"\n"
2589
+"File %s is modified.\n"
2590
+"\n"
2591
+"You should complete the current commit before starting a merge. Doing so "
2592
+"will help you abort a failed merge, should the need arise.\n"
2593
msgstr ""
2594
2334
-#: lib/tools_dlg.tcl:348
2335
-msgid "OK"
2595
+#: lib/merge.tcl:108
2596
+#, tcl-format
2597
+msgid "%s of %s"
2598
msgstr ""
2599
2338
-#: lib/transport.tcl:7
2600
+#: lib/merge.tcl:126
2601
#, tcl-format
2340
-msgid "Fetching new changes from %s"
2602
+msgid "Merging %s and %s..."
2603
msgstr ""
2604
2343
-#: lib/transport.tcl:18
2344
-#, tcl-format
2345
-msgid "remote prune %s"
2605
+#: lib/merge.tcl:137
2606
+msgid "Merge completed successfully."
2607
msgstr ""
2608
2348
-#: lib/transport.tcl:19
2349
-#, tcl-format
2350
-msgid "Pruning tracking branches deleted from %s"
2609
+#: lib/merge.tcl:139
2610
+msgid "Merge failed. Conflict resolution is required."
2611
msgstr ""
2612
2353
-#: lib/transport.tcl:26
2613
+#: lib/merge.tcl:156
2614
#, tcl-format
2355
-msgid "Pushing changes to %s"
2615
+msgid "%s (%s): Merge"
2616
msgstr ""
2617
2358
-#: lib/transport.tcl:64
2618
+#: lib/merge.tcl:164
2619
#, tcl-format
2360
-msgid "Mirroring to %s"
2620
+msgid "Merge Into %s"
2621
msgstr ""
2622
2363
-#: lib/transport.tcl:82
2364
-#, tcl-format
2365
-msgid "Pushing %s %s to %s"
2623
+#: lib/merge.tcl:183
2624
+msgid "Revision To Merge"
2625
msgstr ""
2626
2368
-#: lib/transport.tcl:100
2369
-msgid "Push Branches"
2627
+#: lib/merge.tcl:218
2628
+msgid ""
2629
+"Cannot abort while amending.\n"
2630
+"\n"
2631
+"You must finish amending this commit.\n"
2632
msgstr ""
2633
2372
-#: lib/transport.tcl:114
2373
-msgid "Source Branches"
2634
+#: lib/merge.tcl:228
2635
+msgid ""
2636
+"Abort merge?\n"
2637
+"\n"
2638
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
2639
+"\n"
2640
+"Continue with aborting the current merge?"
2641
msgstr ""
2642
2376
-#: lib/transport.tcl:131
2377
-msgid "Destination Repository"
2643
+#: lib/merge.tcl:234
2644
+msgid ""
2645
+"Reset changes?\n"
2646
+"\n"
2647
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
2648
+"\n"
2649
+"Continue with resetting the current changes?"
2650
msgstr ""
2651
2380
-#: lib/transport.tcl:169
2381
-msgid "Transfer Options"
2652
+#: lib/merge.tcl:246
2653
+msgid "Aborting"
2654
msgstr ""
2655
2384
-#: lib/transport.tcl:171
2385
-msgid "Force overwrite existing branch (may discard changes)"
2656
+#: lib/merge.tcl:247
2657
+msgid "files reset"
2658
msgstr ""
2659
2388
-#: lib/transport.tcl:175
2389
-msgid "Use thin pack (for slow network connections)"
2660
+#: lib/merge.tcl:277
2661
+msgid "Abort failed."
2662
msgstr ""
2663
2392
-#: lib/transport.tcl:179
2393
-msgid "Include tags"
2664
+#: lib/merge.tcl:279
2665
+msgid "Abort completed. Ready."
2666
msgstr ""