i18n: branch: mark strings for translation
Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jiang Xin committed
Apr 16, 2013 at 11:37 UTC
bc554df8c90e3592e8cd70460032b524fb6f03bc
1 file changed
+27
-27
branch.c
+27
-27
@@ -57,7 +57,7 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
57
if (remote_is_branch
58
&& !strcmp(local, shortname)
59
&& !origin) {
60
- warning("Not setting branch %s as its own upstream.",
60
+ warning(_("Not setting branch %s as its own upstream."),
61
local);
62
return;
63
}
@@ -78,25 +78,25 @@ void install_branch_config(int flag, const char *local, const char *origin, cons
78
79
if (flag & BRANCH_CONFIG_VERBOSE) {
80
if (remote_is_branch && origin)
81
- printf(rebasing ?
82
- "Branch %s set up to track remote branch %s from %s by rebasing.\n" :
83
- "Branch %s set up to track remote branch %s from %s.\n",
84
- local, shortname, origin);
81
+ printf_ln(rebasing ?
82
+ _("Branch %s set up to track remote branch %s from %s by rebasing.") :
83
+ _("Branch %s set up to track remote branch %s from %s."),
84
+ local, shortname, origin);
85
else if (remote_is_branch && !origin)
86
- printf(rebasing ?
87
- "Branch %s set up to track local branch %s by rebasing.\n" :
88
- "Branch %s set up to track local branch %s.\n",
89
- local, shortname);
86
+ printf_ln(rebasing ?
87
+ _("Branch %s set up to track local branch %s by rebasing.") :
88
+ _("Branch %s set up to track local branch %s."),
89
+ local, shortname);
90
else if (!remote_is_branch && origin)
91
- printf(rebasing ?
92
- "Branch %s set up to track remote ref %s by rebasing.\n" :
93
- "Branch %s set up to track remote ref %s.\n",
94
- local, remote);
91
+ printf_ln(rebasing ?
92
+ _("Branch %s set up to track remote ref %s by rebasing.") :
93
+ _("Branch %s set up to track remote ref %s."),
94
+ local, remote);
95
else if (!remote_is_branch && !origin)
96
- printf(rebasing ?
97
- "Branch %s set up to track local ref %s by rebasing.\n" :
98
- "Branch %s set up to track local ref %s.\n",
99
- local, remote);
96
+ printf_ln(rebasing ?
97
+ _("Branch %s set up to track local ref %s by rebasing.") :
98
+ _("Branch %s set up to track local ref %s."),
99
+ local, remote);
100
else
101
die("BUG: impossible combination of %d and %p",
102
remote_is_branch, origin);
@@ -115,7 +115,7 @@ static int setup_tracking(const char *new_ref, const char *orig_ref,
115
int config_flags = quiet ? 0 : BRANCH_CONFIG_VERBOSE;
116
117
if (strlen(new_ref) > 1024 - 7 - 7 - 1)
118
- return error("Tracking not set up: name too long: %s",
118
+ return error(_("Tracking not set up: name too long: %s"),
119
new_ref);
120
121
memset(&tracking, 0, sizeof(tracking));
@@ -134,7 +134,7 @@ static int setup_tracking(const char *new_ref, const char *orig_ref,
134
}
135
136
if (tracking.matches > 1)
137
- return error("Not tracking: ambiguous information for ref %s",
137
+ return error(_("Not tracking: ambiguous information for ref %s"),
138
orig_ref);
139
140
install_branch_config(config_flags, new_ref, tracking.remote,
@@ -179,12 +179,12 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
179
int force, int attr_only)
180
{
181
if (strbuf_check_branch_ref(ref, name))
182
- die("'%s' is not a valid branch name.", name);
182
+ die(_("'%s' is not a valid branch name."), name);
183
184
if (!ref_exists(ref->buf))
185
return 0;
186
else if (!force && !attr_only)
187
- die("A branch named '%s' already exists.", ref->buf + strlen("refs/heads/"));
187
+ die(_("A branch named '%s' already exists."), ref->buf + strlen("refs/heads/"));
188
189
if (!attr_only) {
190
const char *head;
@@ -192,7 +192,7 @@ int validate_new_branchname(const char *name, struct strbuf *ref,
192
193
head = resolve_ref_unsafe("HEAD", sha1, 0, NULL);
194
if (!is_bare_repository() && head && !strcmp(head, ref->buf))
195
- die("Cannot force update the current branch.");
195
+ die(_("Cannot force update the current branch."));
196
}
197
return 1;
198
}
@@ -247,7 +247,7 @@ void create_branch(const char *head,
247
}
248
die(_(upstream_missing), start_name);
249
}
250
- die("Not a valid object name: '%s'.", start_name);
250
+ die(_("Not a valid object name: '%s'."), start_name);
251
}
252
253
switch (dwim_ref(start_name, strlen(start_name), sha1, &real_ref)) {
@@ -267,18 +267,18 @@ void create_branch(const char *head,
267
}
268
break;
269
default:
270
- die("Ambiguous object name: '%s'.", start_name);
270
+ die(_("Ambiguous object name: '%s'."), start_name);
271
break;
272
}
273
274
if ((commit = lookup_commit_reference(sha1)) == NULL)
275
- die("Not a valid branch point: '%s'.", start_name);
275
+ die(_("Not a valid branch point: '%s'."), start_name);
276
hashcpy(sha1, commit->object.sha1);
277
278
if (!dont_change_ref) {
279
lock = lock_any_ref_for_update(ref.buf, NULL, 0);
280
if (!lock)
281
- die_errno("Failed to lock ref for update");
281
+ die_errno(_("Failed to lock ref for update"));
282
}
283
284
if (reflog)
@@ -296,7 +296,7 @@ void create_branch(const char *head,
296
297
if (!dont_change_ref)
298
if (write_ref_sha1(lock, sha1, msg) < 0)
299
- die_errno("Failed to write ref");
299
+ die_errno(_("Failed to write ref"));
300
301
strbuf_release(&ref);
302
free(real_ref);