Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-gui: Update po template to include 'Mirroring %s' message
author
Shawn O. Pearce
<spearce@spearce.org>
Mon, 8 Dec 2008 16:32:28 +0000
(08:32 -0800)
committer
Shawn O. Pearce
<spearce@spearce.org>
Mon, 8 Dec 2008 16:33:05 +0000
(08:33 -0800)
A late addition to the message library.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
po/git-gui.pot
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
3ac31e4
)
diff --git
a/po/git-gui.pot
b/po/git-gui.pot
index 58db67c217e00ee1571d0a182969ce162fad4216..15aea0dc64fd9711bf7246d347ceaafc773d874b 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: 2008-1
1-16 13:56
-0800\n"
+"POT-Creation-Date: 2008-1
2-08 08:31
-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"
@@
-234,25
+234,25
@@
msgstr ""
msgid "Redo"
msgstr ""
msgid "Redo"
msgstr ""
-#: git-gui.sh:2378 git-gui.sh:29
23
+#: git-gui.sh:2378 git-gui.sh:29
37
msgid "Cut"
msgstr ""
msgid "Cut"
msgstr ""
-#: git-gui.sh:2381 git-gui.sh:29
26 git-gui.sh:3000 git-gui.sh:3082
+#: git-gui.sh:2381 git-gui.sh:29
40 git-gui.sh:3014 git-gui.sh:3096
#: lib/console.tcl:69
msgid "Copy"
msgstr ""
#: lib/console.tcl:69
msgid "Copy"
msgstr ""
-#: git-gui.sh:2384 git-gui.sh:29
29
+#: git-gui.sh:2384 git-gui.sh:29
43
msgid "Paste"
msgstr ""
msgid "Paste"
msgstr ""
-#: git-gui.sh:2387 git-gui.sh:29
32
lib/branch_delete.tcl:26
+#: git-gui.sh:2387 git-gui.sh:29
46
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:2391 git-gui.sh:29
36 git-gui.sh:3086
lib/console.tcl:71
+#: git-gui.sh:2391 git-gui.sh:29
50 git-gui.sh:3100
lib/console.tcl:71
msgid "Select All"
msgstr ""
msgid "Select All"
msgstr ""
@@
-284,15
+284,15
@@
msgstr ""
msgid "Commit@@verb"
msgstr ""
msgid "Commit@@verb"
msgstr ""
-#: git-gui.sh:2443 git-gui.sh:28
64
+#: git-gui.sh:2443 git-gui.sh:28
78
msgid "New Commit"
msgstr ""
msgid "New Commit"
msgstr ""
-#: git-gui.sh:2451 git-gui.sh:28
71
+#: git-gui.sh:2451 git-gui.sh:28
85
msgid "Amend Last Commit"
msgstr ""
msgid "Amend Last Commit"
msgstr ""
-#: git-gui.sh:2461 git-gui.sh:28
25
lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2461 git-gui.sh:28
39
lib/remote_branch_delete.tcl:99
msgid "Rescan"
msgstr ""
msgid "Rescan"
msgstr ""
@@
-312,15
+312,15
@@
msgstr ""
msgid "Revert Changes"
msgstr ""
msgid "Revert Changes"
msgstr ""
-#: git-gui.sh:2491 git-gui.sh:30
69
+#: git-gui.sh:2491 git-gui.sh:30
83
msgid "Show Less Context"
msgstr ""
msgid "Show Less Context"
msgstr ""
-#: git-gui.sh:2495 git-gui.sh:30
73
+#: git-gui.sh:2495 git-gui.sh:30
87
msgid "Show More Context"
msgstr ""
msgid "Show More Context"
msgstr ""
-#: git-gui.sh:2502 git-gui.sh:28
38 git-gui.sh:2947
+#: git-gui.sh:2502 git-gui.sh:28
52 git-gui.sh:2961
msgid "Sign Off"
msgstr ""
msgid "Sign Off"
msgstr ""
@@
-354,7
+354,7
@@
msgstr ""
msgid "Preferences..."
msgstr ""
msgid "Preferences..."
msgstr ""
-#: git-gui.sh:2565 git-gui.sh:31
15
+#: git-gui.sh:2565 git-gui.sh:31
29
msgid "Options..."
msgstr ""
msgid "Options..."
msgstr ""
@@
-374,124
+374,124
@@
msgstr ""
msgid "Show SSH Key"
msgstr ""
msgid "Show SSH Key"
msgstr ""
-#: git-gui.sh:27
07
+#: git-gui.sh:27
21
#, 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:27
40
+#: git-gui.sh:27
54
msgid "Current Branch:"
msgstr ""
msgid "Current Branch:"
msgstr ""
-#: git-gui.sh:27
61
+#: git-gui.sh:27
75
msgid "Staged Changes (Will Commit)"
msgstr ""
msgid "Staged Changes (Will Commit)"
msgstr ""
-#: git-gui.sh:27
81
+#: git-gui.sh:27
95
msgid "Unstaged Changes"
msgstr ""
msgid "Unstaged Changes"
msgstr ""
-#: git-gui.sh:28
31
+#: git-gui.sh:28
45
msgid "Stage Changed"
msgstr ""
msgid "Stage Changed"
msgstr ""
-#: git-gui.sh:28
50 lib/transport.tcl:93 lib/transport.tcl:182
+#: git-gui.sh:28
64 lib/transport.tcl:104 lib/transport.tcl:193
msgid "Push"
msgstr ""
msgid "Push"
msgstr ""
-#: git-gui.sh:28
85
+#: git-gui.sh:28
99
msgid "Initial Commit Message:"
msgstr ""
msgid "Initial Commit Message:"
msgstr ""
-#: git-gui.sh:2
886
+#: git-gui.sh:2
900
msgid "Amended Commit Message:"
msgstr ""
msgid "Amended Commit Message:"
msgstr ""
-#: git-gui.sh:2
887
+#: git-gui.sh:2
901
msgid "Amended Initial Commit Message:"
msgstr ""
msgid "Amended Initial Commit Message:"
msgstr ""
-#: git-gui.sh:2
888
+#: git-gui.sh:2
902
msgid "Amended Merge Commit Message:"
msgstr ""
msgid "Amended Merge Commit Message:"
msgstr ""
-#: git-gui.sh:2
889
+#: git-gui.sh:2
903
msgid "Merge Commit Message:"
msgstr ""
msgid "Merge Commit Message:"
msgstr ""
-#: git-gui.sh:2
890
+#: git-gui.sh:2
904
msgid "Commit Message:"
msgstr ""
msgid "Commit Message:"
msgstr ""
-#: git-gui.sh:29
39 git-gui.sh:3090
lib/console.tcl:73
+#: git-gui.sh:29
53 git-gui.sh:3104
lib/console.tcl:73
msgid "Copy All"
msgstr ""
msgid "Copy All"
msgstr ""
-#: git-gui.sh:29
63
lib/blame.tcl:104
+#: git-gui.sh:29
77
lib/blame.tcl:104
msgid "File:"
msgstr ""
msgid "File:"
msgstr ""
-#: git-gui.sh:30
78
+#: git-gui.sh:30
92
msgid "Refresh"
msgstr ""
msgid "Refresh"
msgstr ""
-#: git-gui.sh:3
099
+#: git-gui.sh:3
113
msgid "Decrease Font Size"
msgstr ""
msgid "Decrease Font Size"
msgstr ""
-#: git-gui.sh:31
03
+#: git-gui.sh:31
17
msgid "Increase Font Size"
msgstr ""
msgid "Increase Font Size"
msgstr ""
-#: git-gui.sh:31
11
lib/blame.tcl:281
+#: git-gui.sh:31
25
lib/blame.tcl:281
msgid "Encoding"
msgstr ""
msgid "Encoding"
msgstr ""
-#: git-gui.sh:31
22
+#: git-gui.sh:31
36
msgid "Apply/Reverse Hunk"
msgstr ""
msgid "Apply/Reverse Hunk"
msgstr ""
-#: git-gui.sh:31
27
+#: git-gui.sh:31
41
msgid "Apply/Reverse Line"
msgstr ""
msgid "Apply/Reverse Line"
msgstr ""
-#: git-gui.sh:31
37
+#: git-gui.sh:31
51
msgid "Run Merge Tool"
msgstr ""
msgid "Run Merge Tool"
msgstr ""
-#: git-gui.sh:31
42
+#: git-gui.sh:31
56
msgid "Use Remote Version"
msgstr ""
msgid "Use Remote Version"
msgstr ""
-#: git-gui.sh:31
46
+#: git-gui.sh:31
60
msgid "Use Local Version"
msgstr ""
msgid "Use Local Version"
msgstr ""
-#: git-gui.sh:31
50
+#: git-gui.sh:31
64
msgid "Revert To Base"
msgstr ""
msgid "Revert To Base"
msgstr ""
-#: git-gui.sh:31
69
+#: git-gui.sh:31
83
msgid "Unstage Hunk From Commit"
msgstr ""
msgid "Unstage Hunk From Commit"
msgstr ""
-#: git-gui.sh:31
70
+#: git-gui.sh:31
84
msgid "Unstage Line From Commit"
msgstr ""
msgid "Unstage Line From Commit"
msgstr ""
-#: git-gui.sh:31
72
+#: git-gui.sh:31
86
msgid "Stage Hunk For Commit"
msgstr ""
msgid "Stage Hunk For Commit"
msgstr ""
-#: git-gui.sh:31
73
+#: git-gui.sh:31
87
msgid "Stage Line For Commit"
msgstr ""
msgid "Stage Line For Commit"
msgstr ""
-#: git-gui.sh:3
196
+#: git-gui.sh:3
210
msgid "Initializing..."
msgstr ""
msgid "Initializing..."
msgstr ""
-#: git-gui.sh:33
01
+#: git-gui.sh:33
15
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@@
-502,14
+502,14
@@
msgid ""
"\n"
msgstr ""
"\n"
msgstr ""
-#: git-gui.sh:33
31
+#: git-gui.sh:33
45
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:33
36
+#: git-gui.sh:33
50
#, tcl-format
msgid ""
"\n"
#, tcl-format
msgid ""
"\n"
@@
-589,43
+589,43
@@
msgstr ""
msgid "Loading annotation..."
msgstr ""
msgid "Loading annotation..."
msgstr ""
-#: lib/blame.tcl:96
4
+#: lib/blame.tcl:96
3
msgid "Author:"
msgstr ""
msgid "Author:"
msgstr ""
-#: lib/blame.tcl:96
8
+#: lib/blame.tcl:96
7
msgid "Committer:"
msgstr ""
msgid "Committer:"
msgstr ""
-#: lib/blame.tcl:97
3
+#: lib/blame.tcl:97
2
msgid "Original File:"
msgstr ""
msgid "Original File:"
msgstr ""
-#: lib/blame.tcl:102
1
+#: lib/blame.tcl:102
0
msgid "Cannot find HEAD commit:"
msgstr ""
msgid "Cannot find HEAD commit:"
msgstr ""
-#: lib/blame.tcl:107
6
+#: lib/blame.tcl:107
5
msgid "Cannot find parent commit:"
msgstr ""
msgid "Cannot find parent commit:"
msgstr ""
-#: lib/blame.tcl:109
1
+#: lib/blame.tcl:109
0
msgid "Unable to display parent"
msgstr ""
msgid "Unable to display parent"
msgstr ""
-#: lib/blame.tcl:109
2
lib/diff.tcl:297
+#: lib/blame.tcl:109
1
lib/diff.tcl:297
msgid "Error loading diff:"
msgstr ""
msgid "Error loading diff:"
msgstr ""
-#: lib/blame.tcl:123
2
+#: lib/blame.tcl:123
1
msgid "Originally By:"
msgstr ""
msgid "Originally By:"
msgstr ""
-#: lib/blame.tcl:123
8
+#: lib/blame.tcl:123
7
msgid "In File:"
msgstr ""
msgid "In File:"
msgstr ""
-#: lib/blame.tcl:124
3
+#: lib/blame.tcl:124
2
msgid "Copied Or Moved Here By:"
msgstr ""
msgid "Copied Or Moved Here By:"
msgstr ""
@@
-642,7
+642,7
@@
msgstr ""
#: lib/checkout_op.tcl:544 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/checkout_op.tcl:544 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:
97
+#: lib/transport.tcl:
108
msgid "Cancel"
msgstr ""
msgid "Cancel"
msgstr ""
@@
-1254,19
+1254,19
@@
msgid ""
"current merge activity.\n"
msgstr ""
"current merge activity.\n"
msgstr ""
-#: lib/commit.tcl:4
9
+#: lib/commit.tcl:4
8
msgid "Error loading commit data for amend:"
msgstr ""
msgid "Error loading commit data for amend:"
msgstr ""
-#: lib/commit.tcl:7
6
+#: lib/commit.tcl:7
5
msgid "Unable to obtain your identity:"
msgstr ""
msgid "Unable to obtain your identity:"
msgstr ""
-#: lib/commit.tcl:8
1
+#: lib/commit.tcl:8
0
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr ""
msgid "Invalid GIT_COMMITTER_IDENT:"
msgstr ""
-#: lib/commit.tcl:13
3
+#: lib/commit.tcl:13
2
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
msgid ""
"Last scanned state does not match repository state.\n"
"\n"
@@
-1276,7
+1276,7
@@
msgid ""
"The rescan will be automatically started now.\n"
msgstr ""
"The rescan will be automatically started now.\n"
msgstr ""
-#: lib/commit.tcl:15
6
+#: lib/commit.tcl:15
5
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
#, tcl-format
msgid ""
"Unmerged files cannot be committed.\n"
@@
-1285,7
+1285,7
@@
msgid ""
"before committing.\n"
msgstr ""
"before committing.\n"
msgstr ""
-#: lib/commit.tcl:16
4
+#: lib/commit.tcl:16
3
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
#, tcl-format
msgid ""
"Unknown file state %s detected.\n"
@@
-1293,14
+1293,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:17
2
+#: lib/commit.tcl:17
1
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:18
7
+#: lib/commit.tcl:18
6
msgid ""
"Please supply a commit message.\n"
"\n"
msgid ""
"Please supply a commit message.\n"
"\n"
@@
-1311,45
+1311,45
@@
msgid ""
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
"- Remaining lines: Describe why this change is good.\n"
msgstr ""
-#: lib/commit.tcl:21
1
+#: lib/commit.tcl:21
0
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr ""
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr ""
-#: lib/commit.tcl:22
7
+#: lib/commit.tcl:22
6
msgid "Calling pre-commit hook..."
msgstr ""
msgid "Calling pre-commit hook..."
msgstr ""
-#: lib/commit.tcl:24
2
+#: lib/commit.tcl:24
1
msgid "Commit declined by pre-commit hook."
msgstr ""
msgid "Commit declined by pre-commit hook."
msgstr ""
-#: lib/commit.tcl:26
5
+#: lib/commit.tcl:26
4
msgid "Calling commit-msg hook..."
msgstr ""
msgid "Calling commit-msg hook..."
msgstr ""
-#: lib/commit.tcl:2
80
+#: lib/commit.tcl:2
79
msgid "Commit declined by commit-msg hook."
msgstr ""
msgid "Commit declined by commit-msg hook."
msgstr ""
-#: lib/commit.tcl:29
3
+#: lib/commit.tcl:29
2
msgid "Committing changes..."
msgstr ""
msgid "Committing changes..."
msgstr ""
-#: lib/commit.tcl:30
9
+#: lib/commit.tcl:30
8
msgid "write-tree failed:"
msgstr ""
msgid "write-tree failed:"
msgstr ""
-#: lib/commit.tcl:3
10 lib/commit.tcl:354 lib/commit.tcl:374
+#: lib/commit.tcl:3
09 lib/commit.tcl:353 lib/commit.tcl:373
msgid "Commit failed."
msgstr ""
msgid "Commit failed."
msgstr ""
-#: lib/commit.tcl:32
7
+#: lib/commit.tcl:32
6
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr ""
#, tcl-format
msgid "Commit %s appears to be corrupt"
msgstr ""
-#: lib/commit.tcl:33
2
+#: lib/commit.tcl:33
1
msgid ""
"No changes to commit.\n"
"\n"
msgid ""
"No changes to commit.\n"
"\n"
@@
-1358,19
+1358,19
@@
msgid ""
"A rescan will be automatically started now.\n"
msgstr ""
"A rescan will be automatically started now.\n"
msgstr ""
-#: lib/commit.tcl:33
9
+#: lib/commit.tcl:33
8
msgid "No changes to commit."
msgstr ""
msgid "No changes to commit."
msgstr ""
-#: lib/commit.tcl:35
3
+#: lib/commit.tcl:35
2
msgid "commit-tree failed:"
msgstr ""
msgid "commit-tree failed:"
msgstr ""
-#: lib/commit.tcl:37
3
+#: lib/commit.tcl:37
2
msgid "update-ref failed:"
msgstr ""
msgid "update-ref failed:"
msgstr ""
-#: lib/commit.tcl:46
1
+#: lib/commit.tcl:46
0
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
#, tcl-format
msgid "Created commit %s: %s"
msgstr ""
@@
-1999,7
+1999,8
@@
msgstr ""
msgid "Do not know how to initialize repository at location '%s'."
msgstr ""
msgid "Do not know how to initialize repository at location '%s'."
msgstr ""
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:71
+#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
+#: lib/transport.tcl:81
#, tcl-format
msgid "push %s"
msgstr ""
#, tcl-format
msgid "push %s"
msgstr ""
@@
-2017,11
+2018,11
@@
msgstr ""
msgid "From Repository"
msgstr ""
msgid "From Repository"
msgstr ""
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:1
23
+#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:1
34
msgid "Remote:"
msgstr ""
msgid "Remote:"
msgstr ""
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:1
38
+#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:1
49
msgid "Arbitrary Location:"
msgstr ""
msgid "Arbitrary Location:"
msgstr ""
@@
-2336,35
+2337,40
@@
msgstr ""
msgid "Pushing changes to %s"
msgstr ""
msgid "Pushing changes to %s"
msgstr ""
-#: lib/transport.tcl:72
+#: lib/transport.tcl:64
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr ""
+
+#: lib/transport.tcl:82
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr ""
#, tcl-format
msgid "Pushing %s %s to %s"
msgstr ""
-#: lib/transport.tcl:
89
+#: lib/transport.tcl:
100
msgid "Push Branches"
msgstr ""
msgid "Push Branches"
msgstr ""
-#: lib/transport.tcl:1
03
+#: lib/transport.tcl:1
14
msgid "Source Branches"
msgstr ""
msgid "Source Branches"
msgstr ""
-#: lib/transport.tcl:1
20
+#: lib/transport.tcl:1
31
msgid "Destination Repository"
msgstr ""
msgid "Destination Repository"
msgstr ""
-#: lib/transport.tcl:1
58
+#: lib/transport.tcl:1
69
msgid "Transfer Options"
msgstr ""
msgid "Transfer Options"
msgstr ""
-#: lib/transport.tcl:1
60
+#: lib/transport.tcl:1
71
msgid "Force overwrite existing branch (may discard changes)"
msgstr ""
msgid "Force overwrite existing branch (may discard changes)"
msgstr ""
-#: lib/transport.tcl:1
64
+#: lib/transport.tcl:1
75
msgid "Use thin pack (for slow network connections)"
msgstr ""
msgid "Use thin pack (for slow network connections)"
msgstr ""
-#: lib/transport.tcl:1
68
+#: lib/transport.tcl:1
79
msgid "Include tags"
msgstr ""
msgid "Include tags"
msgstr ""