Skip to content

Commit a2c01b5

Browse files
committed
l10n: Update git.pot (1 new message)
Changes of po/git.pot from v1.7.10-rc0 to v1.7.10-rc1: * 1 new l10n message at line: 3361. Signed-off-by: Jiang Xin <[email protected]>
1 parent d90b16e commit a2c01b5

File tree

1 file changed

+17
-12
lines changed

1 file changed

+17
-12
lines changed

po/git.pot

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: Git Mailing List <[email protected]>\n"
11-
"POT-Creation-Date: 2012-03-08 10:19+0800\n"
11+
"POT-Creation-Date: 2012-03-16 20:18+0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -3071,49 +3071,49 @@ msgstr ""
30713071
msgid "Patch format detection failed."
30723072
msgstr ""
30733073

3074-
#: git-am.sh:409
3074+
#: git-am.sh:411
30753075
msgid "-d option is no longer supported. Do not use."
30763076
msgstr ""
30773077

3078-
#: git-am.sh:472
3078+
#: git-am.sh:474
30793079
#, sh-format
30803080
msgid "previous rebase directory $dotest still exists but mbox given."
30813081
msgstr ""
30823082

3083-
#: git-am.sh:477
3083+
#: git-am.sh:479
30843084
msgid "Please make up your mind. --skip or --abort?"
30853085
msgstr ""
30863086

3087-
#: git-am.sh:504
3087+
#: git-am.sh:506
30883088
msgid "Resolve operation not in progress, we are not resuming."
30893089
msgstr ""
30903090

3091-
#: git-am.sh:570
3091+
#: git-am.sh:572
30923092
#, sh-format
30933093
msgid "Dirty index: cannot apply patches (dirty: $files)"
30943094
msgstr ""
30953095

3096-
#: git-am.sh:746
3096+
#: git-am.sh:748
30973097
msgid "cannot be interactive without stdin connected to a terminal."
30983098
msgstr ""
30993099

31003100
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
31013101
#. in your translation. The program will only accept English
31023102
#. input at this point.
3103-
#: git-am.sh:757
3103+
#: git-am.sh:759
31043104
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
31053105
msgstr ""
31063106

3107-
#: git-am.sh:793
3107+
#: git-am.sh:795
31083108
#, sh-format
31093109
msgid "Applying: $FIRSTLINE"
31103110
msgstr ""
31113111

3112-
#: git-am.sh:838
3112+
#: git-am.sh:840
31133113
msgid "No changes -- Patch already applied."
31143114
msgstr ""
31153115

3116-
#: git-am.sh:864
3116+
#: git-am.sh:866
31173117
msgid "applying to an empty history"
31183118
msgstr ""
31193119

@@ -3350,11 +3350,16 @@ msgstr ""
33503350
msgid "No submodule mapping found in .gitmodules for path '$path'"
33513351
msgstr ""
33523352

3353-
#: git-submodule.sh:173
3353+
#: git-submodule.sh:149
33543354
#, sh-format
33553355
msgid "Clone of '$url' into submodule path '$path' failed"
33563356
msgstr ""
33573357

3358+
#: git-submodule.sh:159
3359+
#, sh-format
3360+
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
3361+
msgstr ""
3362+
33583363
#: git-submodule.sh:247
33593364
#, sh-format
33603365
msgid "repo URL: '$repo' must be absolute or begin with ./|../"

0 commit comments

Comments
 (0)