gitk: Regenerate .po files
This is the result of running make update-po and removing or fixing the strings that were fuzzily matched. The ones that were fixed were the ones where the only change was "git rev-list" to "git log", and the "about gitk" message where the copyright year got updated. To get xgettext to see the menu labels as needing translation, it was necessary for arrange for them to be preceded by "mc". This therefore changes makemenu to ignore the first element in each menu item so that it can be "mc" in the makemenu call. Signed-off-by: Paul Mackerras <paulus@samba.org>
Paul Mackerras committed
Oct 18, 2008 at 16:24 UTC
79056034bece6bf39140554eb48f293053828d4d
5 files changed
+1037
-966
gitk
+49
-39
@@ -1750,12 +1750,20 @@ proc setoptions {} {
1750
option add *Entry.font uifont startupFile
1751
}
1752
1753
+# Make a menu and submenus.
1754
+# m is the window name for the menu, items is the list of menu items to add.
1755
+# Each item is a list {mc label type description options...}
1756
+# mc is ignored; it's so we can put mc there to alert xgettext
1757
+# label is the string that appears in the menu
1758
+# type is cascade, command or radiobutton (should add checkbutton)
1759
+# description depends on type; it's the sublist for cascade, the
1760
+# command to invoke for command, or {variable value} for radiobutton
1761
proc makemenu {m items} {
1762
menu $m
1763
foreach i $items {
1756
- set name [mc [lindex $i 0]]
1757
- set type [lindex $i 1]
1758
- set thing [lindex $i 2]
1764
+ set name [mc [lindex $i 1]]
1765
+ set type [lindex $i 2]
1766
+ set thing [lindex $i 3]
1767
set params [list $type]
1768
if {$name ne {}} {
1769
set u [string first "&" [string map {&& x} $name]]
@@ -1766,7 +1774,7 @@ proc makemenu {m items} {
1774
}
1775
switch -- $type {
1776
"cascade" {
1769
- set submenu [string tolower [string map {& ""} [lindex $i 0]]]
1777
+ set submenu [string tolower [string map {& ""} [lindex $i 1]]]
1778
lappend params -menu $m.$submenu
1779
}
1780
"command" {
@@ -1777,7 +1785,7 @@ proc makemenu {m items} {
1785
-value [lindex $thing 1]
1786
}
1787
}
1780
- eval $m add $params [lrange $i 3 end]
1788
+ eval $m add $params [lrange $i 4 end]
1789
if {$type eq "cascade"} {
1790
makemenu $m.$submenu $thing
1791
}
@@ -1806,27 +1814,29 @@ proc makewindow {} {
1814
global rprogitem rprogcoord rownumsel numcommits
1815
global have_tk85
1816
1817
+ # The "mc" arguments here are purely so that xgettext
1818
+ # sees the following string as needing to be translated
1819
makemenu .bar {
1810
- {"File" cascade {
1811
- {"Update" command updatecommits -accelerator F5}
1812
- {"Reload" command reloadcommits}
1813
- {"Reread references" command rereadrefs}
1814
- {"List references" command showrefs}
1815
- {"Quit" command doquit}
1820
+ {mc "File" cascade {
1821
+ {mc "Update" command updatecommits -accelerator F5}
1822
+ {mc "Reload" command reloadcommits}
1823
+ {mc "Reread references" command rereadrefs}
1824
+ {mc "List references" command showrefs}
1825
+ {mc "Quit" command doquit}
1826
}}
1817
- {"Edit" cascade {
1818
- {"Preferences" command doprefs}
1827
+ {mc "Edit" cascade {
1828
+ {mc "Preferences" command doprefs}
1829
}}
1820
- {"View" cascade {
1821
- {"New view..." command {newview 0}}
1822
- {"Edit view..." command editview -state disabled}
1823
- {"Delete view" command delview -state disabled}
1824
- {"" separator}
1825
- {"All files" radiobutton {selectedview 0} -command {showview 0}}
1830
+ {mc "View" cascade {
1831
+ {mc "New view..." command {newview 0}}
1832
+ {mc "Edit view..." command editview -state disabled}
1833
+ {mc "Delete view" command delview -state disabled}
1834
+ {xx "" separator}
1835
+ {mc "All files" radiobutton {selectedview 0} -command {showview 0}}
1836
}}
1827
- {"Help" cascade {
1828
- {"About gitk" command about}
1829
- {"Key bindings" command keys}
1837
+ {mc "Help" cascade {
1838
+ {mc "About gitk" command about}
1839
+ {mc "Key bindings" command keys}
1840
}}
1841
}
1842
. configure -menu .bar
@@ -2210,39 +2220,39 @@ proc makewindow {} {
2220
2221
set rowctxmenu .rowctxmenu
2222
makemenu $rowctxmenu {
2213
- {"Diff this -> selected" command {diffvssel 0}}
2214
- {"Diff selected -> this" command {diffvssel 1}}
2215
- {"Make patch" command mkpatch}
2216
- {"Create tag" command mktag}
2217
- {"Write commit to file" command writecommit}
2218
- {"Create new branch" command mkbranch}
2219
- {"Cherry-pick this commit" command cherrypick}
2220
- {"Reset HEAD branch to here" command resethead}
2223
+ {mc "Diff this -> selected" command {diffvssel 0}}
2224
+ {mc "Diff selected -> this" command {diffvssel 1}}
2225
+ {mc "Make patch" command mkpatch}
2226
+ {mc "Create tag" command mktag}
2227
+ {mc "Write commit to file" command writecommit}
2228
+ {mc "Create new branch" command mkbranch}
2229
+ {mc "Cherry-pick this commit" command cherrypick}
2230
+ {mc "Reset HEAD branch to here" command resethead}
2231
}
2232
$rowctxmenu configure -tearoff 0
2233
2234
set fakerowmenu .fakerowmenu
2235
makemenu $fakerowmenu {
2226
- {"Diff this -> selected" command {diffvssel 0}}
2227
- {"Diff selected -> this" command {diffvssel 1}}
2228
- {"Make patch" command mkpatch}
2236
+ {mc "Diff this -> selected" command {diffvssel 0}}
2237
+ {mc "Diff selected -> this" command {diffvssel 1}}
2238
+ {mc "Make patch" command mkpatch}
2239
}
2240
$fakerowmenu configure -tearoff 0
2241
2242
set headctxmenu .headctxmenu
2243
makemenu $headctxmenu {
2234
- {"Check out this branch" command cobranch}
2235
- {"Remove this branch" command rmbranch}
2244
+ {mc "Check out this branch" command cobranch}
2245
+ {mc "Remove this branch" command rmbranch}
2246
}
2247
$headctxmenu configure -tearoff 0
2248
2249
global flist_menu
2250
set flist_menu .flistctxmenu
2251
makemenu $flist_menu {
2242
- {"Highlight this too" command {flist_hl 0}}
2243
- {"Highlight this only" command {flist_hl 1}}
2244
- {"External diff" command {external_diff}}
2245
- {"Blame parent commit" command {external_blame 1}}
2252
+ {mc "Highlight this too" command {flist_hl 0}}
2253
+ {mc "Highlight this only" command {flist_hl 1}}
2254
+ {mc "External diff" command {external_diff}}
2255
+ {mc "Blame parent commit" command {external_blame 1}}
2256
}
2257
$flist_menu configure -tearoff 0
2258
}
po/de.po
+234
-226
@@ -7,7 +7,7 @@ msgid ""
7
msgstr ""
8
"Project-Id-Version: git-gui\n"
9
"Report-Msgid-Bugs-To: \n"
10
-"POT-Creation-Date: 2008-05-24 22:32+0200\n"
10
+"POT-Creation-Date: 2008-10-18 22:03+1100\n"
11
"PO-Revision-Date: 2008-05-24 22:40+0200\n"
12
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
13
"Language-Team: German\n"
@@ -15,17 +15,17 @@ msgstr ""
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
18
-#: gitk:102
18
+#: gitk:113
19
msgid "Couldn't get list of unmerged files:"
20
msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:"
21
22
-#: gitk:329
22
+#: gitk:340
23
msgid "No files selected: --merge specified but no files are unmerged."
24
msgstr ""
25
"Keine Dateien ausgewählt: --merge angegeben, es existieren aber keine nicht-"
26
"zusammengeführten Dateien."
27
28
-#: gitk:332
28
+#: gitk:343
29
msgid ""
30
"No files selected: --merge specified but no unmerged files are within file "
31
"limit."
@@ -33,257 +33,261 @@ msgstr ""
33
"Keine Dateien ausgewähle: --merge angegeben, aber keine nicht-"
34
"zusammengeführten Dateien sind in der Dateiauswahl."
35
36
-#: gitk:354
36
+#: gitk:365 gitk:503
37
msgid "Error executing git log:"
38
msgstr "Fehler beim Ausführen von git-log:"
39
40
-#: gitk:369
40
+#: gitk:378
41
msgid "Reading"
42
msgstr "Lesen"
43
44
-#: gitk:151 gitk:2191
44
+#: gitk:438 gitk:3462
45
msgid "Reading commits..."
46
msgstr "Versionen lesen..."
47
48
-#: gitk:275
49
-msgid "Can't parse git log output:"
50
-msgstr "Ausgabe von git-log kann nicht erkannt werden:"
51
-
52
-#: gitk:386 gitk:2195
48
+#: gitk:441 gitk:1528 gitk:3465
49
msgid "No commits selected"
50
msgstr "Keine Versionen ausgewählt."
51
56
-#: gitk:500
52
+#: gitk:1399
53
+msgid "Can't parse git log output:"
54
+msgstr "Ausgabe von git-log kann nicht erkannt werden:"
55
+
56
+#: gitk:1605
57
msgid "No commit information available"
58
msgstr "Keine Versionsinformation verfügbar"
59
60
-#: gitk:599 gitk:621 gitk:1955 gitk:6424 gitk:7924 gitk:8083
60
+#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466
61
msgid "OK"
62
msgstr "Ok"
63
64
-#: gitk:623 gitk:1956 gitk:6108 gitk:6179 gitk:6276 gitk:6322 gitk:6426
65
-#: gitk:7925 gitk:8084
64
+#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766
65
+#: gitk:9294 gitk:9467
66
msgid "Cancel"
67
msgstr "Abbrechen"
68
69
-#: gitk:661
70
-msgid "File"
71
-msgstr "Datei"
72
-
73
-#: gitk:663
69
+#: gitk:1811
70
msgid "Update"
71
msgstr "Aktualisieren"
72
77
-#: gitk:1722
73
+#: gitk:1812
74
msgid "Reload"
75
msgstr "Neu laden"
76
81
-#: gitk:1723
77
+#: gitk:1813
78
msgid "Reread references"
79
msgstr "Zweige neu laden"
80
85
-#: gitk:665
81
+#: gitk:1814
82
msgid "List references"
83
msgstr "Zweige/Markierungen auflisten"
84
89
-#: gitk:666
85
+#: gitk:1815
86
msgid "Quit"
87
msgstr "Beenden"
88
93
-#: gitk:668
94
-msgid "Edit"
95
-msgstr "Bearbeiten"
89
+#: gitk:1810
90
+msgid "File"
91
+msgstr "Datei"
92
97
-#: gitk:669
93
+#: gitk:1818
94
msgid "Preferences"
95
msgstr "Einstellungen"
96
101
-#: gitk:672 gitk:1892
102
-msgid "View"
103
-msgstr "Ansicht"
97
+#: gitk:1817
98
+msgid "Edit"
99
+msgstr "Bearbeiten"
100
105
-#: gitk:673
101
+#: gitk:1821
102
msgid "New view..."
103
msgstr "Neue Ansicht..."
104
109
-#: gitk:674 gitk:2133 gitk:8723
105
+#: gitk:1822
106
msgid "Edit view..."
107
msgstr "Ansicht bearbeiten..."
108
113
-#: gitk:676 gitk:2134 gitk:8724
109
+#: gitk:1823
110
msgid "Delete view"
111
msgstr "Ansicht löschen"
112
117
-#: gitk:678
113
+#: gitk:1825
114
msgid "All files"
115
msgstr "Alle Dateien"
116
121
-#: gitk:682
122
-msgid "Help"
123
-msgstr "Hilfe"
117
+#: gitk:1820 gitk:3196
118
+msgid "View"
119
+msgstr "Ansicht"
120
125
-#: gitk:683 gitk:1317
121
+#: gitk:1828 gitk:2487
122
msgid "About gitk"
123
msgstr "Über gitk"
124
129
-#: gitk:684
125
+#: gitk:1829
126
msgid "Key bindings"
127
msgstr "Tastenkürzel"
128
133
-#: gitk:741
129
+#: gitk:1827
130
+msgid "Help"
131
+msgstr "Hilfe"
132
+
133
+#: gitk:1887
134
msgid "SHA1 ID: "
135
msgstr "SHA1:"
136
137
-#: gitk:1831
137
+#: gitk:1918
138
msgid "Row"
139
msgstr "Zeile"
140
141
-#: gitk:1862
141
+#: gitk:1949
142
msgid "Find"
143
msgstr "Suche"
144
145
-#: gitk:792
145
+#: gitk:1950
146
msgid "next"
147
msgstr "nächste"
148
149
-#: gitk:793
149
+#: gitk:1951
150
msgid "prev"
151
msgstr "vorige"
152
153
-#: gitk:794
153
+#: gitk:1952
154
msgid "commit"
155
msgstr "Version nach"
156
157
-#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
157
+#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621
158
msgid "containing:"
159
msgstr "Beschreibung:"
160
161
-#: gitk:800 gitk:1778 gitk:1783 gitk:2431
161
+#: gitk:1958 gitk:2954 gitk:2959 gitk:3692
162
msgid "touching paths:"
163
msgstr "Dateien:"
164
165
-#: gitk:801 gitk:2436
165
+#: gitk:1959 gitk:3697
166
msgid "adding/removing string:"
167
msgstr "Änderungen:"
168
169
-#: gitk:810 gitk:812
169
+#: gitk:1968 gitk:1970
170
msgid "Exact"
171
msgstr "Exakt"
172
173
-#: gitk:812 gitk:2514 gitk:4274
173
+#: gitk:1970 gitk:3773 gitk:5518
174
msgid "IgnCase"
175
msgstr "Kein Groß/Klein"
176
177
-#: gitk:812 gitk:2405 gitk:2512 gitk:4270
177
+#: gitk:1970 gitk:3666 gitk:3771 gitk:5514
178
msgid "Regexp"
179
msgstr "Regexp"
180
181
-#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
181
+#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708
182
msgid "All fields"
183
msgstr "Alle Felder"
184
185
-#: gitk:815 gitk:2531 gitk:2563 gitk:4336
185
+#: gitk:1973 gitk:3790 gitk:3822 gitk:5580
186
msgid "Headline"
187
msgstr "Überschrift"
188
189
-#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
189
+#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109
190
msgid "Comments"
191
msgstr "Beschreibung"
192
193
-#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5957
194
-#: gitk:5972
193
+#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285
194
+#: gitk:7300
195
msgid "Author"
196
msgstr "Autor"
197
198
-#: gitk:816 gitk:2531 gitk:4336 gitk:4765
198
+#: gitk:1974 gitk:3790 gitk:5580 gitk:6047
199
msgid "Committer"
200
msgstr "Eintragender"
201
202
-#: gitk:845
202
+#: gitk:2003
203
msgid "Search"
204
msgstr "Suche"
205
206
-#: gitk:852
206
+#: gitk:2010
207
msgid "Diff"
208
msgstr "Vergleich"
209
210
-#: gitk:854
210
+#: gitk:2012
211
msgid "Old version"
212
msgstr "Alte Version"
213
214
-#: gitk:856
214
+#: gitk:2014
215
msgid "New version"
216
msgstr "Neue Version"
217
218
-#: gitk:858
218
+#: gitk:2016
219
msgid "Lines of context"
220
msgstr "Kontextzeilen"
221
222
-#: gitk:868
222
+#: gitk:2026
223
msgid "Ignore space change"
224
msgstr "Leerzeichenänderungen ignorieren"
225
226
-#: gitk:926
226
+#: gitk:2084
227
msgid "Patch"
228
msgstr "Patch"
229
230
-#: gitk:928
230
+#: gitk:2086
231
msgid "Tree"
232
msgstr "Baum"
233
234
-#: gitk:1053 gitk:1068 gitk:6023
234
+#: gitk:2213 gitk:2226
235
msgid "Diff this -> selected"
236
msgstr "Vergleich diese -> gewählte"
237
238
-#: gitk:1055 gitk:1070 gitk:6024
238
+#: gitk:2214 gitk:2227
239
msgid "Diff selected -> this"
240
msgstr "Vergleich gewählte -> diese"
241
242
-#: gitk:1057 gitk:1072 gitk:6025
242
+#: gitk:2215 gitk:2228
243
msgid "Make patch"
244
msgstr "Patch erstellen"
245
246
-#: gitk:1058 gitk:6163
246
+#: gitk:2216 gitk:7494
247
msgid "Create tag"
248
msgstr "Markierung erstellen"
249
250
-#: gitk:1059 gitk:6256
250
+#: gitk:2217 gitk:7593
251
msgid "Write commit to file"
252
msgstr "Version in Datei schreiben"
253
254
-#: gitk:1060 gitk:6310
254
+#: gitk:2218 gitk:7647
255
msgid "Create new branch"
256
msgstr "Neuen Zweig erstellen"
257
258
-#: gitk:1061
258
+#: gitk:2219
259
msgid "Cherry-pick this commit"
260
msgstr "Diese Version pflücken"
261
262
-#: gitk:1063
262
+#: gitk:2220
263
msgid "Reset HEAD branch to here"
264
msgstr "HEAD-Zweig auf diese Version zurücksetzen"
265
266
-#: gitk:1079
266
+#: gitk:2234
267
msgid "Check out this branch"
268
msgstr "Auf diesen Zweig umstellen"
269
270
-#: gitk:1081
270
+#: gitk:2235
271
msgid "Remove this branch"
272
msgstr "Zweig löschen"
273
274
-#: gitk:1087
274
+#: gitk:2242
275
msgid "Highlight this too"
276
msgstr "Diesen auch hervorheben"
277
278
-#: gitk:1089
278
+#: gitk:2243
279
msgid "Highlight this only"
280
msgstr "Nur diesen hervorheben"
281
282
-#: gitk:2162
282
+#: gitk:2244
283
msgid "External diff"
284
msgstr "Externer Vergleich"
285
286
-#: gitk:2403
286
+#: gitk:2245
287
+msgid "Blame parent commit"
288
+msgstr ""
289
+
290
+#: gitk:2488
291
msgid ""
292
"\n"
293
"Gitk - a commit viewer for git\n"
@@ -297,431 +301,431 @@ msgstr ""
301
"\n"
302
"Copyright © 2005-2008 Paul Mackerras\n"
303
"\n"
300
-"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License"
304
+"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
305
+"License"
306
302
-#: gitk:1326 gitk:1387 gitk:6582
307
+#: gitk:2496 gitk:2557 gitk:7943
308
msgid "Close"
309
msgstr "Schließen"
310
306
-#: gitk:1345
311
+#: gitk:2515
312
msgid "Gitk key bindings"
313
msgstr "Gitk Tastaturbelegung"
314
310
-#: gitk:1347
315
+#: gitk:2517
316
msgid "Gitk key bindings:"
317
msgstr "Gitk Tastaturbelegung:"
318
314
-#: gitk:1349
319
+#: gitk:2519
320
#, tcl-format
321
msgid "<%s-Q>\t\tQuit"
322
msgstr "<%s-Q>\t\tBeenden"
323
319
-#: gitk:1350
324
+#: gitk:2520
325
msgid "<Home>\t\tMove to first commit"
326
msgstr "<Pos1>\t\tZur neuesten Version springen"
327
323
-#: gitk:1351
328
+#: gitk:2521
329
msgid "<End>\t\tMove to last commit"
330
msgstr "<Ende>\t\tZur ältesten Version springen"
331
327
-#: gitk:1352
332
+#: gitk:2522
333
msgid "<Up>, p, i\tMove up one commit"
334
msgstr "<Hoch>, p, i\tNächste neuere Version"
335
331
-#: gitk:1353
336
+#: gitk:2523
337
msgid "<Down>, n, k\tMove down one commit"
338
msgstr "<Runter>, n, k\tNächste ältere Version"
339
335
-#: gitk:1354
340
+#: gitk:2524
341
msgid "<Left>, z, j\tGo back in history list"
342
msgstr "<Links>, z, j\tEine Version zurückgehen"
343
339
-#: gitk:1355
344
+#: gitk:2525
345
msgid "<Right>, x, l\tGo forward in history list"
346
msgstr "<Rechts>, x, l\tEine Version weitergehen"
347
343
-#: gitk:1356
348
+#: gitk:2526
349
msgid "<PageUp>\tMove up one page in commit list"
350
msgstr "<BildHoch>\tEine Seite nach oben blättern"
351
347
-#: gitk:1357
352
+#: gitk:2527
353
msgid "<PageDown>\tMove down one page in commit list"
354
msgstr "<BildRunter>\tEine Seite nach unten blättern"
355
351
-#: gitk:1358
356
+#: gitk:2528
357
#, tcl-format
358
msgid "<%s-Home>\tScroll to top of commit list"
359
msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern"
360
356
-#: gitk:1359
361
+#: gitk:2529
362
#, tcl-format
363
msgid "<%s-End>\tScroll to bottom of commit list"
364
msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern"
365
361
-#: gitk:1360
366
+#: gitk:2530
367
#, tcl-format
368
msgid "<%s-Up>\tScroll commit list up one line"
369
msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern"
370
366
-#: gitk:1361
371
+#: gitk:2531
372
#, tcl-format
373
msgid "<%s-Down>\tScroll commit list down one line"
374
msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern"
375
371
-#: gitk:1362
376
+#: gitk:2532
377
#, tcl-format
378
msgid "<%s-PageUp>\tScroll commit list up one page"
379
msgstr "<%s-BildHoch>\tVersionsliste eine Seite hoch blättern"
380
376
-#: gitk:1363
381
+#: gitk:2533
382
#, tcl-format
383
msgid "<%s-PageDown>\tScroll commit list down one page"
384
msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern"
385
381
-#: gitk:1364
386
+#: gitk:2534
387
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
388
msgstr "<Umschalt-Hoch>\tRückwärts suchen (nach oben; neuere Versionen)"
389
385
-#: gitk:1365
390
+#: gitk:2535
391
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
392
msgstr "<Umschalt-Runter> Suchen (nach unten; ältere Versionen)"
393
389
-#: gitk:1366
394
+#: gitk:2536
395
msgid "<Delete>, b\tScroll diff view up one page"
396
msgstr "<Entf>, b\t\tVergleich eine Seite nach oben blättern"
397
393
-#: gitk:1367
398
+#: gitk:2537
399
msgid "<Backspace>\tScroll diff view up one page"
400
msgstr "<Löschtaste>\tVergleich eine Seite nach oben blättern"
401
397
-#: gitk:1368
402
+#: gitk:2538
403
msgid "<Space>\t\tScroll diff view down one page"
404
msgstr "<Leertaste>\tVergleich eine Seite nach unten blättern"
405
401
-#: gitk:1369
406
+#: gitk:2539
407
msgid "u\t\tScroll diff view up 18 lines"
408
msgstr "u\t\tVergleich um 18 Zeilen nach oben (»up«) blättern"
409
405
-#: gitk:1370
410
+#: gitk:2540
411
msgid "d\t\tScroll diff view down 18 lines"
412
msgstr "d\t\tVergleich um 18 Zeilen nach unten (»down«) blättern"
413
409
-#: gitk:1371
414
+#: gitk:2541
415
#, tcl-format
416
msgid "<%s-F>\t\tFind"
417
msgstr "<%s-F>\t\tSuchen"
418
414
-#: gitk:1372
419
+#: gitk:2542
420
#, tcl-format
421
msgid "<%s-G>\t\tMove to next find hit"
422
msgstr "<%s-G>\t\tWeitersuchen"
423
419
-#: gitk:1373
424
+#: gitk:2543
425
msgid "<Return>\tMove to next find hit"
426
msgstr "<Eingabetaste>\tWeitersuchen"
427
423
-#: gitk:1374
428
+#: gitk:2544
429
msgid "/\t\tMove to next find hit, or redo find"
430
msgstr "/\t\tWeitersuchen oder neue Suche beginnen"
431
427
-#: gitk:1375
432
+#: gitk:2545
433
msgid "?\t\tMove to previous find hit"
434
msgstr "?\t\tRückwärts weitersuchen"
435
431
-#: gitk:1376
436
+#: gitk:2546
437
msgid "f\t\tScroll diff view to next file"
438
msgstr "f\t\tVergleich zur nächsten Datei (»file«) blättern"
439
435
-#: gitk:1377
440
+#: gitk:2547
441
#, tcl-format
442
msgid "<%s-S>\t\tSearch for next hit in diff view"
443
msgstr "<%s-S>\t\tWeitersuchen im Vergleich"
444
440
-#: gitk:1378
445
+#: gitk:2548
446
#, tcl-format
447
msgid "<%s-R>\t\tSearch for previous hit in diff view"
448
msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich"
449
445
-#: gitk:1379
450
+#: gitk:2549
451
#, tcl-format
452
msgid "<%s-KP+>\tIncrease font size"
453
msgstr "<%s-Nummerblock-Plus>\tSchriftgröße vergrößern"
454
450
-#: gitk:1380
455
+#: gitk:2550
456
#, tcl-format
457
msgid "<%s-plus>\tIncrease font size"
458
msgstr "<%s-Plus>\tSchriftgröße vergrößern"
459
455
-#: gitk:1381
460
+#: gitk:2551
461
#, tcl-format
462
msgid "<%s-KP->\tDecrease font size"
463
msgstr "<%s-Nummernblock-> Schriftgröße verkleinern"
464
460
-#: gitk:1382
465
+#: gitk:2552
466
#, tcl-format
467
msgid "<%s-minus>\tDecrease font size"
468
msgstr "<%s-Minus>\tSchriftgröße verkleinern"
469
465
-#: gitk:1383
470
+#: gitk:2553
471
msgid "<F5>\t\tUpdate"
472
msgstr "<F5>\t\tAktualisieren"
473
469
-#: gitk:1896
474
+#: gitk:3200
475
msgid "Gitk view definition"
476
msgstr "Gitk Ansichten"
477
473
-#: gitk:1921
478
+#: gitk:3225
479
msgid "Name"
480
msgstr "Name"
481
477
-#: gitk:1924
482
+#: gitk:3228
483
msgid "Remember this view"
484
msgstr "Diese Ansicht speichern"
485
481
-#: gitk:3126
486
+#: gitk:3232
487
msgid "Commits to include (arguments to git log):"
488
msgstr "Versionen anzeigen (Argumente von git-log):"
489
485
-#: gitk:3133
490
+#: gitk:3239
491
msgid "Command to generate more commits to include:"
492
msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
493
489
-#: gitk:1942
494
+#: gitk:3246
495
msgid "Enter files and directories to include, one per line:"
496
msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):"
497
493
-#: gitk:1989
498
+#: gitk:3293
499
msgid "Error in commit selection arguments:"
500
msgstr "Fehler in den ausgewählten Versionen:"
501
497
-#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8689 gitk:8690
502
+#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142
503
msgid "None"
504
msgstr "Keine"
505
501
-#: gitk:2531 gitk:4336 gitk:5959 gitk:5974
506
+#: gitk:3790 gitk:5580 gitk:7287 gitk:7302
507
msgid "Date"
508
msgstr "Datum"
509
505
-#: gitk:2531 gitk:4336
510
+#: gitk:3790 gitk:5580
511
msgid "CDate"
512
msgstr "Eintragedatum"
513
509
-#: gitk:2680 gitk:2685
514
+#: gitk:3939 gitk:3944
515
msgid "Descendant"
516
msgstr "Abkömmling"
517
513
-#: gitk:2681
518
+#: gitk:3940
519
msgid "Not descendant"
520
msgstr "Nicht Abkömmling"
521
517
-#: gitk:2688 gitk:2693
522
+#: gitk:3947 gitk:3952
523
msgid "Ancestor"
524
msgstr "Vorgänger"
525
521
-#: gitk:2689
526
+#: gitk:3948
527
msgid "Not ancestor"
528
msgstr "Nicht Vorgänger"
529
525
-#: gitk:2924
530
+#: gitk:4187
531
msgid "Local changes checked in to index but not committed"
532
msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen"
533
529
-#: gitk:2954
534
+#: gitk:4220
535
msgid "Local uncommitted changes, not checked in to index"
536
msgstr "Lokale Änderungen, nicht bereitgestellt"
537
533
-#: gitk:4305
538
+#: gitk:5549
539
msgid "Searching"
540
msgstr "Suchen"
541
537
-#: gitk:4767
542
+#: gitk:6049
543
msgid "Tags:"
544
msgstr "Markierungen:"
545
541
-#: gitk:4784 gitk:4790 gitk:5952
546
+#: gitk:6066 gitk:6072 gitk:7280
547
msgid "Parent"
548
msgstr "Eltern"
549
545
-#: gitk:4795
550
+#: gitk:6077
551
msgid "Child"
552
msgstr "Kind"
553
549
-#: gitk:4804
554
+#: gitk:6086
555
msgid "Branch"
556
msgstr "Zweig"
557
553
-#: gitk:4807
558
+#: gitk:6089
559
msgid "Follows"
560
msgstr "Folgt auf"
561
557
-#: gitk:4810
562
+#: gitk:6092
563
msgid "Precedes"
564
msgstr "Vorgänger von"
565
561
-#: gitk:5094
566
+#: gitk:6378
567
msgid "Error getting merge diffs:"
568
msgstr "Fehler beim Laden des Vergleichs:"
569
565
-#: gitk:5779
570
+#: gitk:7113
571
msgid "Goto:"
572
msgstr "Gehe zu:"
573
569
-#: gitk:5781
574
+#: gitk:7115
575
msgid "SHA1 ID:"
576
msgstr "SHA1-Hashwert:"
577
573
-#: gitk:5806
578
+#: gitk:7134
579
#, tcl-format
580
msgid "Short SHA1 id %s is ambiguous"
581
msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig"
582
578
-#: gitk:5818
583
+#: gitk:7146
584
#, tcl-format
585
msgid "SHA1 id %s is not known"
586
msgstr "SHA1-Hashwert »%s« unbekannt"
587
583
-#: gitk:5820
588
+#: gitk:7148
589
#, tcl-format
590
msgid "Tag/Head %s is not known"
591
msgstr "Markierung/Zweig »%s« ist unbekannt"
592
588
-#: gitk:5962
593
+#: gitk:7290
594
msgid "Children"
595
msgstr "Kinder"
596
592
-#: gitk:6019
597
+#: gitk:7347
598
#, tcl-format
599
msgid "Reset %s branch to here"
600
msgstr "Zweig »%s« hierher zurücksetzen"
601
597
-#: gitk:7204
602
+#: gitk:7349
603
msgid "Detached head: can't reset"
604
msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
605
601
-#: gitk:7236
606
+#: gitk:7381
607
msgid "Top"
608
msgstr "Oben"
609
605
-#: gitk:6051
610
+#: gitk:7382
611
msgid "From"
612
msgstr "Von"
613
609
-#: gitk:6056
614
+#: gitk:7387
615
msgid "To"
616
msgstr "bis"
617
613
-#: gitk:6079
618
+#: gitk:7410
619
msgid "Generate patch"
620
msgstr "Patch erstellen"
621
617
-#: gitk:6081
622
+#: gitk:7412
623
msgid "From:"
624
msgstr "Von:"
625
621
-#: gitk:6090
626
+#: gitk:7421
627
msgid "To:"
628
msgstr "bis:"
629
625
-#: gitk:6099
630
+#: gitk:7430
631
msgid "Reverse"
632
msgstr "Umgekehrt"
633
629
-#: gitk:6101 gitk:6270
634
+#: gitk:7432 gitk:7607
635
msgid "Output file:"
636
msgstr "Ausgabedatei:"
637
633
-#: gitk:6107
638
+#: gitk:7438
639
msgid "Generate"
640
msgstr "Erzeugen"
641
637
-#: gitk:6143
642
+#: gitk:7474
643
msgid "Error creating patch:"
644
msgstr "Fehler beim Patch erzeugen:"
645
641
-#: gitk:6165 gitk:6258 gitk:6312
646
+#: gitk:7496 gitk:7595 gitk:7649
647
msgid "ID:"
648
msgstr "ID:"
649
645
-#: gitk:6174
650
+#: gitk:7505
651
msgid "Tag name:"
652
msgstr "Markierungsname:"
653
649
-#: gitk:6178 gitk:6321
654
+#: gitk:7509 gitk:7659
655
msgid "Create"
656
msgstr "Erstellen"
657
653
-#: gitk:6193
658
+#: gitk:7524
659
msgid "No tag name specified"
660
msgstr "Kein Markierungsname angegeben"
661
657
-#: gitk:6197
662
+#: gitk:7528
663
#, tcl-format
664
msgid "Tag \"%s\" already exists"
665
msgstr "Markierung »%s« existiert bereits."
666
662
-#: gitk:6203
667
+#: gitk:7534
668
msgid "Error creating tag:"
669
msgstr "Fehler bei Markierung erstellen:"
670
666
-#: gitk:6267
671
+#: gitk:7604
672
msgid "Command:"
673
msgstr "Kommando:"
674
670
-#: gitk:6275
675
+#: gitk:7612
676
msgid "Write"
677
msgstr "Schreiben"
678
674
-#: gitk:6291
679
+#: gitk:7628
680
msgid "Error writing commit:"
681
msgstr "Fehler beim Schreiben der Version:"
682
678
-#: gitk:6317
683
+#: gitk:7654
684
msgid "Name:"
685
msgstr "Name:"
686
682
-#: gitk:6336
687
+#: gitk:7674
688
msgid "Please specify a name for the new branch"
689
msgstr "Bitte geben Sie einen Namen für den neuen Zweig an."
690
686
-#: gitk:6365
691
+#: gitk:7703
692
#, tcl-format
693
msgid "Commit %s is already included in branch %s -- really re-apply it?"
694
msgstr ""
690
-"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut "
691
-"eintragen?"
695
+"Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut eintragen?"
696
693
-#: gitk:6370
697
+#: gitk:7708
698
msgid "Cherry-picking"
699
msgstr "Version pflücken"
700
697
-#: gitk:6382
701
+#: gitk:7720
702
msgid "No changes committed"
703
msgstr "Keine Änderungen eingetragen"
704
701
-#: gitk:6405
705
+#: gitk:7745
706
msgid "Confirm reset"
707
msgstr "Zurücksetzen bestätigen"
708
705
-#: gitk:6407
709
+#: gitk:7747
710
#, tcl-format
711
msgid "Reset branch %s to %s?"
712
msgstr "Zweig »%s« auf »%s« zurücksetzen?"
713
710
-#: gitk:6411
714
+#: gitk:7751
715
msgid "Reset type:"
716
msgstr "Art des Zurücksetzens:"
717
714
-#: gitk:6415
718
+#: gitk:7755
719
msgid "Soft: Leave working tree and index untouched"
720
msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert"
721
718
-#: gitk:6418
722
+#: gitk:7758
723
msgid "Mixed: Leave working tree untouched, reset index"
724
msgstr ""
725
"Gemischt: Arbeitskopie unverändert,\n"
726
"Bereitstellung zurückgesetzt"
727
724
-#: gitk:6421
728
+#: gitk:7761
729
msgid ""
730
"Hard: Reset working tree and index\n"
731
"(discard ALL local changes)"
@@ -729,21 +733,21 @@ msgstr ""
733
"Hart: Arbeitskopie und Bereitstellung\n"
734
"(Alle lokalen Änderungen werden gelöscht)"
735
732
-#: gitk:6437
736
+#: gitk:7777
737
msgid "Resetting"
738
msgstr "Zurücksetzen"
739
736
-#: gitk:6494
740
+#: gitk:7834
741
msgid "Checking out"
742
msgstr "Umstellen"
743
740
-#: gitk:6524
744
+#: gitk:7885
745
msgid "Cannot delete the currently checked-out branch"
746
msgstr ""
747
"Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht "
748
"gelöscht werden."
749
746
-#: gitk:6530
750
+#: gitk:7891
751
#, tcl-format
752
msgid ""
753
"The commits on branch %s aren't on any other branch.\n"
@@ -752,16 +756,16 @@ msgstr ""
756
"Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n"
757
"Zweig »%s« trotzdem löschen?"
758
755
-#: gitk:6561
759
+#: gitk:7922
760
#, tcl-format
761
msgid "Tags and heads: %s"
762
msgstr "Markierungen und Zweige: %s"
763
760
-#: gitk:6575
764
+#: gitk:7936
765
msgid "Filter"
766
msgstr "Filtern"
767
764
-#: gitk:6869
768
+#: gitk:8230
769
msgid ""
770
"Error reading commit topology information; branch and preceding/following "
771
"tag information will be incomplete."
@@ -769,125 +773,129 @@ msgstr ""
773
"Fehler beim Lesen der Strukturinformationen; Zweige und Vorgänger/Nachfolger "
774
"Informationen werden unvollständig sein."
775
772
-#: gitk:7853
776
+#: gitk:9216
777
msgid "Tag"
778
msgstr "Markierung"
779
776
-#: gitk:7853
780
+#: gitk:9216
781
msgid "Id"
782
msgstr "Id"
783
780
-#: gitk:7893
784
+#: gitk:9262
785
msgid "Gitk font chooser"
786
msgstr "Gitk Schriften wählen"
787
784
-#: gitk:7910
788
+#: gitk:9279
789
msgid "B"
790
msgstr "F"
791
788
-#: gitk:7913
792
+#: gitk:9282
793
msgid "I"
794
msgstr "K"
795
792
-#: gitk:8006
796
+#: gitk:9375
797
msgid "Gitk preferences"
798
msgstr "Gitk Einstellungen"
799
796
-#: gitk:8007
800
+#: gitk:9376
801
msgid "Commit list display options"
802
msgstr "Anzeige Versionsliste"
803
800
-#: gitk:8010
804
+#: gitk:9379
805
msgid "Maximum graph width (lines)"
806
msgstr "Maximale Graphenbreite (Zeilen)"
807
804
-#: gitk:8014
808
+#: gitk:9383
809
#, tcl-format
810
msgid "Maximum graph width (% of pane)"
811
msgstr "Maximale Graphenbreite (% des Fensters)"
812
809
-#: gitk:8019
813
+#: gitk:9388
814
msgid "Show local changes"
815
msgstr "Lokale Änderungen anzeigen"
816
813
-#: gitk:8024
817
+#: gitk:9393
818
msgid "Auto-select SHA1"
819
msgstr "SHA1-Hashwert automatisch markieren"
820
817
-#: gitk:8029
821
+#: gitk:9398
822
msgid "Diff display options"
823
msgstr "Anzeige Vergleich"
824
821
-#: gitk:8031
825
+#: gitk:9400
826
msgid "Tab spacing"
827
msgstr "Tabulatorbreite"
828
825
-#: gitk:8035
829
+#: gitk:9404
830
msgid "Display nearby tags"
831
msgstr "Naheliegende Überschriften anzeigen"
832
829
-#: gitk:8040
833
+#: gitk:9409
834
msgid "Limit diffs to listed paths"
835
msgstr "Vergleich nur für angezeigte Pfade"
836
833
-#: gitk:9264
837
+#: gitk:9414
838
+msgid "Support per-file encodings"
839
+msgstr ""
840
+
841
+#: gitk:9421
842
msgid "External diff tool"
843
msgstr "Externes Vergleich-(Diff-)Programm"
844
837
-#: gitk:9266
845
+#: gitk:9423
846
msgid "Choose..."
847
msgstr "Wählen..."
848
841
-#: gitk:9271
849
+#: gitk:9428
850
msgid "Colors: press to choose"
851
msgstr "Farben: Klicken zum Wählen"
852
845
-#: gitk:8048
853
+#: gitk:9431
854
msgid "Background"
855
msgstr "Hintergrund"
856
849
-#: gitk:8052
857
+#: gitk:9435
858
msgid "Foreground"
859
msgstr "Vordergrund"
860
853
-#: gitk:8056
861
+#: gitk:9439
862
msgid "Diff: old lines"
863
msgstr "Vergleich: Alte Zeilen"
864
857
-#: gitk:8061
865
+#: gitk:9444
866
msgid "Diff: new lines"
867
msgstr "Vergleich: Neue Zeilen"
868
861
-#: gitk:8066
869
+#: gitk:9449
870
msgid "Diff: hunk header"
871
msgstr "Vergleich: Änderungstitel"
872
865
-#: gitk:8072
873
+#: gitk:9455
874
msgid "Select bg"
875
msgstr "Hintergrundfarbe Auswählen"
876
869
-#: gitk:8076
877
+#: gitk:9459
878
msgid "Fonts: press to choose"
879
msgstr "Schriftart: Klicken zum Wählen"
880
873
-#: gitk:8078
881
+#: gitk:9461
882
msgid "Main font"
883
msgstr "Programmschriftart"
884
877
-#: gitk:8079
885
+#: gitk:9462
886
msgid "Diff display font"
887
msgstr "Vergleich"
888
881
-#: gitk:8080
889
+#: gitk:9463
890
msgid "User interface font"
891
msgstr "Beschriftungen"
892
885
-#: gitk:8096
893
+#: gitk:9488
894
#, tcl-format
895
msgid "Gitk: choose color for %s"
896
msgstr "Gitk: Farbe wählen für %s"
897
890
-#: gitk:8477
898
+#: gitk:9934
899
msgid ""
900
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
901
" Gitk requires at least Tcl/Tk 8.4."
@@ -895,24 +903,24 @@ msgstr ""
903
"Gitk läuft nicht mit dieser Version von Tcl/Tk.\n"
904
"Gitk benötigt mindestens Tcl/Tk 8.4."
905
898
-#: gitk:8566
906
+#: gitk:10047
907
msgid "Cannot find a git repository here."
908
msgstr "Kein Git-Projektarchiv gefunden."
909
902
-#: gitk:8570
910
+#: gitk:10051
911
#, tcl-format
912
msgid "Cannot find the git directory \"%s\"."
913
msgstr "Git-Verzeichnis »%s« wurde nicht gefunden."
914
907
-#: gitk:8613
915
+#: gitk:10098
916
#, tcl-format
917
msgid "Ambiguous argument '%s': both revision and filename"
918
msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
919
912
-#: gitk:8625
920
+#: gitk:10110
921
msgid "Bad arguments to gitk:"
922
msgstr "Falsche Kommandozeilen-Parameter für gitk:"
923
916
-#: gitk:9915
924
+#: gitk:10170
925
msgid "Command line"
926
msgstr "Kommandozeile"
po/es.po
+264
-243
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: gitk\n"
10
"Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2008-03-13 17:29+0100\n"
11
+"POT-Creation-Date: 2008-10-18 22:03+1100\n"
12
"PO-Revision-Date: 2008-03-25 11:20+0100\n"
13
"Last-Translator: Santiago Gala <santiago.gala@gmail.com>\n"
14
"Language-Team: Spanish\n"
@@ -16,676 +16,702 @@ msgstr ""
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
-#: gitk:111
20
-msgid "Error executing git rev-list:"
21
-msgstr "Error al ejecutar git rev-list:"
19
+#: gitk:113
20
+msgid "Couldn't get list of unmerged files:"
21
+msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
22
23
-#: gitk:124
23
+#: gitk:340
24
+msgid "No files selected: --merge specified but no files are unmerged."
25
+msgstr ""
26
+"No hay archivos seleccionados: se seleccionó la opción --merge pero no hay "
27
+"archivos pendientes de fusión."
28
+
29
+#: gitk:343
30
+msgid ""
31
+"No files selected: --merge specified but no unmerged files are within file "
32
+"limit."
33
+msgstr ""
34
+"No hay archivos seleccionados: se seleccionó la opción --merge pero los "
35
+"archivos especificados no necesitan fusión."
36
+
37
+#: gitk:378
38
msgid "Reading"
39
msgstr "Leyendo"
40
27
-#: gitk:151 gitk:2191
41
+#: gitk:438 gitk:3462
42
msgid "Reading commits..."
43
msgstr "Leyendo revisiones..."
44
31
-#: gitk:275
32
-msgid "Can't parse git log output:"
33
-msgstr "Error analizando la salida de git log:"
34
-
35
-#: gitk:386 gitk:2195
45
+#: gitk:441 gitk:1528 gitk:3465
46
msgid "No commits selected"
47
msgstr "No se seleccionaron revisiones"
48
39
-#: gitk:500
49
+#: gitk:1399
50
+msgid "Can't parse git log output:"
51
+msgstr "Error analizando la salida de git log:"
52
+
53
+#: gitk:1605
54
msgid "No commit information available"
55
msgstr "Falta información sobre las revisiones"
56
43
-#: gitk:599 gitk:621 gitk:1955 gitk:6423 gitk:7923 gitk:8082
57
+#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466
58
msgid "OK"
59
msgstr "Aceptar"
60
47
-#: gitk:623 gitk:1956 gitk:6107 gitk:6178 gitk:6275 gitk:6321 gitk:6425
48
-#: gitk:7924 gitk:8083
61
+#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766
62
+#: gitk:9294 gitk:9467
63
msgid "Cancel"
64
msgstr "Cancelar"
65
52
-#: gitk:661
53
-msgid "File"
54
-msgstr "Archivo"
55
-
56
-#: gitk:663
66
+#: gitk:1811
67
msgid "Update"
68
msgstr "Actualizar"
69
60
-#: gitk:664
70
+#: gitk:1813
71
msgid "Reread references"
72
msgstr "Releer referencias"
73
64
-#: gitk:665
74
+#: gitk:1814
75
msgid "List references"
76
msgstr "Lista de referencias"
77
68
-#: gitk:666
78
+#: gitk:1815
79
msgid "Quit"
80
msgstr "Salir"
81
72
-#: gitk:668
73
-msgid "Edit"
74
-msgstr "Editar"
82
+#: gitk:1810
83
+msgid "File"
84
+msgstr "Archivo"
85
76
-#: gitk:669
86
+#: gitk:1818
87
msgid "Preferences"
88
msgstr "Preferencias"
89
80
-#: gitk:672 gitk:1892
81
-msgid "View"
82
-msgstr "Vista"
90
+#: gitk:1817
91
+msgid "Edit"
92
+msgstr "Editar"
93
84
-#: gitk:673
94
+#: gitk:1821
95
msgid "New view..."
96
msgstr "Nueva vista..."
97
88
-#: gitk:674 gitk:2133 gitk:8722
98
+#: gitk:1822
99
msgid "Edit view..."
100
msgstr "Modificar vista..."
101
92
-#: gitk:676 gitk:2134 gitk:8723
102
+#: gitk:1823
103
msgid "Delete view"
104
msgstr "Eliminar vista"
105
96
-#: gitk:678
106
+#: gitk:1825
107
msgid "All files"
108
msgstr "Todos los archivos"
109
100
-#: gitk:682
101
-msgid "Help"
102
-msgstr "Ayuda"
110
+#: gitk:1820 gitk:3196
111
+msgid "View"
112
+msgstr "Vista"
113
104
-#: gitk:683 gitk:1317
114
+#: gitk:1828 gitk:2487
115
msgid "About gitk"
116
msgstr "Acerca de gitk"
117
108
-#: gitk:684
118
+#: gitk:1829
119
msgid "Key bindings"
120
msgstr "Combinaciones de teclas"
121
112
-#: gitk:741
122
+#: gitk:1827
123
+msgid "Help"
124
+msgstr "Ayuda"
125
+
126
+#: gitk:1887
127
msgid "SHA1 ID: "
128
msgstr "SHA1 ID: "
129
116
-#: gitk:791
130
+#: gitk:1918
131
+msgid "Row"
132
+msgstr ""
133
+
134
+#: gitk:1949
135
msgid "Find"
136
msgstr "Buscar"
137
120
-#: gitk:792
138
+#: gitk:1950
139
msgid "next"
140
msgstr "<<"
141
124
-#: gitk:793
142
+#: gitk:1951
143
msgid "prev"
144
msgstr ">>"
145
128
-#: gitk:794
146
+#: gitk:1952
147
msgid "commit"
148
msgstr "revisión"
149
132
-#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
150
+#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621
151
msgid "containing:"
152
msgstr "que contiene:"
153
136
-#: gitk:800 gitk:1778 gitk:1783 gitk:2431
154
+#: gitk:1958 gitk:2954 gitk:2959 gitk:3692
155
msgid "touching paths:"
156
msgstr "que modifica la ruta:"
157
140
-#: gitk:801 gitk:2436
158
+#: gitk:1959 gitk:3697
159
msgid "adding/removing string:"
160
msgstr "que añade/elimina cadena:"
161
144
-#: gitk:810 gitk:812
162
+#: gitk:1968 gitk:1970
163
msgid "Exact"
164
msgstr "Exacto"
165
148
-#: gitk:812 gitk:2514 gitk:4274
166
+#: gitk:1970 gitk:3773 gitk:5518
167
msgid "IgnCase"
168
msgstr "NoMayús"
169
152
-#: gitk:812 gitk:2405 gitk:2512 gitk:4270
170
+#: gitk:1970 gitk:3666 gitk:3771 gitk:5514
171
msgid "Regexp"
172
msgstr "Regex"
173
156
-#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
174
+#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708
175
msgid "All fields"
176
msgstr "Todos los campos"
177
160
-#: gitk:815 gitk:2531 gitk:2563 gitk:4336
178
+#: gitk:1973 gitk:3790 gitk:3822 gitk:5580
179
msgid "Headline"
180
msgstr "Título"
181
164
-#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
182
+#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109
183
msgid "Comments"
184
msgstr "Comentarios"
185
168
-#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5956
169
-#: gitk:5971
186
+#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285
187
+#: gitk:7300
188
msgid "Author"
189
msgstr "Autor"
190
173
-#: gitk:816 gitk:2531 gitk:4336 gitk:4765
191
+#: gitk:1974 gitk:3790 gitk:5580 gitk:6047
192
msgid "Committer"
193
msgstr ""
194
177
-#: gitk:845
195
+#: gitk:2003
196
msgid "Search"
197
msgstr "Buscar"
198
181
-#: gitk:852
199
+#: gitk:2010
200
msgid "Diff"
201
msgstr "Diferencia"
202
185
-#: gitk:854
203
+#: gitk:2012
204
msgid "Old version"
205
msgstr "Versión antigua"
206
189
-#: gitk:856
207
+#: gitk:2014
208
msgid "New version"
209
msgstr "Versión nueva"
210
193
-#: gitk:858
211
+#: gitk:2016
212
msgid "Lines of context"
213
msgstr "Líneas de contexto"
214
197
-#: gitk:868
215
+#: gitk:2026
216
msgid "Ignore space change"
217
msgstr "Ignora cambios de espaciado"
218
201
-#: gitk:926
219
+#: gitk:2084
220
msgid "Patch"
221
msgstr "Parche"
222
205
-#: gitk:928
223
+#: gitk:2086
224
msgid "Tree"
225
msgstr "Árbol"
226
209
-#: gitk:1053 gitk:1068 gitk:6022
227
+#: gitk:2213 gitk:2226
228
msgid "Diff this -> selected"
229
msgstr "Diferencia de esta -> seleccionada"
230
213
-#: gitk:1055 gitk:1070 gitk:6023
231
+#: gitk:2214 gitk:2227
232
msgid "Diff selected -> this"
233
msgstr "Diferencia de seleccionada -> esta"
234
217
-#: gitk:1057 gitk:1072 gitk:6024
235
+#: gitk:2215 gitk:2228
236
msgid "Make patch"
237
msgstr "Crear patch"
238
221
-#: gitk:1058 gitk:6162
239
+#: gitk:2216 gitk:7494
240
msgid "Create tag"
241
msgstr "Crear etiqueta"
242
225
-#: gitk:1059 gitk:6255
243
+#: gitk:2217 gitk:7593
244
msgid "Write commit to file"
245
msgstr "Escribir revisiones a archivo"
246
229
-#: gitk:1060 gitk:6309
247
+#: gitk:2218 gitk:7647
248
msgid "Create new branch"
249
msgstr "Crear nueva rama"
250
233
-#: gitk:1061
251
+#: gitk:2219
252
msgid "Cherry-pick this commit"
253
msgstr "Añadir esta revisión a la rama actual (cherry-pick)"
254
237
-#: gitk:1063
255
+#: gitk:2220
256
msgid "Reset HEAD branch to here"
257
msgstr "Traer la rama HEAD aquí"
258
241
-#: gitk:1079
259
+#: gitk:2234
260
msgid "Check out this branch"
261
msgstr "Cambiar a esta rama"
262
245
-#: gitk:1081
263
+#: gitk:2235
264
msgid "Remove this branch"
265
msgstr "Eliminar esta rama"
266
249
-#: gitk:1087
267
+#: gitk:2242
268
msgid "Highlight this too"
269
msgstr "Seleccionar también"
270
253
-#: gitk:1089
271
+#: gitk:2243
272
msgid "Highlight this only"
273
msgstr "Seleccionar sólo"
274
257
-#: gitk:1318
275
+#: gitk:2245
276
+msgid "Blame parent commit"
277
+msgstr ""
278
+
279
+#: gitk:2488
280
msgid ""
281
"\n"
282
"Gitk - a commit viewer for git\n"
283
"\n"
262
-"Copyright © 2005-2006 Paul Mackerras\n"
284
+"Copyright © 2005-2008 Paul Mackerras\n"
285
"\n"
286
"Use and redistribute under the terms of the GNU General Public License"
287
msgstr ""
288
"\n"
289
"Gitk - un visualizador de revisiones para git\n"
290
"\n"
269
-"Copyright © 2005-2006 Paul Mackerras\n"
291
+"Copyright © 2005-2008 Paul Mackerras\n"
292
"\n"
271
-"Uso y redistribución permitidos según los términos de la Licencia Pública General de "
272
-"GNU (GNU GPL)"
293
+"Uso y redistribución permitidos según los términos de la Licencia Pública "
294
+"General de GNU (GNU GPL)"
295
274
-#: gitk:1326 gitk:1387 gitk:6581
296
+#: gitk:2496 gitk:2557 gitk:7943
297
msgid "Close"
298
msgstr "Cerrar"
299
278
-#: gitk:1345
300
+#: gitk:2515
301
msgid "Gitk key bindings"
302
msgstr "Combinaciones de tecla de Gitk"
303
282
-#: gitk:1347
304
+#: gitk:2517
305
msgid "Gitk key bindings:"
306
msgstr "Combinaciones de tecla de Gitk:"
307
286
-#: gitk:1349
308
+#: gitk:2519
309
#, tcl-format
310
msgid "<%s-Q>\t\tQuit"
311
msgstr "<%s-Q>\t\tSalir"
312
291
-#: gitk:1350
313
+#: gitk:2520
314
msgid "<Home>\t\tMove to first commit"
315
msgstr "<Home>\t\tIr a la primera revisión"
316
295
-#: gitk:1351
317
+#: gitk:2521
318
msgid "<End>\t\tMove to last commit"
319
msgstr "<End>\t\tIr a la última revisión"
320
299
-#: gitk:1352
321
+#: gitk:2522
322
msgid "<Up>, p, i\tMove up one commit"
323
msgstr "<Up>, p, i\tSubir una revisión"
324
303
-#: gitk:1353
325
+#: gitk:2523
326
msgid "<Down>, n, k\tMove down one commit"
327
msgstr "<Down>, n, k\tBajar una revisión"
328
307
-#: gitk:1354
329
+#: gitk:2524
330
msgid "<Left>, z, j\tGo back in history list"
331
msgstr "<Left>, z, j\tRetroceder en la historia"
332
311
-#: gitk:1355
333
+#: gitk:2525
334
msgid "<Right>, x, l\tGo forward in history list"
335
msgstr "<Right>, x, l\tAvanzar en la historia"
336
315
-#: gitk:1356
337
+#: gitk:2526
338
msgid "<PageUp>\tMove up one page in commit list"
339
msgstr "<PageUp>\tSubir una página en la lista de revisiones"
340
319
-#: gitk:1357
341
+#: gitk:2527
342
msgid "<PageDown>\tMove down one page in commit list"
343
msgstr "<PageDown>\tBajar una página en la lista de revisiones"
344
323
-#: gitk:1358
345
+#: gitk:2528
346
#, tcl-format
347
msgid "<%s-Home>\tScroll to top of commit list"
348
msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones"
349
328
-#: gitk:1359
350
+#: gitk:2529
351
#, tcl-format
352
msgid "<%s-End>\tScroll to bottom of commit list"
353
msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones"
354
333
-#: gitk:1360
355
+#: gitk:2530
356
#, tcl-format
357
msgid "<%s-Up>\tScroll commit list up one line"
358
msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones"
359
338
-#: gitk:1361
360
+#: gitk:2531
361
#, tcl-format
362
msgid "<%s-Down>\tScroll commit list down one line"
363
msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones"
364
343
-#: gitk:1362
365
+#: gitk:2532
366
#, tcl-format
367
msgid "<%s-PageUp>\tScroll commit list up one page"
368
msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones"
369
348
-#: gitk:1363
370
+#: gitk:2533
371
#, tcl-format
372
msgid "<%s-PageDown>\tScroll commit list down one page"
373
msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones"
374
353
-#: gitk:1364
375
+#: gitk:2534
376
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
377
msgstr "<Shift-Up>\tBuscar hacia atrás (arriba, revisiones siguientes)"
378
357
-#: gitk:1365
379
+#: gitk:2535
380
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
381
msgstr "<Shift-Down>\tBuscar hacia adelante (abajo, revisiones anteriores)"
382
361
-#: gitk:1366
383
+#: gitk:2536
384
msgid "<Delete>, b\tScroll diff view up one page"
385
msgstr "<Delete>, b\tDesplaza hacia arriba una página la vista de diferencias"
386
365
-#: gitk:1367
387
+#: gitk:2537
388
msgid "<Backspace>\tScroll diff view up one page"
389
msgstr "<Backspace>\tDesplaza hacia arriba una página la vista de diferencias"
390
369
-#: gitk:1368
391
+#: gitk:2538
392
msgid "<Space>\t\tScroll diff view down one page"
393
msgstr "<Space>\t\tDesplaza hacia abajo una página la vista de diferencias"
394
373
-#: gitk:1369
395
+#: gitk:2539
396
msgid "u\t\tScroll diff view up 18 lines"
397
msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias"
398
377
-#: gitk:1370
399
+#: gitk:2540
400
msgid "d\t\tScroll diff view down 18 lines"
401
msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias"
402
381
-#: gitk:1371
403
+#: gitk:2541
404
#, tcl-format
405
msgid "<%s-F>\t\tFind"
406
msgstr "<%s-F>\t\tBuscar"
407
386
-#: gitk:1372
408
+#: gitk:2542
409
#, tcl-format
410
msgid "<%s-G>\t\tMove to next find hit"
411
msgstr "<%s-G>\t\tBuscar el siguiente"
412
391
-#: gitk:1373
413
+#: gitk:2543
414
msgid "<Return>\tMove to next find hit"
415
msgstr "<Return>\tBuscar el siguiente"
416
395
-#: gitk:1374
417
+#: gitk:2544
418
msgid "/\t\tMove to next find hit, or redo find"
419
msgstr "/\t\tBuscar el siguiente, o reiniciar la búsqueda"
420
399
-#: gitk:1375
421
+#: gitk:2545
422
msgid "?\t\tMove to previous find hit"
423
msgstr "?\t\tBuscar el anterior"
424
403
-#: gitk:1376
425
+#: gitk:2546
426
msgid "f\t\tScroll diff view to next file"
427
msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente"
428
407
-#: gitk:1377
429
+#: gitk:2547
430
#, tcl-format
431
msgid "<%s-S>\t\tSearch for next hit in diff view"
432
msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias"
433
412
-#: gitk:1378
434
+#: gitk:2548
435
#, tcl-format
436
msgid "<%s-R>\t\tSearch for previous hit in diff view"
437
msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias"
438
417
-#: gitk:1379
439
+#: gitk:2549
440
#, tcl-format
441
msgid "<%s-KP+>\tIncrease font size"
442
msgstr "<%s-KP+>\tAumentar tamaño del texto"
443
422
-#: gitk:1380
444
+#: gitk:2550
445
#, tcl-format
446
msgid "<%s-plus>\tIncrease font size"
447
msgstr "<%s-plus>\tAumentar tamaño del texto"
448
427
-#: gitk:1381
449
+#: gitk:2551
450
#, tcl-format
451
msgid "<%s-KP->\tDecrease font size"
452
msgstr "<%s-KP->\tDisminuir tamaño del texto"
453
432
-#: gitk:1382
454
+#: gitk:2552
455
#, tcl-format
456
msgid "<%s-minus>\tDecrease font size"
457
msgstr "<%s-minus>\tDisminuir tamaño del texto"
458
437
-#: gitk:1383
459
+#: gitk:2553
460
msgid "<F5>\t\tUpdate"
461
msgstr "<F5>\t\tActualizar"
462
441
-#: gitk:1896
463
+#: gitk:3200
464
msgid "Gitk view definition"
465
msgstr "Definición de vistas de Gitk"
466
445
-#: gitk:1921
467
+#: gitk:3225
468
msgid "Name"
469
msgstr "Nombre"
470
449
-#: gitk:1924
471
+#: gitk:3228
472
msgid "Remember this view"
473
msgstr "Recordar esta vista"
474
453
-#: gitk:1928
454
-msgid "Commits to include (arguments to git rev-list):"
455
-msgstr "Revisiones a incluir (argumentos a git rev-list):"
475
+#: gitk:3232
476
+msgid "Commits to include (arguments to git log):"
477
+msgstr "Revisiones a incluir (argumentos a git log):"
478
457
-#: gitk:1935
479
+#: gitk:3239
480
msgid "Command to generate more commits to include:"
481
msgstr "Comando que genera más revisiones a incluir:"
482
461
-#: gitk:1942
483
+#: gitk:3246
484
msgid "Enter files and directories to include, one per line:"
485
msgstr "Introducir archivos y directorios a incluir, uno por línea:"
486
465
-#: gitk:1989
487
+#: gitk:3293
488
msgid "Error in commit selection arguments:"
489
msgstr "Error en los argumentos de selección de las revisiones:"
490
469
-#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8688 gitk:8689
491
+#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142
492
msgid "None"
493
msgstr "Ninguno"
494
473
-#: gitk:2531 gitk:4336 gitk:5958 gitk:5973
495
+#: gitk:3790 gitk:5580 gitk:7287 gitk:7302
496
msgid "Date"
497
msgstr "Fecha"
498
477
-#: gitk:2531 gitk:4336
499
+#: gitk:3790 gitk:5580
500
msgid "CDate"
501
msgstr "Fecha de creación"
502
481
-#: gitk:2680 gitk:2685
503
+#: gitk:3939 gitk:3944
504
msgid "Descendant"
505
msgstr "Descendiente"
506
485
-#: gitk:2681
507
+#: gitk:3940
508
msgid "Not descendant"
509
msgstr "No descendiente"
510
489
-#: gitk:2688 gitk:2693
511
+#: gitk:3947 gitk:3952
512
msgid "Ancestor"
513
msgstr "Antepasado"
514
493
-#: gitk:2689
515
+#: gitk:3948
516
msgid "Not ancestor"
517
msgstr "No antepasado"
518
497
-#: gitk:2924
519
+#: gitk:4187
520
msgid "Local changes checked in to index but not committed"
521
msgstr "Cambios locales añadidos al índice pero sin completar revisión"
522
501
-#: gitk:2954
523
+#: gitk:4220
524
msgid "Local uncommitted changes, not checked in to index"
525
msgstr "Cambios locales sin añadir al índice"
526
505
-#: gitk:4305
527
+#: gitk:5549
528
msgid "Searching"
529
msgstr "Buscando"
530
509
-#: gitk:4767
531
+#: gitk:6049
532
msgid "Tags:"
533
msgstr "Etiquetas:"
534
513
-#: gitk:4784 gitk:4790 gitk:5951
535
+#: gitk:6066 gitk:6072 gitk:7280
536
msgid "Parent"
537
msgstr "Padre"
538
517
-#: gitk:4795
539
+#: gitk:6077
540
msgid "Child"
541
msgstr "Hija"
542
521
-#: gitk:4804
543
+#: gitk:6086
544
msgid "Branch"
545
msgstr "Rama"
546
525
-#: gitk:4807
547
+#: gitk:6089
548
msgid "Follows"
549
msgstr "Sigue-a"
550
529
-#: gitk:4810
551
+#: gitk:6092
552
msgid "Precedes"
553
msgstr "Precede-a"
554
533
-#: gitk:5093
555
+#: gitk:6378
556
msgid "Error getting merge diffs:"
557
msgstr "Error al leer las diferencias de fusión:"
558
537
-#: gitk:5778
559
+#: gitk:7113
560
msgid "Goto:"
561
msgstr "Ir a:"
562
541
-#: gitk:5780
563
+#: gitk:7115
564
msgid "SHA1 ID:"
565
msgstr "SHA1 ID:"
566
545
-#: gitk:5805
567
+#: gitk:7134
568
#, tcl-format
569
msgid "Short SHA1 id %s is ambiguous"
570
msgstr "La id SHA1 abreviada %s es ambigua"
571
550
-#: gitk:5817
572
+#: gitk:7146
573
#, tcl-format
574
msgid "SHA1 id %s is not known"
575
msgstr "La id SHA1 %s es desconocida"
576
555
-#: gitk:5819
577
+#: gitk:7148
578
#, tcl-format
579
msgid "Tag/Head %s is not known"
580
msgstr "La etiqueta/rama %s es deconocida"
581
560
-#: gitk:5961
582
+#: gitk:7290
583
msgid "Children"
584
msgstr "Hijas"
585
564
-#: gitk:6018
586
+#: gitk:7347
587
#, tcl-format
588
msgid "Reset %s branch to here"
589
msgstr "Poner la rama %s en esta revisión"
590
569
-#: gitk:6049
591
+#: gitk:7349
592
+msgid "Detached head: can't reset"
593
+msgstr ""
594
+
595
+#: gitk:7381
596
msgid "Top"
597
msgstr "Origen"
598
573
-#: gitk:6050
599
+#: gitk:7382
600
msgid "From"
601
msgstr "De"
602
577
-#: gitk:6055
603
+#: gitk:7387
604
msgid "To"
605
msgstr "A"
606
581
-#: gitk:6078
607
+#: gitk:7410
608
msgid "Generate patch"
609
msgstr "Generar parche"
610
585
-#: gitk:6080
611
+#: gitk:7412
612
msgid "From:"
613
msgstr "De:"
614
589
-#: gitk:6089
615
+#: gitk:7421
616
msgid "To:"
617
msgstr "Para:"
618
593
-#: gitk:6098
619
+#: gitk:7430
620
msgid "Reverse"
621
msgstr "Invertir"
622
597
-#: gitk:6100 gitk:6269
623
+#: gitk:7432 gitk:7607
624
msgid "Output file:"
625
msgstr "Escribir a archivo:"
626
601
-#: gitk:6106
627
+#: gitk:7438
628
msgid "Generate"
629
msgstr "Generar"
630
605
-#: gitk:6142
631
+#: gitk:7474
632
msgid "Error creating patch:"
633
msgstr "Error en la creación del parche:"
634
609
-#: gitk:6164 gitk:6257 gitk:6311
635
+#: gitk:7496 gitk:7595 gitk:7649
636
msgid "ID:"
637
msgstr "ID:"
638
613
-#: gitk:6173
639
+#: gitk:7505
640
msgid "Tag name:"
641
msgstr "Nombre de etiqueta:"
642
617
-#: gitk:6177 gitk:6320
643
+#: gitk:7509 gitk:7659
644
msgid "Create"
645
msgstr "Crear"
646
621
-#: gitk:6192
647
+#: gitk:7524
648
msgid "No tag name specified"
649
msgstr "No se ha especificado etiqueta"
650
625
-#: gitk:6196
651
+#: gitk:7528
652
#, tcl-format
653
msgid "Tag \"%s\" already exists"
654
msgstr "La etiqueta \"%s\" ya existe"
655
630
-#: gitk:6202
656
+#: gitk:7534
657
msgid "Error creating tag:"
658
msgstr "Error al crear la etiqueta:"
659
634
-#: gitk:6266
660
+#: gitk:7604
661
msgid "Command:"
662
msgstr "Comando:"
663
638
-#: gitk:6274
664
+#: gitk:7612
665
msgid "Write"
666
msgstr "Escribir"
667
642
-#: gitk:6290
668
+#: gitk:7628
669
msgid "Error writing commit:"
670
msgstr "Error al escribir revisión:"
671
646
-#: gitk:6316
672
+#: gitk:7654
673
msgid "Name:"
674
msgstr "Nombre:"
675
650
-#: gitk:6335
676
+#: gitk:7674
677
msgid "Please specify a name for the new branch"
678
msgstr "Especifique un nombre para la nueva rama"
679
654
-#: gitk:6364
680
+#: gitk:7703
681
#, tcl-format
682
msgid "Commit %s is already included in branch %s -- really re-apply it?"
683
msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?"
684
659
-#: gitk:6369
685
+#: gitk:7708
686
msgid "Cherry-picking"
687
msgstr "Eligiendo revisiones (cherry-picking)"
688
663
-#: gitk:6381
689
+#: gitk:7720
690
msgid "No changes committed"
691
msgstr "No se han guardado cambios"
692
667
-#: gitk:6404
693
+#: gitk:7745
694
msgid "Confirm reset"
695
msgstr "Confirmar git reset"
696
671
-#: gitk:6406
697
+#: gitk:7747
698
#, tcl-format
699
msgid "Reset branch %s to %s?"
700
msgstr "¿Reponer la rama %s a %s?"
701
676
-#: gitk:6410
702
+#: gitk:7751
703
msgid "Reset type:"
704
msgstr "Tipo de reposición:"
705
680
-#: gitk:6414
706
+#: gitk:7755
707
msgid "Soft: Leave working tree and index untouched"
708
msgstr "Suave: No altera la copia de trabajo ni el índice"
709
684
-#: gitk:6417
710
+#: gitk:7758
711
msgid "Mixed: Leave working tree untouched, reset index"
712
msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo"
713
688
-#: gitk:6420
714
+#: gitk:7761
715
msgid ""
716
"Hard: Reset working tree and index\n"
717
"(discard ALL local changes)"
@@ -693,19 +719,19 @@ msgstr ""
719
"Dura: Actualiza el índice y la copia de trabajo\n"
720
"(abandona TODAS las modificaciones locales)"
721
696
-#: gitk:6436
722
+#: gitk:7777
723
msgid "Resetting"
724
msgstr "Reponiendo"
725
700
-#: gitk:6493
726
+#: gitk:7834
727
msgid "Checking out"
728
msgstr "Creando copia de trabajo"
729
704
-#: gitk:6523
730
+#: gitk:7885
731
msgid "Cannot delete the currently checked-out branch"
732
msgstr "No se puede borrar la rama actual"
733
708
-#: gitk:6529
734
+#: gitk:7891
735
#, tcl-format
736
msgid ""
737
"The commits on branch %s aren't on any other branch.\n"
@@ -714,134 +740,146 @@ msgstr ""
740
"Las revisiones de la rama %s no están presentes en otras ramas.\n"
741
"¿Borrar la rama %s?"
742
717
-#: gitk:6560
743
+#: gitk:7922
744
#, tcl-format
745
msgid "Tags and heads: %s"
746
msgstr "Etiquetas y ramas: %s"
747
722
-#: gitk:6574
748
+#: gitk:7936
749
msgid "Filter"
750
msgstr "Filtro"
751
726
-#: gitk:6868
752
+#: gitk:8230
753
msgid ""
754
"Error reading commit topology information; branch and preceding/following "
755
"tag information will be incomplete."
756
msgstr ""
731
-"Error al leer la topología de revisiones: la información sobre "
732
-"las ramas y etiquetas precedentes y siguientes será incompleta."
757
+"Error al leer la topología de revisiones: la información sobre las ramas y "
758
+"etiquetas precedentes y siguientes será incompleta."
759
734
-#: gitk:7852
760
+#: gitk:9216
761
msgid "Tag"
762
msgstr "Etiqueta"
763
738
-#: gitk:7852
764
+#: gitk:9216
765
msgid "Id"
766
msgstr "Id"
767
742
-#: gitk:7892
768
+#: gitk:9262
769
msgid "Gitk font chooser"
770
msgstr "Selector de tipografías gitk"
771
746
-#: gitk:7909
772
+#: gitk:9279
773
msgid "B"
774
msgstr "B"
775
750
-#: gitk:7912
776
+#: gitk:9282
777
msgid "I"
778
msgstr "I"
779
754
-#: gitk:8005
780
+#: gitk:9375
781
msgid "Gitk preferences"
782
msgstr "Preferencias de gitk"
783
758
-#: gitk:8006
784
+#: gitk:9376
785
msgid "Commit list display options"
786
msgstr "Opciones de visualización de la lista de revisiones"
787
762
-#: gitk:8009
788
+#: gitk:9379
789
msgid "Maximum graph width (lines)"
790
msgstr "Ancho máximo del gráfico (en líneas)"
791
766
-#: gitk:8013
792
+#: gitk:9383
793
#, tcl-format
794
msgid "Maximum graph width (% of pane)"
795
msgstr "Ancho máximo del gráfico (en % del panel)"
796
771
-#: gitk:8018
797
+#: gitk:9388
798
msgid "Show local changes"
799
msgstr "Mostrar cambios locales"
800
775
-#: gitk:8023
801
+#: gitk:9393
802
msgid "Auto-select SHA1"
803
msgstr "Seleccionar automáticamente SHA1 hash"
804
779
-#: gitk:8028
805
+#: gitk:9398
806
msgid "Diff display options"
807
msgstr "Opciones de visualización de diferencias"
808
783
-#: gitk:8030
809
+#: gitk:9400
810
msgid "Tab spacing"
811
msgstr "Espaciado de tabulador"
812
787
-#: gitk:8034
813
+#: gitk:9404
814
msgid "Display nearby tags"
815
msgstr "Mostrar etiquetas cercanas"
816
791
-#: gitk:8039
817
+#: gitk:9409
818
msgid "Limit diffs to listed paths"
819
msgstr "Limitar las diferencias a las rutas seleccionadas"
820
795
-#: gitk:8044
821
+#: gitk:9414
822
+msgid "Support per-file encodings"
823
+msgstr ""
824
+
825
+#: gitk:9421
826
+msgid "External diff tool"
827
+msgstr ""
828
+
829
+#: gitk:9423
830
+msgid "Choose..."
831
+msgstr ""
832
+
833
+#: gitk:9428
834
msgid "Colors: press to choose"
835
msgstr "Colores: pulse para seleccionar"
836
799
-#: gitk:8047
837
+#: gitk:9431
838
msgid "Background"
839
msgstr "Fondo"
840
803
-#: gitk:8051
841
+#: gitk:9435
842
msgid "Foreground"
843
msgstr "Primer plano"
844
807
-#: gitk:8055
845
+#: gitk:9439
846
msgid "Diff: old lines"
847
msgstr "Diff: líneas viejas"
848
811
-#: gitk:8060
849
+#: gitk:9444
850
msgid "Diff: new lines"
851
msgstr "Diff: líneas nuevas"
852
815
-#: gitk:8065
853
+#: gitk:9449
854
msgid "Diff: hunk header"
855
msgstr "Diff: cabecera de fragmento"
856
819
-#: gitk:8071
857
+#: gitk:9455
858
msgid "Select bg"
859
msgstr "Color de fondo de la selección"
860
823
-#: gitk:8075
861
+#: gitk:9459
862
msgid "Fonts: press to choose"
863
msgstr "Tipografías: pulse para elegir"
864
827
-#: gitk:8077
865
+#: gitk:9461
866
msgid "Main font"
867
msgstr "Tipografía principal"
868
831
-#: gitk:8078
869
+#: gitk:9462
870
msgid "Diff display font"
871
msgstr "Tipografía para diferencias"
872
835
-#: gitk:8079
873
+#: gitk:9463
874
msgid "User interface font"
875
msgstr "Tipografía para interfaz de usuario"
876
839
-#: gitk:8095
877
+#: gitk:9488
878
#, tcl-format
879
msgid "Gitk: choose color for %s"
880
msgstr "Gitk: elegir color para %s"
881
844
-#: gitk:8476
882
+#: gitk:9934
883
msgid ""
884
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
885
" Gitk requires at least Tcl/Tk 8.4."
@@ -849,42 +887,25 @@ msgstr ""
887
"Esta versión de Tcl/Tk es demasiado antigua.\n"
888
" Gitk requiere Tcl/Tk versión 8.4 o superior."
889
852
-#: gitk:8565
890
+#: gitk:10047
891
msgid "Cannot find a git repository here."
892
msgstr "No hay un repositorio git aquí."
893
856
-#: gitk:8569
894
+#: gitk:10051
895
#, tcl-format
896
msgid "Cannot find the git directory \"%s\"."
897
msgstr "No hay directorio git \"%s\"."
898
861
-#: gitk:8612
899
+#: gitk:10098
900
#, tcl-format
901
msgid "Ambiguous argument '%s': both revision and filename"
864
-msgstr "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
902
+msgstr ""
903
+"Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo"
904
866
-#: gitk:8624
905
+#: gitk:10110
906
msgid "Bad arguments to gitk:"
907
msgstr "Argumentos incorrectos a Gitk:"
908
870
-#: gitk:8636
871
-msgid "Couldn't get list of unmerged files:"
872
-msgstr "Imposible obtener la lista de archivos pendientes de fusión:"
873
-
874
-#: gitk:8652
875
-msgid "No files selected: --merge specified but no files are unmerged."
876
-msgstr ""
877
-"No hay archivos seleccionados: se seleccionó la opción --merge pero no hay "
878
-"archivos pendientes de fusión."
879
-
880
-#: gitk:8655
881
-msgid ""
882
-"No files selected: --merge specified but no unmerged files are within file "
883
-"limit."
884
-msgstr ""
885
-"No hay archivos seleccionados: se seleccionó la opción --merge pero los archivos "
886
-"especificados no necesitan fusión."
887
-
888
-#: gitk:8716
909
+#: gitk:10170
910
msgid "Command line"
911
msgstr "Línea de comandos"
po/it.po
+262
-238
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: gitk\n"
10
"Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2008-03-13 17:29+0100\n"
11
+"POT-Creation-Date: 2008-10-18 22:03+1100\n"
12
"PO-Revision-Date: 2008-03-13 17:34+0100\n"
13
"Last-Translator: Michele Ballabio <barra_cuda@katamail.com>\n"
14
"Language-Team: Italian\n"
@@ -16,676 +16,706 @@ msgstr ""
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
-#: gitk:111
20
-msgid "Error executing git rev-list:"
21
-msgstr "Errore nell'esecuzione di git rev-list:"
19
+#: gitk:113
20
+msgid "Couldn't get list of unmerged files:"
21
+msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:"
22
+
23
+#: gitk:340
24
+msgid "No files selected: --merge specified but no files are unmerged."
25
+msgstr ""
26
+"Nessun file selezionato: è stata specificata l'opzione --merge ma non ci "
27
+"sono file in attesa di fusione."
28
+
29
+#: gitk:343
30
+msgid ""
31
+"No files selected: --merge specified but no unmerged files are within file "
32
+"limit."
33
+msgstr ""
34
+"Nessun file selezionato: è stata specificata l'opzione --merge ma i file "
35
+"specificati non sono in attesa di fusione."
36
23
-#: gitk:124
37
+#: gitk:365 gitk:503
38
+msgid "Error executing git log:"
39
+msgstr "Errore nell'esecuzione di git log:"
40
+
41
+#: gitk:378
42
msgid "Reading"
43
msgstr "Lettura in corso"
44
27
-#: gitk:151 gitk:2191
45
+#: gitk:438 gitk:3462
46
msgid "Reading commits..."
47
msgstr "Lettura delle revisioni in corso..."
48
31
-#: gitk:275
32
-msgid "Can't parse git log output:"
33
-msgstr "Impossibile elaborare i dati di git log:"
34
-
35
-#: gitk:386 gitk:2195
49
+#: gitk:441 gitk:1528 gitk:3465
50
msgid "No commits selected"
51
msgstr "Nessuna revisione selezionata"
52
39
-#: gitk:500
53
+#: gitk:1399
54
+msgid "Can't parse git log output:"
55
+msgstr "Impossibile elaborare i dati di git log:"
56
+
57
+#: gitk:1605
58
msgid "No commit information available"
59
msgstr "Nessuna informazione disponibile sulle revisioni"
60
43
-#: gitk:599 gitk:621 gitk:1955 gitk:6423 gitk:7923 gitk:8082
61
+#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466
62
msgid "OK"
63
msgstr "OK"
64
47
-#: gitk:623 gitk:1956 gitk:6107 gitk:6178 gitk:6275 gitk:6321 gitk:6425
48
-#: gitk:7924 gitk:8083
65
+#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766
66
+#: gitk:9294 gitk:9467
67
msgid "Cancel"
68
msgstr "Annulla"
69
52
-#: gitk:661
53
-msgid "File"
54
-msgstr "File"
55
-
56
-#: gitk:663
70
+#: gitk:1811
71
msgid "Update"
72
msgstr "Aggiorna"
73
60
-#: gitk:664
74
+#: gitk:1813
75
msgid "Reread references"
76
msgstr "Rileggi riferimenti"
77
64
-#: gitk:665
78
+#: gitk:1814
79
msgid "List references"
80
msgstr "Elenca riferimenti"
81
68
-#: gitk:666
82
+#: gitk:1815
83
msgid "Quit"
84
msgstr "Esci"
85
72
-#: gitk:668
73
-msgid "Edit"
74
-msgstr "Modifica"
86
+#: gitk:1810
87
+msgid "File"
88
+msgstr "File"
89
76
-#: gitk:669
90
+#: gitk:1818
91
msgid "Preferences"
92
msgstr "Preferenze"
93
80
-#: gitk:672 gitk:1892
81
-msgid "View"
82
-msgstr "Vista"
94
+#: gitk:1817
95
+msgid "Edit"
96
+msgstr "Modifica"
97
84
-#: gitk:673
98
+#: gitk:1821
99
msgid "New view..."
100
msgstr "Nuova vista..."
101
88
-#: gitk:674 gitk:2133 gitk:8722
102
+#: gitk:1822
103
msgid "Edit view..."
104
msgstr "Modifica vista..."
105
92
-#: gitk:676 gitk:2134 gitk:8723
106
+#: gitk:1823
107
msgid "Delete view"
108
msgstr "Elimina vista"
109
96
-#: gitk:678
110
+#: gitk:1825
111
msgid "All files"
112
msgstr "Tutti i file"
113
100
-#: gitk:682
101
-msgid "Help"
102
-msgstr "Aiuto"
114
+#: gitk:1820 gitk:3196
115
+msgid "View"
116
+msgstr "Vista"
117
104
-#: gitk:683 gitk:1317
118
+#: gitk:1828 gitk:2487
119
msgid "About gitk"
120
msgstr "Informazioni su gitk"
121
108
-#: gitk:684
122
+#: gitk:1829
123
msgid "Key bindings"
124
msgstr "Scorciatoie da tastiera"
125
112
-#: gitk:741
126
+#: gitk:1827
127
+msgid "Help"
128
+msgstr "Aiuto"
129
+
130
+#: gitk:1887
131
msgid "SHA1 ID: "
132
msgstr "SHA1 ID: "
133
116
-#: gitk:791
134
+#: gitk:1918
135
+msgid "Row"
136
+msgstr ""
137
+
138
+#: gitk:1949
139
msgid "Find"
140
msgstr "Trova"
141
120
-#: gitk:792
142
+#: gitk:1950
143
msgid "next"
144
msgstr "succ"
145
124
-#: gitk:793
146
+#: gitk:1951
147
msgid "prev"
148
msgstr "prec"
149
128
-#: gitk:794
150
+#: gitk:1952
151
msgid "commit"
152
msgstr "revisione"
153
132
-#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
154
+#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621
155
msgid "containing:"
156
msgstr "contenente:"
157
136
-#: gitk:800 gitk:1778 gitk:1783 gitk:2431
158
+#: gitk:1958 gitk:2954 gitk:2959 gitk:3692
159
msgid "touching paths:"
160
msgstr "che riguarda i percorsi:"
161
140
-#: gitk:801 gitk:2436
162
+#: gitk:1959 gitk:3697
163
msgid "adding/removing string:"
164
msgstr "che aggiunge/rimuove la stringa:"
165
144
-#: gitk:810 gitk:812
166
+#: gitk:1968 gitk:1970
167
msgid "Exact"
168
msgstr "Esatto"
169
148
-#: gitk:812 gitk:2514 gitk:4274
170
+#: gitk:1970 gitk:3773 gitk:5518
171
msgid "IgnCase"
172
msgstr ""
173
152
-#: gitk:812 gitk:2405 gitk:2512 gitk:4270
174
+#: gitk:1970 gitk:3666 gitk:3771 gitk:5514
175
msgid "Regexp"
176
msgstr ""
177
156
-#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
178
+#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708
179
msgid "All fields"
180
msgstr "Tutti i campi"
181
160
-#: gitk:815 gitk:2531 gitk:2563 gitk:4336
182
+#: gitk:1973 gitk:3790 gitk:3822 gitk:5580
183
msgid "Headline"
184
msgstr "Titolo"
185
164
-#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
186
+#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109
187
msgid "Comments"
188
msgstr "Commenti"
189
168
-#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5956
169
-#: gitk:5971
190
+#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285
191
+#: gitk:7300
192
msgid "Author"
193
msgstr "Autore"
194
173
-#: gitk:816 gitk:2531 gitk:4336 gitk:4765
195
+#: gitk:1974 gitk:3790 gitk:5580 gitk:6047
196
msgid "Committer"
197
msgstr "Revisione creata da"
198
177
-#: gitk:845
199
+#: gitk:2003
200
msgid "Search"
201
msgstr "Cerca"
202
181
-#: gitk:852
203
+#: gitk:2010
204
msgid "Diff"
205
msgstr ""
206
185
-#: gitk:854
207
+#: gitk:2012
208
msgid "Old version"
209
msgstr "Vecchia versione"
210
189
-#: gitk:856
211
+#: gitk:2014
212
msgid "New version"
213
msgstr "Nuova versione"
214
193
-#: gitk:858
215
+#: gitk:2016
216
msgid "Lines of context"
217
msgstr "Linee di contesto"
218
197
-#: gitk:868
219
+#: gitk:2026
220
msgid "Ignore space change"
221
msgstr "Ignora modifiche agli spazi"
222
201
-#: gitk:926
223
+#: gitk:2084
224
msgid "Patch"
225
msgstr "Modifiche"
226
205
-#: gitk:928
227
+#: gitk:2086
228
msgid "Tree"
229
msgstr "Directory"
230
209
-#: gitk:1053 gitk:1068 gitk:6022
231
+#: gitk:2213 gitk:2226
232
msgid "Diff this -> selected"
233
msgstr "Diff questo -> selezionato"
234
213
-#: gitk:1055 gitk:1070 gitk:6023
235
+#: gitk:2214 gitk:2227
236
msgid "Diff selected -> this"
237
msgstr "Diff selezionato -> questo"
238
217
-#: gitk:1057 gitk:1072 gitk:6024
239
+#: gitk:2215 gitk:2228
240
msgid "Make patch"
241
msgstr "Crea patch"
242
221
-#: gitk:1058 gitk:6162
243
+#: gitk:2216 gitk:7494
244
msgid "Create tag"
245
msgstr "Crea etichetta"
246
225
-#: gitk:1059 gitk:6255
247
+#: gitk:2217 gitk:7593
248
msgid "Write commit to file"
249
msgstr "Scrivi revisione in un file"
250
229
-#: gitk:1060 gitk:6309
251
+#: gitk:2218 gitk:7647
252
msgid "Create new branch"
253
msgstr "Crea un nuovo ramo"
254
233
-#: gitk:1061
255
+#: gitk:2219
256
msgid "Cherry-pick this commit"
257
msgstr "Porta questa revisione in cima al ramo attuale"
258
237
-#: gitk:1063
259
+#: gitk:2220
260
msgid "Reset HEAD branch to here"
261
msgstr "Aggiorna il ramo HEAD a questa revisione"
262
241
-#: gitk:1079
263
+#: gitk:2234
264
msgid "Check out this branch"
265
msgstr "Attiva questo ramo"
266
245
-#: gitk:1081
267
+#: gitk:2235
268
msgid "Remove this branch"
269
msgstr "Elimina questo ramo"
270
249
-#: gitk:1087
271
+#: gitk:2242
272
msgid "Highlight this too"
273
msgstr "Evidenzia anche questo"
274
253
-#: gitk:1089
275
+#: gitk:2243
276
msgid "Highlight this only"
277
msgstr "Evidenzia solo questo"
278
257
-#: gitk:1318
279
+#: gitk:2245
280
+msgid "Blame parent commit"
281
+msgstr ""
282
+
283
+#: gitk:2488
284
msgid ""
285
"\n"
286
"Gitk - a commit viewer for git\n"
287
"\n"
262
-"Copyright © 2005-2006 Paul Mackerras\n"
288
+"Copyright © 2005-2008 Paul Mackerras\n"
289
"\n"
290
"Use and redistribute under the terms of the GNU General Public License"
291
msgstr ""
292
"\n"
293
"Gitk - un visualizzatore di revisioni per git\n"
294
"\n"
269
-"Copyright © 2005-2006 Paul Mackerras\n"
295
+"Copyright © 2005-2008 Paul Mackerras\n"
296
"\n"
297
"Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
298
"License"
299
274
-#: gitk:1326 gitk:1387 gitk:6581
300
+#: gitk:2496 gitk:2557 gitk:7943
301
msgid "Close"
302
msgstr "Chiudi"
303
278
-#: gitk:1345
304
+#: gitk:2515
305
msgid "Gitk key bindings"
306
msgstr "Scorciatoie da tastiera di Gitk"
307
282
-#: gitk:1347
308
+#: gitk:2517
309
msgid "Gitk key bindings:"
310
msgstr "Scorciatoie da tastiera di Gitk:"
311
286
-#: gitk:1349
312
+#: gitk:2519
313
#, tcl-format
314
msgid "<%s-Q>\t\tQuit"
315
msgstr "<%s-Q>\t\tEsci"
316
291
-#: gitk:1350
317
+#: gitk:2520
318
msgid "<Home>\t\tMove to first commit"
319
msgstr "<Home>\t\tVai alla prima revisione"
320
295
-#: gitk:1351
321
+#: gitk:2521
322
msgid "<End>\t\tMove to last commit"
323
msgstr "<End>\t\tVai all'ultima revisione"
324
299
-#: gitk:1352
325
+#: gitk:2522
326
msgid "<Up>, p, i\tMove up one commit"
327
msgstr "<Up>, p, i\tVai più in alto di una revisione"
328
303
-#: gitk:1353
329
+#: gitk:2523
330
msgid "<Down>, n, k\tMove down one commit"
331
msgstr "<Down>, n, k\tVai più in basso di una revisione"
332
307
-#: gitk:1354
333
+#: gitk:2524
334
msgid "<Left>, z, j\tGo back in history list"
335
msgstr "<Left>, z, j\tTorna indietro nella cronologia"
336
311
-#: gitk:1355
337
+#: gitk:2525
338
msgid "<Right>, x, l\tGo forward in history list"
339
msgstr "<Right>, x, l\tVai avanti nella cronologia"
340
315
-#: gitk:1356
341
+#: gitk:2526
342
msgid "<PageUp>\tMove up one page in commit list"
343
msgstr "<PageUp>\tVai più in alto di una pagina nella lista delle revisioni"
344
319
-#: gitk:1357
345
+#: gitk:2527
346
msgid "<PageDown>\tMove down one page in commit list"
347
msgstr "<PageDown>\tVai più in basso di una pagina nella lista delle revisioni"
348
323
-#: gitk:1358
349
+#: gitk:2528
350
#, tcl-format
351
msgid "<%s-Home>\tScroll to top of commit list"
352
msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni"
353
328
-#: gitk:1359
354
+#: gitk:2529
355
#, tcl-format
356
msgid "<%s-End>\tScroll to bottom of commit list"
357
msgstr "<%s-End>\tScorri alla fine della lista delle revisioni"
358
333
-#: gitk:1360
359
+#: gitk:2530
360
#, tcl-format
361
msgid "<%s-Up>\tScroll commit list up one line"
362
msgstr "<%s-Up>\tScorri la lista delle revisioni in alto di una riga"
363
338
-#: gitk:1361
364
+#: gitk:2531
365
#, tcl-format
366
msgid "<%s-Down>\tScroll commit list down one line"
367
msgstr "<%s-Down>\tScorri la lista delle revisioni in basso di una riga"
368
343
-#: gitk:1362
369
+#: gitk:2532
370
#, tcl-format
371
msgid "<%s-PageUp>\tScroll commit list up one page"
372
msgstr "<%s-PageUp>\tScorri la lista delle revisioni in alto di una pagina"
373
348
-#: gitk:1363
374
+#: gitk:2533
375
#, tcl-format
376
msgid "<%s-PageDown>\tScroll commit list down one page"
377
msgstr "<%s-PageDown>\tScorri la lista delle revisioni in basso di una pagina"
378
353
-#: gitk:1364
379
+#: gitk:2534
380
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
381
msgstr "<Shift-Up>\tTrova all'indietro (verso l'alto, revisioni successive)"
382
357
-#: gitk:1365
383
+#: gitk:2535
384
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
385
msgstr "<Shift-Down>\tTrova in avanti (verso il basso, revisioni precedenti)"
386
361
-#: gitk:1366
387
+#: gitk:2536
388
msgid "<Delete>, b\tScroll diff view up one page"
389
msgstr "<Delete>, b\tScorri la vista delle differenze in alto di una pagina"
390
365
-#: gitk:1367
391
+#: gitk:2537
392
msgid "<Backspace>\tScroll diff view up one page"
393
msgstr "<Backspace>\tScorri la vista delle differenze in alto di una pagina"
394
369
-#: gitk:1368
395
+#: gitk:2538
396
msgid "<Space>\t\tScroll diff view down one page"
397
msgstr "<Space>\t\tScorri la vista delle differenze in basso di una pagina"
398
373
-#: gitk:1369
399
+#: gitk:2539
400
msgid "u\t\tScroll diff view up 18 lines"
401
msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee"
402
377
-#: gitk:1370
403
+#: gitk:2540
404
msgid "d\t\tScroll diff view down 18 lines"
405
msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee"
406
381
-#: gitk:1371
407
+#: gitk:2541
408
#, tcl-format
409
msgid "<%s-F>\t\tFind"
410
msgstr "<%s-F>\t\tTrova"
411
386
-#: gitk:1372
412
+#: gitk:2542
413
#, tcl-format
414
msgid "<%s-G>\t\tMove to next find hit"
415
msgstr "<%s-G>\t\tTrova in avanti"
416
391
-#: gitk:1373
417
+#: gitk:2543
418
msgid "<Return>\tMove to next find hit"
419
msgstr "<Return>\tTrova in avanti"
420
395
-#: gitk:1374
421
+#: gitk:2544
422
msgid "/\t\tMove to next find hit, or redo find"
423
msgstr "/\t\tTrova in avanti, o cerca di nuovo"
424
399
-#: gitk:1375
425
+#: gitk:2545
426
msgid "?\t\tMove to previous find hit"
427
msgstr "?\t\tTrova all'indietro"
428
403
-#: gitk:1376
429
+#: gitk:2546
430
msgid "f\t\tScroll diff view to next file"
431
msgstr "f\t\tScorri la vista delle differenze al file successivo"
432
407
-#: gitk:1377
433
+#: gitk:2547
434
#, tcl-format
435
msgid "<%s-S>\t\tSearch for next hit in diff view"
436
msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze"
437
412
-#: gitk:1378
438
+#: gitk:2548
439
#, tcl-format
440
msgid "<%s-R>\t\tSearch for previous hit in diff view"
441
msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze"
442
417
-#: gitk:1379
443
+#: gitk:2549
444
#, tcl-format
445
msgid "<%s-KP+>\tIncrease font size"
446
msgstr "<%s-KP+>\tAumenta grandezza carattere"
447
422
-#: gitk:1380
448
+#: gitk:2550
449
#, tcl-format
450
msgid "<%s-plus>\tIncrease font size"
451
msgstr "<%s-plus>\tAumenta grandezza carattere"
452
427
-#: gitk:1381
453
+#: gitk:2551
454
#, tcl-format
455
msgid "<%s-KP->\tDecrease font size"
456
msgstr "<%s-KP->\tDiminuisci grandezza carattere"
457
432
-#: gitk:1382
458
+#: gitk:2552
459
#, tcl-format
460
msgid "<%s-minus>\tDecrease font size"
461
msgstr "<%s-minus>\tDiminuisci grandezza carattere"
462
437
-#: gitk:1383
463
+#: gitk:2553
464
msgid "<F5>\t\tUpdate"
465
msgstr "<F5>\t\tAggiorna"
466
441
-#: gitk:1896
467
+#: gitk:3200
468
msgid "Gitk view definition"
469
msgstr "Scelta vista Gitk"
470
445
-#: gitk:1921
471
+#: gitk:3225
472
msgid "Name"
473
msgstr "Nome"
474
449
-#: gitk:1924
475
+#: gitk:3228
476
msgid "Remember this view"
477
msgstr "Ricorda questa vista"
478
453
-#: gitk:1928
454
-msgid "Commits to include (arguments to git rev-list):"
455
-msgstr "Revisioni da includere (argomenti di git rev-list):"
479
+#: gitk:3232
480
+msgid "Commits to include (arguments to git log):"
481
+msgstr "Revisioni da includere (argomenti di git log):"
482
457
-#: gitk:1935
483
+#: gitk:3239
484
msgid "Command to generate more commits to include:"
485
msgstr "Comando che genera altre revisioni da visualizzare:"
486
461
-#: gitk:1942
487
+#: gitk:3246
488
msgid "Enter files and directories to include, one per line:"
489
msgstr "Inserire file e directory da includere, uno per riga:"
490
465
-#: gitk:1989
491
+#: gitk:3293
492
msgid "Error in commit selection arguments:"
493
msgstr "Errore negli argomenti di selezione delle revisioni:"
494
469
-#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8688 gitk:8689
495
+#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142
496
msgid "None"
497
msgstr "Nessuno"
498
473
-#: gitk:2531 gitk:4336 gitk:5958 gitk:5973
499
+#: gitk:3790 gitk:5580 gitk:7287 gitk:7302
500
msgid "Date"
501
msgstr "Data"
502
477
-#: gitk:2531 gitk:4336
503
+#: gitk:3790 gitk:5580
504
msgid "CDate"
505
msgstr ""
506
481
-#: gitk:2680 gitk:2685
507
+#: gitk:3939 gitk:3944
508
msgid "Descendant"
509
msgstr "Discendente"
510
485
-#: gitk:2681
511
+#: gitk:3940
512
msgid "Not descendant"
513
msgstr "Non discendente"
514
489
-#: gitk:2688 gitk:2693
515
+#: gitk:3947 gitk:3952
516
msgid "Ancestor"
517
msgstr "Ascendente"
518
493
-#: gitk:2689
519
+#: gitk:3948
520
msgid "Not ancestor"
521
msgstr "Non ascendente"
522
497
-#: gitk:2924
523
+#: gitk:4187
524
msgid "Local changes checked in to index but not committed"
525
msgstr "Modifiche locali presenti nell'indice ma non nell'archivio"
526
501
-#: gitk:2954
527
+#: gitk:4220
528
msgid "Local uncommitted changes, not checked in to index"
529
msgstr "Modifiche locali non presenti né nell'archivio né nell'indice"
530
505
-#: gitk:4305
531
+#: gitk:5549
532
msgid "Searching"
533
msgstr "Ricerca in corso"
534
509
-#: gitk:4767
535
+#: gitk:6049
536
msgid "Tags:"
537
msgstr "Etichette:"
538
513
-#: gitk:4784 gitk:4790 gitk:5951
539
+#: gitk:6066 gitk:6072 gitk:7280
540
msgid "Parent"
541
msgstr "Genitore"
542
517
-#: gitk:4795
543
+#: gitk:6077
544
msgid "Child"
545
msgstr "Figlio"
546
521
-#: gitk:4804
547
+#: gitk:6086
548
msgid "Branch"
549
msgstr "Ramo"
550
525
-#: gitk:4807
551
+#: gitk:6089
552
msgid "Follows"
553
msgstr "Segue"
554
529
-#: gitk:4810
555
+#: gitk:6092
556
msgid "Precedes"
557
msgstr "Precede"
558
533
-#: gitk:5093
559
+#: gitk:6378
560
msgid "Error getting merge diffs:"
561
msgstr "Errore nella lettura delle differenze di fusione:"
562
537
-#: gitk:5778
563
+#: gitk:7113
564
msgid "Goto:"
565
msgstr "Vai a:"
566
541
-#: gitk:5780
567
+#: gitk:7115
568
msgid "SHA1 ID:"
569
msgstr "SHA1 ID:"
570
545
-#: gitk:5805
571
+#: gitk:7134
572
#, tcl-format
573
msgid "Short SHA1 id %s is ambiguous"
574
msgstr "La SHA1 id abbreviata %s è ambigua"
575
550
-#: gitk:5817
576
+#: gitk:7146
577
#, tcl-format
578
msgid "SHA1 id %s is not known"
579
msgstr "La SHA1 id %s è sconosciuta"
580
555
-#: gitk:5819
581
+#: gitk:7148
582
#, tcl-format
583
msgid "Tag/Head %s is not known"
584
msgstr "L'etichetta/ramo %s è sconosciuto"
585
560
-#: gitk:5961
586
+#: gitk:7290
587
msgid "Children"
588
msgstr "Figli"
589
564
-#: gitk:6018
590
+#: gitk:7347
591
#, tcl-format
592
msgid "Reset %s branch to here"
593
msgstr "Aggiorna il ramo %s a questa revisione"
594
569
-#: gitk:6049
595
+#: gitk:7349
596
+msgid "Detached head: can't reset"
597
+msgstr ""
598
+
599
+#: gitk:7381
600
msgid "Top"
601
msgstr "Inizio"
602
573
-#: gitk:6050
603
+#: gitk:7382
604
msgid "From"
605
msgstr "Da"
606
577
-#: gitk:6055
607
+#: gitk:7387
608
msgid "To"
609
msgstr "A"
610
581
-#: gitk:6078
611
+#: gitk:7410
612
msgid "Generate patch"
613
msgstr "Genera patch"
614
585
-#: gitk:6080
615
+#: gitk:7412
616
msgid "From:"
617
msgstr "Da:"
618
589
-#: gitk:6089
619
+#: gitk:7421
620
msgid "To:"
621
msgstr "A:"
622
593
-#: gitk:6098
623
+#: gitk:7430
624
msgid "Reverse"
625
msgstr "Inverti"
626
597
-#: gitk:6100 gitk:6269
627
+#: gitk:7432 gitk:7607
628
msgid "Output file:"
629
msgstr "Scrivi sul file:"
630
601
-#: gitk:6106
631
+#: gitk:7438
632
msgid "Generate"
633
msgstr "Genera"
634
605
-#: gitk:6142
635
+#: gitk:7474
636
msgid "Error creating patch:"
637
msgstr "Errore nella creazione della patch:"
638
609
-#: gitk:6164 gitk:6257 gitk:6311
639
+#: gitk:7496 gitk:7595 gitk:7649
640
msgid "ID:"
641
msgstr "ID:"
642
613
-#: gitk:6173
643
+#: gitk:7505
644
msgid "Tag name:"
645
msgstr "Nome etichetta:"
646
617
-#: gitk:6177 gitk:6320
647
+#: gitk:7509 gitk:7659
648
msgid "Create"
649
msgstr "Crea"
650
621
-#: gitk:6192
651
+#: gitk:7524
652
msgid "No tag name specified"
653
msgstr "Nessuna etichetta specificata"
654
625
-#: gitk:6196
655
+#: gitk:7528
656
#, tcl-format
657
msgid "Tag \"%s\" already exists"
658
msgstr "L'etichetta \"%s\" esiste già"
659
630
-#: gitk:6202
660
+#: gitk:7534
661
msgid "Error creating tag:"
662
msgstr "Errore nella creazione dell'etichetta:"
663
634
-#: gitk:6266
664
+#: gitk:7604
665
msgid "Command:"
666
msgstr "Comando:"
667
638
-#: gitk:6274
668
+#: gitk:7612
669
msgid "Write"
670
msgstr "Scrivi"
671
642
-#: gitk:6290
672
+#: gitk:7628
673
msgid "Error writing commit:"
674
msgstr "Errore nella scrittura della revisione:"
675
646
-#: gitk:6316
676
+#: gitk:7654
677
msgid "Name:"
678
msgstr "Nome:"
679
650
-#: gitk:6335
680
+#: gitk:7674
681
msgid "Please specify a name for the new branch"
682
msgstr "Specificare un nome per il nuovo ramo"
683
654
-#: gitk:6364
684
+#: gitk:7703
685
#, tcl-format
686
msgid "Commit %s is already included in branch %s -- really re-apply it?"
687
msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?"
688
659
-#: gitk:6369
689
+#: gitk:7708
690
msgid "Cherry-picking"
691
msgstr ""
692
663
-#: gitk:6381
693
+#: gitk:7720
694
msgid "No changes committed"
695
msgstr "Nessuna modifica archiviata"
696
667
-#: gitk:6404
697
+#: gitk:7745
698
msgid "Confirm reset"
699
msgstr "Conferma git reset"
700
671
-#: gitk:6406
701
+#: gitk:7747
702
#, tcl-format
703
msgid "Reset branch %s to %s?"
704
msgstr "Aggiornare il ramo %s a %s?"
705
676
-#: gitk:6410
706
+#: gitk:7751
707
msgid "Reset type:"
708
msgstr "Tipo di aggiornamento:"
709
680
-#: gitk:6414
710
+#: gitk:7755
711
msgid "Soft: Leave working tree and index untouched"
712
msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono"
713
684
-#: gitk:6417
714
+#: gitk:7758
715
msgid "Mixed: Leave working tree untouched, reset index"
716
msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice"
717
688
-#: gitk:6420
718
+#: gitk:7761
719
msgid ""
720
"Hard: Reset working tree and index\n"
721
"(discard ALL local changes)"
@@ -693,19 +723,19 @@ msgstr ""
723
"Hard: Aggiorna la directory di lavoro e l'indice\n"
724
"(abbandona TUTTE le modifiche locali)"
725
696
-#: gitk:6436
726
+#: gitk:7777
727
msgid "Resetting"
728
msgstr "git reset in corso"
729
700
-#: gitk:6493
730
+#: gitk:7834
731
msgid "Checking out"
732
msgstr "Attivazione in corso"
733
704
-#: gitk:6523
734
+#: gitk:7885
735
msgid "Cannot delete the currently checked-out branch"
736
msgstr "Impossibile cancellare il ramo attualmente attivo"
737
708
-#: gitk:6529
738
+#: gitk:7891
739
#, tcl-format
740
msgid ""
741
"The commits on branch %s aren't on any other branch.\n"
@@ -714,16 +744,16 @@ msgstr ""
744
"Le revisioni nel ramo %s non sono presenti su altri rami.\n"
745
"Cancellare il ramo %s?"
746
717
-#: gitk:6560
747
+#: gitk:7922
748
#, tcl-format
749
msgid "Tags and heads: %s"
750
msgstr "Etichette e rami: %s"
751
722
-#: gitk:6574
752
+#: gitk:7936
753
msgid "Filter"
754
msgstr "Filtro"
755
726
-#: gitk:6868
756
+#: gitk:8230
757
msgid ""
758
"Error reading commit topology information; branch and preceding/following "
759
"tag information will be incomplete."
@@ -731,117 +761,129 @@ msgstr ""
761
"Errore nella lettura della topologia delle revisioni: le informazioni sul "
762
"ramo e le etichette precedenti e seguenti saranno incomplete."
763
734
-#: gitk:7852
764
+#: gitk:9216
765
msgid "Tag"
766
msgstr "Etichetta"
767
738
-#: gitk:7852
768
+#: gitk:9216
769
msgid "Id"
770
msgstr "Id"
771
742
-#: gitk:7892
772
+#: gitk:9262
773
msgid "Gitk font chooser"
774
msgstr "Scelta caratteri gitk"
775
746
-#: gitk:7909
776
+#: gitk:9279
777
msgid "B"
778
msgstr "B"
779
750
-#: gitk:7912
780
+#: gitk:9282
781
msgid "I"
782
msgstr "I"
783
754
-#: gitk:8005
784
+#: gitk:9375
785
msgid "Gitk preferences"
786
msgstr "Preferenze gitk"
787
758
-#: gitk:8006
788
+#: gitk:9376
789
msgid "Commit list display options"
790
msgstr "Opzioni visualizzazione dell'elenco revisioni"
791
762
-#: gitk:8009
792
+#: gitk:9379
793
msgid "Maximum graph width (lines)"
794
msgstr "Larghezza massima del grafico (in linee)"
795
766
-#: gitk:8013
796
+#: gitk:9383
797
#, tcl-format
798
msgid "Maximum graph width (% of pane)"
799
msgstr "Larghezza massima del grafico (% del pannello)"
800
771
-#: gitk:8018
801
+#: gitk:9388
802
msgid "Show local changes"
803
msgstr "Mostra modifiche locali"
804
775
-#: gitk:8023
805
+#: gitk:9393
806
msgid "Auto-select SHA1"
807
msgstr "Seleziona automaticamente SHA1 hash"
808
779
-#: gitk:8028
809
+#: gitk:9398
810
msgid "Diff display options"
811
msgstr "Opzioni di visualizzazione delle differenze"
812
783
-#: gitk:8030
813
+#: gitk:9400
814
msgid "Tab spacing"
815
msgstr "Spaziatura tabulazioni"
816
787
-#: gitk:8034
817
+#: gitk:9404
818
msgid "Display nearby tags"
819
msgstr "Mostra etichette vicine"
820
791
-#: gitk:8039
821
+#: gitk:9409
822
msgid "Limit diffs to listed paths"
823
msgstr "Limita le differenze ai percorsi elencati"
824
795
-#: gitk:8044
825
+#: gitk:9414
826
+msgid "Support per-file encodings"
827
+msgstr ""
828
+
829
+#: gitk:9421
830
+msgid "External diff tool"
831
+msgstr ""
832
+
833
+#: gitk:9423
834
+msgid "Choose..."
835
+msgstr ""
836
+
837
+#: gitk:9428
838
msgid "Colors: press to choose"
839
msgstr "Colori: premere per scegliere"
840
799
-#: gitk:8047
841
+#: gitk:9431
842
msgid "Background"
843
msgstr "Sfondo"
844
803
-#: gitk:8051
845
+#: gitk:9435
846
msgid "Foreground"
847
msgstr "Primo piano"
848
807
-#: gitk:8055
849
+#: gitk:9439
850
msgid "Diff: old lines"
851
msgstr "Diff: vecchie linee"
852
811
-#: gitk:8060
853
+#: gitk:9444
854
msgid "Diff: new lines"
855
msgstr "Diff: nuove linee"
856
815
-#: gitk:8065
857
+#: gitk:9449
858
msgid "Diff: hunk header"
859
msgstr "Diff: intestazione della sezione"
860
819
-#: gitk:8071
861
+#: gitk:9455
862
msgid "Select bg"
863
msgstr "Sfondo selezione"
864
823
-#: gitk:8075
865
+#: gitk:9459
866
msgid "Fonts: press to choose"
867
msgstr "Carattere: premere per scegliere"
868
827
-#: gitk:8077
869
+#: gitk:9461
870
msgid "Main font"
871
msgstr "Carattere principale"
872
831
-#: gitk:8078
873
+#: gitk:9462
874
msgid "Diff display font"
875
msgstr "Carattere per differenze"
876
835
-#: gitk:8079
877
+#: gitk:9463
878
msgid "User interface font"
879
msgstr "Carattere per interfaccia utente"
880
839
-#: gitk:8095
881
+#: gitk:9488
882
#, tcl-format
883
msgid "Gitk: choose color for %s"
884
msgstr "Gitk: scegliere un colore per %s"
885
844
-#: gitk:8476
886
+#: gitk:9934
887
msgid ""
888
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
889
" Gitk requires at least Tcl/Tk 8.4."
@@ -849,42 +891,24 @@ msgstr ""
891
"Questa versione di Tcl/Tk non può avviare gitk.\n"
892
" Gitk richiede Tcl/Tk versione 8.4 o superiore."
893
852
-#: gitk:8565
894
+#: gitk:10047
895
msgid "Cannot find a git repository here."
896
msgstr "Archivio git non trovato."
897
856
-#: gitk:8569
898
+#: gitk:10051
899
#, tcl-format
900
msgid "Cannot find the git directory \"%s\"."
901
msgstr "Directory git \"%s\" non trovata."
902
861
-#: gitk:8612
903
+#: gitk:10098
904
#, tcl-format
905
msgid "Ambiguous argument '%s': both revision and filename"
906
msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file"
907
866
-#: gitk:8624
908
+#: gitk:10110
909
msgid "Bad arguments to gitk:"
910
msgstr "Gitk: argomenti errati:"
911
870
-#: gitk:8636
871
-msgid "Couldn't get list of unmerged files:"
872
-msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:"
873
-
874
-#: gitk:8652
875
-msgid "No files selected: --merge specified but no files are unmerged."
876
-msgstr ""
877
-"Nessun file selezionato: è stata specificata l'opzione --merge ma non ci "
878
-"sono file in attesa di fusione."
879
-
880
-#: gitk:8655
881
-msgid ""
882
-"No files selected: --merge specified but no unmerged files are within file "
883
-"limit."
884
-msgstr ""
885
-"Nessun file selezionato: è stata specificata l'opzione --merge ma i file "
886
-"specificati non sono in attesa di fusione."
887
-
888
-#: gitk:8716
912
+#: gitk:10170
913
msgid "Command line"
914
msgstr "Linea di comando"
po/sv.po
+228
-220
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: sv\n"
10
"Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2008-08-03 18:58+0200\n"
11
+"POT-Creation-Date: 2008-10-18 22:03+1100\n"
12
"PO-Revision-Date: 2008-08-03 19:03+0200\n"
13
"Last-Translator: Mikael Magnusson <mikachu@gmail.com>\n"
14
"Language-Team: Swedish <sv@li.org>\n"
@@ -16,17 +16,17 @@ msgstr ""
16
"Content-Type: text/plain; charset=UTF-8\n"
17
"Content-Transfer-Encoding: 8bit\n"
18
19
-#: gitk:102
19
+#: gitk:113
20
msgid "Couldn't get list of unmerged files:"
21
msgstr "Kunde inta hämta lista över ej sammanslagna filer:"
22
23
-#: gitk:329
23
+#: gitk:340
24
msgid "No files selected: --merge specified but no files are unmerged."
25
msgstr ""
26
"Inga filer valdes: --merge angavs men det finns inga filer som inte har "
27
"slagits samman."
28
29
-#: gitk:332
29
+#: gitk:343
30
msgid ""
31
"No files selected: --merge specified but no unmerged files are within file "
32
"limit."
@@ -34,257 +34,261 @@ msgstr ""
34
"Inga filer valdes: --merge angavs men det finns inga filer inom "
35
"filbegränsningen."
36
37
-#: gitk:354
37
+#: gitk:365 gitk:503
38
msgid "Error executing git log:"
39
msgstr "Fel vid körning av git log:"
40
41
-#: gitk:369
41
+#: gitk:378
42
msgid "Reading"
43
msgstr "Läser"
44
45
-#: gitk:400 gitk:3356
45
+#: gitk:438 gitk:3462
46
msgid "Reading commits..."
47
msgstr "Läser incheckningar..."
48
49
-#: gitk:403 gitk:1480 gitk:3359
49
+#: gitk:441 gitk:1528 gitk:3465
50
msgid "No commits selected"
51
msgstr "Inga incheckningar markerade"
52
53
-#: gitk:1358
53
+#: gitk:1399
54
msgid "Can't parse git log output:"
55
msgstr "Kan inte tolka utdata från git log:"
56
57
-#: gitk:1557
57
+#: gitk:1605
58
msgid "No commit information available"
59
msgstr "Ingen incheckningsinformation är tillgänglig"
60
61
-#: gitk:1654 gitk:1676 gitk:3150 gitk:7620 gitk:9149 gitk:9317
61
+#: gitk:1709 gitk:1731 gitk:3259 gitk:7764 gitk:9293 gitk:9466
62
msgid "OK"
63
msgstr "OK"
64
65
-#: gitk:1678 gitk:3151 gitk:7296 gitk:7367 gitk:7470 gitk:7516 gitk:7622
66
-#: gitk:9150 gitk:9318
65
+#: gitk:1733 gitk:3260 gitk:7439 gitk:7510 gitk:7613 gitk:7660 gitk:7766
66
+#: gitk:9294 gitk:9467
67
msgid "Cancel"
68
msgstr "Avbryt"
69
70
-#: gitk:1716
71
-msgid "File"
72
-msgstr "Arkiv"
73
-
74
-#: gitk:1718
70
+#: gitk:1811
71
msgid "Update"
72
msgstr "Uppdatera"
73
78
-#: gitk:1719
74
+#: gitk:1812
75
msgid "Reload"
76
msgstr "Ladda om"
77
82
-#: gitk:1720
78
+#: gitk:1813
79
msgid "Reread references"
80
msgstr "Läs om referenser"
81
86
-#: gitk:1721
82
+#: gitk:1814
83
msgid "List references"
84
msgstr "Visa referenser"
85
90
-#: gitk:1722
86
+#: gitk:1815
87
msgid "Quit"
88
msgstr "Avsluta"
89
94
-#: gitk:1724
95
-msgid "Edit"
96
-msgstr "Redigera"
90
+#: gitk:1810
91
+msgid "File"
92
+msgstr "Arkiv"
93
98
-#: gitk:1725
94
+#: gitk:1818
95
msgid "Preferences"
96
msgstr "Inställningar"
97
102
-#: gitk:1728 gitk:3087
103
-msgid "View"
104
-msgstr "Visa"
98
+#: gitk:1817
99
+msgid "Edit"
100
+msgstr "Redigera"
101
106
-#: gitk:1729
102
+#: gitk:1821
103
msgid "New view..."
104
msgstr "Ny vy..."
105
110
-#: gitk:1730 gitk:3298 gitk:9932
106
+#: gitk:1822
107
msgid "Edit view..."
108
msgstr "Ändra vy..."
109
114
-#: gitk:1732 gitk:3299 gitk:9933
110
+#: gitk:1823
111
msgid "Delete view"
112
msgstr "Ta bort vy"
113
118
-#: gitk:1734
114
+#: gitk:1825
115
msgid "All files"
116
msgstr "Alla filer"
117
122
-#: gitk:1738
123
-msgid "Help"
124
-msgstr "Hjälp"
118
+#: gitk:1820 gitk:3196
119
+msgid "View"
120
+msgstr "Visa"
121
126
-#: gitk:1739 gitk:2399
122
+#: gitk:1828 gitk:2487
123
msgid "About gitk"
124
msgstr "Om gitk"
125
130
-#: gitk:1740
126
+#: gitk:1829
127
msgid "Key bindings"
128
msgstr "Tangentbordsbindningar"
129
134
-#: gitk:1797
130
+#: gitk:1827
131
+msgid "Help"
132
+msgstr "Hjälp"
133
+
134
+#: gitk:1887
135
msgid "SHA1 ID: "
136
msgstr "SHA1-id: "
137
138
-#: gitk:1828
138
+#: gitk:1918
139
msgid "Row"
140
msgstr "Rad"
141
142
-#: gitk:1859
142
+#: gitk:1949
143
msgid "Find"
144
msgstr "Sök"
145
146
-#: gitk:1860
146
+#: gitk:1950
147
msgid "next"
148
msgstr "nästa"
149
150
-#: gitk:1861
150
+#: gitk:1951
151
msgid "prev"
152
msgstr "föreg"
153
154
-#: gitk:1862
154
+#: gitk:1952
155
msgid "commit"
156
msgstr "incheckning"
157
158
-#: gitk:1865 gitk:1867 gitk:3511 gitk:3534 gitk:3558 gitk:5441 gitk:5512
158
+#: gitk:1955 gitk:1957 gitk:3617 gitk:3640 gitk:3664 gitk:5550 gitk:5621
159
msgid "containing:"
160
msgstr "som innehåller:"
161
162
-#: gitk:1868 gitk:2866 gitk:2871 gitk:3586
162
+#: gitk:1958 gitk:2954 gitk:2959 gitk:3692
163
msgid "touching paths:"
164
msgstr "som rör sökväg:"
165
166
-#: gitk:1869 gitk:3591
166
+#: gitk:1959 gitk:3697
167
msgid "adding/removing string:"
168
msgstr "som lägger/till tar bort sträng:"
169
170
-#: gitk:1878 gitk:1880
170
+#: gitk:1968 gitk:1970
171
msgid "Exact"
172
msgstr "Exakt"
173
174
-#: gitk:1880 gitk:3667 gitk:5409
174
+#: gitk:1970 gitk:3773 gitk:5518
175
msgid "IgnCase"
176
msgstr "IgnVersaler"
177
178
-#: gitk:1880 gitk:3560 gitk:3665 gitk:5405
178
+#: gitk:1970 gitk:3666 gitk:3771 gitk:5514
179
msgid "Regexp"
180
msgstr "Reg.uttr."
181
182
-#: gitk:1882 gitk:1883 gitk:3686 gitk:3716 gitk:3723 gitk:5532 gitk:5599
182
+#: gitk:1972 gitk:1973 gitk:3792 gitk:3822 gitk:3829 gitk:5641 gitk:5708
183
msgid "All fields"
184
msgstr "Alla fält"
185
186
-#: gitk:1883 gitk:3684 gitk:3716 gitk:5471
186
+#: gitk:1973 gitk:3790 gitk:3822 gitk:5580
187
msgid "Headline"
188
msgstr "Rubrik"
189
190
-#: gitk:1884 gitk:3684 gitk:5471 gitk:5599 gitk:6000
190
+#: gitk:1974 gitk:3790 gitk:5580 gitk:5708 gitk:6109
191
msgid "Comments"
192
msgstr "Kommentarer"
193
194
-#: gitk:1884 gitk:3684 gitk:3688 gitk:3723 gitk:5471 gitk:5936 gitk:7142
195
-#: gitk:7157
194
+#: gitk:1974 gitk:3790 gitk:3794 gitk:3829 gitk:5580 gitk:6045 gitk:7285
195
+#: gitk:7300
196
msgid "Author"
197
msgstr "Författare"
198
199
-#: gitk:1884 gitk:3684 gitk:5471 gitk:5938
199
+#: gitk:1974 gitk:3790 gitk:5580 gitk:6047
200
msgid "Committer"
201
msgstr "Incheckare"
202
203
-#: gitk:1913
203
+#: gitk:2003
204
msgid "Search"
205
msgstr "Sök"
206
207
-#: gitk:1920
207
+#: gitk:2010
208
msgid "Diff"
209
msgstr "Diff"
210
211
-#: gitk:1922
211
+#: gitk:2012
212
msgid "Old version"
213
msgstr "Gammal version"
214
215
-#: gitk:1924
215
+#: gitk:2014
216
msgid "New version"
217
msgstr "Ny version"
218
219
-#: gitk:1926
219
+#: gitk:2016
220
msgid "Lines of context"
221
msgstr "Rader sammanhang"
222
223
-#: gitk:1936
223
+#: gitk:2026
224
msgid "Ignore space change"
225
msgstr "Ignorera ändringar i blanksteg"
226
227
-#: gitk:1994
227
+#: gitk:2084
228
msgid "Patch"
229
msgstr "Patch"
230
231
-#: gitk:1996
231
+#: gitk:2086
232
msgid "Tree"
233
msgstr "Träd"
234
235
-#: gitk:2121 gitk:2136 gitk:7211
235
+#: gitk:2213 gitk:2226
236
msgid "Diff this -> selected"
237
msgstr "Diff denna -> markerad"
238
239
-#: gitk:2123 gitk:2138 gitk:7212
239
+#: gitk:2214 gitk:2227
240
msgid "Diff selected -> this"
241
msgstr "Diff markerad -> denna"
242
243
-#: gitk:2125 gitk:2140 gitk:7213
243
+#: gitk:2215 gitk:2228
244
msgid "Make patch"
245
msgstr "Skapa patch"
246
247
-#: gitk:2126 gitk:7351
247
+#: gitk:2216 gitk:7494
248
msgid "Create tag"
249
msgstr "Skapa tagg"
250
251
-#: gitk:2127 gitk:7450
251
+#: gitk:2217 gitk:7593
252
msgid "Write commit to file"
253
msgstr "Skriv incheckning till fil"
254
255
-#: gitk:2128 gitk:7504
255
+#: gitk:2218 gitk:7647
256
msgid "Create new branch"
257
msgstr "Skapa ny gren"
258
259
-#: gitk:2129
259
+#: gitk:2219
260
msgid "Cherry-pick this commit"
261
msgstr "Plocka denna incheckning"
262
263
-#: gitk:2131
263
+#: gitk:2220
264
msgid "Reset HEAD branch to here"
265
msgstr "Återställ HEAD-grenen hit"
266
267
-#: gitk:2147
267
+#: gitk:2234
268
msgid "Check out this branch"
269
msgstr "Checka ut denna gren"
270
271
-#: gitk:2149
271
+#: gitk:2235
272
msgid "Remove this branch"
273
msgstr "Ta bort denna gren"
274
275
-#: gitk:2155
275
+#: gitk:2242
276
msgid "Highlight this too"
277
msgstr "Markera även detta"
278
279
-#: gitk:2157
279
+#: gitk:2243
280
msgid "Highlight this only"
281
msgstr "Markera bara detta"
282
283
-#: gitk:2159
283
+#: gitk:2244
284
msgid "External diff"
285
msgstr "Extern diff"
286
287
-#: gitk:2400
287
+#: gitk:2245
288
+msgid "Blame parent commit"
289
+msgstr ""
290
+
291
+#: gitk:2488
292
msgid ""
293
"\n"
294
"Gitk - a commit viewer for git\n"
@@ -300,427 +304,427 @@ msgstr ""
304
"\n"
305
"Använd och vidareförmedla enligt villkoren i GNU General Public License"
306
303
-#: gitk:2408 gitk:2469 gitk:7799
307
+#: gitk:2496 gitk:2557 gitk:7943
308
msgid "Close"
309
msgstr "Stäng"
310
307
-#: gitk:2427
311
+#: gitk:2515
312
msgid "Gitk key bindings"
313
msgstr "Tangentbordsbindningar för Gitk"
314
311
-#: gitk:2429
315
+#: gitk:2517
316
msgid "Gitk key bindings:"
317
msgstr "Tangentbordsbindningar för Gitk:"
318
315
-#: gitk:2431
319
+#: gitk:2519
320
#, tcl-format
321
msgid "<%s-Q>\t\tQuit"
322
msgstr "<%s-Q>\t\tAvsluta"
323
320
-#: gitk:2432
324
+#: gitk:2520
325
msgid "<Home>\t\tMove to first commit"
326
msgstr "<Home>\t\tGå till första incheckning"
327
324
-#: gitk:2433
328
+#: gitk:2521
329
msgid "<End>\t\tMove to last commit"
330
msgstr "<End>\t\tGå till sista incheckning"
331
328
-#: gitk:2434
332
+#: gitk:2522
333
msgid "<Up>, p, i\tMove up one commit"
334
msgstr "<Upp>, p, i\tGå en incheckning upp"
335
332
-#: gitk:2435
336
+#: gitk:2523
337
msgid "<Down>, n, k\tMove down one commit"
338
msgstr "<Ned>, n, k\tGå en incheckning ned"
339
336
-#: gitk:2436
340
+#: gitk:2524
341
msgid "<Left>, z, j\tGo back in history list"
342
msgstr "<Vänster>, z, j\tGå bakåt i historiken"
343
340
-#: gitk:2437
344
+#: gitk:2525
345
msgid "<Right>, x, l\tGo forward in history list"
346
msgstr "<Höger>, x, l\tGå framåt i historiken"
347
344
-#: gitk:2438
348
+#: gitk:2526
349
msgid "<PageUp>\tMove up one page in commit list"
350
msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
351
348
-#: gitk:2439
352
+#: gitk:2527
353
msgid "<PageDown>\tMove down one page in commit list"
354
msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
355
352
-#: gitk:2440
356
+#: gitk:2528
357
#, tcl-format
358
msgid "<%s-Home>\tScroll to top of commit list"
359
msgstr "<%s-Home>\tRulla till början av incheckningslistan"
360
357
-#: gitk:2441
361
+#: gitk:2529
362
#, tcl-format
363
msgid "<%s-End>\tScroll to bottom of commit list"
364
msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
365
362
-#: gitk:2442
366
+#: gitk:2530
367
#, tcl-format
368
msgid "<%s-Up>\tScroll commit list up one line"
369
msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
370
367
-#: gitk:2443
371
+#: gitk:2531
372
#, tcl-format
373
msgid "<%s-Down>\tScroll commit list down one line"
374
msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
375
372
-#: gitk:2444
376
+#: gitk:2532
377
#, tcl-format
378
msgid "<%s-PageUp>\tScroll commit list up one page"
379
msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
380
377
-#: gitk:2445
381
+#: gitk:2533
382
#, tcl-format
383
msgid "<%s-PageDown>\tScroll commit list down one page"
384
msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
385
382
-#: gitk:2446
386
+#: gitk:2534
387
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
388
msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
389
386
-#: gitk:2447
390
+#: gitk:2535
391
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
392
msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
393
390
-#: gitk:2448
394
+#: gitk:2536
395
msgid "<Delete>, b\tScroll diff view up one page"
396
msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
397
394
-#: gitk:2449
398
+#: gitk:2537
399
msgid "<Backspace>\tScroll diff view up one page"
400
msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
401
398
-#: gitk:2450
402
+#: gitk:2538
403
msgid "<Space>\t\tScroll diff view down one page"
404
msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
405
402
-#: gitk:2451
406
+#: gitk:2539
407
msgid "u\t\tScroll diff view up 18 lines"
408
msgstr "u\t\tRulla diffvisningen upp 18 rader"
409
406
-#: gitk:2452
410
+#: gitk:2540
411
msgid "d\t\tScroll diff view down 18 lines"
412
msgstr "d\t\tRulla diffvisningen ned 18 rader"
413
410
-#: gitk:2453
414
+#: gitk:2541
415
#, tcl-format
416
msgid "<%s-F>\t\tFind"
417
msgstr "<%s-F>\t\tSök"
418
415
-#: gitk:2454
419
+#: gitk:2542
420
#, tcl-format
421
msgid "<%s-G>\t\tMove to next find hit"
422
msgstr "<%s-G>\t\tGå till nästa sökträff"
423
420
-#: gitk:2455
424
+#: gitk:2543
425
msgid "<Return>\tMove to next find hit"
426
msgstr "<Return>\t\tGå till nästa sökträff"
427
424
-#: gitk:2456
428
+#: gitk:2544
429
msgid "/\t\tMove to next find hit, or redo find"
430
msgstr "/\t\tGå till nästa sökträff, eller sök på nytt"
431
428
-#: gitk:2457
432
+#: gitk:2545
433
msgid "?\t\tMove to previous find hit"
434
msgstr "?\t\tGå till föregående sökträff"
435
432
-#: gitk:2458
436
+#: gitk:2546
437
msgid "f\t\tScroll diff view to next file"
438
msgstr "f\t\tRulla diffvisningen till nästa fil"
439
436
-#: gitk:2459
440
+#: gitk:2547
441
#, tcl-format
442
msgid "<%s-S>\t\tSearch for next hit in diff view"
443
msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
444
441
-#: gitk:2460
445
+#: gitk:2548
446
#, tcl-format
447
msgid "<%s-R>\t\tSearch for previous hit in diff view"
448
msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
449
446
-#: gitk:2461
450
+#: gitk:2549
451
#, tcl-format
452
msgid "<%s-KP+>\tIncrease font size"
453
msgstr "<%s-Num+>\tÖka teckenstorlek"
454
451
-#: gitk:2462
455
+#: gitk:2550
456
#, tcl-format
457
msgid "<%s-plus>\tIncrease font size"
458
msgstr "<%s-plus>\tÖka teckenstorlek"
459
456
-#: gitk:2463
460
+#: gitk:2551
461
#, tcl-format
462
msgid "<%s-KP->\tDecrease font size"
463
msgstr "<%s-Num->\tMinska teckenstorlek"
464
461
-#: gitk:2464
465
+#: gitk:2552
466
#, tcl-format
467
msgid "<%s-minus>\tDecrease font size"
468
msgstr "<%s-minus>\tMinska teckenstorlek"
469
466
-#: gitk:2465
470
+#: gitk:2553
471
msgid "<F5>\t\tUpdate"
472
msgstr "<F5>\t\tUppdatera"
473
470
-#: gitk:3091
474
+#: gitk:3200
475
msgid "Gitk view definition"
476
msgstr "Definition av Gitk-vy"
477
474
-#: gitk:3116
478
+#: gitk:3225
479
msgid "Name"
480
msgstr "Namn"
481
478
-#: gitk:3119
482
+#: gitk:3228
483
msgid "Remember this view"
484
msgstr "Spara denna vy"
485
482
-#: gitk:3123
486
+#: gitk:3232
487
msgid "Commits to include (arguments to git log):"
488
msgstr "Incheckningar att ta med (argument till git log):"
489
486
-#: gitk:3130
490
+#: gitk:3239
491
msgid "Command to generate more commits to include:"
492
msgstr "Kommando för att generera fler incheckningar att ta med:"
493
490
-#: gitk:3137
494
+#: gitk:3246
495
msgid "Enter files and directories to include, one per line:"
496
msgstr "Ange filer och kataloger att ta med, en per rad:"
497
494
-#: gitk:3184
498
+#: gitk:3293
499
msgid "Error in commit selection arguments:"
500
msgstr "Fel i argument för val av incheckningar:"
501
498
-#: gitk:3238 gitk:3290 gitk:3736 gitk:3750 gitk:4951 gitk:9896 gitk:9897
502
+#: gitk:3347 gitk:3399 gitk:3842 gitk:3856 gitk:5060 gitk:10141 gitk:10142
503
msgid "None"
504
msgstr "Inget"
505
502
-#: gitk:3684 gitk:5471 gitk:7144 gitk:7159
506
+#: gitk:3790 gitk:5580 gitk:7287 gitk:7302
507
msgid "Date"
508
msgstr "Datum"
509
506
-#: gitk:3684 gitk:5471
510
+#: gitk:3790 gitk:5580
511
msgid "CDate"
512
msgstr "Skapat datum"
513
510
-#: gitk:3833 gitk:3838
514
+#: gitk:3939 gitk:3944
515
msgid "Descendant"
516
msgstr "Avkomling"
517
514
-#: gitk:3834
518
+#: gitk:3940
519
msgid "Not descendant"
520
msgstr "Inte avkomling"
521
518
-#: gitk:3841 gitk:3846
522
+#: gitk:3947 gitk:3952
523
msgid "Ancestor"
524
msgstr "Förfader"
525
522
-#: gitk:3842
526
+#: gitk:3948
527
msgid "Not ancestor"
528
msgstr "Inte förfader"
529
526
-#: gitk:4078
530
+#: gitk:4187
531
msgid "Local changes checked in to index but not committed"
532
msgstr "Lokala ändringar sparade i indexet men inte incheckade"
533
530
-#: gitk:4111
534
+#: gitk:4220
535
msgid "Local uncommitted changes, not checked in to index"
536
msgstr "Lokala ändringar, ej sparade i indexet"
537
534
-#: gitk:5440
538
+#: gitk:5549
539
msgid "Searching"
540
msgstr "Söker"
541
538
-#: gitk:5940
542
+#: gitk:6049
543
msgid "Tags:"
544
msgstr "Taggar:"
545
542
-#: gitk:5957 gitk:5963 gitk:7137
546
+#: gitk:6066 gitk:6072 gitk:7280
547
msgid "Parent"
548
msgstr "Förälder"
549
546
-#: gitk:5968
550
+#: gitk:6077
551
msgid "Child"
552
msgstr "Barn"
553
550
-#: gitk:5977
554
+#: gitk:6086
555
msgid "Branch"
556
msgstr "Gren"
557
554
-#: gitk:5980
558
+#: gitk:6089
559
msgid "Follows"
560
msgstr "Följer"
561
558
-#: gitk:5983
562
+#: gitk:6092
563
msgid "Precedes"
564
msgstr "Föregår"
565
562
-#: gitk:6267
566
+#: gitk:6378
567
msgid "Error getting merge diffs:"
568
msgstr "Fel vid hämtning av sammanslagningsdiff:"
569
566
-#: gitk:6970
570
+#: gitk:7113
571
msgid "Goto:"
572
msgstr "Gå till:"
573
570
-#: gitk:6972
574
+#: gitk:7115
575
msgid "SHA1 ID:"
576
msgstr "SHA1-id:"
577
574
-#: gitk:6991
578
+#: gitk:7134
579
#, tcl-format
580
msgid "Short SHA1 id %s is ambiguous"
581
msgstr "Förkortat SHA1-id %s är tvetydigt"
582
579
-#: gitk:7003
583
+#: gitk:7146
584
#, tcl-format
585
msgid "SHA1 id %s is not known"
586
msgstr "SHA-id:t %s är inte känt"
587
584
-#: gitk:7005
588
+#: gitk:7148
589
#, tcl-format
590
msgid "Tag/Head %s is not known"
591
msgstr "Tagg/huvud %s är okänt"
592
589
-#: gitk:7147
593
+#: gitk:7290
594
msgid "Children"
595
msgstr "Barn"
596
593
-#: gitk:7204
597
+#: gitk:7347
598
#, tcl-format
599
msgid "Reset %s branch to here"
600
msgstr "Återställ grenen %s hit"
601
598
-#: gitk:7206
602
+#: gitk:7349
603
msgid "Detached head: can't reset"
604
msgstr "Frånkopplad head: kan inte återställa"
605
602
-#: gitk:7238
606
+#: gitk:7381
607
msgid "Top"
608
msgstr "Topp"
609
606
-#: gitk:7239
610
+#: gitk:7382
611
msgid "From"
612
msgstr "Från"
613
610
-#: gitk:7244
614
+#: gitk:7387
615
msgid "To"
616
msgstr "Till"
617
614
-#: gitk:7267
618
+#: gitk:7410
619
msgid "Generate patch"
620
msgstr "Generera patch"
621
618
-#: gitk:7269
622
+#: gitk:7412
623
msgid "From:"
624
msgstr "Från:"
625
622
-#: gitk:7278
626
+#: gitk:7421
627
msgid "To:"
628
msgstr "Till:"
629
626
-#: gitk:7287
630
+#: gitk:7430
631
msgid "Reverse"
632
msgstr "Vänd"
633
630
-#: gitk:7289 gitk:7464
634
+#: gitk:7432 gitk:7607
635
msgid "Output file:"
636
msgstr "Utdatafil:"
637
634
-#: gitk:7295
638
+#: gitk:7438
639
msgid "Generate"
640
msgstr "Generera"
641
638
-#: gitk:7331
642
+#: gitk:7474
643
msgid "Error creating patch:"
644
msgstr "Fel vid generering av patch:"
645
642
-#: gitk:7353 gitk:7452 gitk:7506
646
+#: gitk:7496 gitk:7595 gitk:7649
647
msgid "ID:"
648
msgstr "Id:"
649
646
-#: gitk:7362
650
+#: gitk:7505
651
msgid "Tag name:"
652
msgstr "Taggnamn:"
653
650
-#: gitk:7366 gitk:7515
654
+#: gitk:7509 gitk:7659
655
msgid "Create"
656
msgstr "Skapa"
657
654
-#: gitk:7381
658
+#: gitk:7524
659
msgid "No tag name specified"
660
msgstr "Inget taggnamn angavs"
661
658
-#: gitk:7385
662
+#: gitk:7528
663
#, tcl-format
664
msgid "Tag \"%s\" already exists"
665
msgstr "Taggen \"%s\" finns redan"
666
663
-#: gitk:7391
667
+#: gitk:7534
668
msgid "Error creating tag:"
669
msgstr "Fel vid skapande av tagg:"
670
667
-#: gitk:7461
671
+#: gitk:7604
672
msgid "Command:"
673
msgstr "Kommando:"
674
671
-#: gitk:7469
675
+#: gitk:7612
676
msgid "Write"
677
msgstr "Skriv"
678
675
-#: gitk:7485
679
+#: gitk:7628
680
msgid "Error writing commit:"
681
msgstr "Fel vid skrivning av incheckning:"
682
679
-#: gitk:7511
683
+#: gitk:7654
684
msgid "Name:"
685
msgstr "Namn:"
686
683
-#: gitk:7530
687
+#: gitk:7674
688
msgid "Please specify a name for the new branch"
689
msgstr "Ange ett namn för den nya grenen"
690
687
-#: gitk:7559
691
+#: gitk:7703
692
#, tcl-format
693
msgid "Commit %s is already included in branch %s -- really re-apply it?"
694
msgstr ""
695
"Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
696
"på nytt?"
697
694
-#: gitk:7564
698
+#: gitk:7708
699
msgid "Cherry-picking"
700
msgstr "Plockar"
701
698
-#: gitk:7576
702
+#: gitk:7720
703
msgid "No changes committed"
704
msgstr "Inga ändringar incheckade"
705
702
-#: gitk:7601
706
+#: gitk:7745
707
msgid "Confirm reset"
708
msgstr "Bekräfta återställning"
709
706
-#: gitk:7603
710
+#: gitk:7747
711
#, tcl-format
712
msgid "Reset branch %s to %s?"
713
msgstr "Återställa grenen %s till %s?"
714
711
-#: gitk:7607
715
+#: gitk:7751
716
msgid "Reset type:"
717
msgstr "Typ av återställning:"
718
715
-#: gitk:7611
719
+#: gitk:7755
720
msgid "Soft: Leave working tree and index untouched"
721
msgstr "Mjuk: Rör inte utcheckning och index"
722
719
-#: gitk:7614
723
+#: gitk:7758
724
msgid "Mixed: Leave working tree untouched, reset index"
725
msgstr "Blandad: Rör inte utcheckning, återställ index"
726
723
-#: gitk:7617
727
+#: gitk:7761
728
msgid ""
729
"Hard: Reset working tree and index\n"
730
"(discard ALL local changes)"
@@ -728,19 +732,19 @@ msgstr ""
732
"Hård: Återställ utcheckning och index\n"
733
"(förkastar ALLA lokala ändringar)"
734
731
-#: gitk:7633
735
+#: gitk:7777
736
msgid "Resetting"
737
msgstr "Återställer"
738
735
-#: gitk:7690
739
+#: gitk:7834
740
msgid "Checking out"
741
msgstr "Checkar ut"
742
739
-#: gitk:7741
743
+#: gitk:7885
744
msgid "Cannot delete the currently checked-out branch"
745
msgstr "Kan inte ta bort den just nu utcheckade grenen"
746
743
-#: gitk:7747
747
+#: gitk:7891
748
#, tcl-format
749
msgid ""
750
"The commits on branch %s aren't on any other branch.\n"
@@ -749,16 +753,16 @@ msgstr ""
753
"Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
754
"Vill du verkligen ta bort grenen %s?"
755
752
-#: gitk:7778
756
+#: gitk:7922
757
#, tcl-format
758
msgid "Tags and heads: %s"
759
msgstr "Taggar och huvuden: %s"
760
757
-#: gitk:7792
761
+#: gitk:7936
762
msgid "Filter"
763
msgstr "Filter"
764
761
-#: gitk:8086
765
+#: gitk:8230
766
msgid ""
767
"Error reading commit topology information; branch and preceding/following "
768
"tag information will be incomplete."
@@ -766,125 +770,129 @@ msgstr ""
770
"Fel vid läsning av information om incheckningstopologi; information om "
771
"grenar och föregående/senare taggar kommer inte vara komplett."
772
769
-#: gitk:9072
773
+#: gitk:9216
774
msgid "Tag"
775
msgstr "Tagg"
776
773
-#: gitk:9072
777
+#: gitk:9216
778
msgid "Id"
779
msgstr "Id"
780
777
-#: gitk:9118
781
+#: gitk:9262
782
msgid "Gitk font chooser"
783
msgstr "Teckensnittsväljare för Gitk"
784
781
-#: gitk:9135
785
+#: gitk:9279
786
msgid "B"
787
msgstr "F"
788
785
-#: gitk:9138
789
+#: gitk:9282
790
msgid "I"
791
msgstr "K"
792
789
-#: gitk:9231
793
+#: gitk:9375
794
msgid "Gitk preferences"
795
msgstr "Inställningar för Gitk"
796
793
-#: gitk:9232
797
+#: gitk:9376
798
msgid "Commit list display options"
799
msgstr "Alternativ för incheckningslistvy"
800
797
-#: gitk:9235
801
+#: gitk:9379
802
msgid "Maximum graph width (lines)"
803
msgstr "Maximal grafbredd (rader)"
804
801
-#: gitk:9239
805
+#: gitk:9383
806
#, tcl-format
807
msgid "Maximum graph width (% of pane)"
808
msgstr "Maximal grafbredd (% av ruta)"
809
806
-#: gitk:9244
810
+#: gitk:9388
811
msgid "Show local changes"
812
msgstr "Visa lokala ändringar"
813
810
-#: gitk:9249
814
+#: gitk:9393
815
msgid "Auto-select SHA1"
816
msgstr "Välj SHA1 automatiskt"
817
814
-#: gitk:9254
818
+#: gitk:9398
819
msgid "Diff display options"
820
msgstr "Alternativ för diffvy"
821
818
-#: gitk:9256
822
+#: gitk:9400
823
msgid "Tab spacing"
824
msgstr "Blanksteg för tabulatortecken"
825
822
-#: gitk:9260
826
+#: gitk:9404
827
msgid "Display nearby tags"
828
msgstr "Visa närliggande taggar"
829
826
-#: gitk:9265
830
+#: gitk:9409
831
msgid "Limit diffs to listed paths"
832
msgstr "Begränsa diff till listade sökvägar"
833
830
-#: gitk:9272
834
+#: gitk:9414
835
+msgid "Support per-file encodings"
836
+msgstr ""
837
+
838
+#: gitk:9421
839
msgid "External diff tool"
840
msgstr "Externt diff-verktyg"
841
834
-#: gitk:9274
842
+#: gitk:9423
843
msgid "Choose..."
844
msgstr "Välj..."
845
838
-#: gitk:9279
846
+#: gitk:9428
847
msgid "Colors: press to choose"
848
msgstr "Färger: tryck för att välja"
849
842
-#: gitk:9282
850
+#: gitk:9431
851
msgid "Background"
852
msgstr "Bakgrund"
853
846
-#: gitk:9286
854
+#: gitk:9435
855
msgid "Foreground"
856
msgstr "Förgrund"
857
850
-#: gitk:9290
858
+#: gitk:9439
859
msgid "Diff: old lines"
860
msgstr "Diff: gamla rader"
861
854
-#: gitk:9295
862
+#: gitk:9444
863
msgid "Diff: new lines"
864
msgstr "Diff: nya rader"
865
858
-#: gitk:9300
866
+#: gitk:9449
867
msgid "Diff: hunk header"
868
msgstr "Diff: delhuvud"
869
862
-#: gitk:9306
870
+#: gitk:9455
871
msgid "Select bg"
872
msgstr "Markerad bakgrund"
873
866
-#: gitk:9310
874
+#: gitk:9459
875
msgid "Fonts: press to choose"
876
msgstr "Teckensnitt: tryck för att välja"
877
870
-#: gitk:9312
878
+#: gitk:9461
879
msgid "Main font"
880
msgstr "Huvudteckensnitt"
881
874
-#: gitk:9313
882
+#: gitk:9462
883
msgid "Diff display font"
884
msgstr "Teckensnitt för diffvisning"
885
878
-#: gitk:9314
886
+#: gitk:9463
887
msgid "User interface font"
888
msgstr "Teckensnitt för användargränssnitt"
889
882
-#: gitk:9339
890
+#: gitk:9488
891
#, tcl-format
892
msgid "Gitk: choose color for %s"
893
msgstr "Gitk: välj färg för %s"
894
887
-#: gitk:9720
895
+#: gitk:9934
896
msgid ""
897
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
898
" Gitk requires at least Tcl/Tk 8.4."
@@ -892,24 +900,24 @@ msgstr ""
900
"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
901
" Gitk kräver åtminstone Tcl/Tk 8.4."
902
895
-#: gitk:9812
903
+#: gitk:10047
904
msgid "Cannot find a git repository here."
905
msgstr "Hittar inget gitk-arkiv här."
906
899
-#: gitk:9816
907
+#: gitk:10051
908
#, tcl-format
909
msgid "Cannot find the git directory \"%s\"."
910
msgstr "Hittar inte git-katalogen \"%s\"."
911
904
-#: gitk:9853
912
+#: gitk:10098
913
#, tcl-format
914
msgid "Ambiguous argument '%s': both revision and filename"
915
msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
916
909
-#: gitk:9865
917
+#: gitk:10110
918
msgid "Bad arguments to gitk:"
919
msgstr "Felaktiga argument till gitk:"
920
913
-#: gitk:9925
921
+#: gitk:10170
922
msgid "Command line"
923
msgstr "Kommandorad"