Changes of po/git.pot from v1.7.10 to v1.7.10-382-g62bc8
* 33 new l10n messages at lines:
401, 406, 411, 416, 1602, 1780, 2753, 2766, 2774, 2782, 3403, 3408,
3423, 3428, 3433, 3438, 3443, 3448, 3453, 3458, 3463, 3468, 3473,
3480, 3485, 3490, 3495, 3500, 3505, 3510, 3515, 3520, 3525
* 24 deleted l10n messages at lines:
2740, 3351, 3356, 3371, 3376, 3381, 3386, 3391, 3396, 3401, 3406,
3411, 3416, 3421, 3428, 3433, 3438, 3443, 3448, 3453, 3458, 3463,
3468, 3473
Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2012-03-16 20:18+0800\n"
+"POT-Creation-Date: 2012-04-28 20:17+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"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
#, c-format
msgid "hint: %.*s\n"
msgstr ""
#, c-format
msgid "hint: %.*s\n"
msgstr ""
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
#. * Message used both when 'git commit' fails and when
#. * other commands doing a merge do.
#.
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
msgid ""
"Fix them up in the work tree,\n"
"and then use 'git add/rm <file>' as\n"
"or use 'git commit -a'."
msgstr ""
"or use 'git commit -a'."
msgstr ""
#, c-format
msgid "could not parse %s"
msgstr ""
#, c-format
msgid "could not parse %s"
msgstr ""
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
#, c-format
msgid "%s %s is not a commit!"
msgstr ""
msgid " 0 files changed\n"
msgstr ""
msgid " 0 files changed\n"
msgstr ""
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid " %d file changed"
msgid_plural " %d files changed"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ", %d insertion(+)"
msgid_plural ", %d insertions(+)"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ", %d deletion(-)"
msgid_plural ", %d deletions(-)"
msgstr[0] ""
msgstr[1] ""
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
-#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985
-#: builtin/merge.c:1095 builtin/merge.c:1105
+#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978
+#: builtin/merge.c:1088 builtin/merge.c:1098
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867
-#: builtin/merge.c:1097 builtin/merge.c:1110
+#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868
+#: builtin/merge.c:1090 builtin/merge.c:1103
#, c-format
msgid "Could not write to '%s'"
msgstr ""
#, c-format
msgid "Could not write to '%s'"
msgstr ""
msgid "could not apply %s... %s"
msgstr ""
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713
-#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348
+#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719
+#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
msgid "Can't cherry-pick into empty head"
msgstr ""
+#: sha1_name.c:864
+msgid "HEAD does not point to a branch"
+msgstr ""
+
+#: sha1_name.c:867
+#, c-format
+msgid "No such branch: '%s'"
+msgstr ""
+
+#: sha1_name.c:869
+#, c-format
+msgid "No upstream configured for branch '%s'"
+msgstr ""
+
+#: sha1_name.c:872
+#, c-format
+msgid "Upstream branch '%s' not stored as a remote-tracking branch"
+msgstr ""
+
#: wt-status.c:134
msgid "Unmerged paths:"
msgstr ""
#: wt-status.c:134
msgid "Unmerged paths:"
msgstr ""
msgstr ""
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
msgstr ""
#. TRANSLATORS: This is "remote " in "remote branch '%s' not found"
msgid "remote "
msgstr ""
msgid "remote "
msgstr ""
msgid "cannot use -a with -d"
msgstr ""
msgid "cannot use -a with -d"
msgstr ""
msgid "Couldn't look up commit object for HEAD"
msgstr ""
msgid "Couldn't look up commit object for HEAD"
msgstr ""
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
#, c-format
msgid "Cannot delete the branch '%s' which you are currently on."
msgstr ""
#, c-format
msgid "%sbranch '%s' not found."
msgstr ""
#, c-format
msgid "%sbranch '%s' not found."
msgstr ""
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr ""
#, c-format
msgid "Error deleting %sbranch '%s'"
msgstr ""
#, c-format
msgid "Error deleting %sbranch '%s'"
msgstr ""
#, c-format
msgid "Deleted %sbranch %s (was %s).\n"
msgstr ""
#, c-format
msgid "Deleted %sbranch %s (was %s).\n"
msgstr ""
msgid "Update of config-file failed"
msgstr ""
msgid "Update of config-file failed"
msgstr ""
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr ""
#, c-format
msgid "branch '%s' does not point at a commit"
msgstr ""
#, c-format
msgid "behind %d] "
msgstr ""
#, c-format
msgid "behind %d] "
msgstr ""
#, c-format
msgid "ahead %d] "
msgstr ""
#, c-format
msgid "ahead %d] "
msgstr ""
#, c-format
msgid "ahead %d, behind %d] "
msgstr ""
#, c-format
msgid "ahead %d, behind %d] "
msgstr ""
msgid "(no branch)"
msgstr ""
msgid "(no branch)"
msgstr ""
msgid "some refs could not be read"
msgstr ""
msgid "some refs could not be read"
msgstr ""
msgid "cannot rename the current branch while not on any."
msgstr ""
msgid "cannot rename the current branch while not on any."
msgstr ""
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
msgid "Branch rename failed"
msgstr ""
msgid "Branch rename failed"
msgstr ""
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
#, c-format
msgid "malformed object name %s"
msgstr ""
#, c-format
msgid "malformed object name %s"
msgstr ""
#, c-format
msgid "could not write branch description template: %s\n"
msgstr ""
#, c-format
msgid "could not write branch description template: %s\n"
msgstr ""
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
msgid "Failed to resolve HEAD as a valid ref."
msgstr ""
-#: builtin/branch.c:751 builtin/clone.c:558
+#: builtin/branch.c:755 builtin/clone.c:558
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "HEAD not found below refs/heads!"
msgstr ""
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
msgstr ""
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
msgstr ""
#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583
msgid "unable to write new index file"
msgstr ""
msgid "unable to write new index file"
msgstr ""
msgid "Can not do reflog for '%s'\n"
msgstr ""
msgid "Can not do reflog for '%s'\n"
msgstr ""
-#: builtin/checkout.c:565
+#: builtin/checkout.c:566
msgid "HEAD is now at"
msgstr ""
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:572
+#: builtin/checkout.c:573
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:575
+#: builtin/checkout.c:576
#, c-format
msgid "Already on '%s'\n"
msgstr ""
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:579
+#: builtin/checkout.c:580
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:581
+#: builtin/checkout.c:582
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:583
+#: builtin/checkout.c:584
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:639
+#: builtin/checkout.c:640
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
#, c-format
msgid " ... and %d more.\n"
msgstr ""
#. The singular version
-#: builtin/checkout.c:645
+#: builtin/checkout.c:646
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
msgstr[0] ""
msgstr[1] ""
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:663
+#: builtin/checkout.c:664
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
-#: builtin/checkout.c:692
+#: builtin/checkout.c:693
msgid "internal error in revision walk"
msgstr ""
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:696
+#: builtin/checkout.c:697
msgid "Previous HEAD position was"
msgstr ""
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:722
+#: builtin/checkout.c:723
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
msgid "You are on a branch yet to be born"
msgstr ""
#. case (1)
-#: builtin/checkout.c:853
+#: builtin/checkout.c:854
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
#, c-format
msgid "invalid reference: %s"
msgstr ""
#. case (1): want a tree
-#: builtin/checkout.c:892
+#: builtin/checkout.c:893
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:972
+#: builtin/checkout.c:973
msgid "-B cannot be used with -b"
msgstr ""
msgid "-B cannot be used with -b"
msgstr ""
-#: builtin/checkout.c:981
+#: builtin/checkout.c:982
msgid "--patch is incompatible with all other options"
msgstr ""
msgid "--patch is incompatible with all other options"
msgstr ""
-#: builtin/checkout.c:984
+#: builtin/checkout.c:985
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr ""
-#: builtin/checkout.c:986
+#: builtin/checkout.c:987
msgid "--detach cannot be used with -t"
msgstr ""
msgid "--detach cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:992
+#: builtin/checkout.c:993
msgid "--track needs a branch name"
msgstr ""
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:999
+#: builtin/checkout.c:1000
msgid "Missing branch name; try -b"
msgstr ""
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1006
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
msgid "--orphan and -b|-B are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1007
+#: builtin/checkout.c:1008
msgid "--orphan cannot be used with -t"
msgstr ""
msgid "--orphan cannot be used with -t"
msgstr ""
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1018
msgid "git checkout: -f and -m are incompatible"
msgstr ""
msgid "git checkout: -f and -m are incompatible"
msgstr ""
-#: builtin/checkout.c:1051
+#: builtin/checkout.c:1052
msgid "invalid path specification"
msgstr ""
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1059
+#: builtin/checkout.c:1060
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
"Did you intend to checkout '%s' which can not be resolved as commit?"
msgstr ""
-#: builtin/checkout.c:1061
+#: builtin/checkout.c:1062
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
msgid "git checkout: updating paths is incompatible with switching branches."
msgstr ""
-#: builtin/checkout.c:1066
+#: builtin/checkout.c:1067
msgid "git checkout: --detach does not take a path argument"
msgstr ""
msgid "git checkout: --detach does not take a path argument"
msgstr ""
-#: builtin/checkout.c:1069
+#: builtin/checkout.c:1070
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
msgstr ""
-#: builtin/checkout.c:1088
+#: builtin/checkout.c:1089
msgid "Cannot switch branch to a non-commit."
msgstr ""
msgid "Cannot switch branch to a non-commit."
msgstr ""
-#: builtin/checkout.c:1091
+#: builtin/checkout.c:1092
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
msgid "--ours/--theirs is incompatible with switching branches."
msgstr ""
msgid "unable to write temporary index file"
msgstr ""
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:550 builtin/commit.c:556
+#: builtin/commit.c:561 builtin/commit.c:567
#, c-format
msgid "invalid commit: %s"
msgstr ""
#, c-format
msgid "invalid commit: %s"
msgstr ""
msgid "malformed --author parameter"
msgstr ""
msgid "malformed --author parameter"
msgstr ""
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
#, c-format
msgid "Malformed ident string: '%s'"
msgstr ""
-#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000
+#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033
#, c-format
msgid "could not lookup commit %s"
msgstr ""
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:682 builtin/shortlog.c:296
+#: builtin/commit.c:701 builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
msgid "could not read log from standard input"
msgstr ""
msgid "could not read log from standard input"
msgstr ""
#, c-format
msgid "could not read log file '%s'"
msgstr ""
#, c-format
msgid "could not read log file '%s'"
msgstr ""
msgid "commit has empty message"
msgstr ""
msgid "commit has empty message"
msgstr ""
msgid "could not read MERGE_MSG"
msgstr ""
msgid "could not read MERGE_MSG"
msgstr ""
msgid "could not read SQUASH_MSG"
msgstr ""
msgid "could not read SQUASH_MSG"
msgstr ""
#, c-format
msgid "could not read '%s'"
msgstr ""
#, c-format
msgid "could not read '%s'"
msgstr ""
#, c-format
msgid "could not open '%s'"
msgstr ""
#, c-format
msgid "could not open '%s'"
msgstr ""
msgid "could not write commit template"
msgstr ""
msgid "could not write commit template"
msgstr ""
#, c-format
msgid ""
"\n"
#, c-format
msgid ""
"\n"
"and try again.\n"
msgstr ""
"and try again.\n"
msgstr ""
msgid "Please enter the commit message for your changes."
msgstr ""
msgid "Please enter the commit message for your changes."
msgstr ""
msgid ""
" Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
msgid ""
" Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
msgstr ""
msgid ""
" Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
msgid ""
" Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
"An empty message aborts the commit.\n"
msgstr ""
#, c-format
msgid "%sAuthor: %s"
msgstr ""
#, c-format
msgid "%sAuthor: %s"
msgstr ""
#, c-format
msgid "%sCommitter: %s"
msgstr ""
#, c-format
msgid "%sCommitter: %s"
msgstr ""
msgid "Cannot read index"
msgstr ""
msgid "Cannot read index"
msgstr ""
msgid "Error building trees"
msgstr ""
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:895 builtin/tag.c:357
+#: builtin/commit.c:911 builtin/tag.c:357
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
+#: builtin/commit.c:1008
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
#, c-format
msgid "No existing author found with '%s'"
msgstr ""
-#: builtin/commit.c:990 builtin/commit.c:1182
+#: builtin/commit.c:1023 builtin/commit.c:1217
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1030
+#: builtin/commit.c:1063
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1041
+#: builtin/commit.c:1074
msgid "You have nothing to amend."
msgstr ""
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1043
+#: builtin/commit.c:1076
#, c-format
msgid "You are in the middle of a %s -- cannot amend."
msgstr ""
#, c-format
msgid "You are in the middle of a %s -- cannot amend."
msgstr ""
-#: builtin/commit.c:1045
+#: builtin/commit.c:1078
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1055
+#: builtin/commit.c:1088
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1057
+#: builtin/commit.c:1090
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1063
+#: builtin/commit.c:1098
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1080
+#: builtin/commit.c:1115
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1082
+#: builtin/commit.c:1117
msgid "No paths with --include/--only does not make sense."
msgstr ""
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1084
+#: builtin/commit.c:1119
msgid "Clever... amending the last one with dirty index."
msgstr ""
msgid "Clever... amending the last one with dirty index."
msgstr ""
-#: builtin/commit.c:1086
+#: builtin/commit.c:1121
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr ""
-#: builtin/commit.c:1096 builtin/tag.c:556
+#: builtin/commit.c:1131 builtin/tag.c:556
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1101
+#: builtin/commit.c:1136
msgid "Paths with -a does not make sense."
msgstr ""
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1280
+#: builtin/commit.c:1315
msgid "couldn't look up newly created commit"
msgstr ""
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1282
+#: builtin/commit.c:1317
msgid "could not parse newly created commit"
msgstr ""
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1323
+#: builtin/commit.c:1358
msgid "detached HEAD"
msgstr ""
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1325
+#: builtin/commit.c:1360
msgid " (root-commit)"
msgstr ""
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1415
+#: builtin/commit.c:1450
msgid "could not parse HEAD commit"
msgstr ""
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1452 builtin/merge.c:509
+#: builtin/commit.c:1487 builtin/merge.c:509
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
-#: builtin/commit.c:1459
+#: builtin/commit.c:1494
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1466
+#: builtin/commit.c:1501
msgid "could not read MERGE_MODE"
msgstr ""
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1485
+#: builtin/commit.c:1520
#, c-format
msgid "could not read commit message: %s"
msgstr ""
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1499
+#: builtin/commit.c:1534
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1539
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968
+#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr ""
msgid "failed to write commit object"
msgstr ""
-#: builtin/commit.c:1535
+#: builtin/commit.c:1575
msgid "cannot lock HEAD ref"
msgstr ""
msgid "cannot lock HEAD ref"
msgstr ""
-#: builtin/commit.c:1539
+#: builtin/commit.c:1579
msgid "cannot update HEAD ref"
msgstr ""
msgid "cannot update HEAD ref"
msgstr ""
-#: builtin/commit.c:1550
+#: builtin/commit.c:1590
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
msgid "Couldn't find remote ref HEAD"
msgstr ""
msgid "Couldn't find remote ref HEAD"
msgstr ""
#, c-format
msgid "object %s not found"
msgstr ""
#, c-format
msgid "object %s not found"
msgstr ""
msgid "[up to date]"
msgstr ""
msgid "[up to date]"
msgstr ""
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
#, c-format
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
msgstr ""
-#: builtin/fetch.c:273 builtin/fetch.c:351
+#: builtin/fetch.c:274 builtin/fetch.c:360
msgid "[rejected]"
msgstr ""
msgid "[rejected]"
msgstr ""
msgid "[tag update]"
msgstr ""
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331
+#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
msgid " (unable to update local ref)"
msgstr ""
msgid " (unable to update local ref)"
msgstr ""
msgid "[new tag]"
msgstr ""
msgid "[new tag]"
msgstr ""
msgid "[new branch]"
msgstr ""
msgid "[new branch]"
msgstr ""
+#: builtin/fetch.c:311
+msgid "[new ref]"
+msgstr ""
+
+#: builtin/fetch.c:356
msgid "unable to update local ref"
msgstr ""
msgid "unable to update local ref"
msgstr ""
msgid "forced update"
msgstr ""
msgid "forced update"
msgstr ""
msgid "(non-fast-forward)"
msgstr ""
msgid "(non-fast-forward)"
msgstr ""
-#: builtin/fetch.c:384 builtin/fetch.c:676
+#: builtin/fetch.c:393 builtin/fetch.c:685
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
#, c-format
msgid "cannot open %s: %s\n"
msgstr ""
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
#, c-format
msgid "From %.*s\n"
msgstr ""
#, c-format
msgid "From %.*s\n"
msgstr ""
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr ""
#, c-format
msgid " (%s will become dangling)\n"
msgstr ""
#, c-format
msgid " (%s will become dangling)\n"
msgstr ""
#, c-format
msgid " (%s has become dangling)\n"
msgstr ""
#, c-format
msgid " (%s has become dangling)\n"
msgstr ""
msgid "[deleted]"
msgstr ""
msgid "[deleted]"
msgstr ""
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
#, c-format
msgid "Don't know how to fetch from %s"
msgstr ""
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
#, c-format
msgid "Fetching %s\n"
msgstr ""
#, c-format
msgid "Fetching %s\n"
msgstr ""
#, c-format
msgid "Could not fetch %s"
msgstr ""
#, c-format
msgid "Could not fetch %s"
msgstr ""
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
msgid "You need to specify a tag name."
msgstr ""
msgid "You need to specify a tag name."
msgstr ""
msgid "fetch --all does not take a repository argument"
msgstr ""
msgid "fetch --all does not take a repository argument"
msgstr ""
msgid "fetch --all does not make sense with refspecs"
msgstr ""
msgid "fetch --all does not make sense with refspecs"
msgstr ""
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
msgid "Cannot access work tree '%s'"
msgstr ""
msgid "Cannot access work tree '%s'"
msgstr ""
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:395 builtin/log.c:483
+#: builtin/log.c:401 builtin/log.c:489
#, c-format
msgid "Could not read object %s"
msgstr ""
#, c-format
msgid "Could not read object %s"
msgstr ""
#, c-format
msgid "Unknown type: %d"
msgstr ""
#, c-format
msgid "Unknown type: %d"
msgstr ""
msgid "format.headers without value"
msgstr ""
msgid "format.headers without value"
msgstr ""
msgid "name of output directory is too long"
msgstr ""
msgid "name of output directory is too long"
msgstr ""
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
msgid "Need exactly one range."
msgstr ""
msgid "Need exactly one range."
msgstr ""
msgid "Not a range."
msgstr ""
msgid "Not a range."
msgstr ""
msgid "Could not extract email from committer identity."
msgstr ""
msgid "Could not extract email from committer identity."
msgstr ""
msgid "Cover letter needs email format"
msgstr ""
msgid "Cover letter needs email format"
msgstr ""
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
msgid "Two output directories?"
msgstr ""
msgid "Two output directories?"
msgstr ""
#, c-format
msgid "bogus committer info %s"
msgstr ""
#, c-format
msgid "bogus committer info %s"
msgstr ""
msgid "-n and -k are mutually exclusive."
msgstr ""
msgid "-n and -k are mutually exclusive."
msgstr ""
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
msgid "--subject-prefix and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1225 builtin/shortlog.c:284
+#: builtin/log.c:1231 builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
msgid "--name-only does not make sense"
msgstr ""
msgid "--name-only does not make sense"
msgstr ""
msgid "--name-status does not make sense"
msgstr ""
msgid "--name-status does not make sense"
msgstr ""
msgid "--check does not make sense"
msgstr ""
msgid "--check does not make sense"
msgstr ""
msgid "standard output, or directory, which one?"
msgstr ""
msgid "standard output, or directory, which one?"
msgstr ""
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
msgid "Failed to create output files"
msgstr ""
msgid "Failed to create output files"
msgstr ""
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544
+#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550
#, c-format
msgid "Unknown commit %s"
msgstr ""
#, c-format
msgid "Unknown commit %s"
msgstr ""
msgid "switch `m' requires a value"
msgstr ""
msgid "switch `m' requires a value"
msgstr ""
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
#, c-format
msgid "Available strategies are:"
msgstr ""
#, c-format
msgid "Available strategies are:"
msgstr ""
#, c-format
msgid "Available custom strategies are:"
msgstr ""
#, c-format
msgid "Available custom strategies are:"
msgstr ""
msgid "could not run stash."
msgstr ""
msgid "could not run stash."
msgstr ""
msgid "stash failed"
msgstr ""
msgid "stash failed"
msgstr ""
#, c-format
msgid "not a valid object: %s"
msgstr ""
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:270 builtin/merge.c:287
+#: builtin/merge.c:269 builtin/merge.c:286
msgid "read-tree failed"
msgstr ""
msgid "read-tree failed"
msgstr ""
msgid " (nothing to squash)"
msgstr ""
msgid " (nothing to squash)"
msgstr ""
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
msgid "Writing SQUASH_MSG"
msgstr ""
msgid "Writing SQUASH_MSG"
msgstr ""
msgid "Finishing SQUASH_MSG"
msgstr ""
msgid "Finishing SQUASH_MSG"
msgstr ""
msgid "failed to read the cache"
msgstr ""
msgid "failed to read the cache"
msgstr ""
msgid "Unable to write index."
msgstr ""
msgid "Unable to write index."
msgstr ""
msgid "Not handling anything other than two heads merge."
msgstr ""
msgid "Not handling anything other than two heads merge."
msgstr ""
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
#, c-format
msgid "unable to write %s"
msgstr ""
#, c-format
msgid "unable to write %s"
msgstr ""
#, c-format
msgid "Could not read from '%s'"
msgstr ""
#, c-format
msgid "Could not read from '%s'"
msgstr ""
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
"especially if it merges an updated upstream into a topic branch.\n"
"the commit.\n"
msgstr ""
"the commit.\n"
msgstr ""
msgid "Empty commit message."
msgstr ""
msgid "Empty commit message."
msgstr ""
#, c-format
msgid "Wonderful.\n"
msgstr ""
#, c-format
msgid "Wonderful.\n"
msgstr ""
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
#, c-format
msgid "'%s' is not a commit"
msgstr ""
#, c-format
msgid "'%s' is not a commit"
msgstr ""
msgid "No current branch."
msgstr ""
msgid "No current branch."
msgstr ""
msgid "No remote for the current branch."
msgstr ""
msgid "No remote for the current branch."
msgstr ""
msgid "No default upstream defined for the current branch."
msgstr ""
msgid "No default upstream defined for the current branch."
msgstr ""
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr ""
#, c-format
msgid "No remote tracking branch for %s from %s"
msgstr ""
+#: builtin/merge.c:1146 builtin/merge.c:1303
+#, c-format
+msgid "%s - not something we can merge"
+msgstr ""
+
+#: builtin/merge.c:1214
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1204 git-pull.sh:31
+#: builtin/merge.c:1230 git-pull.sh:31
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
-#: builtin/merge.c:1207 git-pull.sh:34
+#: builtin/merge.c:1233 git-pull.sh:34
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you can merge."
msgstr ""
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
msgid "You cannot combine --squash with --no-ff."
msgstr ""
msgid "You cannot combine --squash with --no-ff."
msgstr ""
msgid "You cannot combine --no-ff with --ff-only."
msgstr ""
msgid "You cannot combine --no-ff with --ff-only."
msgstr ""
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
msgid "Can merge only exactly one commit into empty head"
msgstr ""
msgid "Can merge only exactly one commit into empty head"
msgstr ""
msgid "Squash commit into empty head not supported yet"
msgstr ""
msgid "Squash commit into empty head not supported yet"
msgstr ""
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1275 builtin/merge.c:1319
-#, c-format
-msgid "%s - not something we can merge"
-msgstr ""
-
-#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
#, c-format
msgid "Nope.\n"
msgstr ""
#, c-format
msgid "Nope.\n"
msgstr ""
msgid "Not possible to fast-forward, aborting."
msgstr ""
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1485 builtin/merge.c:1562
+#: builtin/merge.c:1513 builtin/merge.c:1592
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
msgid "unable to parse value '%s' for option %s"
msgstr ""
msgid "unable to parse value '%s' for option %s"
msgstr ""
msgid "tag shorthand without <tag>"
msgstr ""
msgid "tag shorthand without <tag>"
msgstr ""
msgid "--delete only accepts plain target ref names"
msgstr ""
msgid "--delete only accepts plain target ref names"
msgstr ""
#, c-format
msgid ""
"You are not currently on a branch.\n"
#, c-format
msgid ""
"You are not currently on a branch.\n"
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
" git push --set-upstream %s %s\n"
msgstr ""
" git push --set-upstream %s %s\n"
msgstr ""
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
+#: builtin/push.c:102
+#, c-format
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+"You are pushing to remote '%s', which is not the upstream of\n"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
msgstr ""
#: builtin/push.c:131
msgstr ""
#: builtin/push.c:131
-#, c-format
-msgid "Pushing to %s\n"
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+
+#: builtin/push.c:138
+msgid ""
+"Updates were rejected because the tip of your current branch is behind\n"
+"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
+"before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:144
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. If you did not intend to push that branch, you may want to\n"
+"specify branches to push or set the 'push.default' configuration\n"
+"variable to 'current' or 'upstream' to push only the current branch."
+#: builtin/push.c:150
+msgid ""
+"Updates were rejected because a pushed branch tip is behind its remote\n"
+"counterpart. Check out this branch and merge the remote changes\n"
+"(e.g. 'git pull') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+
+#: builtin/push.c:190
-msgid "failed to push some refs to '%s'"
-msgid ""
-"To prevent you from losing history, non-fast-forward updates were rejected\n"
-"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n"
-"'Note about fast-forwards' section of 'git push --help' for details.\n"
+msgid "failed to push some refs to '%s'"
#, c-format
msgid "bad repository '%s'"
msgstr ""
#, c-format
msgid "bad repository '%s'"
msgstr ""
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
" git push <name>\n"
msgstr ""
" git push <name>\n"
msgstr ""
msgid "--all and --tags are incompatible"
msgstr ""
msgid "--all and --tags are incompatible"
msgstr ""
msgid "--all can't be combined with refspecs"
msgstr ""
msgid "--all can't be combined with refspecs"
msgstr ""
msgid "--mirror and --tags are incompatible"
msgstr ""
msgid "--mirror and --tags are incompatible"
msgstr ""
msgid "--mirror can't be combined with refspecs"
msgstr ""
msgid "--mirror can't be combined with refspecs"
msgstr ""
msgid "--all and --mirror are incompatible"
msgstr ""
msgid "--all and --mirror are incompatible"
msgstr ""
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
msgid "--delete doesn't make sense without any refs"
msgstr ""
msgid "--delete doesn't make sense without any refs"
msgstr ""
msgid "Could not reset index file to revision '%s'."
msgstr ""
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/revert.c:70 builtin/revert.c:91
+#: builtin/revert.c:70 builtin/revert.c:92
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
#, c-format
msgid "%s: %s cannot be used with %s"
msgstr ""
msgid "program error"
msgstr ""
msgid "program error"
msgstr ""
msgid "revert failed"
msgstr ""
msgid "revert failed"
msgstr ""
msgid "cherry-pick failed"
msgstr ""
msgid "cherry-pick failed"
msgstr ""
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
msgid "You need to set your committer info first"
msgstr ""
msgid "You need to set your committer info first"
msgstr ""
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr ""
msgid "Patch format detection failed."
msgstr ""
msgid "Patch format detection failed."
msgstr ""
msgid "-d option is no longer supported. Do not use."
msgstr ""
msgid "-d option is no longer supported. Do not use."
msgstr ""
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr ""
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
msgid "Please make up your mind. --skip or --abort?"
msgstr ""
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr ""
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
#. in your translation. The program will only accept English
#. input at this point.
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr ""
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr ""
msgid "No changes -- Patch already applied."
msgstr ""
msgid "No changes -- Patch already applied."
msgstr ""
msgid "applying to an empty history"
msgstr ""
msgid "applying to an empty history"
msgstr ""
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
msgid "cannot strip one component off url '$remoteurl'"
msgstr ""
-msgid "No submodule mapping found in .gitmodules for path '$path'"
+msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
-msgid "Clone of '$url' into submodule path '$path' failed"
+msgid "Clone of '$url' into submodule path '$sm_path' failed"
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr ""
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
#, sh-format
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
msgstr ""
-msgid "'$path' already exists in the index"
+msgid "'$sm_path' already exists in the index"
-msgid "'$path' already exists and is not a valid git repo"
+msgid "'$sm_path' already exists and is not a valid git repo"
-msgid "Unable to checkout submodule '$path'"
+msgid "Unable to checkout submodule '$sm_path'"
-msgid "Failed to add submodule '$path'"
+msgid "Failed to add submodule '$sm_path'"
-msgid "Failed to register submodule '$path'"
+msgid "Failed to register submodule '$sm_path'"
-msgid "Entering '$prefix$path'"
+msgid "Entering '$prefix$sm_path'"
-msgid "Stopping at '$path'; script returned non-zero status."
+msgid "Stopping at '$sm_path'; script returned non-zero status."
-msgid "No url found for submodule path '$path' in .gitmodules"
+msgid "No url found for submodule path '$sm_path' in .gitmodules"
-msgid "Failed to register url for submodule path '$path'"
+msgid "Failed to register url for submodule path '$sm_path'"
-msgid "Failed to register update mode for submodule path '$path'"
+msgid "Failed to register update mode for submodule path '$sm_path'"
-msgid "Submodule '$name' ($url) registered for path '$path'"
+msgid "Submodule '$name' ($url) registered for path '$sm_path'"
-"Submodule path '$path' not initialized\n"
+"Submodule path '$sm_path' not initialized\n"
"Maybe you want to use 'update --init'?"
msgstr ""
"Maybe you want to use 'update --init'?"
msgstr ""
-msgid "Unable to find current revision in submodule path '$path'"
+msgid "Unable to find current revision in submodule path '$sm_path'"
-msgid "Unable to fetch in submodule path '$path'"
+msgid "Unable to fetch in submodule path '$sm_path'"
-msgid "Unable to rebase '$sha1' in submodule path '$path'"
+msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
-msgid "Submodule path '$path': rebased into '$sha1'"
+msgid "Submodule path '$sm_path': rebased into '$sha1'"
-msgid "Unable to merge '$sha1' in submodule path '$path'"
+msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
-msgid "Submodule path '$path': merged in '$sha1'"
+msgid "Submodule path '$sm_path': merged in '$sha1'"
-msgid "Unable to checkout '$sha1' in submodule path '$path'"
+msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
-msgid "Submodule path '$path': checked out '$sha1'"
+msgid "Submodule path '$sm_path': checked out '$sha1'"
-#: git-submodule.sh:600 git-submodule.sh:923
+#: git-submodule.sh:604 git-submodule.sh:927
-msgid "Failed to recurse into submodule path '$path'"
+msgid "Failed to recurse into submodule path '$sm_path'"
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
msgid "submodule"
msgstr ""
msgid "submodule"
msgstr ""
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr ""