git-gui: (i18n) Fix a bunch of still untranslated strings.
Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Christian Stimming committed
Feb 2, 2008 at 10:20 UTC
5e6d7768e13088cc0082614fd106b327214fdc6d
5 files changed
+73
-38
lib/checkout_op.tcl
+3
-3
@@ -280,7 +280,7 @@ The rescan will be automatically started now.
280
} elseif {[is_config_true gui.trustmtime]} {
281
_readtree $this
282
} else {
283
- ui_status {Refreshing file status...}
283
+ ui_status [mc "Refreshing file status..."]
284
set fd [git_read update-index \
285
-q \
286
--unmerged \
@@ -320,7 +320,7 @@ method _readtree {} {
320
set readtree_d {}
321
$::main_status start \
322
[mc "Updating working directory to '%s'..." [_name $this]] \
323
- {files checked out}
323
+ [mc "files checked out"]
324
325
set fd [git_read --stderr read-tree \
326
-m \
@@ -447,7 +447,7 @@ If you wanted to be on a branch, create one now starting from 'This Detached Che
447
} else {
448
repository_state commit_type HEAD MERGE_HEAD
449
set PARENT $HEAD
450
- ui_status "Checked out '$name'."
450
+ ui_status [mc "Checked out '%s'." $name]
451
}
452
delete_this
453
}
lib/commit.tcl
+8
-8
@@ -218,7 +218,7 @@ A good commit message has the following format:
218
return
219
}
220
221
- ui_status {Calling pre-commit hook...}
221
+ ui_status [mc "Calling pre-commit hook..."]
222
set pch_error {}
223
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
224
fileevent $fd_ph readable \
@@ -233,7 +233,7 @@ proc commit_prehook_wait {fd_ph curHEAD msg_p} {
233
if {[eof $fd_ph]} {
234
if {[catch {close $fd_ph}]} {
235
catch {file delete $msg_p}
236
- ui_status {Commit declined by pre-commit hook.}
236
+ ui_status [mc "Commit declined by pre-commit hook."]
237
hook_failed_popup pre-commit $pch_error
238
unlock_index
239
} else {
@@ -256,7 +256,7 @@ proc commit_commitmsg {curHEAD msg_p} {
256
return
257
}
258
259
- ui_status {Calling commit-msg hook...}
259
+ ui_status [mc "Calling commit-msg hook..."]
260
set pch_error {}
261
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
262
fileevent $fd_ph readable \
@@ -271,7 +271,7 @@ proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {
271
if {[eof $fd_ph]} {
272
if {[catch {close $fd_ph}]} {
273
catch {file delete $msg_p}
274
- ui_status {Commit declined by commit-msg hook.}
274
+ ui_status [mc "Commit declined by commit-msg hook."]
275
hook_failed_popup commit-msg $pch_error
276
unlock_index
277
} else {
@@ -284,7 +284,7 @@ proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {
284
}
285
286
proc commit_writetree {curHEAD msg_p} {
287
- ui_status {Committing changes...}
287
+ ui_status [mc "Committing changes..."]
288
set fd_wt [git_read write-tree]
289
fileevent $fd_wt readable \
290
[list commit_committree $fd_wt $curHEAD $msg_p]
@@ -301,7 +301,7 @@ proc commit_committree {fd_wt curHEAD msg_p} {
301
if {[catch {close $fd_wt} err]} {
302
catch {file delete $msg_p}
303
error_popup [strcat [mc "write-tree failed:"] "\n\n$err"]
304
- ui_status {Commit failed.}
304
+ ui_status [mc "Commit failed."]
305
unlock_index
306
return
307
}
@@ -345,7 +345,7 @@ A rescan will be automatically started now.
345
if {[catch {set cmt_id [eval git $cmd]} err]} {
346
catch {file delete $msg_p}
347
error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"]
348
- ui_status {Commit failed.}
348
+ ui_status [mc "Commit failed."]
349
unlock_index
350
return
351
}
@@ -365,7 +365,7 @@ A rescan will be automatically started now.
365
} err]} {
366
catch {file delete $msg_p}
367
error_popup [strcat [mc "update-ref failed:"] "\n\n$err"]
368
- ui_status {Commit failed.}
368
+ ui_status [mc "Commit failed."]
369
unlock_index
370
return
371
}
lib/index.tcl
+1
-1
@@ -310,7 +310,7 @@ proc add_helper {txt paths} {
310
update_index \
311
$txt \
312
$pathList \
313
- [concat $after {ui_status {Ready to commit.}}]
313
+ [concat $after {ui_status [mc "Ready to commit."]}]
314
}
315
}
316
lib/merge.tcl
+2
-3
@@ -116,8 +116,7 @@ method _start {} {
116
lappend cmd HEAD
117
lappend cmd $name
118
119
- set msg [mc "Merging %s and %s" $current_branch $stitle]
120
- ui_status "$msg..."
119
+ ui_status [mc "Merging %s and %s..." $current_branch $stitle]
120
set cons [console::new [mc "Merge"] "merge $stitle"]
121
console::exec $cons $cmd [cb _finish $cons]
122
@@ -236,7 +235,7 @@ Continue with resetting the current changes?"]
235
set fd [git_read --stderr read-tree --reset -u -v HEAD]
236
fconfigure $fd -blocking 0 -translation binary
237
fileevent $fd readable [namespace code [list _reset_wait $fd]]
239
- $::main_status start [mc "Aborting"] {files reset}
238
+ $::main_status start [mc "Aborting"] [mc "files reset"]
239
} else {
240
unlock_index
241
}
po/git-gui.pot
+59
-23
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: \n"
11
-"POT-Creation-Date: 2007-11-24 10:36+0100\n"
11
+"POT-Creation-Date: 2008-02-02 10:14+0100\n"
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -386,31 +386,31 @@ msgstr ""
386
msgid "File:"
387
msgstr ""
388
389
-#: git-gui.sh:2545
390
-msgid "Refresh"
389
+#: git-gui.sh:2573
390
+msgid "Apply/Reverse Hunk"
391
msgstr ""
392
393
-#: git-gui.sh:2566
394
-msgid "Apply/Reverse Hunk"
393
+#: git-gui.sh:2579
394
+msgid "Show Less Context"
395
msgstr ""
396
397
-#: git-gui.sh:2572
398
-msgid "Decrease Font Size"
397
+#: git-gui.sh:2586
398
+msgid "Show More Context"
399
msgstr ""
400
401
-#: git-gui.sh:2576
402
-msgid "Increase Font Size"
401
+#: git-gui.sh:2594
402
+msgid "Refresh"
403
msgstr ""
404
405
-#: git-gui.sh:2581
406
-msgid "Show Less Context"
405
+#: git-gui.sh:2615
406
+msgid "Decrease Font Size"
407
msgstr ""
408
409
-#: git-gui.sh:2588
410
-msgid "Show More Context"
409
+#: git-gui.sh:2619
410
+msgid "Increase Font Size"
411
msgstr ""
412
413
-#: git-gui.sh:2602
413
+#: git-gui.sh:2630
414
msgid "Unstage Hunk From Commit"
415
msgstr ""
416
@@ -766,6 +766,10 @@ msgstr ""
766
msgid "Updating working directory to '%s'..."
767
msgstr ""
768
769
+#: lib/checkout_op.tcl:323
770
+msgid "files checked out"
771
+msgstr ""
772
+
773
#: lib/checkout_op.tcl:353
774
#, tcl-format
775
msgid "Aborted checkout of '%s' (file level merging is required)."
@@ -1182,11 +1186,40 @@ msgid ""
1186
"- Remaining lines: Describe why this change is good.\n"
1187
msgstr ""
1188
1185
-#: lib/commit.tcl:257
1189
+#: lib/commit.tcl:207
1190
+#, tcl-format
1191
+msgid "warning: Tcl does not support encoding '%s'."
1192
+msgstr ""
1193
+
1194
+#: lib/commit.tcl:221
1195
+msgid "Calling pre-commit hook..."
1196
+msgstr ""
1197
+
1198
+#: lib/commit.tcl:236
1199
+msgid "Commit declined by pre-commit hook."
1200
+msgstr ""
1201
+
1202
+#: lib/commit.tcl:259
1203
+msgid "Calling commit-msg hook..."
1204
+msgstr ""
1205
+
1206
+#: lib/commit.tcl:274
1207
+msgid "Commit declined by commit-msg hook."
1208
+msgstr ""
1209
+
1210
+#: lib/commit.tcl:287
1211
+msgid "Committing changes..."
1212
+msgstr ""
1213
+
1214
+#: lib/commit.tcl:303
1215
msgid "write-tree failed:"
1216
msgstr ""
1217
1189
-#: lib/commit.tcl:275
1218
+#: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
1219
+msgid "Commit failed."
1220
+msgstr ""
1221
+
1222
+#: lib/commit.tcl:321
1223
#, tcl-format
1224
msgid "Commit %s appears to be corrupt"
1225
msgstr ""
@@ -1204,12 +1237,7 @@ msgstr ""
1237
msgid "No changes to commit."
1238
msgstr ""
1239
1207
-#: lib/commit.tcl:303
1208
-#, tcl-format
1209
-msgid "warning: Tcl does not support encoding '%s'."
1210
-msgstr ""
1211
-
1212
-#: lib/commit.tcl:317
1240
+#: lib/commit.tcl:347
1241
msgid "commit-tree failed:"
1242
msgstr ""
1243
@@ -1373,6 +1401,10 @@ msgstr ""
1401
msgid "Unstaging %s from commit"
1402
msgstr ""
1403
1404
+#: lib/index.tcl:313
1405
+msgid "Ready to commit."
1406
+msgstr ""
1407
+
1408
#: lib/index.tcl:326
1409
#, tcl-format
1410
msgid "Adding %s"
@@ -1491,7 +1523,11 @@ msgstr ""
1523
msgid "Aborting"
1524
msgstr ""
1525
1494
-#: lib/merge.tcl:266
1526
+#: lib/merge.tcl:238
1527
+msgid "files reset"
1528
+msgstr ""
1529
+
1530
+#: lib/merge.tcl:265
1531
msgid "Abort failed."
1532
msgstr ""
1533