Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Update translation template
author
Shawn O. Pearce
<spearce@spearce.org>
Tue, 26 Jan 2010 23:47:45 +0000
(15:47 -0800)
committer
Shawn O. Pearce
<spearce@spearce.org>
Tue, 26 Jan 2010 23:47:45 +0000
(15:47 -0800)
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
po/git-gui.pot
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
73b3446
)
diff --git
a/po/git-gui.pot
b/po/git-gui.pot
index 074582d979e87704969ebdd2380566537c6a9548..1ae2aaa0b3bb46302a9a4876dbbb1be00d2c2ddf 100644
(file)
--- a/
po/git-gui.pot
+++ b/
po/git-gui.pot
@@
-8,7
+8,7
@@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 20
08-12-08 08:31
-0800\n"
+"POT-Creation-Date: 20
10-01-26 15:47
-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@
-16,33
+16,33
@@
msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: git-gui.sh:41 git-gui.sh:7
37 git-gui.sh:751 git-gui.sh:764 git-gui.sh:847
-#: git-gui.sh:
866
+#: git-gui.sh:41 git-gui.sh:7
93 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
+#: git-gui.sh:
922
msgid "git-gui: fatal error"
msgstr ""
msgid "git-gui: fatal error"
msgstr ""
-#: git-gui.sh:
689
+#: git-gui.sh:
743
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr ""
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr ""
-#: git-gui.sh:7
23
+#: git-gui.sh:7
79
msgid "Main Font"
msgstr ""
msgid "Main Font"
msgstr ""
-#: git-gui.sh:7
24
+#: git-gui.sh:7
80
msgid "Diff/Console Font"
msgstr ""
msgid "Diff/Console Font"
msgstr ""
-#: git-gui.sh:7
38
+#: git-gui.sh:7
94
msgid "Cannot find git in PATH."
msgstr ""
msgid "Cannot find git in PATH."
msgstr ""
-#: git-gui.sh:
765
+#: git-gui.sh:
821
msgid "Cannot parse Git version string:"
msgstr ""
msgid "Cannot parse Git version string:"
msgstr ""
-#: git-gui.sh:
783
+#: git-gui.sh:
839
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@@
-54,449
+54,473
@@
msgid ""
"Assume '%s' is version 1.5.0?\n"
msgstr ""
"Assume '%s' is version 1.5.0?\n"
msgstr ""
-#: git-gui.sh:1
062
+#: git-gui.sh:1
128
msgid "Git directory not found:"
msgstr ""
msgid "Git directory not found:"
msgstr ""
-#: git-gui.sh:1
069
+#: git-gui.sh:1
146
msgid "Cannot move to top of working directory:"
msgstr ""
msgid "Cannot move to top of working directory:"
msgstr ""
-#: git-gui.sh:1
076
-msgid "Cannot use
funny .git direc
tory:"
+#: git-gui.sh:1
154
+msgid "Cannot use
bare reposi
tory:"
msgstr ""
msgstr ""
-#: git-gui.sh:1
081
+#: git-gui.sh:1
162
msgid "No working directory"
msgstr ""
msgid "No working directory"
msgstr ""
-#: git-gui.sh:1
247 lib/checkout_op.tcl:305
+#: git-gui.sh:1
334 lib/checkout_op.tcl:306
msgid "Refreshing file status..."
msgstr ""
msgid "Refreshing file status..."
msgstr ""
-#: git-gui.sh:13
03
+#: git-gui.sh:13
90
msgid "Scanning for modified files ..."
msgstr ""
msgid "Scanning for modified files ..."
msgstr ""
-#: git-gui.sh:1
367
+#: git-gui.sh:1
454
msgid "Calling prepare-commit-msg hook..."
msgstr ""
msgid "Calling prepare-commit-msg hook..."
msgstr ""
-#: git-gui.sh:1
384
+#: git-gui.sh:1
471
msgid "Commit declined by prepare-commit-msg hook."
msgstr ""
msgid "Commit declined by prepare-commit-msg hook."
msgstr ""
-#: git-gui.sh:1
542
lib/browser.tcl:246
+#: git-gui.sh:1
629
lib/browser.tcl:246
msgid "Ready."
msgstr ""
msgid "Ready."
msgstr ""
-#: git-gui.sh:17
26
+#: git-gui.sh:17
87
#, tcl-format
msgid "Displaying only %s of %s files."
msgstr ""
#, tcl-format
msgid "Displaying only %s of %s files."
msgstr ""
-#: git-gui.sh:1
819
+#: git-gui.sh:1
913
msgid "Unmodified"
msgstr ""
msgid "Unmodified"
msgstr ""
-#: git-gui.sh:1
821
+#: git-gui.sh:1
915
msgid "Modified, not staged"
msgstr ""
msgid "Modified, not staged"
msgstr ""
-#: git-gui.sh:1
822 git-gui.sh:1830
+#: git-gui.sh:1
916 git-gui.sh:1924
msgid "Staged for commit"
msgstr ""
msgid "Staged for commit"
msgstr ""
-#: git-gui.sh:1
823 git-gui.sh:1831
+#: git-gui.sh:1
917 git-gui.sh:1925
msgid "Portions staged for commit"
msgstr ""
msgid "Portions staged for commit"
msgstr ""
-#: git-gui.sh:1
824 git-gui.sh:1832
+#: git-gui.sh:1
918 git-gui.sh:1926
msgid "Staged for commit, missing"
msgstr ""
msgid "Staged for commit, missing"
msgstr ""
-#: git-gui.sh:1
826
+#: git-gui.sh:1
920
msgid "File type changed, not staged"
msgstr ""
msgid "File type changed, not staged"
msgstr ""
-#: git-gui.sh:1
827
+#: git-gui.sh:1
921
msgid "File type changed, staged"
msgstr ""
msgid "File type changed, staged"
msgstr ""
-#: git-gui.sh:1
829
+#: git-gui.sh:1
923
msgid "Untracked, not staged"
msgstr ""
msgid "Untracked, not staged"
msgstr ""
-#: git-gui.sh:1
834
+#: git-gui.sh:1
928
msgid "Missing"
msgstr ""
msgid "Missing"
msgstr ""
-#: git-gui.sh:1
835
+#: git-gui.sh:1
929
msgid "Staged for removal"
msgstr ""
msgid "Staged for removal"
msgstr ""
-#: git-gui.sh:1
836
+#: git-gui.sh:1
930
msgid "Staged for removal, still present"
msgstr ""
msgid "Staged for removal, still present"
msgstr ""
-#: git-gui.sh:1
838 git-gui.sh:1839 git-gui.sh:1840 git-gui.sh:1841
-#: git-gui.sh:1
842 git-gui.sh:1843
+#: git-gui.sh:1
932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
+#: git-gui.sh:1
936 git-gui.sh:1937
msgid "Requires merge resolution"
msgstr ""
msgid "Requires merge resolution"
msgstr ""
-#: git-gui.sh:1
878
+#: git-gui.sh:1
972
msgid "Starting gitk... please wait..."
msgstr ""
msgid "Starting gitk... please wait..."
msgstr ""
-#: git-gui.sh:1
887
+#: git-gui.sh:1
984
msgid "Couldn't find gitk in PATH"
msgstr ""
msgid "Couldn't find gitk in PATH"
msgstr ""
-#: git-gui.sh:2280 lib/choose_repository.tcl:36
+#: git-gui.sh:2043
+msgid "Couldn't find git gui in PATH"
+msgstr ""
+
+#: git-gui.sh:2455 lib/choose_repository.tcl:36
msgid "Repository"
msgstr ""
msgid "Repository"
msgstr ""
-#: git-gui.sh:2
281
+#: git-gui.sh:2
456
msgid "Edit"
msgstr ""
msgid "Edit"
msgstr ""
-#: git-gui.sh:2
283
lib/choose_rev.tcl:561
+#: git-gui.sh:2
458
lib/choose_rev.tcl:561
msgid "Branch"
msgstr ""
msgid "Branch"
msgstr ""
-#: git-gui.sh:2
286
lib/choose_rev.tcl:548
+#: git-gui.sh:2
461
lib/choose_rev.tcl:548
msgid "Commit@@noun"
msgstr ""
msgid "Commit@@noun"
msgstr ""
-#: git-gui.sh:2
289
lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2
464
lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
msgstr ""
msgid "Merge"
msgstr ""
-#: git-gui.sh:2
290
lib/choose_rev.tcl:557
+#: git-gui.sh:2
465
lib/choose_rev.tcl:557
msgid "Remote"
msgstr ""
msgid "Remote"
msgstr ""
-#: git-gui.sh:2
293
+#: git-gui.sh:2
468
msgid "Tools"
msgstr ""
msgid "Tools"
msgstr ""
-#: git-gui.sh:2
302
+#: git-gui.sh:2
477
msgid "Explore Working Copy"
msgstr ""
msgid "Explore Working Copy"
msgstr ""
-#: git-gui.sh:2
307
+#: git-gui.sh:2
483
msgid "Browse Current Branch's Files"
msgstr ""
msgid "Browse Current Branch's Files"
msgstr ""
-#: git-gui.sh:2
311
+#: git-gui.sh:2
487
msgid "Browse Branch Files..."
msgstr ""
msgid "Browse Branch Files..."
msgstr ""
-#: git-gui.sh:2
316
+#: git-gui.sh:2
492
msgid "Visualize Current Branch's History"
msgstr ""
msgid "Visualize Current Branch's History"
msgstr ""
-#: git-gui.sh:2
320
+#: git-gui.sh:2
496
msgid "Visualize All Branch History"
msgstr ""
msgid "Visualize All Branch History"
msgstr ""
-#: git-gui.sh:2
327
+#: git-gui.sh:2
503
#, tcl-format
msgid "Browse %s's Files"
msgstr ""
#, tcl-format
msgid "Browse %s's Files"
msgstr ""
-#: git-gui.sh:2
329
+#: git-gui.sh:2
505
#, tcl-format
msgid "Visualize %s's History"
msgstr ""
#, tcl-format
msgid "Visualize %s's History"
msgstr ""
-#: git-gui.sh:2
334
lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2
510
lib/database.tcl:27 lib/database.tcl:67
msgid "Database Statistics"
msgstr ""
msgid "Database Statistics"
msgstr ""
-#: git-gui.sh:2
337
lib/database.tcl:34
+#: git-gui.sh:2
513
lib/database.tcl:34
msgid "Compress Database"
msgstr ""
msgid "Compress Database"
msgstr ""
-#: git-gui.sh:2
340
+#: git-gui.sh:2
516
msgid "Verify Database"
msgstr ""
msgid "Verify Database"
msgstr ""
-#: git-gui.sh:2
347 git-gui.sh:2351 git-gui.sh:2355 lib/shortcut.tcl:7
-#: lib/shortcut.tcl:
39 lib/shortcut.tcl:71
+#: git-gui.sh:2
523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
+#: lib/shortcut.tcl:
40 lib/shortcut.tcl:72
msgid "Create Desktop Icon"
msgstr ""
msgid "Create Desktop Icon"
msgstr ""
-#: git-gui.sh:2
363
lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2
539
lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
msgid "Quit"
msgstr ""
msgid "Quit"
msgstr ""
-#: git-gui.sh:2
371
+#: git-gui.sh:2
547
msgid "Undo"
msgstr ""
msgid "Undo"
msgstr ""
-#: git-gui.sh:2
374
+#: git-gui.sh:2
550
msgid "Redo"
msgstr ""
msgid "Redo"
msgstr ""
-#: git-gui.sh:2
378 git-gui.sh:2937
+#: git-gui.sh:2
554 git-gui.sh:3109
msgid "Cut"
msgstr ""
msgid "Cut"
msgstr ""
-#: git-gui.sh:2
381 git-gui.sh:2940 git-gui.sh:3014 git-gui.sh:3096
+#: git-gui.sh:2
557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
#: lib/console.tcl:69
msgid "Copy"
msgstr ""
#: lib/console.tcl:69
msgid "Copy"
msgstr ""
-#: git-gui.sh:2
384 git-gui.sh:2943
+#: git-gui.sh:2
560 git-gui.sh:3115
msgid "Paste"
msgstr ""
msgid "Paste"
msgstr ""
-#: git-gui.sh:2
387 git-gui.sh:2946
lib/branch_delete.tcl:26
+#: git-gui.sh:2
563 git-gui.sh:3118
lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr ""
#: lib/remote_branch_delete.tcl:38
msgid "Delete"
msgstr ""
-#: git-gui.sh:2
391 git-gui.sh:2950 git-gui.sh:3100
lib/console.tcl:71
+#: git-gui.sh:2
567 git-gui.sh:3122 git-gui.sh:3263
lib/console.tcl:71
msgid "Select All"
msgstr ""
msgid "Select All"
msgstr ""
-#: git-gui.sh:2
400
+#: git-gui.sh:2
576
msgid "Create..."
msgstr ""
msgid "Create..."
msgstr ""
-#: git-gui.sh:2
406
+#: git-gui.sh:2
582
msgid "Checkout..."
msgstr ""
msgid "Checkout..."
msgstr ""
-#: git-gui.sh:2
412
+#: git-gui.sh:2
588
msgid "Rename..."
msgstr ""
msgid "Rename..."
msgstr ""
-#: git-gui.sh:2
417
+#: git-gui.sh:2
593
msgid "Delete..."
msgstr ""
msgid "Delete..."
msgstr ""
-#: git-gui.sh:2
422
+#: git-gui.sh:2
598
msgid "Reset..."
msgstr ""
msgid "Reset..."
msgstr ""
-#: git-gui.sh:2
432
+#: git-gui.sh:2
608
msgid "Done"
msgstr ""
msgid "Done"
msgstr ""
-#: git-gui.sh:2
434
+#: git-gui.sh:2
610
msgid "Commit@@verb"
msgstr ""
msgid "Commit@@verb"
msgstr ""
-#: git-gui.sh:2
443 git-gui.sh:2878
+#: git-gui.sh:2
619 git-gui.sh:3050
msgid "New Commit"
msgstr ""
msgid "New Commit"
msgstr ""
-#: git-gui.sh:2
451 git-gui.sh:2885
+#: git-gui.sh:2
627 git-gui.sh:3057
msgid "Amend Last Commit"
msgstr ""
msgid "Amend Last Commit"
msgstr ""
-#: git-gui.sh:2
461 git-gui.sh:2839
lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2
637 git-gui.sh:3011
lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr ""
msgid "Rescan"
msgstr ""
-#: git-gui.sh:2
467
+#: git-gui.sh:2
643
msgid "Stage To Commit"
msgstr ""
msgid "Stage To Commit"
msgstr ""
-#: git-gui.sh:2
473
+#: git-gui.sh:2
649
msgid "Stage Changed Files To Commit"
msgstr ""
msgid "Stage Changed Files To Commit"
msgstr ""
-#: git-gui.sh:2
479
+#: git-gui.sh:2
655
msgid "Unstage From Commit"
msgstr ""
msgid "Unstage From Commit"
msgstr ""
-#: git-gui.sh:2
484 lib/index.tcl:410
+#: git-gui.sh:2
661 lib/index.tcl:412
msgid "Revert Changes"
msgstr ""
msgid "Revert Changes"
msgstr ""
-#: git-gui.sh:2
491 git-gui.sh:3083
+#: git-gui.sh:2
669 git-gui.sh:3310 git-gui.sh:3341
msgid "Show Less Context"
msgstr ""
msgid "Show Less Context"
msgstr ""
-#: git-gui.sh:2
495 git-gui.sh:3087
+#: git-gui.sh:2
673 git-gui.sh:3314 git-gui.sh:3345
msgid "Show More Context"
msgstr ""
msgid "Show More Context"
msgstr ""
-#: git-gui.sh:2
502 git-gui.sh:2852 git-gui.sh:2961
+#: git-gui.sh:2
680 git-gui.sh:3024 git-gui.sh:3133
msgid "Sign Off"
msgstr ""
msgid "Sign Off"
msgstr ""
-#: git-gui.sh:2
518
+#: git-gui.sh:2
696
msgid "Local Merge..."
msgstr ""
msgid "Local Merge..."
msgstr ""
-#: git-gui.sh:2
523
+#: git-gui.sh:2
701
msgid "Abort Merge..."
msgstr ""
msgid "Abort Merge..."
msgstr ""
-#: git-gui.sh:2
535 git-gui.sh:2575
+#: git-gui.sh:2
713 git-gui.sh:2741
msgid "Add..."
msgstr ""
msgid "Add..."
msgstr ""
-#: git-gui.sh:2
539
+#: git-gui.sh:2
717
msgid "Push..."
msgstr ""
msgid "Push..."
msgstr ""
-#: git-gui.sh:2
543
+#: git-gui.sh:2
721
msgid "Delete Branch..."
msgstr ""
msgid "Delete Branch..."
msgstr ""
-#: git-gui.sh:2553 git-gui.sh:2589 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
-#, tcl-format
-msgid "About %s"
-msgstr ""
-
-#: git-gui.sh:2557
-msgid "Preferences..."
-msgstr ""
-
-#: git-gui.sh:2565 git-gui.sh:3129
+#: git-gui.sh:2731 git-gui.sh:3292
msgid "Options..."
msgstr ""
msgid "Options..."
msgstr ""
-#: git-gui.sh:2
576
+#: git-gui.sh:2
742
msgid "Remove..."
msgstr ""
msgid "Remove..."
msgstr ""
-#: git-gui.sh:2
585
lib/choose_repository.tcl:50
+#: git-gui.sh:2
751
lib/choose_repository.tcl:50
msgid "Help"
msgstr ""
msgid "Help"
msgstr ""
-#: git-gui.sh:2611
+#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
+#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#, tcl-format
+msgid "About %s"
+msgstr ""
+
+#: git-gui.sh:2783
msgid "Online Documentation"
msgstr ""
msgid "Online Documentation"
msgstr ""
-#: git-gui.sh:2
614
lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:2
786
lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
msgid "Show SSH Key"
msgstr ""
msgid "Show SSH Key"
msgstr ""
-#: git-gui.sh:2
721
+#: git-gui.sh:2
893
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
-#: git-gui.sh:2
754
+#: git-gui.sh:2
926
msgid "Current Branch:"
msgstr ""
msgid "Current Branch:"
msgstr ""
-#: git-gui.sh:2
775
+#: git-gui.sh:2
947
msgid "Staged Changes (Will Commit)"
msgstr ""
msgid "Staged Changes (Will Commit)"
msgstr ""
-#: git-gui.sh:2
795
+#: git-gui.sh:2
967
msgid "Unstaged Changes"
msgstr ""
msgid "Unstaged Changes"
msgstr ""
-#: git-gui.sh:
2845
+#: git-gui.sh:
3017
msgid "Stage Changed"
msgstr ""
msgid "Stage Changed"
msgstr ""
-#: git-gui.sh:
2864
lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:
3036
lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr ""
msgid "Push"
msgstr ""
-#: git-gui.sh:
2899
+#: git-gui.sh:
3071
msgid "Initial Commit Message:"
msgstr ""
msgid "Initial Commit Message:"
msgstr ""
-#: git-gui.sh:
2900
+#: git-gui.sh:
3072
msgid "Amended Commit Message:"
msgstr ""
msgid "Amended Commit Message:"
msgstr ""
-#: git-gui.sh:
2901
+#: git-gui.sh:
3073
msgid "Amended Initial Commit Message:"
msgstr ""
msgid "Amended Initial Commit Message:"
msgstr ""
-#: git-gui.sh:
2902
+#: git-gui.sh:
3074
msgid "Amended Merge Commit Message:"
msgstr ""
msgid "Amended Merge Commit Message:"
msgstr ""
-#: git-gui.sh:
2903
+#: git-gui.sh:
3075
msgid "Merge Commit Message:"
msgstr ""
msgid "Merge Commit Message:"
msgstr ""
-#: git-gui.sh:
2904
+#: git-gui.sh:
3076
msgid "Commit Message:"
msgstr ""
msgid "Commit Message:"
msgstr ""
-#: git-gui.sh:
2953 git-gui.sh:3104
lib/console.tcl:73
+#: git-gui.sh:
3125 git-gui.sh:3267
lib/console.tcl:73
msgid "Copy All"
msgstr ""
msgid "Copy All"
msgstr ""
-#: git-gui.sh:
2977
lib/blame.tcl:104
+#: git-gui.sh:
3149
lib/blame.tcl:104
msgid "File:"
msgstr ""
msgid "File:"
msgstr ""
-#: git-gui.sh:3
092
+#: git-gui.sh:3
255
msgid "Refresh"
msgstr ""
msgid "Refresh"
msgstr ""
-#: git-gui.sh:3
113
+#: git-gui.sh:3
276
msgid "Decrease Font Size"
msgstr ""
msgid "Decrease Font Size"
msgstr ""
-#: git-gui.sh:3
117
+#: git-gui.sh:3
280
msgid "Increase Font Size"
msgstr ""
msgid "Increase Font Size"
msgstr ""
-#: git-gui.sh:3
125
lib/blame.tcl:281
+#: git-gui.sh:3
288
lib/blame.tcl:281
msgid "Encoding"
msgstr ""
msgid "Encoding"
msgstr ""
-#: git-gui.sh:3
136
+#: git-gui.sh:3
299
msgid "Apply/Reverse Hunk"
msgstr ""
msgid "Apply/Reverse Hunk"
msgstr ""
-#: git-gui.sh:3
141
+#: git-gui.sh:3
304
msgid "Apply/Reverse Line"
msgstr ""
msgid "Apply/Reverse Line"
msgstr ""
-#: git-gui.sh:3
151
+#: git-gui.sh:3
323
msgid "Run Merge Tool"
msgstr ""
msgid "Run Merge Tool"
msgstr ""
-#: git-gui.sh:3
156
+#: git-gui.sh:3
328
msgid "Use Remote Version"
msgstr ""
msgid "Use Remote Version"
msgstr ""
-#: git-gui.sh:3
160
+#: git-gui.sh:3
332
msgid "Use Local Version"
msgstr ""
msgid "Use Local Version"
msgstr ""
-#: git-gui.sh:3
164
+#: git-gui.sh:3
336
msgid "Revert To Base"
msgstr ""
msgid "Revert To Base"
msgstr ""
-#: git-gui.sh:3183
+#: git-gui.sh:3354
+msgid "Visualize These Changes In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3358
+msgid "Visualize Current Branch History In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3362
+msgid "Visualize All Branch History In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3367
+msgid "Start git gui In The Submodule"
+msgstr ""
+
+#: git-gui.sh:3389
msgid "Unstage Hunk From Commit"
msgstr ""
msgid "Unstage Hunk From Commit"
msgstr ""
-#: git-gui.sh:3184
+#: git-gui.sh:3391
+msgid "Unstage Lines From Commit"
+msgstr ""
+
+#: git-gui.sh:3393
msgid "Unstage Line From Commit"
msgstr ""
msgid "Unstage Line From Commit"
msgstr ""
-#: git-gui.sh:3
18
6
+#: git-gui.sh:3
39
6
msgid "Stage Hunk For Commit"
msgstr ""
msgid "Stage Hunk For Commit"
msgstr ""
-#: git-gui.sh:3187
+#: git-gui.sh:3398
+msgid "Stage Lines For Commit"
+msgstr ""
+
+#: git-gui.sh:3400
msgid "Stage Line For Commit"
msgstr ""
msgid "Stage Line For Commit"
msgstr ""
-#: git-gui.sh:3
210
+#: git-gui.sh:3
424
msgid "Initializing..."
msgstr ""
msgid "Initializing..."
msgstr ""
-#: git-gui.sh:3
315
+#: git-gui.sh:3
541
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@
-507,14
+531,14
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: git-gui.sh:3
345
+#: git-gui.sh:3
570
msgid ""
"\n"
"This is due to a known issue with the\n"
"Tcl binary distributed by Cygwin."
msgstr ""
msgid ""
"\n"
"This is due to a known issue with the\n"
"Tcl binary distributed by Cygwin."
msgstr ""
-#: git-gui.sh:3
350
+#: git-gui.sh:3
575
#, tcl-format
msgid ""
"\n"
#, tcl-format
msgid ""
"\n"
@@
-618,7
+642,7
@@
msgstr ""
msgid "Unable to display parent"
msgstr ""
msgid "Unable to display parent"
msgstr ""
-#: lib/blame.tcl:1091 lib/diff.tcl:
297
+#: lib/blame.tcl:1091 lib/diff.tcl:
320
msgid "Error loading diff:"
msgstr ""
msgid "Error loading diff:"
msgstr ""
@@
-644,7
+668,7
@@
msgstr ""
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:5
44
lib/choose_font.tcl:43 lib/merge.tcl:172
+#: lib/checkout_op.tcl:5
79
lib/choose_font.tcl:43 lib/merge.tcl:172
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:108
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:108
@@
-675,7
+699,7
@@
msgstr ""
msgid "Create New Branch"
msgstr ""
msgid "Create New Branch"
msgstr ""
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:3
77
+#: lib/branch_create.tcl:31 lib/choose_repository.tcl:3
81
msgid "Create"
msgstr ""
msgid "Create"
msgstr ""
@@
-707,7
+731,7
@@
msgstr ""
msgid "Fast Forward Only"
msgstr ""
msgid "Fast Forward Only"
msgstr ""
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:5
36
+#: lib/branch_create.tcl:85 lib/checkout_op.tcl:5
71
msgid "Reset"
msgstr ""
msgid "Reset"
msgstr ""
@@
-749,8
+773,8
@@
msgstr ""
msgid "Delete Only If Merged Into"
msgstr ""
msgid "Delete Only If Merged Into"
msgstr ""
-#: lib/branch_delete.tcl:54
-msgid "Always (Do not perform merge
test.
)"
+#: lib/branch_delete.tcl:54
lib/remote_branch_delete.tcl:119
+msgid "Always (Do not perform merge
checks
)"
msgstr ""
#: lib/branch_delete.tcl:103
msgstr ""
#: lib/branch_delete.tcl:103
@@
-758,6
+782,13
@@
msgstr ""
msgid "The following branches are not completely merged into %s:"
msgstr ""
msgid "The following branches are not completely merged into %s:"
msgstr ""
+#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
#: lib/branch_delete.tcl:141
#, tcl-format
msgid ""
@@
-785,7
+816,7
@@
msgstr ""
msgid "Please select a branch to rename."
msgstr ""
msgid "Please select a branch to rename."
msgstr ""
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:20
1
+#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:20
2
#, tcl-format
msgid "Branch '%s' already exists."
msgstr ""
#, tcl-format
msgid "Branch '%s' already exists."
msgstr ""
@@
-816,38
+847,38
@@
msgstr ""
msgid "Browse Branch Files"
msgstr ""
msgid "Browse Branch Files"
msgstr ""
-#: lib/browser.tcl:278 lib/choose_repository.tcl:39
4
-#: lib/choose_repository.tcl:48
0 lib/choose_repository.tcl:491
-#: lib/choose_repository.tcl:
995
+#: lib/browser.tcl:278 lib/choose_repository.tcl:39
8
+#: lib/choose_repository.tcl:48
6 lib/choose_repository.tcl:497
+#: lib/choose_repository.tcl:
1028
msgid "Browse"
msgstr ""
msgid "Browse"
msgstr ""
-#: lib/checkout_op.tcl:8
4
+#: lib/checkout_op.tcl:8
5
#, tcl-format
msgid "Fetching %s from %s"
msgstr ""
#, tcl-format
msgid "Fetching %s from %s"
msgstr ""
-#: lib/checkout_op.tcl:13
2
+#: lib/checkout_op.tcl:13
3
#, tcl-format
msgid "fatal: Cannot resolve %s"
msgstr ""
#, tcl-format
msgid "fatal: Cannot resolve %s"
msgstr ""
-#: lib/checkout_op.tcl:14
5
lib/console.tcl:81 lib/database.tcl:31
+#: lib/checkout_op.tcl:14
6
lib/console.tcl:81 lib/database.tcl:31
#: lib/sshkey.tcl:53
msgid "Close"
msgstr ""
#: lib/sshkey.tcl:53
msgid "Close"
msgstr ""
-#: lib/checkout_op.tcl:17
4
+#: lib/checkout_op.tcl:17
5
#, tcl-format
msgid "Branch '%s' does not exist."
msgstr ""
#, tcl-format
msgid "Branch '%s' does not exist."
msgstr ""
-#: lib/checkout_op.tcl:19
3
+#: lib/checkout_op.tcl:19
4
#, tcl-format
msgid "Failed to configure simplified git-pull for '%s'."
msgstr ""
#, tcl-format
msgid "Failed to configure simplified git-pull for '%s'."
msgstr ""
-#: lib/checkout_op.tcl:22
8
+#: lib/checkout_op.tcl:22
9
#, tcl-format
msgid ""
"Branch '%s' already exists.\n"
#, tcl-format
msgid ""
"Branch '%s' already exists.\n"
@@
-856,21
+887,21
@@
msgid ""
"A merge is required."
msgstr ""
"A merge is required."
msgstr ""
-#: lib/checkout_op.tcl:24
2
+#: lib/checkout_op.tcl:24
3
#, tcl-format
msgid "Merge strategy '%s' not supported."
msgstr ""
#, tcl-format
msgid "Merge strategy '%s' not supported."
msgstr ""
-#: lib/checkout_op.tcl:26
1
+#: lib/checkout_op.tcl:26
2
#, tcl-format
msgid "Failed to update '%s'."
msgstr ""
#, tcl-format
msgid "Failed to update '%s'."
msgstr ""
-#: lib/checkout_op.tcl:27
3
+#: lib/checkout_op.tcl:27
4
msgid "Staging area (index) is already locked."
msgstr ""
msgid "Staging area (index) is already locked."
msgstr ""
-#: lib/checkout_op.tcl:28
8
+#: lib/checkout_op.tcl:28
9
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@@
-880,30
+911,30
@@
msgid ""
"The rescan will be automatically started now.\n"
msgstr ""
"The rescan will be automatically started now.\n"
msgstr ""
-#: lib/checkout_op.tcl:34
4
+#: lib/checkout_op.tcl:34
5
#, tcl-format
msgid "Updating working directory to '%s'..."
msgstr ""
#, tcl-format
msgid "Updating working directory to '%s'..."
msgstr ""
-#: lib/checkout_op.tcl:34
5
+#: lib/checkout_op.tcl:34
6
msgid "files checked out"
msgstr ""
msgid "files checked out"
msgstr ""
-#: lib/checkout_op.tcl:37
5
+#: lib/checkout_op.tcl:37
6
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
msgstr ""
#, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)."
msgstr ""
-#: lib/checkout_op.tcl:37
6
+#: lib/checkout_op.tcl:37
7
msgid "File level merge required."
msgstr ""
msgid "File level merge required."
msgstr ""
-#: lib/checkout_op.tcl:38
0
+#: lib/checkout_op.tcl:38
1
#, tcl-format
msgid "Staying on branch '%s'."
msgstr ""
#, tcl-format
msgid "Staying on branch '%s'."
msgstr ""
-#: lib/checkout_op.tcl:45
1
+#: lib/checkout_op.tcl:45
2
msgid ""
"You are no longer on a local branch.\n"
"\n"
msgid ""
"You are no longer on a local branch.\n"
"\n"
@@
-911,30
+942,30
@@
msgid ""
"Checkout'."
msgstr ""
"Checkout'."
msgstr ""
-#: lib/checkout_op.tcl:
468 lib/checkout_op.tcl:472
+#: lib/checkout_op.tcl:
503 lib/checkout_op.tcl:507
#, tcl-format
msgid "Checked out '%s'."
msgstr ""
#, tcl-format
msgid "Checked out '%s'."
msgstr ""
-#: lib/checkout_op.tcl:5
00
+#: lib/checkout_op.tcl:5
35
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
msgstr ""
#, tcl-format
msgid "Resetting '%s' to '%s' will lose the following commits:"
msgstr ""
-#: lib/checkout_op.tcl:5
22
+#: lib/checkout_op.tcl:5
57
msgid "Recovering lost commits may not be easy."
msgstr ""
msgid "Recovering lost commits may not be easy."
msgstr ""
-#: lib/checkout_op.tcl:5
27
+#: lib/checkout_op.tcl:5
62
#, tcl-format
msgid "Reset '%s'?"
msgstr ""
#, tcl-format
msgid "Reset '%s'?"
msgstr ""
-#: lib/checkout_op.tcl:5
32
lib/merge.tcl:164 lib/tools_dlg.tcl:343
+#: lib/checkout_op.tcl:5
67
lib/merge.tcl:164 lib/tools_dlg.tcl:343
msgid "Visualize"
msgstr ""
msgid "Visualize"
msgstr ""
-#: lib/checkout_op.tcl:6
00
+#: lib/checkout_op.tcl:6
35
#, tcl-format
msgid ""
"Failed to set current branch.\n"
#, tcl-format
msgid ""
"Failed to set current branch.\n"
@@
-971,7
+1002,7
@@
msgstr ""
msgid "Git Gui"
msgstr ""
msgid "Git Gui"
msgstr ""
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:38
2
+#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:38
6
msgid "Create New Repository"
msgstr ""
msgid "Create New Repository"
msgstr ""
@@
-979,7
+1010,7
@@
msgstr ""
msgid "New..."
msgstr ""
msgid "New..."
msgstr ""
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:4
65
+#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:4
71
msgid "Clone Existing Repository"
msgstr ""
msgid "Clone Existing Repository"
msgstr ""
@@
-987,7
+1018,7
@@
msgstr ""
msgid "Clone..."
msgstr ""
msgid "Clone..."
msgstr ""
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:
983
+#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:
1016
msgid "Open Existing Repository"
msgstr ""
msgid "Open Existing Repository"
msgstr ""
@@
-1003,193
+1034,193
@@
msgstr ""
msgid "Open Recent Repository:"
msgstr ""
msgid "Open Recent Repository:"
msgstr ""
-#: lib/choose_repository.tcl:30
2 lib/choose_repository.tcl:309
-#: lib/choose_repository.tcl:3
16
+#: lib/choose_repository.tcl:30
6 lib/choose_repository.tcl:313
+#: lib/choose_repository.tcl:3
20
#, tcl-format
msgid "Failed to create repository %s:"
msgstr ""
#, tcl-format
msgid "Failed to create repository %s:"
msgstr ""
-#: lib/choose_repository.tcl:3
87
+#: lib/choose_repository.tcl:3
91
msgid "Directory:"
msgstr ""
msgid "Directory:"
msgstr ""
-#: lib/choose_repository.tcl:4
17 lib/choose_repository.tcl:544
-#: lib/choose_repository.tcl:10
17
+#: lib/choose_repository.tcl:4
23 lib/choose_repository.tcl:550
+#: lib/choose_repository.tcl:10
52
msgid "Git Repository"
msgstr ""
msgid "Git Repository"
msgstr ""
-#: lib/choose_repository.tcl:44
2
+#: lib/choose_repository.tcl:44
8
#, tcl-format
msgid "Directory %s already exists."
msgstr ""
#, tcl-format
msgid "Directory %s already exists."
msgstr ""
-#: lib/choose_repository.tcl:4
46
+#: lib/choose_repository.tcl:4
52
#, tcl-format
msgid "File %s already exists."
msgstr ""
#, tcl-format
msgid "File %s already exists."
msgstr ""
-#: lib/choose_repository.tcl:46
0
+#: lib/choose_repository.tcl:46
6
msgid "Clone"
msgstr ""
msgid "Clone"
msgstr ""
-#: lib/choose_repository.tcl:47
3
+#: lib/choose_repository.tcl:47
9
msgid "Source Location:"
msgstr ""
msgid "Source Location:"
msgstr ""
-#: lib/choose_repository.tcl:4
84
+#: lib/choose_repository.tcl:4
90
msgid "Target Directory:"
msgstr ""
msgid "Target Directory:"
msgstr ""
-#: lib/choose_repository.tcl:
496
+#: lib/choose_repository.tcl:
502
msgid "Clone Type:"
msgstr ""
msgid "Clone Type:"
msgstr ""
-#: lib/choose_repository.tcl:50
2
+#: lib/choose_repository.tcl:50
8
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr ""
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr ""
-#: lib/choose_repository.tcl:5
08
+#: lib/choose_repository.tcl:5
14
msgid "Full Copy (Slower, Redundant Backup)"
msgstr ""
msgid "Full Copy (Slower, Redundant Backup)"
msgstr ""
-#: lib/choose_repository.tcl:5
14
+#: lib/choose_repository.tcl:5
20
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr ""
msgid "Shared (Fastest, Not Recommended, No Backup)"
msgstr ""
-#: lib/choose_repository.tcl:55
0 lib/choose_repository.tcl:597
-#: lib/choose_repository.tcl:74
3 lib/choose_repository.tcl:813
-#: lib/choose_repository.tcl:10
23 lib/choose_repository.tcl:1031
+#: lib/choose_repository.tcl:55
6 lib/choose_repository.tcl:603
+#: lib/choose_repository.tcl:74
9 lib/choose_repository.tcl:819
+#: lib/choose_repository.tcl:10
58 lib/choose_repository.tcl:1066
#, tcl-format
msgid "Not a Git repository: %s"
msgstr ""
#, tcl-format
msgid "Not a Git repository: %s"
msgstr ""
-#: lib/choose_repository.tcl:5
86
+#: lib/choose_repository.tcl:5
92
msgid "Standard only available for local repository."
msgstr ""
msgid "Standard only available for local repository."
msgstr ""
-#: lib/choose_repository.tcl:59
0
+#: lib/choose_repository.tcl:59
6
msgid "Shared only available for local repository."
msgstr ""
msgid "Shared only available for local repository."
msgstr ""
-#: lib/choose_repository.tcl:61
1
+#: lib/choose_repository.tcl:61
7
#, tcl-format
msgid "Location %s already exists."
msgstr ""
#, tcl-format
msgid "Location %s already exists."
msgstr ""
-#: lib/choose_repository.tcl:62
2
+#: lib/choose_repository.tcl:62
8
msgid "Failed to configure origin"
msgstr ""
msgid "Failed to configure origin"
msgstr ""
-#: lib/choose_repository.tcl:6
34
+#: lib/choose_repository.tcl:6
40
msgid "Counting objects"
msgstr ""
msgid "Counting objects"
msgstr ""
-#: lib/choose_repository.tcl:6
35
+#: lib/choose_repository.tcl:6
41
msgid "buckets"
msgstr ""
msgid "buckets"
msgstr ""
-#: lib/choose_repository.tcl:6
59
+#: lib/choose_repository.tcl:6
65
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr ""
#, tcl-format
msgid "Unable to copy objects/info/alternates: %s"
msgstr ""
-#: lib/choose_repository.tcl:
695
+#: lib/choose_repository.tcl:
701
#, tcl-format
msgid "Nothing to clone from %s."
msgstr ""
#, tcl-format
msgid "Nothing to clone from %s."
msgstr ""
-#: lib/choose_repository.tcl:
697 lib/choose_repository.tcl:911
-#: lib/choose_repository.tcl:92
3
+#: lib/choose_repository.tcl:
703 lib/choose_repository.tcl:917
+#: lib/choose_repository.tcl:92
9
msgid "The 'master' branch has not been initialized."
msgstr ""
msgid "The 'master' branch has not been initialized."
msgstr ""
-#: lib/choose_repository.tcl:71
0
+#: lib/choose_repository.tcl:71
6
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr ""
msgid "Hardlinks are unavailable. Falling back to copying."
msgstr ""
-#: lib/choose_repository.tcl:72
2
+#: lib/choose_repository.tcl:72
8
#, tcl-format
msgid "Cloning from %s"
msgstr ""
#, tcl-format
msgid "Cloning from %s"
msgstr ""
-#: lib/choose_repository.tcl:75
3
+#: lib/choose_repository.tcl:75
9
msgid "Copying objects"
msgstr ""
msgid "Copying objects"
msgstr ""
-#: lib/choose_repository.tcl:7
54
+#: lib/choose_repository.tcl:7
60
msgid "KiB"
msgstr ""
msgid "KiB"
msgstr ""
-#: lib/choose_repository.tcl:7
78
+#: lib/choose_repository.tcl:7
84
#, tcl-format
msgid "Unable to copy object: %s"
msgstr ""
#, tcl-format
msgid "Unable to copy object: %s"
msgstr ""
-#: lib/choose_repository.tcl:7
88
+#: lib/choose_repository.tcl:7
94
msgid "Linking objects"
msgstr ""
msgid "Linking objects"
msgstr ""
-#: lib/choose_repository.tcl:7
89
+#: lib/choose_repository.tcl:7
95
msgid "objects"
msgstr ""
msgid "objects"
msgstr ""
-#: lib/choose_repository.tcl:
797
+#: lib/choose_repository.tcl:
803
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr ""
#, tcl-format
msgid "Unable to hardlink object: %s"
msgstr ""
-#: lib/choose_repository.tcl:85
2
+#: lib/choose_repository.tcl:85
8
msgid "Cannot fetch branches and objects. See console output for details."
msgstr ""
msgid "Cannot fetch branches and objects. See console output for details."
msgstr ""
-#: lib/choose_repository.tcl:86
3
+#: lib/choose_repository.tcl:86
9
msgid "Cannot fetch tags. See console output for details."
msgstr ""
msgid "Cannot fetch tags. See console output for details."
msgstr ""
-#: lib/choose_repository.tcl:8
87
+#: lib/choose_repository.tcl:8
93
msgid "Cannot determine HEAD. See console output for details."
msgstr ""
msgid "Cannot determine HEAD. See console output for details."
msgstr ""
-#: lib/choose_repository.tcl:
896
+#: lib/choose_repository.tcl:
902
#, tcl-format
msgid "Unable to cleanup %s"
msgstr ""
#, tcl-format
msgid "Unable to cleanup %s"
msgstr ""
-#: lib/choose_repository.tcl:90
2
+#: lib/choose_repository.tcl:90
8
msgid "Clone failed."
msgstr ""
msgid "Clone failed."
msgstr ""
-#: lib/choose_repository.tcl:9
09
+#: lib/choose_repository.tcl:9
15
msgid "No default branch obtained."
msgstr ""
msgid "No default branch obtained."
msgstr ""
-#: lib/choose_repository.tcl:92
0
+#: lib/choose_repository.tcl:92
6
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr ""
#, tcl-format
msgid "Cannot resolve %s as a commit."
msgstr ""
-#: lib/choose_repository.tcl:93
2
+#: lib/choose_repository.tcl:93
8
msgid "Creating working directory"
msgstr ""
msgid "Creating working directory"
msgstr ""
-#: lib/choose_repository.tcl:93
3 lib/index.tcl:65 lib/index.tcl:128
-#: lib/index.tcl:19
6
+#: lib/choose_repository.tcl:93
9 lib/index.tcl:67 lib/index.tcl:130
+#: lib/index.tcl:19
8
msgid "files"
msgstr ""
msgid "files"
msgstr ""
-#: lib/choose_repository.tcl:96
2
+#: lib/choose_repository.tcl:96
8
msgid "Initial file checkout failed."
msgstr ""
msgid "Initial file checkout failed."
msgstr ""
-#: lib/choose_repository.tcl:
978
+#: lib/choose_repository.tcl:
1011
msgid "Open"
msgstr ""
msgid "Open"
msgstr ""
-#: lib/choose_repository.tcl:
988
+#: lib/choose_repository.tcl:
1021
msgid "Repository:"
msgstr ""
msgid "Repository:"
msgstr ""
-#: lib/choose_repository.tcl:10
37
+#: lib/choose_repository.tcl:10
72
#, tcl-format
msgid "Failed to open repository %s:"
msgstr ""
#, tcl-format
msgid "Failed to open repository %s:"
msgstr ""
@@
-1264,7
+1295,12
@@
msgstr ""
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr ""
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr ""
-#: lib/commit.tcl:132
+#: lib/commit.tcl:129
+#, tcl-format
+msgid "warning: Tcl does not support encoding '%s'."
+msgstr ""
+
+#: lib/commit.tcl:149
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@@
-1274,7
+1310,7
@@
msgid ""
"The rescan will be automatically started now.\n"
msgstr ""
"The rescan will be automatically started now.\n"
msgstr ""
-#: lib/commit.tcl:1
55
+#: lib/commit.tcl:1
72
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@@
-1283,7
+1319,7
@@
msgid ""
"before committing.\n"
msgstr ""
"before committing.\n"
msgstr ""
-#: lib/commit.tcl:1
63
+#: lib/commit.tcl:1
80
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@@
-1291,14
+1327,14
@@
msgid ""
"File %s cannot be committed by this program.\n"
msgstr ""
"File %s cannot be committed by this program.\n"
msgstr ""
-#: lib/commit.tcl:1
71
+#: lib/commit.tcl:1
88
msgid ""
"No changes to commit.\n"
"\n"
"You must stage at least 1 file before you can commit.\n"
msgstr ""
msgid ""
"No changes to commit.\n"
"\n"
"You must stage at least 1 file before you can commit.\n"
msgstr ""
-#: lib/commit.tcl:
186
+#: lib/commit.tcl:
203
msgid ""
"Please supply a commit message.\n"
"\n"
msgid ""
"Please supply a commit message.\n"
"\n"
@@
-1309,45
+1345,40
@@
msgid ""
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
-#: lib/commit.tcl:210
-#, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
-msgstr ""
-
-#: lib/commit.tcl:226
+#: lib/commit.tcl:234
msgid "Calling pre-commit hook..."
msgstr ""
msgid "Calling pre-commit hook..."
msgstr ""
-#: lib/commit.tcl:24
1
+#: lib/commit.tcl:24
9
msgid "Commit declined by pre-commit hook."
msgstr ""
msgid "Commit declined by pre-commit hook."
msgstr ""
-#: lib/commit.tcl:2
64
+#: lib/commit.tcl:2
72
msgid "Calling commit-msg hook..."
msgstr ""
msgid "Calling commit-msg hook..."
msgstr ""
-#: lib/commit.tcl:2
79
+#: lib/commit.tcl:2
87
msgid "Commit declined by commit-msg hook."
msgstr ""
msgid "Commit declined by commit-msg hook."
msgstr ""
-#: lib/commit.tcl:
292
+#: lib/commit.tcl:
300
msgid "Committing changes..."
msgstr ""
msgid "Committing changes..."
msgstr ""
-#: lib/commit.tcl:3
08
+#: lib/commit.tcl:3
16
msgid "write-tree failed:"
msgstr ""
msgid "write-tree failed:"
msgstr ""
-#: lib/commit.tcl:3
09 lib/commit.tcl:353 lib/commit.tcl:373
+#: lib/commit.tcl:3
17 lib/commit.tcl:361 lib/commit.tcl:382
msgid "Commit failed."
msgstr ""
msgid "Commit failed."
msgstr ""
-#: lib/commit.tcl:3
26
+#: lib/commit.tcl:3
34
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr ""
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr ""
-#: lib/commit.tcl:33
1
+#: lib/commit.tcl:33
9
msgid ""
"No changes to commit.\n"
"\n"
msgid ""
"No changes to commit.\n"
"\n"
@@
-1356,19
+1387,19
@@
msgid ""
"A rescan will be automatically started now.\n"
msgstr ""
"A rescan will be automatically started now.\n"
msgstr ""
-#: lib/commit.tcl:3
38
+#: lib/commit.tcl:3
46
msgid "No changes to commit."
msgstr ""
msgid "No changes to commit."
msgstr ""
-#: lib/commit.tcl:3
52
+#: lib/commit.tcl:3
60
msgid "commit-tree failed:"
msgstr ""
msgid "commit-tree failed:"
msgstr ""
-#: lib/commit.tcl:3
72
+#: lib/commit.tcl:3
81
msgid "update-ref failed:"
msgstr ""
msgid "update-ref failed:"
msgstr ""
-#: lib/commit.tcl:46
0
+#: lib/commit.tcl:46
9
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
@@
-1421,13
+1452,13
@@
msgstr ""
msgid "Verifying the object database with fsck-objects"
msgstr ""
msgid "Verifying the object database with fsck-objects"
msgstr ""
-#: lib/database.tcl:10
8
+#: lib/database.tcl:10
7
#, tcl-format
msgid ""
"This repository currently has approximately %i loose objects.\n"
"\n"
"To maintain optimal performance it is strongly recommended that you compress "
#, tcl-format
msgid ""
"This repository currently has approximately %i loose objects.\n"
"\n"
"To maintain optimal performance it is strongly recommended that you compress "
-"the database
when more than %i loose objects exist
.\n"
+"the database.\n"
"\n"
"Compress the database now?"
msgstr ""
"\n"
"Compress the database now?"
msgstr ""
@@
-1437,7
+1468,7
@@
msgstr ""
msgid "Invalid date from Git: %s"
msgstr ""
msgid "Invalid date from Git: %s"
msgstr ""
-#: lib/diff.tcl:
59
+#: lib/diff.tcl:
64
#, tcl-format
msgid ""
"No differences detected.\n"
#, tcl-format
msgid ""
"No differences detected.\n"
@@
-1451,56
+1482,56
@@
msgid ""
"the same state."
msgstr ""
"the same state."
msgstr ""
-#: lib/diff.tcl:
99
+#: lib/diff.tcl:
104
#, tcl-format
msgid "Loading diff of %s..."
msgstr ""
#, tcl-format
msgid "Loading diff of %s..."
msgstr ""
-#: lib/diff.tcl:12
0
+#: lib/diff.tcl:12
5
msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
msgstr ""
msgid ""
"LOCAL: deleted\n"
"REMOTE:\n"
msgstr ""
-#: lib/diff.tcl:1
25
+#: lib/diff.tcl:1
30
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
msgstr ""
msgid ""
"REMOTE: deleted\n"
"LOCAL:\n"
msgstr ""
-#: lib/diff.tcl:13
2
+#: lib/diff.tcl:13
7
msgid "LOCAL:\n"
msgstr ""
msgid "LOCAL:\n"
msgstr ""
-#: lib/diff.tcl:1
35
+#: lib/diff.tcl:1
40
msgid "REMOTE:\n"
msgstr ""
msgid "REMOTE:\n"
msgstr ""
-#: lib/diff.tcl:
197 lib/diff.tcl:296
+#: lib/diff.tcl:
202 lib/diff.tcl:319
#, tcl-format
msgid "Unable to display %s"
msgstr ""
#, tcl-format
msgid "Unable to display %s"
msgstr ""
-#: lib/diff.tcl:
198
+#: lib/diff.tcl:
203
msgid "Error loading file:"
msgstr ""
msgid "Error loading file:"
msgstr ""
-#: lib/diff.tcl:2
05
+#: lib/diff.tcl:2
10
msgid "Git Repository (subproject)"
msgstr ""
msgid "Git Repository (subproject)"
msgstr ""
-#: lib/diff.tcl:2
17
+#: lib/diff.tcl:2
22
msgid "* Binary file (not showing content)."
msgstr ""
msgid "* Binary file (not showing content)."
msgstr ""
-#: lib/diff.tcl:22
2
+#: lib/diff.tcl:22
7
#, tcl-format
msgid ""
"* Untracked file is %d bytes.\n"
"* Showing only first %d bytes.\n"
msgstr ""
#, tcl-format
msgid ""
"* Untracked file is %d bytes.\n"
"* Showing only first %d bytes.\n"
msgstr ""
-#: lib/diff.tcl:2
28
+#: lib/diff.tcl:2
33
#, tcl-format
msgid ""
"\n"
#, tcl-format
msgid ""
"\n"
@@
-1508,19
+1539,19
@@
msgid ""
"* To see the entire file, use an external editor.\n"
msgstr ""
"* To see the entire file, use an external editor.\n"
msgstr ""
-#: lib/diff.tcl:4
36
+#: lib/diff.tcl:4
82
msgid "Failed to unstage selected hunk."
msgstr ""
msgid "Failed to unstage selected hunk."
msgstr ""
-#: lib/diff.tcl:4
43
+#: lib/diff.tcl:4
89
msgid "Failed to stage selected hunk."
msgstr ""
msgid "Failed to stage selected hunk."
msgstr ""
-#: lib/diff.tcl:5
09
+#: lib/diff.tcl:5
68
msgid "Failed to unstage selected line."
msgstr ""
msgid "Failed to unstage selected line."
msgstr ""
-#: lib/diff.tcl:5
17
+#: lib/diff.tcl:5
76
msgid "Failed to stage selected line."
msgstr ""
msgid "Failed to stage selected line."
msgstr ""
@@
-1557,13
+1588,13
@@
msgstr ""
msgid "Index Error"
msgstr ""
msgid "Index Error"
msgstr ""
-#: lib/index.tcl:
21
+#: lib/index.tcl:
17
msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
msgstr ""
msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
msgstr ""
-#: lib/index.tcl:2
7
+#: lib/index.tcl:2
8
msgid "Continue"
msgstr ""
msgid "Continue"
msgstr ""
@@
-1571,43
+1602,43
@@
msgstr ""
msgid "Unlock Index"
msgstr ""
msgid "Unlock Index"
msgstr ""
-#: lib/index.tcl:28
7
+#: lib/index.tcl:28
9
#, tcl-format
msgid "Unstaging %s from commit"
msgstr ""
#, tcl-format
msgid "Unstaging %s from commit"
msgstr ""
-#: lib/index.tcl:32
6
+#: lib/index.tcl:32
8
msgid "Ready to commit."
msgstr ""
msgid "Ready to commit."
msgstr ""
-#: lib/index.tcl:3
39
+#: lib/index.tcl:3
41
#, tcl-format
msgid "Adding %s"
msgstr ""
#, tcl-format
msgid "Adding %s"
msgstr ""
-#: lib/index.tcl:39
6
+#: lib/index.tcl:39
8
#, tcl-format
msgid "Revert changes in file %s?"
msgstr ""
#, tcl-format
msgid "Revert changes in file %s?"
msgstr ""
-#: lib/index.tcl:
398
+#: lib/index.tcl:
400
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr ""
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr ""
-#: lib/index.tcl:40
6
+#: lib/index.tcl:40
8
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
-#: lib/index.tcl:4
09
+#: lib/index.tcl:4
11
msgid "Do Nothing"
msgstr ""
msgid "Do Nothing"
msgstr ""
-#: lib/index.tcl:42
7
+#: lib/index.tcl:42
9
msgid "Reverting selected files"
msgstr ""
msgid "Reverting selected files"
msgstr ""
-#: lib/index.tcl:43
1
+#: lib/index.tcl:43
3
#, tcl-format
msgid "Reverting %s"
msgstr ""
#, tcl-format
msgid "Reverting %s"
msgstr ""
@@
-2036,10
+2067,6
@@
msgstr ""
msgid "Merged Into:"
msgstr ""
msgid "Merged Into:"
msgstr ""
-#: lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr ""
-
#: lib/remote_branch_delete.tcl:152
msgid "A branch is required for 'Merged Into'."
msgstr ""
#: lib/remote_branch_delete.tcl:152
msgid "A branch is required for 'Merged Into'."
msgstr ""
@@
-2063,23
+2090,16
@@
msgstr ""
msgid "Please select one or more branches to delete."
msgstr ""
msgid "Please select one or more branches to delete."
msgstr ""
-#: lib/remote_branch_delete.tcl:216
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-
#: lib/remote_branch_delete.tcl:226
#, tcl-format
msgid "Deleting branches from %s"
msgstr ""
#: lib/remote_branch_delete.tcl:226
#, tcl-format
msgid "Deleting branches from %s"
msgstr ""
-#: lib/remote_branch_delete.tcl:2
86
+#: lib/remote_branch_delete.tcl:2
92
msgid "No repository selected."
msgstr ""
msgid "No repository selected."
msgstr ""
-#: lib/remote_branch_delete.tcl:29
1
+#: lib/remote_branch_delete.tcl:29
7
#, tcl-format
msgid "Scanning %s..."
msgstr ""
#, tcl-format
msgid "Scanning %s..."
msgstr ""
@@
-2100,11
+2120,11
@@
msgstr ""
msgid "Case-Sensitive"
msgstr ""
msgid "Case-Sensitive"
msgstr ""
-#: lib/shortcut.tcl:2
0 lib/shortcut.tcl:61
+#: lib/shortcut.tcl:2
1 lib/shortcut.tcl:62
msgid "Cannot write shortcut:"
msgstr ""
msgid "Cannot write shortcut:"
msgstr ""
-#: lib/shortcut.tcl:13
6
+#: lib/shortcut.tcl:13
7
msgid "Cannot write icon:"
msgstr ""
msgid "Cannot write icon:"
msgstr ""