i18n: merge: mark messages for translation
Mark messages shown to the user for translation. Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vasco Almeida committed
Jun 17, 2016 at 20:21 UTC
bef4830e88008adf488d190c742e243cacc46e16
1 file changed
+5
-5
builtin/merge.c
+5
-5
@@ -1014,7 +1014,7 @@ static int default_edit_option(void)
1014
if (e) {
1015
int v = git_config_maybe_bool(name, e);
1016
if (v < 0)
1017
- die("Bad value '%s' in environment '%s'", e, name);
1017
+ die(_("Bad value '%s' in environment '%s'"), e, name);
1018
return v;
1019
}
1020
@@ -1115,7 +1115,7 @@ static void handle_fetch_head(struct commit_list **remotes, struct strbuf *merge
1115
if (!commit) {
1116
if (ptr)
1117
*ptr = '\0';
1118
- die("not something we can merge in %s: %s",
1118
+ die(_("not something we can merge in %s: %s"),
1119
filename, merge_names->buf + pos);
1120
}
1121
remotes = &commit_list_insert(commit, remotes)->next;
@@ -1149,7 +1149,7 @@ static struct commit_list *collect_parents(struct commit *head_commit,
1149
struct commit *commit = get_merge_parent(argv[i]);
1150
if (!commit)
1151
help_unknown_ref(argv[i], "merge",
1152
- "not something we can merge");
1152
+ _("not something we can merge"));
1153
remotes = &commit_list_insert(commit, remotes)->next;
1154
}
1155
remoteheads = reduce_parents(head_commit, head_subsumed, remoteheads);
@@ -1421,7 +1421,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1421
* If head can reach all the merge then we are up to date.
1422
* but first the most common case of merging one remote.
1423
*/
1424
- finish_up_to_date("Already up-to-date.");
1424
+ finish_up_to_date(_("Already up-to-date."));
1425
goto done;
1426
} else if (fast_forward != FF_NO && !remoteheads->next &&
1427
!common->next &&
@@ -1506,7 +1506,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
1506
}
1507
}
1508
if (up_to_date) {
1509
- finish_up_to_date("Already up-to-date. Yeeah!");
1509
+ finish_up_to_date(_("Already up-to-date. Yeeah!"));
1510
goto done;
1511
}
1512
}