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 <worldhello.net@gmail.com>
Jiang Xin committed
Mar 16, 2012 at 20:28 UTC
a2c01b55ff71ee20c49c4e6d088e14b6e80dd930
1 file changed
+17
-12
po/git.pot
+17
-12
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: PACKAGE VERSION\n"
10
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
11
-"POT-Creation-Date: 2012-03-08 10:19+0800\n"
11
+"POT-Creation-Date: 2012-03-16 20:18+0800\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"
@@ -3071,49 +3071,49 @@ msgstr ""
3071
msgid "Patch format detection failed."
3072
msgstr ""
3073
3074
-#: git-am.sh:409
3074
+#: git-am.sh:411
3075
msgid "-d option is no longer supported. Do not use."
3076
msgstr ""
3077
3078
-#: git-am.sh:472
3078
+#: git-am.sh:474
3079
#, sh-format
3080
msgid "previous rebase directory $dotest still exists but mbox given."
3081
msgstr ""
3082
3083
-#: git-am.sh:477
3083
+#: git-am.sh:479
3084
msgid "Please make up your mind. --skip or --abort?"
3085
msgstr ""
3086
3087
-#: git-am.sh:504
3087
+#: git-am.sh:506
3088
msgid "Resolve operation not in progress, we are not resuming."
3089
msgstr ""
3090
3091
-#: git-am.sh:570
3091
+#: git-am.sh:572
3092
#, sh-format
3093
msgid "Dirty index: cannot apply patches (dirty: $files)"
3094
msgstr ""
3095
3096
-#: git-am.sh:746
3096
+#: git-am.sh:748
3097
msgid "cannot be interactive without stdin connected to a terminal."
3098
msgstr ""
3099
3100
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
3101
#. in your translation. The program will only accept English
3102
#. input at this point.
3103
-#: git-am.sh:757
3103
+#: git-am.sh:759
3104
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
3105
msgstr ""
3106
3107
-#: git-am.sh:793
3107
+#: git-am.sh:795
3108
#, sh-format
3109
msgid "Applying: $FIRSTLINE"
3110
msgstr ""
3111
3112
-#: git-am.sh:838
3112
+#: git-am.sh:840
3113
msgid "No changes -- Patch already applied."
3114
msgstr ""
3115
3116
-#: git-am.sh:864
3116
+#: git-am.sh:866
3117
msgid "applying to an empty history"
3118
msgstr ""
3119
@@ -3350,11 +3350,16 @@ msgstr ""
3350
msgid "No submodule mapping found in .gitmodules for path '$path'"
3351
msgstr ""
3352
3353
-#: git-submodule.sh:173
3353
+#: git-submodule.sh:149
3354
#, sh-format
3355
msgid "Clone of '$url' into submodule path '$path' failed"
3356
msgstr ""
3357
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
+
3363
#: git-submodule.sh:247
3364
#, sh-format
3365
msgid "repo URL: '$repo' must be absolute or begin with ./|../"