1
=== modified file 'Makefile'
2
--- Makefile	2011-04-18 00:44:08 +0000
3
+++ Makefile	2011-05-14 03:14:26 +0000
4
@@ -420,6 +420,26 @@
5
420
	$(PYTHON) tools/win32/ostools.py remove dist
420
	$(PYTHON) tools/win32/ostools.py remove dist
6
421
421
7
422
422
8
423
# i18n targets
9
424
10
425
.PHONY: update-pot po/bzr.pot
11
426
update-pot: po/bzr.pot
12
427
13
428
TRANSLATABLE_PYFILES:=$(shell find bzrlib -name '*.py' \
14
429
    		| grep -v 'bzrlib/tests/' \
15
430
    		| grep -v 'bzrlib/doc' \
16
431
		)
17
432
18
433
po/bzr.pot: $(PYFILES) $(DOCFILES)
19
434
	BZR_PLUGIN_PATH='-site' $(PYTHON) ./bzr export-pot > po/bzr.pot
20
435
	echo $(TRANSLATABLE_PYFILES) | xargs \
21
436
	  xgettext --package-name "bzr" \
22
437
	  --msgid-bugs-address "<bazaar@canonical.com>" \
23
438
	  --copyright-holder "Canonical" \
24
439
	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
25
440
	  -d bzr -p po -o bzr.pot
26
441
27
442
28
423
### Packaging Targets ###
443
### Packaging Targets ###
29
424
444
30
425
.PHONY: dist check-dist-tarball
445
.PHONY: dist check-dist-tarball
31
426
446
32
=== modified file 'bzrlib/builtins.py'
33
--- bzrlib/builtins.py	2011-05-03 13:53:46 +0000
34
+++ bzrlib/builtins.py	2011-05-14 03:14:26 +0000
35
@@ -6154,6 +6154,16 @@
36
6154
            self.outf.write('%s %s\n' % (path, location))
6154
            self.outf.write('%s %s\n' % (path, location))
37
6155
6155
38
6156
6156
39
6157
class cmd_export_pot(Command):
40
6158
    __doc__ = """Export command helps and error messages in po format."""
41
6159
42
6160
    hidden = True
43
6161
44
6162
    def run(self):
45
6163
        from bzrlib.export_pot import export_pot
46
6164
        export_pot(self.outf)
47
6165
48
6166
49
6157
def _register_lazy_builtins():
6167
def _register_lazy_builtins():
50
6158
    # register lazy builtins from other modules; called at startup and should
6168
    # register lazy builtins from other modules; called at startup and should
51
6159
    # be only called once.
6169
    # be only called once.
52
6160
6170
53
=== modified file 'bzrlib/commands.py'
54
--- bzrlib/commands.py	2011-04-19 04:37:48 +0000
55
+++ bzrlib/commands.py	2011-05-14 03:14:26 +0000
56
@@ -41,6 +41,12 @@
57
41
    trace,
41
    trace,
58
42
    ui,
42
    ui,
59
43
    )
43
    )
60
44
from bzrlib.i18n import (
61
45
    gettext,
62
46
    N_,
63
47
    install,
64
48
    install_zzz,
65
49
    )
66
44
""")
50
""")
67
45
51
68
46
from bzrlib.hooks import Hooks
52
from bzrlib.hooks import Hooks
69
@@ -507,11 +513,11 @@
70
507
513
71
508
        # The header is the purpose and usage
514
        # The header is the purpose and usage
72
509
        result = ""
515
        result = ""
74
510
        result += ':Purpose: %s\n' % purpose
516
        result += ':%s: %s\n' % (gettext('Purpose'), purpose)
75
511
        if usage.find('\n') >= 0:
517
        if usage.find('\n') >= 0:
77
512
            result += ':Usage:\n%s\n' % usage
518
            result += ':%s:\n%s\n' % (gettext('Usage'), usage)
78
513
        else:
519
        else:
80
514
            result += ':Usage:   %s\n' % usage
520
            result += ':%s:   %s\n' % (gettext('Usage'), usage)
81
515
        result += '\n'
521
        result += '\n'
82
516
522
83
517
        # Add the options
523
        # Add the options
84
@@ -527,11 +533,9 @@
85
527
        # block.
533
        # block.
86
528
        if not plain and options.find('  --1.9  ') != -1:
534
        if not plain and options.find('  --1.9  ') != -1:
87
529
            options = options.replace(' format:\n', ' format::\n\n', 1)
535
            options = options.replace(' format:\n', ' format::\n\n', 1)
93
530
        if options.startswith('Options:'):
536
        if options.startswith('Options:') or options.startswith('options:'):
94
531
            result += ':' + options
537
            # Python 2.4 version of optparse uses 'options'.
95
532
        elif options.startswith('options:'):
538
            result += ':%s:%s' % (gettext('Options'), options[len('options:'):])
91
533
            # Python 2.4 version of optparse
92
534
            result += ':Options:' + options[len('options:'):]
96
535
        else:
539
        else:
97
536
            result += options
540
            result += options
98
537
        result += '\n'
541
        result += '\n'
99
@@ -542,7 +546,7 @@
100
542
            if sections.has_key(None):
546
            if sections.has_key(None):
101
543
                text = sections.pop(None)
547
                text = sections.pop(None)
102
544
                text = '\n  '.join(text.splitlines())
548
                text = '\n  '.join(text.splitlines())
104
545
                result += ':%s:\n  %s\n\n' % ('Description',text)
549
                result += ':%s:\n  %s\n\n' % (gettext('Description'),text)
105
546
550
106
547
            # Add the custom sections (e.g. Examples). Note that there's no need
551
            # Add the custom sections (e.g. Examples). Note that there's no need
107
548
            # to indent these as they must be indented already in the source.
552
            # to indent these as they must be indented already in the source.
108
@@ -557,7 +561,7 @@
109
557
561
110
558
        # Add the aliases, source (plug-in) and see also links, if any
562
        # Add the aliases, source (plug-in) and see also links, if any
111
559
        if self.aliases:
563
        if self.aliases:
113
560
            result += ':Aliases:  '
564
            result += ':%s:  ' % gettext('Aliases')
114
561
            result += ', '.join(self.aliases) + '\n'
565
            result += ', '.join(self.aliases) + '\n'
115
562
        plugin_name = self.plugin_name()
566
        plugin_name = self.plugin_name()
116
563
        if plugin_name is not None:
567
        if plugin_name is not None:
117
@@ -576,7 +580,7 @@
118
576
                        link_text = ":doc:`%s <%s-help>`" % (item, item)
580
                        link_text = ":doc:`%s <%s-help>`" % (item, item)
119
577
                        see_also_links.append(link_text)
581
                        see_also_links.append(link_text)
120
578
                see_also = see_also_links
582
                see_also = see_also_links
122
579
            result += ':See also: '
583
            result += ':%s: ' % gettext('See also')
123
580
            result += ', '.join(see_also) + '\n'
584
            result += ', '.join(see_also) + '\n'
124
581
585
125
582
        # If this will be rendered as plain text, convert it
586
        # If this will be rendered as plain text, convert it
126
@@ -667,7 +671,8 @@
127
667
671
128
668
        # Process the standard options
672
        # Process the standard options
129
669
        if 'help' in opts:  # e.g. bzr add --help
673
        if 'help' in opts:  # e.g. bzr add --help
131
670
            sys.stdout.write(self.get_help_text())
674
            self._setup_outf()
132
675
            self.outf.write(self.get_help_text())
133
671
            return 0
676
            return 0
134
672
        if 'usage' in opts:  # e.g. bzr add --usage
677
        if 'usage' in opts:  # e.g. bzr add --usage
135
673
            sys.stdout.write(self.get_help_text(verbose=False))
678
            sys.stdout.write(self.get_help_text(verbose=False))
136
@@ -755,7 +760,7 @@
137
755
        from inspect import getdoc
760
        from inspect import getdoc
138
756
        if self.__doc__ is Command.__doc__:
761
        if self.__doc__ is Command.__doc__:
139
757
            return None
762
            return None
141
758
        return getdoc(self)
763
        return gettext(getdoc(self))
142
759
764
143
760
    def name(self):
765
    def name(self):
144
761
        """Return the canonical name for this command.
766
        """Return the canonical name for this command.
145
@@ -1088,6 +1093,10 @@
146
1088
        i += 1
1093
        i += 1
147
1089
1094
148
1090
    debug.set_debug_flags_from_config()
1095
    debug.set_debug_flags_from_config()
149
1096
    if 'i18n' in debug.debug_flags:
150
1097
        install_zzz()
151
1098
    else:
152
1099
        install()
153
1091
1100
154
1092
    if not opt_no_plugins:
1101
    if not opt_no_plugins:
155
1093
        load_plugins()
1102
        load_plugins()
156
1094
1103
157
=== modified file 'bzrlib/errors.py'
158
--- bzrlib/errors.py	2011-05-08 12:42:43 +0000
159
+++ bzrlib/errors.py	2011-05-14 03:14:26 +0000
160
@@ -18,6 +18,7 @@
161
18
"""
18
"""
162
19
19
163
20
from bzrlib import (
20
from bzrlib import (
164
21
    i18n,
165
21
    osutils,
22
    osutils,
166
22
    symbol_versioning,
23
    symbol_versioning,
167
23
    )
24
    )
168
@@ -93,6 +94,21 @@
169
93
            for key, value in kwds.items():
94
            for key, value in kwds.items():
170
94
                setattr(self, key, value)
95
                setattr(self, key, value)
171
95
96
172
97
    def i18n(self):
173
98
        """Returns translated message in user encoding"""
174
99
        try:
175
100
            fmt = self._get_format_string()
176
101
            if fmt:
177
102
                fmt = i18n.gettext(fmt)
178
103
                return fmt % dict(self.__dict__)
179
104
        except (AttributeError, TypeError, NameError, ValueError, KeyError), e:
180
105
            return 'Unprintable exception %s: dict=%r, fmt=%r, error=%r' \
181
106
                % (self.__class__.__name__,
182
107
                   self.__dict__,
183
108
                   getattr(self, '_fmt', None),
184
109
                   e)
185
110
186
111
187
96
    def _format(self):
112
    def _format(self):
188
97
        s = getattr(self, '_preformatted_string', None)
113
        s = getattr(self, '_preformatted_string', None)
189
98
        if s is not None:
114
        if s is not None:
190
99
115
191
=== added file 'bzrlib/export_pot.py'
192
--- bzrlib/export_pot.py	1970-01-01 00:00:00 +0000
193
+++ bzrlib/export_pot.py	2011-05-14 03:14:26 +0000
194
@@ -0,0 +1,250 @@
195
1
# Copyright (C) 2011 Canonical Ltd
196
2
#
197
3
# This program is free software; you can redistribute it and/or modify
198
4
# it under the terms of the GNU General Public License as published by
199
5
# the Free Software Foundation; either version 2 of the License, or
200
6
# (at your option) any later version.
201
7
#
202
8
# This program is distributed in the hope that it will be useful,
203
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
204
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
205
11
# GNU General Public License for more details.
206
12
#
207
13
# You should have received a copy of the GNU General Public License
208
14
# along with this program; if not, write to the Free Software
209
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
210
16
211
17
# The normalize function is taken from pygettext which is distributed
212
18
# with Python under the Python License, which is GPL compatible.
213
19
214
20
"""Extract docstrings from Bazaar commands.
215
21
"""
216
22
217
23
import inspect
218
24
import os
219
25
220
26
from bzrlib import (
221
27
    commands as _mod_commands,
222
28
    errors,
223
29
    help_topics,
224
30
    plugin,
225
31
    )
226
32
from bzrlib.trace import (
227
33
    mutter,
228
34
    note,
229
35
    )
230
36
231
37
232
38
def _escape(s):
233
39
    s = (s.replace('\\', '\\\\')
234
40
        .replace('\n', '\\n')
235
41
        .replace('\r', '\\r')
236
42
        .replace('\t', '\\t')
237
43
        .replace('"', '\\"')
238
44
        )
239
45
    return s
240
46
241
47
def _normalize(s):
242
48
    # This converts the various Python string types into a format that
243
49
    # is appropriate for .po files, namely much closer to C style.
244
50
    lines = s.split('\n')
245
51
    if len(lines) == 1:
246
52
        s = '"' + _escape(s) + '"'
247
53
    else:
248
54
        if not lines[-1]:
249
55
            del lines[-1]
250
56
            lines[-1] = lines[-1] + '\n'
251
57
        lines = map(_escape, lines)
252
58
        lineterm = '\\n"\n"'
253
59
        s = '""\n"' + lineterm.join(lines) + '"'
254
60
    return s
255
61
256
62
257
63
_FOUND_MSGID = None # set by entry function.
258
64
259
65
def _poentry(outf, path, lineno, s, comment=None):
260
66
    if s in _FOUND_MSGID:
261
67
        return
262
68
    _FOUND_MSGID.add(s)
263
69
    if comment is None:
264
70
        comment = ''
265
71
    else:
266
72
        comment = "# %s\n" % comment
267
73
    print >>outf, ('#: %s:%d\n' % (path, lineno) +
268
74
           comment+
269
75
           'msgid %s\n' % _normalize(s) +
270
76
           'msgstr ""\n')
271
77
272
78
def _poentry_per_paragraph(outf, path, lineno, msgid):
273
79
    # TODO: How to split long help?
274
80
    paragraphs = msgid.split('\n\n')
275
81
    for p in paragraphs:
276
82
        _poentry(outf, path, lineno, p)
277
83
        lineno += p.count('\n') + 2
278
84
279
85
_LAST_CACHE = _LAST_CACHED_SRC = None
280
86
281
87
def _offsets_of_literal(src):
282
88
    global _LAST_CACHE, _LAST_CACHED_SRC
283
89
    if src == _LAST_CACHED_SRC:
284
90
        return _LAST_CACHE.copy()
285
91
286
92
    import ast
287
93
    root = ast.parse(src)
288
94
    offsets = {}
289
95
    for node in ast.walk(root):
290
96
        if not isinstance(node, ast.Str):
291
97
            continue
292
98
        offsets[node.s] = node.lineno - node.s.count('\n')
293
99
294
100
    _LAST_CACHED_SRC = src
295
101
    _LAST_CACHE = offsets.copy()
296
102
    return offsets
297
103
298
104
def _standard_options(outf):
299
105
    from bzrlib.option import Option
300
106
    src = inspect.findsource(Option)[0]
301
107
    src = ''.join(src)
302
108
    path = 'bzrlib/option.py'
303
109
    offsets = _offsets_of_literal(src)
304
110
305
111
    for name in sorted(Option.OPTIONS.keys()):
306
112
        opt = Option.OPTIONS[name]
307
113
        if getattr(opt, 'hidden', False):
308
114
            continue
309
115
        if getattr(opt, 'title', None):
310
116
            lineno = offsets.get(opt.title, 9999)
311
117
            if lineno == 9999:
312
118
                note("%r is not found in bzrlib/option.py" % opt.title)
313
119
            _poentry(outf, path, lineno, opt.title,
314
120
                     'title of %r option' % name)
315
121
        if getattr(opt, 'help', None):
316
122
            lineno = offsets.get(opt.help, 9999)
317
123
            if lineno == 9999:
318
124
                note("%r is not found in bzrlib/option.py" % opt.help)
319
125
            _poentry(outf, path, lineno, opt.help,
320
126
                     'help of %r option' % name)
321
127
322
128
def _command_options(outf, path, cmd):
323
129
    src, default_lineno = inspect.findsource(cmd.__class__)
324
130
    offsets = _offsets_of_literal(''.join(src))
325
131
    for opt in cmd.takes_options:
326
132
        if isinstance(opt, str):
327
133
            continue
328
134
        if getattr(opt, 'hidden', False):
329
135
            continue
330
136
        name = opt.name
331
137
        if getattr(opt, 'title', None):
332
138
            lineno = offsets.get(opt.title, default_lineno)
333
139
            _poentry(outf, path, lineno, opt.title,
334
140
                     'title of %r option of %r command' % (name, cmd.name()))
335
141
        if getattr(opt, 'help', None):
336
142
            lineno = offsets.get(opt.help, default_lineno)
337
143
            _poentry(outf, path, lineno, opt.help,
338
144
                     'help of %r option of %r command' % (name, cmd.name()))
339
145
340
146
341
147
def _write_command_help(outf, cmd_name, cmd):
342
148
    path = inspect.getfile(cmd.__class__)
343
149
    if path.endswith('.pyc'):
344
150
        path = path[:-1]
345
151
    path = os.path.relpath(path)
346
152
    src, lineno = inspect.findsource(cmd.__class__)
347
153
    offsets = _offsets_of_literal(''.join(src))
348
154
    lineno = offsets[cmd.__doc__]
349
155
    doc = inspect.getdoc(cmd)
350
156
351
157
    _poentry_per_paragraph(outf, path, lineno, doc)
352
158
    _command_options(outf, path, cmd)
353
159
354
160
def _command_helps(outf):
355
161
    """Extract docstrings from path.
356
162
357
163
    This respects the Bazaar cmdtable/table convention and will
358
164
    only extract docstrings from functions mentioned in these tables.
359
165
    """
360
166
    from glob import glob
361
167
362
168
    # builtin commands
363
169
    for cmd_name in _mod_commands.builtin_command_names():
364
170
        command = _mod_commands.get_cmd_object(cmd_name, False)
365
171
        if command.hidden:
366
172
            continue
367
173
        note("Exporting messages from builtin command: %s", cmd_name)
368
174
        _write_command_help(outf, cmd_name, command)
369
175
370
176
    plugin_path = plugin.get_core_plugin_path()
371
177
    core_plugins = glob(plugin_path + '/*/__init__.py')
372
178
    core_plugins = [os.path.basename(os.path.dirname(p))
373
179
                        for p in core_plugins]
374
180
    # core plugins
375
181
    for cmd_name in _mod_commands.plugin_command_names():
376
182
        command = _mod_commands.get_cmd_object(cmd_name, False)
377
183
        if command.hidden:
378
184
            continue
379
185
        if command.plugin_name() not in core_plugins:
380
186
            # skip non-core plugins
381
187
            # TODO: Support extracting from third party plugins.
382
188
            continue
383
189
        note("Exporting messages from plugin command: %s in %s",
384
190
             cmd_name, command.plugin_name())
385
191
        _write_command_help(outf, cmd_name, command)
386
192
387
193
388
194
def _error_messages(outf):
389
195
    """Extract fmt string from bzrlib.errors."""
390
196
    path = errors.__file__
391
197
    if path.endswith('.pyc'):
392
198
        path = path[:-1]
393
199
    offsets = _offsets_of_literal(open(path).read())
394
200
395
201
    base_klass = errors.BzrError
396
202
    for name in dir(errors):
397
203
        klass = getattr(errors, name)
398
204
        if not inspect.isclass(klass):
399
205
            continue
400
206
        if not issubclass(klass, base_klass):
401
207
            continue
402
208
        if klass is base_klass:
403
209
            continue
404
210
        if klass.internal_error:
405
211
            continue
406
212
        fmt = getattr(klass, "_fmt", None)
407
213
        if fmt:
408
214
            note("Exporting message from error: %s", name)
409
215
            _poentry(outf, 'bzrlib/errors.py',
410
216
                     offsets.get(fmt, 9999), fmt)
411
217
412
218
def _help_topics(outf):
413
219
    topic_registry = help_topics.topic_registry
414
220
    offsets = _offsets_of_literal(inspect.getsource(help_topics))
415
221
416
222
    for key in topic_registry.keys():
417
223
        summary = topic_registry.get_summary(key)
418
224
        if summary is not None:
419
225
            lineno = offsets.get(summary, 9999)
420
226
            _poentry(outf, 'bzrlib/help_topics/__init__.py',
421
227
                     lineno, summary)
422
228
423
229
        doc = topic_registry.get(key)
424
230
        if isinstance(doc, basestring):
425
231
            lineno = offsets.get(doc, 9999)
426
232
            _poentry_per_paragraph(
427
233
                    outf,
428
234
                    'bzrlib/help_topics/__init__.py', lineno,
429
235
                    doc)
430
236
        elif doc == help_topics._load_from_file:
431
237
            _poentry_per_paragraph(
432
238
                    outf,
433
239
                    'bzrlib/help_topics/en/%s.txt' % (key,), 1,
434
240
                    topic_registry.get_detail(key)
435
241
                    )
436
242
437
243
438
244
def export_pot(outf):
439
245
    global _FOUND_MSGID
440
246
    _FOUND_MSGID = set()
441
247
    _standard_options(outf)
442
248
    _command_helps(outf)
443
249
    _error_messages(outf)
444
250
    _help_topics(outf)
445
0
251
446
=== modified file 'bzrlib/help.py'
447
--- bzrlib/help.py	2010-05-26 07:19:50 +0000
448
+++ bzrlib/help.py	2011-05-14 03:14:26 +0000
449
@@ -22,7 +22,6 @@
450
22
# TODO: `help commands --all` should show hidden commands
22
# TODO: `help commands --all` should show hidden commands
451
23
23
452
24
import sys
24
import sys
453
25
import textwrap
454
26
25
455
27
from bzrlib import (
26
from bzrlib import (
456
28
    commands as _mod_commands,
27
    commands as _mod_commands,
457
@@ -30,8 +29,11 @@
458
30
    help_topics,
29
    help_topics,
459
31
    osutils,
30
    osutils,
460
32
    plugin,
31
    plugin,
461
32
    utextwrap,
462
33
    )
33
    )
463
34
34
464
35
from bzrlib.i18n import gettext
465
36
466
35
37
467
36
def help(topic=None, outfile=None):
38
def help(topic=None, outfile=None):
468
37
    """Write the help for the specific topic to outfile"""
39
    """Write the help for the specific topic to outfile"""
469
@@ -96,7 +98,7 @@
470
96
        else:
98
        else:
471
97
            firstline = ''
99
            firstline = ''
472
98
        helpstring = '%-*s %s%s' % (max_name, cmd_name, firstline, plugin_name)
100
        helpstring = '%-*s %s%s' % (max_name, cmd_name, firstline, plugin_name)
474
99
        lines = textwrap.wrap(
101
        lines = utextwrap.wrap(
475
100
            helpstring, subsequent_indent=indent,
102
            helpstring, subsequent_indent=indent,
476
101
            width=width,
103
            width=width,
477
102
            break_long_words=False)
104
            break_long_words=False)
478
103
105
479
=== modified file 'bzrlib/help_topics/__init__.py'
480
--- bzrlib/help_topics/__init__.py	2010-11-06 10:55:58 +0000
481
+++ bzrlib/help_topics/__init__.py	2011-05-14 03:14:26 +0000
482
@@ -863,7 +863,8 @@
483
863
        :param plain: if False, raw help (reStructuredText) is
863
        :param plain: if False, raw help (reStructuredText) is
484
864
            returned instead of plain text.
864
            returned instead of plain text.
485
865
        """
865
        """
487
866
        result = topic_registry.get_detail(self.topic)
866
        from bzrlib.i18n import gettext
488
867
        result = gettext(topic_registry.get_detail(self.topic))
489
867
        # there is code duplicated here and in bzrlib/plugin.py's
868
        # there is code duplicated here and in bzrlib/plugin.py's
490
868
        # matching Topic code. This should probably be factored in
869
        # matching Topic code. This should probably be factored in
491
869
        # to a helper function and a common base class.
870
        # to a helper function and a common base class.
492
870
871
493
=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
494
--- bzrlib/help_topics/en/debug-flags.txt	2010-10-06 03:20:28 +0000
495
+++ bzrlib/help_topics/en/debug-flags.txt	2011-05-14 03:14:26 +0000
496
@@ -21,6 +21,7 @@
497
21
-Dhpssdetail      More hpss details.
21
-Dhpssdetail      More hpss details.
498
22
-Dhpssvfs         Traceback on vfs access to Remote objects.
22
-Dhpssvfs         Traceback on vfs access to Remote objects.
499
23
-Dhttp            Trace http connections, requests and responses.
23
-Dhttp            Trace http connections, requests and responses.
500
24
-Di18n            Use "zz{{msg}}" for translated message.
501
24
-Dindex           Trace major index operations.
25
-Dindex           Trace major index operations.
502
25
-Dknit            Trace knit operations.
26
-Dknit            Trace knit operations.
503
26
-Dlock            Trace when lockdir locks are taken or released.
27
-Dlock            Trace when lockdir locks are taken or released.
504
27
28
505
=== added file 'bzrlib/i18n.py'
506
--- bzrlib/i18n.py	1970-01-01 00:00:00 +0000
507
+++ bzrlib/i18n.py	2011-05-14 03:14:26 +0000
508
@@ -0,0 +1,129 @@
509
1
# -*- coding: utf-8 -*-
510
2
#
511
3
# Copyright (C) 2007 Lukáš Lalinský <lalinsky@gmail.com>
512
4
# Copyright (C) 2007,2009 Alexander Belchenko <bialix@ukr.net>
513
5
# Copyright (C) 2011 Canonical Ltd
514
6
#
515
7
# This program is free software; you can redistribute it and/or
516
8
# modify it under the terms of the GNU General Public License
517
9
# as published by the Free Software Foundation; either version 2
518
10
# of the License, or (at your option) any later version.
519
11
#
520
12
# This program is distributed in the hope that it will be useful,
521
13
# but WITHOUT ANY WARRANTY; without even the implied warranty of
522
14
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
523
15
# GNU General Public License for more details.
524
16
#
525
17
# You should have received a copy of the GNU General Public License
526
18
# along with this program; if not, write to the Free Software
527
19
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
528
20
529
21
# This module is copied from Bazaar Explorer and modified for bzr.
530
22
531
23
"""i18n and l10n support for Bazaar."""
532
24
533
25
import gettext as _gettext
534
26
import os
535
27
import sys
536
28
537
29
_translation = _null_translation = _gettext.NullTranslations()
538
30
539
31
540
32
def install():
541
33
    global _translation
542
34
    get_current_locale()
543
35
    _translation = _gettext.translation(
544
36
            'bzr', localedir=_get_locale_dir(), fallback=True)
545
37
546
38
def uninstall():
547
39
    global _translation
548
40
    _translation = _null_translation
549
41
550
42
551
43
def _get_locale_dir():
552
44
    if hasattr(sys, 'frozen'):
553
45
        base = os.path.dirname(
554
46
                unicode(sys.executable, sys.getfilesystemencoding()))
555
47
        return os.path.join(base, u'locale')
556
48
    else:
557
49
        base = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
558
50
        return os.path.realpath(os.path.join(base, u'locale'))
559
51
560
52
561
53
def _check_win32_locale():
562
54
    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
563
55
        if os.environ.get(i):
564
56
            break
565
57
    else:
566
58
        lang = None
567
59
        import locale
568
60
        try:
569
61
            import ctypes
570
62
        except ImportError:
571
63
            # use only user's default locale
572
64
            lang = locale.getdefaultlocale()[0]
573
65
        else:
574
66
            # using ctypes to determine all locales
575
67
            lcid_user = ctypes.windll.kernel32.GetUserDefaultLCID()
576
68
            lcid_system = ctypes.windll.kernel32.GetSystemDefaultLCID()
577
69
            if lcid_user != lcid_system:
578
70
                lcid = [lcid_user, lcid_system]
579
71
            else:
580
72
                lcid = [lcid_user]
581
73
            lang = [locale.windows_locale.get(i) for i in lcid]
582
74
            lang = ':'.join([i for i in lang if i])
583
75
        # set lang code for gettext
584
76
        if lang:
585
77
            os.environ['LANGUAGE'] = lang
586
78
587
79
588
80
def get_current_locale():
589
81
    if not os.environ.get('LANGUAGE'):
590
82
        from bzrlib import config
591
83
        lang = config.GlobalConfig().get_user_option('language')
592
84
        if lang:
593
85
            os.environ['LANGUAGE'] = lang
594
86
            return lang
595
87
    if sys.platform == 'win32':
596
88
        _check_win32_locale()
597
89
    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
598
90
        lang = os.environ.get(i)
599
91
        if lang:
600
92
            return lang
601
93
    return None
602
94
603
95
# special zzz translation for debugging i18n stuff
604
96
class _ZzzTranslations(object):
605
97
606
98
    def zzz(self, s):
607
99
        return 'zz{{%s}}' % s
608
100
609
101
    def ugettext(self, s):
610
102
        return self.zzz(_null_translation.ugettext(s))
611
103
612
104
    def ungettext(self, s, p, n):
613
105
        return self.zzz(_null_translation.ungettext(s, p, n))
614
106
615
107
def install_zzz():
616
108
    global _translation
617
109
    _translation = _ZzzTranslations()
618
110
619
111
def gettext(message):
620
112
    """Translate message. 
621
113
    Returns translated message as unicode."""
622
114
    paragraphs = message.split(u'\n\n')
623
115
    ugettext = _translation.ugettext
624
116
    # Be careful not to translate the empty string -- it holds the
625
117
    # meta data of the .po file.
626
118
    return u'\n\n'.join([ugettext(p) if p else u'' for p in paragraphs])
627
119
628
120
def ngettext(s, p, n):
629
121
    return gettext(s if n == 1 else p)
630
122
631
123
def N_(s):
632
124
    """Pass through function.
633
125
634
126
    This function is used to mark the string that may be translated later.
635
127
    """
636
128
    return s
637
129
638
0
130
639
=== added directory 'bzrlib/locale'
640
=== modified file 'bzrlib/option.py'
641
--- bzrlib/option.py	2011-01-14 05:14:04 +0000
642
+++ bzrlib/option.py	2011-05-14 03:14:26 +0000
643
@@ -205,13 +205,14 @@
644
205
205
645
206
    def add_option(self, parser, short_name):
206
    def add_option(self, parser, short_name):
646
207
        """Add this option to an Optparse parser"""
207
        """Add this option to an Optparse parser"""
647
208
        from bzrlib.i18n import gettext
648
208
        option_strings = ['--%s' % self.name]
209
        option_strings = ['--%s' % self.name]
649
209
        if short_name is not None:
210
        if short_name is not None:
650
210
            option_strings.append('-%s' % short_name)
211
            option_strings.append('-%s' % short_name)
651
211
        if self.hidden:
212
        if self.hidden:
652
212
            help = optparse.SUPPRESS_HELP
213
            help = optparse.SUPPRESS_HELP
653
213
        else:
214
        else:
655
214
            help = self.help
215
            help = gettext(self.help)
656
215
        optargfn = self.type
216
        optargfn = self.type
657
216
        if optargfn is None:
217
        if optargfn is None:
658
217
            parser.add_option(action='callback',
218
            parser.add_option(action='callback',
659
@@ -428,6 +429,7 @@
660
428
429
661
429
def get_optparser(options):
430
def get_optparser(options):
662
430
    """Generate an optparse parser for bzrlib-style options"""
431
    """Generate an optparse parser for bzrlib-style options"""
663
432
    from bzrlib.i18n import gettext
664
431
433
665
432
    parser = OptionParser()
434
    parser = OptionParser()
666
433
    parser.remove_option('--help')
435
    parser.remove_option('--help')
667
434
436
668
=== modified file 'bzrlib/tests/__init__.py'
669
--- bzrlib/tests/__init__.py	2011-05-13 12:51:05 +0000
670
+++ bzrlib/tests/__init__.py	2011-05-14 03:14:26 +0000
671
@@ -3783,6 +3783,7 @@
672
3783
        'bzrlib.tests.test_eol_filters',
3783
        'bzrlib.tests.test_eol_filters',
673
3784
        'bzrlib.tests.test_errors',
3784
        'bzrlib.tests.test_errors',
674
3785
        'bzrlib.tests.test_export',
3785
        'bzrlib.tests.test_export',
675
3786
        'bzrlib.tests.test_export_pot',
676
3786
        'bzrlib.tests.test_extract',
3787
        'bzrlib.tests.test_extract',
677
3787
        'bzrlib.tests.test_fetch',
3788
        'bzrlib.tests.test_fetch',
678
3788
        'bzrlib.tests.test_fixtures',
3789
        'bzrlib.tests.test_fixtures',
679
@@ -3899,6 +3900,7 @@
680
3899
        'bzrlib.tests.test_upgrade',
3900
        'bzrlib.tests.test_upgrade',
681
3900
        'bzrlib.tests.test_upgrade_stacked',
3901
        'bzrlib.tests.test_upgrade_stacked',
682
3901
        'bzrlib.tests.test_urlutils',
3902
        'bzrlib.tests.test_urlutils',
683
3903
        'bzrlib.tests.test_utextwrap',
684
3902
        'bzrlib.tests.test_version',
3904
        'bzrlib.tests.test_version',
685
3903
        'bzrlib.tests.test_version_info',
3905
        'bzrlib.tests.test_version_info',
686
3904
        'bzrlib.tests.test_versionedfile',
3906
        'bzrlib.tests.test_versionedfile',
687
3905
3907
688
=== added file 'bzrlib/tests/test_export_pot.py'
689
--- bzrlib/tests/test_export_pot.py	1970-01-01 00:00:00 +0000
690
+++ bzrlib/tests/test_export_pot.py	2011-05-14 03:14:26 +0000
691
@@ -0,0 +1,147 @@
692
1
# Copyright (C) 2011 Canonical Ltd
693
2
#
694
3
# This program is free software; you can redistribute it and/or modify
695
4
# it under the terms of the GNU General Public License as published by
696
5
# the Free Software Foundation; either version 2 of the License, or
697
6
# (at your option) any later version.
698
7
#
699
8
# This program is distributed in the hope that it will be useful,
700
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
701
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
702
11
# GNU General Public License for more details.
703
12
#
704
13
# You should have received a copy of the GNU General Public License
705
14
# along with this program; if not, write to the Free Software
706
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
707
16
708
17
from cStringIO import StringIO
709
18
import textwrap
710
19
711
20
from bzrlib import (
712
21
    export_pot,
713
22
    tests,
714
23
    )
715
24
716
25
class TestEscape(tests.TestCase):
717
26
718
27
    def test_simple_escape(self):
719
28
        self.assertEqual(
720
29
                export_pot._escape('foobar'),
721
30
                'foobar')
722
31
723
32
        s = '''foo\nbar\r\tbaz\\"spam"'''
724
33
        e = '''foo\\nbar\\r\\tbaz\\\\\\"spam\\"'''
725
34
        self.assertEqual(export_pot._escape(s), e)
726
35
727
36
    def test_complex_escape(self):
728
37
        s = '''\\r \\\n'''
729
38
        e = '''\\\\r \\\\\\n'''
730
39
        self.assertEqual(export_pot._escape(s), e)
731
40
732
41
733
42
class TestNormalize(tests.TestCase):
734
43
735
44
    def test_single_line(self):
736
45
        s = 'foobar'
737
46
        e = '"foobar"'
738
47
        self.assertEqual(export_pot._normalize(s), e)
739
48
740
49
        s = 'foo"bar'
741
50
        e = '"foo\\"bar"'
742
51
        self.assertEqual(export_pot._normalize(s), e)
743
52
744
53
    def test_multi_lines(self):
745
54
        s = 'foo\nbar\n'
746
55
        e = '""\n"foo\\n"\n"bar\\n"'
747
56
        self.assertEqual(export_pot._normalize(s), e)
748
57
749
58
        s = '\nfoo\nbar\n'
750
59
        e = ('""\n'
751
60
             '"\\n"\n'
752
61
             '"foo\\n"\n'
753
62
             '"bar\\n"')
754
63
        self.assertEqual(export_pot._normalize(s), e)
755
64
756
65
757
66
class PoEntryTestCase(tests.TestCase):
758
67
759
68
    def setUp(self):
760
69
        self.overrideAttr(export_pot, '_FOUND_MSGID', set())
761
70
        self._outf = StringIO()
762
71
        super(PoEntryTestCase, self).setUp()
763
72
764
73
    def check_output(self, expected):
765
74
        self.assertEqual(
766
75
                self._outf.getvalue(),
767
76
                textwrap.dedent(expected)
768
77
                )
769
78
770
79
class TestPoEntry(PoEntryTestCase):
771
80
772
81
    def test_simple(self):
773
82
        export_pot._poentry(self._outf, 'dummy', 1, "spam")
774
83
        export_pot._poentry(self._outf, 'dummy', 2, "ham", 'EGG')
775
84
        self.check_output('''\
776
85
                #: dummy:1
777
86
                msgid "spam"
778
87
                msgstr ""
779
88
780
89
                #: dummy:2
781
90
                # EGG
782
91
                msgid "ham"
783
92
                msgstr ""
784
93
785
94
                ''')
786
95
787
96
    def test_duplicate(self):
788
97
        export_pot._poentry(self._outf, 'dummy', 1, "spam")
789
98
        # This should be ignored.
790
99
        export_pot._poentry(self._outf, 'dummy', 2, "spam", 'EGG')
791
100
792
101
        self.check_output('''\
793
102
                #: dummy:1
794
103
                msgid "spam"
795
104
                msgstr ""\n
796
105
                ''')
797
106
798
107
799
108
class TestPoentryPerPergraph(PoEntryTestCase):
800
109
801
110
    def test_single(self):
802
111
        export_pot._poentry_per_paragraph(
803
112
                self._outf,
804
113
                'dummy',
805
114
                10,
806
115
                '''foo\nbar\nbaz\n'''
807
116
                )
808
117
        self.check_output('''\
809
118
                #: dummy:10
810
119
                msgid ""
811
120
                "foo\\n"
812
121
                "bar\\n"
813
122
                "baz\\n"
814
123
                msgstr ""\n
815
124
                ''')
816
125
817
126
    def test_multi(self):
818
127
        export_pot._poentry_per_paragraph(
819
128
                self._outf,
820
129
                'dummy',
821
130
                10,
822
131
                '''spam\nham\negg\n\nSPAM\nHAM\nEGG\n'''
823
132
                )
824
133
        self.check_output('''\
825
134
                #: dummy:10
826
135
                msgid ""
827
136
                "spam\\n"
828
137
                "ham\\n"
829
138
                "egg"
830
139
                msgstr ""
831
140
832
141
                #: dummy:14
833
142
                msgid ""
834
143
                "SPAM\\n"
835
144
                "HAM\\n"
836
145
                "EGG\\n"
837
146
                msgstr ""\n
838
147
                ''')
839
0
148
840
=== added file 'bzrlib/tests/test_utextwrap.py'
841
--- bzrlib/tests/test_utextwrap.py	1970-01-01 00:00:00 +0000
842
+++ bzrlib/tests/test_utextwrap.py	2011-05-14 03:14:26 +0000
843
@@ -0,0 +1,192 @@
844
1
# Copyright (C) 2011 Canonical Ltd
845
2
#
846
3
# This program is free software; you can redistribute it and/or modify
847
4
# it under the terms of the GNU General Public License as published by
848
5
# the Free Software Foundation; either version 2 of the License, or
849
6
# (at your option) any later version.
850
7
#
851
8
# This program is distributed in the hope that it will be useful,
852
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
853
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
854
11
# GNU General Public License for more details.
855
12
#
856
13
# You should have received a copy of the GNU General Public License
857
14
# along with this program; if not, write to the Free Software
858
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
859
16
#
860
17
861
18
"""Tests of the bzrlib.utextwrap."""
862
19
863
20
from bzrlib import tests, utextwrap
864
21
865
22
# Japanese "Good morning".
866
23
# Each character have double width. So total 8 width on console.
867
24
_str_D = u'\u304a\u306f\u3088\u3046'
868
25
869
26
_str_S = u"hello"
870
27
871
28
# Combine single width characters and double width characters.
872
29
_str_SD = _str_S + _str_D
873
30
_str_DS = _str_D + _str_S
874
31
875
32
class TestUTextWrap(tests.TestCase):
876
33
877
34
    def check_width(self, text, expected_width):
878
35
        w = utextwrap.UTextWrapper()
879
36
        self.assertEqual(
880
37
                w._width(text),
881
38
                expected_width,
882
39
                "Width of %r should be %d" % (text, expected_width))
883
40
884
41
    def test_width(self):
885
42
        self.check_width(_str_D, 8)
886
43
        self.check_width(_str_SD, 13)
887
44
888
45
    def check_cut(self, text, width, pos):
889
46
        w = utextwrap.UTextWrapper()
890
47
        self.assertEqual((text[:pos], text[pos:]), w._cut(text, width))
891
48
892
49
    def test_cut(self):
893
50
        s = _str_SD
894
51
        self.check_cut(s, 0, 0)
895
52
        self.check_cut(s, 1, 1)
896
53
        self.check_cut(s, 5, 5)
897
54
        self.check_cut(s, 6, 5)
898
55
        self.check_cut(s, 7, 6)
899
56
        self.check_cut(s, 12, 8)
900
57
        self.check_cut(s, 13, 9)
901
58
        self.check_cut(s, 14, 9)
902
59
        self.check_cut(u'A'*5, 3, 3)
903
60
904
61
    def test_split(self):
905
62
        w = utextwrap.UTextWrapper()
906
63
        self.assertEqual(list(_str_D), w._split(_str_D))
907
64
        self.assertEqual([_str_S]+list(_str_D), w._split(_str_SD))
908
65
        self.assertEqual(list(_str_D)+[_str_S], w._split(_str_DS))
909
66
910
67
    def test_wrap(self):
911
68
        self.assertEqual(list(_str_D), utextwrap.wrap(_str_D, 1))
912
69
        self.assertEqual(list(_str_D), utextwrap.wrap(_str_D, 2))
913
70
        self.assertEqual(list(_str_D), utextwrap.wrap(_str_D, 3))
914
71
        self.assertEqual(list(_str_D),
915
72
                         utextwrap.wrap(_str_D, 3, break_long_words=False))
916
73
917
74
class TestUTextFill(tests.TestCase):
918
75
919
76
    def test_fill_simple(self):
920
77
        # Test only can call fill() because it's just '\n'.join(wrap(text)).
921
78
        self.assertEqual("%s\n%s" % (_str_D[:2], _str_D[2:]),
922
79
                         utextwrap.fill(_str_D, 4))
923
80
924
81
    def test_fill_with_breaks(self):
925
82
        # Demonstrate complicated case.
926
83
        text = u"spam ham egg spamhamegg" + _str_D + u" spam" + _str_D*2
927
84
        self.assertEqual(u'\n'.join(["spam ham",
928
85
                                     "egg spam",
929
86
                                     "hamegg" + _str_D[0],
930
87
                                     _str_D[1:],
931
88
                                     "spam" + _str_D[:2],
932
89
                                     _str_D[2:]+_str_D[:2],
933
90
                                     _str_D[2:]]),
934
91
                         utextwrap.fill(text, 8))
935
92
936
93
    def test_fill_without_breaks(self):
937
94
        text = u"spam ham egg spamhamegg" + _str_D + u" spam" + _str_D*2
938
95
        self.assertEqual(u'\n'.join(["spam ham",
939
96
                                     "egg",
940
97
                                     "spamhamegg", 
941
98
                                     # border between single width and double
942
99
                                     # width.
943
100
                                     _str_D,
944
101
                                     "spam" + _str_D[:2],
945
102
                                     _str_D[2:]+_str_D[:2],
946
103
                                     _str_D[2:]]),
947
104
                         utextwrap.fill(text, 8, break_long_words=False))
948
105
949
106
    def test_fill_indent_with_breaks(self):
950
107
        w = utextwrap.UTextWrapper(8, initial_indent=' '*4,
951
108
                                   subsequent_indent=' '*4)
952
109
        self.assertEqual(u'\n'.join(["    hell",
953
110
                                     "    o" + _str_D[0],
954
111
                                     "    " + _str_D[1:3],
955
112
                                     "    " + _str_D[3]
956
113
                                     ]),
957
114
                         w.fill(_str_SD))
958
115
959
116
    def test_fill_indent_without_breaks(self):
960
117
        w = utextwrap.UTextWrapper(8, initial_indent=' '*4,
961
118
                                   subsequent_indent=' '*4)
962
119
        w.break_long_words = False
963
120
        self.assertEqual(u'\n'.join(["    hello",
964
121
                                     "    " + _str_D[:2],
965
122
                                     "    " + _str_D[2:],
966
123
                                     ]),
967
124
                         w.fill(_str_SD))
968
125
969
126
    def test_fill_indent_without_breaks_with_fixed_width(self):
970
127
        w = utextwrap.UTextWrapper(8, initial_indent=' '*4,
971
128
                                   subsequent_indent=' '*4)
972
129
        w.break_long_words = False
973
130
        w.width = 3
974
131
        self.assertEqual(u'\n'.join(["    hello",
975
132
                                     "    " + _str_D[0],
976
133
                                     "    " + _str_D[1],
977
134
                                     "    " + _str_D[2],
978
135
                                     "    " + _str_D[3],
979
136
                                     ]),
980
137
                         w.fill(_str_SD))
981
138
982
139
class TestUTextWrapAmbiWidth(tests.TestCase):
983
140
    _cyrill_char = u"\u0410" # east_asian_width() == 'A'
984
141
985
142
    def test_ambiwidth1(self):
986
143
        w = utextwrap.UTextWrapper(4, ambiguous_width=1)
987
144
        s = self._cyrill_char*8
988
145
        self.assertEqual([self._cyrill_char*4]*2, w.wrap(s))
989
146
990
147
    def test_ambiwidth2(self):
991
148
        w = utextwrap.UTextWrapper(4, ambiguous_width=2)
992
149
        s = self._cyrill_char*8
993
150
        self.assertEqual([self._cyrill_char*2]*4, w.wrap(s))
994
151
995
152
996
153
# Regression test with Python's test_textwrap
997
154
# Note that some distribution including Ubuntu doesn't install
998
155
# Python's test suite.
999
156
try:
1000
157
    from test import test_textwrap
1001
158
1002
159
    def override_textwrap_symbols(testcase):
1003
160
        # Override the symbols imported by test_textwrap so it uses our own
1004
161
        # replacements.
1005
162
        testcase.overrideAttr(test_textwrap, 'TextWrapper',
1006
163
                              utextwrap.UTextWrapper)
1007
164
        testcase.overrideAttr(test_textwrap, 'wrap', utextwrap.wrap)
1008
165
        testcase.overrideAttr(test_textwrap, 'fill', utextwrap.fill)
1009
166
1010
167
1011
168
    def setup_both(testcase, base_class, reused_class):
1012
169
        super(base_class, testcase).setUp()
1013
170
        override_textwrap_symbols(testcase)
1014
171
        reused_class.setUp(testcase)
1015
172
1016
173
1017
174
    class TestWrap(tests.TestCase, test_textwrap.WrapTestCase):
1018
175
1019
176
        def setUp(self):
1020
177
            setup_both(self, TestWrap, test_textwrap.WrapTestCase)
1021
178
1022
179
1023
180
    class TestLongWord(tests.TestCase, test_textwrap.LongWordTestCase):
1024
181
1025
182
        def setUp(self):
1026
183
            setup_both(self, TestLongWord, test_textwrap.LongWordTestCase)
1027
184
1028
185
1029
186
    class TestIndent(tests.TestCase, test_textwrap.IndentTestCases):
1030
187
1031
188
        def setUp(self):
1032
189
            setup_both(self, TestIndent, test_textwrap.IndentTestCases)
1033
190
1034
191
except ImportError:
1035
192
    pass
1036
0
193
1037
=== modified file 'bzrlib/trace.py'
1038
--- bzrlib/trace.py	2011-04-07 10:36:24 +0000
1039
+++ bzrlib/trace.py	2011-05-14 03:14:26 +0000
1040
@@ -566,7 +566,11 @@
1041
566
    :param advice: Extra advice to the user to be printed following the
566
    :param advice: Extra advice to the user to be printed following the
1042
567
        exception.
567
        exception.
1043
568
    """
568
    """
1045
569
    err_file.write("bzr: ERROR: %s\n" % (exc_info[1],))
569
    e = exc_info[1]
1046
570
    if isinstance(e, errors.BzrError):
1047
571
        err_file.write("bzr: ERROR: %s\n" % (e.i18n(),))
1048
572
    else:
1049
573
        err_file.write("bzr: ERROR: %s\n" % (e,))
1050
570
    if advice:
574
    if advice:
1051
571
        err_file.write("%s\n" % (advice,))
575
        err_file.write("%s\n" % (advice,))
1052
572
576
1053
573
577
1054
=== added file 'bzrlib/utextwrap.py'
1055
--- bzrlib/utextwrap.py	1970-01-01 00:00:00 +0000
1056
+++ bzrlib/utextwrap.py	2011-05-14 03:14:26 +0000
1057
@@ -0,0 +1,243 @@
1058
1
# Copyright (C) 2011 Canonical Ltd
1059
2
#
1060
3
# UTextWrapper._handle_long_word, UTextWrapper._wrap_chunks,
1061
4
# wrap and fill is copied from Python's textwrap module
1062
5
# (under PSF license) and modified for support CJK.
1063
6
# Original Copyright for these functions:
1064
7
#
1065
8
# Copyright (C) 1999-2001 Gregory P. Ward.
1066
9
# Copyright (C) 2002, 2003 Python Software Foundation.
1067
10
#
1068
11
# Written by Greg Ward <gward@python.net>
1069
12
# This program is free software; you can redistribute it and/or modify
1070
13
# it under the terms of the GNU General Public License as published by
1071
14
# the Free Software Foundation; either version 2 of the License, or
1072
15
# (at your option) any later version.
1073
16
#
1074
17
# This program is distributed in the hope that it will be useful,
1075
18
# but WITHOUT ANY WARRANTY; without even the implied warranty of
1076
19
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
1077
20
# GNU General Public License for more details.
1078
21
#
1079
22
# You should have received a copy of the GNU General Public License
1080
23
# along with this program; if not, write to the Free Software
1081
24
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1082
25
1083
26
import sys
1084
27
import textwrap
1085
28
from unicodedata import east_asian_width as _eawidth
1086
29
1087
30
from bzrlib import osutils
1088
31
1089
32
__all__ = ["UTextWrapper", "fill", "wrap"]
1090
33
1091
34
class UTextWrapper(textwrap.TextWrapper):
1092
35
    """
1093
36
    Extend TextWrapper for Unicode.
1094
37
1095
38
    This textwrapper handles east asian double width and split word
1096
39
    even if !break_long_words when word contains double width
1097
40
    characters.
1098
41
1099
42
    :param ambiguous_width: (keyword argument) width for character when
1100
43
                            unicodedata.east_asian_width(c) == 'A'
1101
44
                            (default: 1)
1102
45
1103
46
    Limitations:
1104
47
    * expand_tabs doesn't fixed. It uses len() for calculating width
1105
48
      of string on left of TAB.
1106
49
    * Handles one codeunit as a single character having 1 or 2 width.
1107
50
      This is not correct when there are surrogate pairs, combined
1108
51
      characters or zero-width characters.
1109
52
    * Treats all asian character are line breakable. But it is not
1110
53
      true because line breaking is prohibited around some characters.
1111
54
      (For example, breaking before punctation mark is prohibited.)
1112
55
      See UAX # 14 "UNICODE LINE BREAKING ALGORITHM"
1113
56
    """
1114
57
1115
58
    def __init__(self, width=None, **kwargs):
1116
59
        if width is None:
1117
60
            width = (osutils.terminal_width() or
1118
61
                        osutils.default_terminal_width) - 1
1119
62
1120
63
        ambi_width = kwargs.pop('ambiguous_width', 1)
1121
64
        if ambi_width == 1:
1122
65
            self._east_asian_doublewidth = 'FW'
1123
66
        elif ambi_width == 2:
1124
67
            self._east_asian_doublewidth = 'FWA'
1125
68
        else:
1126
69
            raise ValueError("ambiguous_width should be 1 or 2")
1127
70
1128
71
        # No drop_whitespace param before Python 2.6 it was always dropped
1129
72
        if sys.version_info < (2, 6):
1130
73
            self.drop_whitespace = kwargs.pop("drop_whitespace", True)
1131
74
            if not self.drop_whitespace:
1132
75
                raise ValueError("TextWrapper version must drop whitespace")
1133
76
        textwrap.TextWrapper.__init__(self, width, **kwargs)
1134
77
1135
78
    def _unicode_char_width(self, uc):
1136
79
        """Return width of character `uc`.
1137
80
1138
81
        :param:     uc      Single unicode character.
1139
82
        """
1140
83
        # 'A' means width of the character is not be able to determine.
1141
84
        # We assume that it's width is 2 because longer wrap may over
1142
85
        # terminal width but shorter wrap may be acceptable.
1143
86
        return (_eawidth(uc) in self._east_asian_doublewidth and 2) or 1
1144
87
1145
88
    def _width(self, s):
1146
89
        """Returns width for s.
1147
90
        
1148
91
        When s is unicode, take care of east asian width.
1149
92
        When s is bytes, treat all byte is single width character.
1150
93
        """
1151
94
        charwidth = self._unicode_char_width
1152
95
        return sum(charwidth(c) for c in s)
1153
96
1154
97
    def _cut(self, s, width):
1155
98
        """Returns head and rest of s. (head+rest == s)
1156
99
1157
100
        Head is large as long as _width(head) <= width.
1158
101
        """
1159
102
        w = 0
1160
103
        charwidth = self._unicode_char_width
1161
104
        for pos, c in enumerate(s):
1162
105
            w += charwidth(c)
1163
106
            if w > width:
1164
107
                return s[:pos], s[pos:]
1165
108
        return s, u''
1166
109
1167
110
    def _handle_long_word(self, chunks, cur_line, cur_len, width):
1168
111
        # Figure out when indent is larger than the specified width, and make
1169
112
        # sure at least one character is stripped off on every pass
1170
113
        if width < 2:
1171
114
            space_left = chunks[-1] and self._width(chunks[-1][0]) or 1
1172
115
        else:
1173
116
            space_left = width - cur_len
1174
117
1175
118
        # If we're allowed to break long words, then do so: put as much
1176
119
        # of the next chunk onto the current line as will fit.
1177
120
        if self.break_long_words:
1178
121
            head, rest = self._cut(chunks[-1], space_left)
1179
122
            cur_line.append(head)
1180
123
            if rest:
1181
124
                chunks[-1] = rest
1182
125
            else:
1183
126
                del chunks[-1]
1184
127
1185
128
        # Otherwise, we have to preserve the long word intact.  Only add
1186
129
        # it to the current line if there's nothing already there --
1187
130
        # that minimizes how much we violate the width constraint.
1188
131
        elif not cur_line:
1189
132
            cur_line.append(chunks.pop())
1190
133
1191
134
        # If we're not allowed to break long words, and there's already
1192
135
        # text on the current line, do nothing.  Next time through the
1193
136
        # main loop of _wrap_chunks(), we'll wind up here again, but
1194
137
        # cur_len will be zero, so the next line will be entirely
1195
138
        # devoted to the long word that we can't handle right now.
1196
139
1197
140
    def _wrap_chunks(self, chunks):
1198
141
        lines = []
1199
142
        if self.width <= 0:
1200
143
            raise ValueError("invalid width %r (must be > 0)" % self.width)
1201
144
1202
145
        # Arrange in reverse order so items can be efficiently popped
1203
146
        # from a stack of chucks.
1204
147
        chunks.reverse()
1205
148
1206
149
        while chunks:
1207
150
1208
151
            # Start the list of chunks that will make up the current line.
1209
152
            # cur_len is just the length of all the chunks in cur_line.
1210
153
            cur_line = []
1211
154
            cur_len = 0
1212
155
1213
156
            # Figure out which static string will prefix this line.
1214
157
            if lines:
1215
158
                indent = self.subsequent_indent
1216
159
            else:
1217
160
                indent = self.initial_indent
1218
161
1219
162
            # Maximum width for this line.
1220
163
            width = self.width - len(indent)
1221
164
1222
165
            # First chunk on line is whitespace -- drop it, unless this
1223
166
            # is the very beginning of the text (ie. no lines started yet).
1224
167
            if self.drop_whitespace and chunks[-1].strip() == '' and lines:
1225
168
                del chunks[-1]
1226
169
1227
170
            while chunks:
1228
171
                # Use _width instead of len for east asian width
1229
172
                l = self._width(chunks[-1])
1230
173
1231
174
                # Can at least squeeze this chunk onto the current line.
1232
175
                if cur_len + l <= width:
1233
176
                    cur_line.append(chunks.pop())
1234
177
                    cur_len += l
1235
178
1236
179
                # Nope, this line is full.
1237
180
                else:
1238
181
                    break
1239
182
1240
183
            # The current line is full, and the next chunk is too big to
1241
184
            # fit on *any* line (not just this one).
1242
185
            if chunks and self._width(chunks[-1]) > width:
1243
186
                self._handle_long_word(chunks, cur_line, cur_len, width)
1244
187
1245
188
            # If the last chunk on this line is all whitespace, drop it.
1246
189
            if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
1247
190
                del cur_line[-1]
1248
191
1249
192
            # Convert current line back to a string and store it in list
1250
193
            # of all lines (return value).
1251
194
            if cur_line:
1252
195
                lines.append(indent + ''.join(cur_line))
1253
196
1254
197
        return lines
1255
198
1256
199
    def _split(self, text):
1257
200
        chunks = textwrap.TextWrapper._split(self, unicode(text))
1258
201
        cjk_split_chunks = []
1259
202
        for chunk in chunks:
1260
203
            assert chunk # TextWrapper._split removes empty chunk
1261
204
            prev_pos = 0
1262
205
            for pos, char in enumerate(chunk):
1263
206
                if _eawidth(char) in 'FWA':
1264
207
                    if prev_pos < pos:
1265
208
                        cjk_split_chunks.append(chunk[prev_pos:pos])
1266
209
                    cjk_split_chunks.append(char)
1267
210
                    prev_pos = pos+1
1268
211
            if prev_pos < len(chunk):
1269
212
                cjk_split_chunks.append(chunk[prev_pos:])
1270
213
        return cjk_split_chunks
1271
214
1272
215
    def wrap(self, text):
1273
216
        # ensure text is unicode
1274
217
        return textwrap.TextWrapper.wrap(self, unicode(text))
1275
218
1276
219
# -- Convenience interface ---------------------------------------------
1277
220
1278
221
def wrap(text, width=None, **kwargs):
1279
222
    """Wrap a single paragraph of text, returning a list of wrapped lines.
1280
223
1281
224
    Reformat the single paragraph in 'text' so it fits in lines of no
1282
225
    more than 'width' columns, and return a list of wrapped lines.  By
1283
226
    default, tabs in 'text' are expanded with string.expandtabs(), and
1284
227
    all other whitespace characters (including newline) are converted to
1285
228
    space.  See TextWrapper class for available keyword args to customize
1286
229
    wrapping behaviour.
1287
230
    """
1288
231
    return UTextWrapper(width=width, **kwargs).wrap(text)
1289
232
1290
233
def fill(text, width=None, **kwargs):
1291
234
    """Fill a single paragraph of text, returning a new string.
1292
235
1293
236
    Reformat the single paragraph in 'text' to fit in lines of no more
1294
237
    than 'width' columns, and return a new string containing the entire
1295
238
    wrapped paragraph.  As with wrap(), tabs are expanded and other
1296
239
    whitespace characters converted to space.  See TextWrapper class for
1297
240
    available keyword args to customize wrapping behaviour.
1298
241
    """
1299
242
    return UTextWrapper(width=width, **kwargs).fill(text)
1300
243
1301
0
244
1302
=== added directory 'po'
1303
=== added file 'po/bzr.pot'
1304
--- po/bzr.pot	1970-01-01 00:00:00 +0000
1305
+++ po/bzr.pot	2011-05-14 03:14:26 +0000
1306
@@ -0,0 +1,8931 @@
1307
1
# SOME DESCRIPTIVE TITLE.
1308
2
# Copyright (C) YEAR Canonical
1309
3
# This file is distributed under the same license as the PACKAGE package.
1310
4
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
1311
5
#
1312
6
#, fuzzy
1313
7
msgid ""
1314
8
msgstr ""
1315
9
"Project-Id-Version: bzr\n"
1316
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
1317
11
"POT-Creation-Date: 2011-05-14 12:05+0900\n"
1318
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1319
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1320
14
"Language-Team: LANGUAGE <LL@li.org>\n"
1321
15
"Language: \n"
1322
16
"MIME-Version: 1.0\n"
1323
17
"Content-Type: text/plain; charset=CHARSET\n"
1324
18
"Content-Transfer-Encoding: 8bit\n"
1325
19
1326
20
#: bzrlib/builtins.py:206
1327
21
msgid "Display status summary."
1328
22
msgstr ""
1329
23
1330
24
#: bzrlib/builtins.py:208
1331
25
msgid ""
1332
26
"This reports on versioned and unknown files, reporting them\n"
1333
27
"grouped by state.  Possible states are:"
1334
28
msgstr ""
1335
29
1336
30
#: bzrlib/builtins.py:211
1337
31
msgid ""
1338
32
"added\n"
1339
33
"    Versioned in the working copy but not in the previous revision."
1340
34
msgstr ""
1341
35
1342
36
#: bzrlib/builtins.py:214
1343
37
msgid ""
1344
38
"removed\n"
1345
39
"    Versioned in the previous revision but removed or deleted\n"
1346
40
"    in the working copy."
1347
41
msgstr ""
1348
42
1349
43
#: bzrlib/builtins.py:218
1350
44
msgid ""
1351
45
"renamed\n"
1352
46
"    Path of this file changed from the previous revision;\n"
1353
47
"    the text may also have changed.  This includes files whose\n"
1354
48
"    parent directory was renamed."
1355
49
msgstr ""
1356
50
1357
51
#: bzrlib/builtins.py:223
1358
52
msgid ""
1359
53
"modified\n"
1360
54
"    Text has changed since the previous revision."
1361
55
msgstr ""
1362
56
1363
57
#: bzrlib/builtins.py:226
1364
58
msgid ""
1365
59
"kind changed\n"
1366
60
"    File kind has been changed (e.g. from file to directory)."
1367
61
msgstr ""
1368
62
1369
63
#: bzrlib/builtins.py:229
1370
64
msgid ""
1371
65
"unknown\n"
1372
66
"    Not versioned and not matching an ignore pattern."
1373
67
msgstr ""
1374
68
1375
69
#: bzrlib/builtins.py:232
1376
70
msgid ""
1377
71
"Additionally for directories, symlinks and files with an executable\n"
1378
72
"bit, Bazaar indicates their type using a trailing character: '/', '@'\n"
1379
73
"or '*' respectively."
1380
74
msgstr ""
1381
75
1382
76
#: bzrlib/builtins.py:236
1383
77
msgid ""
1384
78
"To see ignored files use 'bzr ignored'.  For details on the\n"
1385
79
"changes to file texts, use 'bzr diff'."
1386
80
msgstr ""
1387
81
1388
82
#: bzrlib/builtins.py:239
1389
83
msgid ""
1390
84
"Note that --short or -S gives status flags for each item, similar\n"
1391
85
"to Subversion's status command. To get output similar to svn -q,\n"
1392
86
"use bzr status -SV."
1393
87
msgstr ""
1394
88
1395
89
#: bzrlib/builtins.py:243
1396
90
msgid ""
1397
91
"If no arguments are specified, the status of the entire working\n"
1398
92
"directory is shown.  Otherwise, only the status of the specified\n"
1399
93
"files or directories is reported.  If a directory is given, status\n"
1400
94
"is reported for everything inside that directory."
1401
95
msgstr ""
1402
96
1403
97
#: bzrlib/builtins.py:248
1404
98
msgid ""
1405
99
"Before merges are committed, the pending merge tip revisions are\n"
1406
100
"shown. To see all pending merge revisions, use the -v option.\n"
1407
101
"To skip the display of pending merge information altogether, use\n"
1408
102
"the no-pending option or specify a file/directory."
1409
103
msgstr ""
1410
104
1411
105
#: bzrlib/builtins.py:253
1412
106
msgid ""
1413
107
"To compare the working directory to a specific revision, pass a\n"
1414
108
"single revision to the revision argument."
1415
109
msgstr ""
1416
110
1417
111
#: bzrlib/builtins.py:256
1418
112
msgid ""
1419
113
"To see which files have changed in a specific revision, or between\n"
1420
114
"two revisions, pass a revision range to the revision argument.\n"
1421
115
"This will produce the same results as calling 'bzr diff --summarize'."
1422
116
msgstr ""
1423
117
1424
118
# help of 'short' option of 'status' command
1425
119
#: bzrlib/builtins.py:265
1426
120
msgid "Use short status indicators."
1427
121
msgstr ""
1428
122
1429
123
# help of 'versioned' option of 'status' command
1430
124
#: bzrlib/builtins.py:267
1431
125
msgid "Only show versioned files."
1432
126
msgstr ""
1433
127
1434
128
# help of 'no-pending' option of 'status' command
1435
129
#: bzrlib/builtins.py:269
1436
130
msgid "Don't show pending merges."
1437
131
msgstr ""
1438
132
1439
133
#: bzrlib/builtins.py:446
1440
134
msgid "Remove the working tree from a given branch/checkout."
1441
135
msgstr ""
1442
136
1443
137
#: bzrlib/builtins.py:448
1444
138
msgid ""
1445
139
"Since a lightweight checkout is little more than a working tree\n"
1446
140
"this will refuse to run against one."
1447
141
msgstr ""
1448
142
1449
143
#: bzrlib/builtins.py:451
1450
144
msgid "To re-create the working tree, use \"bzr checkout\"."
1451
145
msgstr ""
1452
146
1453
147
# help of 'force' option of 'remove-tree' command
1454
148
#: bzrlib/builtins.py:457
1455
149
msgid "Remove the working tree even if it has uncommitted or shelved changes."
1456
150
msgstr ""
1457
151
1458
152
#: bzrlib/builtins.py:542
1459
153
msgid "Show current revision number."
1460
154
msgstr ""
1461
155
1462
156
#: bzrlib/builtins.py:544
1463
157
msgid "This is equal to the number of revisions on this branch."
1464
158
msgstr ""
1465
159
1466
160
# help of 'tree' option of 'revno' command
1467
161
#: bzrlib/builtins.py:585
1468
162
msgid "Show revno of working tree"
1469
163
msgstr ""
1470
164
1471
165
#: bzrlib/builtins.py:633
1472
166
msgid "Add specified files or directories."
1473
167
msgstr ""
1474
168
1475
169
#: bzrlib/builtins.py:635
1476
170
msgid ""
1477
171
"In non-recursive mode, all the named items are added, regardless\n"
1478
172
"of whether they were previously ignored.  A warning is given if\n"
1479
173
"any of the named files are already versioned."
1480
174
msgstr ""
1481
175
1482
176
#: bzrlib/builtins.py:639
1483
177
msgid ""
1484
178
"In recursive mode (the default), files are treated the same way\n"
1485
179
"but the behaviour for directories is different.  Directories that\n"
1486
180
"are already versioned do not give a warning.  All directories,\n"
1487
181
"whether already versioned or not, are searched for files or\n"
1488
182
"subdirectories that are neither versioned or ignored, and these\n"
1489
183
"are added.  This search proceeds recursively into versioned\n"
1490
184
"directories.  If no names are given '.' is assumed."
1491
185
msgstr ""
1492
186
1493
187
#: bzrlib/builtins.py:647
1494
188
msgid ""
1495
189
"Therefore simply saying 'bzr add' will version all files that\n"
1496
190
"are currently unknown."
1497
191
msgstr ""
1498
192
1499
193
#: bzrlib/builtins.py:650
1500
194
msgid ""
1501
195
"Adding a file whose parent directory is not versioned will\n"
1502
196
"implicitly add the parent, and so on up to the root. This means\n"
1503
197
"you should never need to explicitly add a directory, they'll just\n"
1504
198
"get added when you add a file in the directory."
1505
199
msgstr ""
1506
200
1507
201
#: bzrlib/builtins.py:655
1508
202
msgid ""
1509
203
"--dry-run will show which files would be added, but not actually\n"
1510
204
"add them."
1511
205
msgstr ""
1512
206
1513
207
#: bzrlib/builtins.py:658
1514
208
msgid ""
1515
209
"--file-ids-from will try to use the file ids from the supplied path.\n"
1516
210
"It looks up ids trying to find a matching parent directory with the\n"
1517
211
"same filename, and then by pure path. This option is rarely needed\n"
1518
212
"but can be useful when adding the same logical file into two\n"
1519
213
"branches that will be merged later (without showing the two different\n"
1520
214
"adds as a conflict). It is also useful when merging another project\n"
1521
215
"into a subdirectory of this one."
1522
216
msgstr ""
1523
217
1524
218
#: bzrlib/builtins.py:666
1525
219
msgid ""
1526
220
"Any files matching patterns in the ignore list will not be added\n"
1527
221
"unless they are explicitly mentioned."
1528
222
msgstr ""
1529
223
1530
224
# help of 'no-recurse' option of 'add' command
1531
225
#: bzrlib/builtins.py:672
1532
226
msgid "Don't recursively add the contents of directories."
1533
227
msgstr ""
1534
228
1535
229
# help of 'file-ids-from' option of 'add' command
1536
230
#: bzrlib/builtins.py:678
1537
231
msgid "Lookup file ids from this tree."
1538
232
msgstr ""
1539
233
1540
234
#: bzrlib/builtins.py:718
1541
235
msgid "Create a new versioned directory."
1542
236
msgstr ""
1543
237
1544
238
#: bzrlib/builtins.py:720
1545
239
msgid "This is equivalent to creating the directory and then adding it."
1546
240
msgstr ""
1547
241
1548
242
#: bzrlib/builtins.py:814
1549
243
msgid "Move or rename a file."
1550
244
msgstr ""
1551
245
1552
246
#: bzrlib/builtins.py:816
1553
247
msgid ""
1554
248
":Usage:\n"
1555
249
"    bzr mv OLDNAME NEWNAME"
1556
250
msgstr ""
1557
251
1558
252
#: bzrlib/builtins.py:819
1559
253
msgid "    bzr mv SOURCE... DESTINATION"
1560
254
msgstr ""
1561
255
1562
256
#: bzrlib/builtins.py:821
1563
257
msgid ""
1564
258
"If the last argument is a versioned directory, all the other names\n"
1565
259
"are moved into it.  Otherwise, there must be exactly two arguments\n"
1566
260
"and the file is changed to a new name."
1567
261
msgstr ""
1568
262
1569
263
#: bzrlib/builtins.py:825
1570
264
msgid ""
1571
265
"If OLDNAME does not exist on the filesystem but is versioned and\n"
1572
266
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
1573
267
"assumes that the file has been manually moved and only updates\n"
1574
268
"its internal inventory to reflect that change.\n"
1575
269
"The same is valid when moving many SOURCE files to a DESTINATION."
1576
270
msgstr ""
1577
271
1578
272
#: bzrlib/builtins.py:831
1579
273
msgid "Files cannot be moved between branches."
1580
274
msgstr ""
1581
275
1582
276
# help of 'after' option of 'mv' command
1583
277
#: bzrlib/builtins.py:835
1584
278
msgid ""
1585
279
"Move only the bzr identifier of the file, because the file has already been "
1586
280
"moved."
1587
281
msgstr ""
1588
282
1589
283
# help of 'auto' option of 'mv' command
1590
284
#: bzrlib/builtins.py:837
1591
285
msgid "Automatically guess renames."
1592
286
msgstr ""
1593
287
1594
288
# help of 'dry-run' option of 'mv' command
1595
289
#: bzrlib/builtins.py:838
1596
290
msgid "Avoid making changes when guessing renames."
1597
291
msgstr ""
1598
292
1599
293
#: bzrlib/builtins.py:950
1600
294
msgid "Turn this branch into a mirror of another branch."
1601
295
msgstr ""
1602
296
1603
297
#: bzrlib/builtins.py:952
1604
298
msgid ""
1605
299
"By default, this command only works on branches that have not diverged.\n"
1606
300
"Branches are considered diverged if the destination branch's most recent \n"
1607
301
"commit is one that has not been merged (directly or indirectly) into the \n"
1608
302
"parent."
1609
303
msgstr ""
1610
304
1611
305
#: bzrlib/builtins.py:957
1612
306
msgid ""
1613
307
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
1614
308
"from one into the other.  Once one branch has merged, the other should\n"
1615
309
"be able to pull it again."
1616
310
msgstr ""
1617
311
1618
312
#: bzrlib/builtins.py:961
1619
313
msgid ""
1620
314
"If you want to replace your local changes and just want your branch to\n"
1621
315
"match the remote one, use pull --overwrite. This will work even if the two\n"
1622
316
"branches have diverged."
1623
317
msgstr ""
1624
318
1625
319
#: bzrlib/builtins.py:965
1626
320
msgid ""
1627
321
"If there is no default location set, the first pull will set it.  After\n"
1628
322
"that, you can omit the location to use the default.  To change the\n"
1629
323
"default, use --remember. The value will only be saved if the remote\n"
1630
324
"location can be accessed."
1631
325
msgstr ""
1632
326
1633
327
#: bzrlib/builtins.py:970
1634
328
msgid ""
1635
329
"Note: The location can be specified either in the form of a branch,\n"
1636
330
"or in the form of a path to a file containing a merge directive generated\n"
1637
331
"with bzr send."
1638
332
msgstr ""
1639
333
1640
334
# help of 'verbose' option of 'pull' command
1641
335
#: bzrlib/builtins.py:978
1642
336
msgid "Show logs of pulled revisions."
1643
337
msgstr ""
1644
338
1645
339
# help of 'directory' option of 'pull' command
1646
340
#: bzrlib/builtins.py:980
1647
341
msgid ""
1648
342
"Branch to pull into, rather than the one containing the working directory."
1649
343
msgstr ""
1650
344
1651
345
# help of 'local' option of 'pull' command
1652
346
#: bzrlib/builtins.py:983
1653
347
msgid ""
1654
348
"Perform a local pull in a bound branch.  Local pulls are not applied to the "
1655
349
"master branch."
1656
350
msgstr ""
1657
351
1658
352
#: bzrlib/builtins.py:1082
1659
353
msgid "Update a mirror of this branch."
1660
354
msgstr ""
1661
355
1662
356
#: bzrlib/builtins.py:1084
1663
357
msgid ""
1664
358
"The target branch will not have its working tree populated because this\n"
1665
359
"is both expensive, and is not supported on remote file systems."
1666
360
msgstr ""
1667
361
1668
362
#: bzrlib/builtins.py:1087
1669
363
msgid ""
1670
364
"Some smart servers or protocols *may* put the working tree in place in\n"
1671
365
"the future."
1672
366
msgstr ""
1673
367
1674
368
#: bzrlib/builtins.py:1090
1675
369
msgid ""
1676
370
"This command only works on branches that have not diverged.  Branches are\n"
1677
371
"considered diverged if the destination branch's most recent commit is one\n"
1678
372
"that has not been merged (directly or indirectly) by the source branch."
1679
373
msgstr ""
1680
374
1681
375
#: bzrlib/builtins.py:1094
1682
376
msgid ""
1683
377
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
1684
378
"the other branch completely, discarding its unmerged changes."
1685
379
msgstr ""
1686
380
1687
381
#: bzrlib/builtins.py:1097
1688
382
msgid ""
1689
383
"If you want to ensure you have the different changes in the other branch,\n"
1690
384
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
1691
385
"After that you will be able to do a push without '--overwrite'."
1692
386
msgstr ""
1693
387
1694
388
#: bzrlib/builtins.py:1101
1695
389
msgid ""
1696
390
"If there is no default push location set, the first push will set it.\n"
1697
391
"After that, you can omit the location to use the default.  To change the\n"
1698
392
"default, use --remember. The value will only be saved if the remote\n"
1699
393
"location can be accessed."
1700
394
msgstr ""
1701
395
1702
396
# help of 'directory' option of 'push' command
1703
397
#: bzrlib/builtins.py:1113
1704
398
msgid ""
1705
399
"Branch to push from, rather than the one containing the working directory."
1706
400
msgstr ""
1707
401
1708
402
# help of 'use-existing-dir' option of 'push' command
1709
403
#: bzrlib/builtins.py:1116
1710
404
msgid ""
1711
405
"By default push will fail if the target directory exists, but does not "
1712
406
"already have a control directory.  This flag will allow push to proceed."
1713
407
msgstr ""
1714
408
1715
409
# help of 'stacked' option of 'push' command
1716
410
#: bzrlib/builtins.py:1121
1717
411
msgid ""
1718
412
"Create a stacked branch that references the public location of the parent "
1719
413
"branch."
1720
414
msgstr ""
1721
415
1722
416
# help of 'stacked-on' option of 'push' command
1723
417
#: bzrlib/builtins.py:1124
1724
418
msgid ""
1725
419
"Create a stacked branch that refers to another branch for the commit "
1726
420
"history. Only the work not present in the referenced branch is included in "
1727
421
"the branch created."
1728
422
msgstr ""
1729
423
1730
424
# help of 'strict' option of 'push' command
1731
425
#: bzrlib/builtins.py:1129
1732
426
msgid ""
1733
427
"Refuse to push if there are uncommitted changes in the working tree, --no-"
1734
428
"strict disables the check."
1735
429
msgstr ""
1736
430
1737
431
# help of 'no-tree' option of 'push' command
1738
432
#: bzrlib/builtins.py:1132
1739
433
msgid "Don't populate the working tree, even for protocols that support it."
1740
434
msgstr ""
1741
435
1742
436
#: bzrlib/builtins.py:1197
1743
437
msgid "Create a new branch that is a copy of an existing branch."
1744
438
msgstr ""
1745
439
1746
440
#: bzrlib/builtins.py:1199
1747
441
msgid ""
1748
442
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
1749
443
"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
1750
444
"bar.\n"
1751
445
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
1752
446
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
1753
447
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
1754
448
"create ./foo-bar."
1755
449
msgstr ""
1756
450
1757
451
#: bzrlib/builtins.py:1206
1758
452
msgid ""
1759
453
"To retrieve the branch as of a particular revision, supply the --revision\n"
1760
454
"parameter, as in \"branch foo/bar -r 5\"."
1761
455
msgstr ""
1762
456
1763
457
#: bzrlib/builtins.py:1209
1764
458
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
1765
459
msgstr ""
1766
460
1767
461
# help of 'no-tree' option of 'branch' command
1768
462
#: bzrlib/builtins.py:1219
1769
463
msgid "Create a branch without a working-tree."
1770
464
msgstr ""
1771
465
1772
466
# help of 'switch' option of 'branch' command
1773
467
#: bzrlib/builtins.py:1221
1774
468
msgid "Switch the checkout in the current directory to the new branch."
1775
469
msgstr ""
1776
470
1777
471
# help of 'stacked' option of 'branch' command
1778
472
#: bzrlib/builtins.py:1224
1779
473
msgid ""
1780
474
"Create a stacked branch referring to the source branch. The new branch will "
1781
475
"depend on the availability of the source branch for all operations."
1782
476
msgstr ""
1783
477
1784
478
# help of 'standalone' option of 'branch' command
1785
479
#: bzrlib/builtins.py:1228
1786
480
msgid "Do not use a shared repository, even if available."
1787
481
msgstr ""
1788
482
1789
483
# help of 'use-existing-dir' option of 'branch' command
1790
484
#: bzrlib/builtins.py:1230
1791
485
msgid ""
1792
486
"By default branch will fail if the target directory exists, but does not "
1793
487
"already have a control directory.  This flag will allow branch to proceed."
1794
488
msgstr ""
1795
489
1796
490
# help of 'bind' option of 'branch' command
1797
491
#: bzrlib/builtins.py:1235
1798
492
msgid "Bind new branch to from location."
1799
493
msgstr ""
1800
494
1801
495
#: bzrlib/builtins.py:1327
1802
496
msgid "Create a new checkout of an existing branch."
1803
497
msgstr ""
1804
498
1805
499
#: bzrlib/builtins.py:1329
1806
500
msgid ""
1807
501
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
1808
502
"for\n"
1809
503
"the branch found in '.'. This is useful if you have removed the working "
1810
504
"tree\n"
1811
505
"or if it was never created - i.e. if you pushed the branch to its current\n"
1812
506
"location using SFTP."
1813
507
msgstr ""
1814
508
1815
509
#: bzrlib/builtins.py:1334
1816
510
msgid ""
1817
511
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
1818
512
"will\n"
1819
513
"be used.  In other words, \"checkout ../foo/bar\" will attempt to create ./"
1820
514
"bar.\n"
1821
515
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
1822
516
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
1823
517
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
1824
518
"create ./foo-bar."
1825
519
msgstr ""
1826
520
1827
521
#: bzrlib/builtins.py:1341
1828
522
msgid ""
1829
523
"To retrieve the branch as of a particular revision, supply the --revision\n"
1830
524
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
1831
525
"immediately\n"
1832
526
"out of date [so you cannot commit] but it may be useful (i.e. to examine "
1833
527
"old\n"
1834
528
"code.)"
1835
529
msgstr ""
1836
530
1837
531
# help of 'lightweight' option of 'checkout' command
1838
532
#: bzrlib/builtins.py:1351
1839
533
msgid ""
1840
534
"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
1841
535
"the branch for every operation.  Normal checkouts can perform common "
1842
536
"operations like diff and status without such access, and also support local "
1843
537
"commits."
1844
538
msgstr ""
1845
539
1846
540
# help of 'files-from' option of 'branch' command
1847
541
#: bzrlib/builtins.py:1358
1848
542
msgid "Get file contents from this tree."
1849
543
msgstr ""
1850
544
1851
545
# help of 'hardlink' option of 'branch' command
1852
546
#: bzrlib/builtins.py:1360
1853
547
msgid "Hard-link working tree files where possible."
1854
548
msgstr ""
1855
549
1856
550
#: bzrlib/builtins.py:1401
1857
551
msgid ""
1858
552
"Show list of renamed files.\n"
1859
553
"    "
1860
554
msgstr ""
1861
555
1862
556
#: bzrlib/builtins.py:1431
1863
557
msgid "Update a tree to have the latest code committed to its branch."
1864
558
msgstr ""
1865
559
1866
560
#: bzrlib/builtins.py:1433
1867
561
msgid ""
1868
562
"This will perform a merge into the working tree, and may generate\n"
1869
563
"conflicts. If you have any local changes, you will still\n"
1870
564
"need to commit them after the update for the update to be complete."
1871
565
msgstr ""
1872
566
1873
567
#: bzrlib/builtins.py:1437
1874
568
msgid ""
1875
569
"If you want to discard your local changes, you can just do a\n"
1876
570
"'bzr revert' instead of 'bzr commit' after the update."
1877
571
msgstr ""
1878
572
1879
573
#: bzrlib/builtins.py:1440
1880
574
msgid ""
1881
575
"If you want to restore a file that has been removed locally, use\n"
1882
576
"'bzr revert' instead of 'bzr update'."
1883
577
msgstr ""
1884
578
1885
579
#: bzrlib/builtins.py:1443
1886
580
msgid ""
1887
581
"If the tree's branch is bound to a master branch, it will also update\n"
1888
582
"the branch from the master."
1889
583
msgstr ""
1890
584
1891
585
#: bzrlib/builtins.py:1524
1892
586
msgid "Show information about a working tree, branch or repository."
1893
587
msgstr ""
1894
588
1895
589
#: bzrlib/builtins.py:1526
1896
590
msgid ""
1897
591
"This command will show all known locations and formats associated to the\n"
1898
592
"tree, branch or repository."
1899
593
msgstr ""
1900
594
1901
595
#: bzrlib/builtins.py:1529
1902
596
msgid ""
1903
597
"In verbose mode, statistical information is included with each report.\n"
1904
598
"To see extended statistic information, use a verbosity level of 2 or\n"
1905
599
"higher by specifying the verbose option multiple times, e.g. -vv."
1906
600
msgstr ""
1907
601
1908
602
#: bzrlib/builtins.py:1533
1909
603
msgid "Branches and working trees will also report any missing revisions."
1910
604
msgstr ""
1911
605
1912
606
#: bzrlib/builtins.py:1537
1913
607
msgid "  Display information on the format and related locations:"
1914
608
msgstr ""
1915
609
1916
610
#: bzrlib/builtins.py:1539
1917
611
msgid "    bzr info"
1918
612
msgstr ""
1919
613
1920
614
#: bzrlib/builtins.py:1541
1921
615
msgid ""
1922
616
"  Display the above together with extended format information and\n"
1923
617
"  basic statistics (like the number of files in the working tree and\n"
1924
618
"  number of revisions in the branch and repository):"
1925
619
msgstr ""
1926
620
1927
621
#: bzrlib/builtins.py:1545
1928
622
msgid "    bzr info -v"
1929
623
msgstr ""
1930
624
1931
625
#: bzrlib/builtins.py:1547
1932
626
msgid "  Display the above together with number of committers to the branch:"
1933
627
msgstr ""
1934
628
1935
629
#: bzrlib/builtins.py:1549
1936
630
msgid "    bzr info -vv"
1937
631
msgstr ""
1938
632
1939
633
#: bzrlib/builtins.py:1568
1940
634
msgid "Remove files or directories."
1941
635
msgstr ""
1942
636
1943
637
#: bzrlib/builtins.py:1570
1944
638
msgid ""
1945
639
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
1946
640
"delete them if they can easily be recovered using revert otherwise they\n"
1947
641
"will be backed up (adding an extention of the form .~#~). If no options or\n"
1948
642
"parameters are given Bazaar will scan for files that are being tracked by\n"
1949
643
"Bazaar but missing in your tree and stop tracking them for you."
1950
644
msgstr ""
1951
645
1952
646
# help of 'new' option of 'remove' command
1953
647
#: bzrlib/builtins.py:1578
1954
648
msgid "Only remove files that have never been committed."
1955
649
msgstr ""
1956
650
1957
651
# help of 'file-deletion-strategy' option of 'remove' command
1958
652
#: bzrlib/builtins.py:1580
1959
653
msgid "The file deletion mode to be used."
1960
654
msgstr ""
1961
655
1962
656
# title of 'file-deletion-strategy' option of 'remove' command
1963
657
#: bzrlib/builtins.py:1581
1964
658
msgid "Deletion Strategy"
1965
659
msgstr ""
1966
660
1967
661
#: bzrlib/builtins.py:1672
1968
662
msgid "Reconcile bzr metadata in a branch."
1969
663
msgstr ""
1970
664
1971
665
#: bzrlib/builtins.py:1674
1972
666
msgid ""
1973
667
"This can correct data mismatches that may have been caused by\n"
1974
668
"previous ghost operations or bzr upgrades. You should only\n"
1975
669
"need to run this command if 'bzr check' or a bzr developer\n"
1976
670
"advises you to run it."
1977
671
msgstr ""
1978
672
1979
673
#: bzrlib/builtins.py:1679
1980
674
msgid ""
1981
675
"If a second branch is provided, cross-branch reconciliation is\n"
1982
676
"also attempted, which will check that data like the tree root\n"
1983
677
"id which was not present in very early bzr versions is represented\n"
1984
678
"correctly in both branches."
1985
679
msgstr ""
1986
680
1987
681
#: bzrlib/builtins.py:1684
1988
682
msgid ""
1989
683
"At the same time it is run it may recompress data resulting in\n"
1990
684
"a potential saving in disk space or performance gain."
1991
685
msgstr ""
1992
686
1993
687
#: bzrlib/builtins.py:1687
1994
688
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1995
689
msgstr ""
1996
690
1997
691
#: bzrlib/builtins.py:1747
1998
692
msgid "Make a directory into a versioned branch."
1999
693
msgstr ""
2000
694
2001
695
#: bzrlib/builtins.py:1749
2002
696
msgid ""
2003
697
"Use this to create an empty branch, or before importing an\n"
2004
698
"existing project."
2005
699
msgstr ""
2006
700
2007
701
#: bzrlib/builtins.py:1752
2008
702
msgid ""
2009
703
"If there is a repository in a parent directory of the location, then\n"
2010
704
"the history of the branch will be stored in the repository.  Otherwise\n"
2011
705
"init creates a standalone branch which carries its own history\n"
2012
706
"in the .bzr directory."
2013
707
msgstr ""
2014
708
2015
709
#: bzrlib/builtins.py:1757
2016
710
msgid ""
2017
711
"If there is already a branch at the location but it has no working tree,\n"
2018
712
"the tree can be populated with 'bzr checkout'."
2019
713
msgstr ""
2020
714
2021
715
#: bzrlib/builtins.py:1760
2022
716
msgid "Recipe for importing a tree of files::"
2023
717
msgstr ""
2024
718
2025
719
#: bzrlib/builtins.py:1762
2026
720
msgid ""
2027
721
"    cd ~/project\n"
2028
722
"    bzr init\n"
2029
723
"    bzr add .\n"
2030
724
"    bzr status\n"
2031
725
"    bzr commit -m \"imported project\""
2032
726
msgstr ""
2033
727
2034
728
# help of 'create-prefix' option of 'init' command
2035
729
#: bzrlib/builtins.py:1773
2036
730
msgid "Create the path leading up to the branch if it does not already exist."
2037
731
msgstr ""
2038
732
2039
733
# help of 'format' option of 'init' command
2040
734
#: bzrlib/builtins.py:1776
2041
735
msgid "Specify a format for this branch. See \"help formats\"."
2042
736
msgstr ""
2043
737
2044
738
# help of 'append-revisions-only' option of 'init' command
2045
739
#: bzrlib/builtins.py:1784
2046
740
msgid "Never change revnos or the existing log.  Append revisions to it only."
2047
741
msgstr ""
2048
742
2049
743
# help of 'no-tree' option of 'init' command
2050
744
#: bzrlib/builtins.py:1787
2051
745
msgid "Create a branch without a working tree."
2052
746
msgstr ""
2053
747
2054
748
#: bzrlib/builtins.py:1864
2055
749
msgid "Create a shared repository for branches to share storage space."
2056
750
msgstr ""
2057
751
2058
752
#: bzrlib/builtins.py:1866
2059
753
msgid ""
2060
754
"New branches created under the repository directory will store their\n"
2061
755
"revisions in the repository, not in the branch directory.  For branches\n"
2062
756
"with shared history, this reduces the amount of storage needed and \n"
2063
757
"speeds up the creation of new branches."
2064
758
msgstr ""
2065
759
2066
760
#: bzrlib/builtins.py:1871
2067
761
msgid ""
2068
762
"If the --no-trees option is given then the branches in the repository\n"
2069
763
"will not have working trees by default.  They will still exist as \n"
2070
764
"directories on disk, but they will not have separate copies of the \n"
2071
765
"files at a certain revision.  This can be useful for repositories that\n"
2072
766
"store branches which are interacted with through checkouts or remote\n"
2073
767
"branches, such as on a server."
2074
768
msgstr ""
2075
769
2076
770
#: bzrlib/builtins.py:1878
2077
771
msgid ""
2078
772
":Examples:\n"
2079
773
"    Create a shared repository holding just branches::"
2080
774
msgstr ""
2081
775
2082
776
#: bzrlib/builtins.py:1881
2083
777
msgid ""
2084
778
"        bzr init-repo --no-trees repo\n"
2085
779
"        bzr init repo/trunk"
2086
780
msgstr ""
2087
781
2088
782
#: bzrlib/builtins.py:1884
2089
783
msgid "    Make a lightweight checkout elsewhere::"
2090
784
msgstr ""
2091
785
2092
786
#: bzrlib/builtins.py:1886
2093
787
msgid ""
2094
788
"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
2095
789
"        cd trunk-checkout\n"
2096
790
"        (add files here)"
2097
791
msgstr ""
2098
792
2099
793
# help of 'format' option of 'init-repository' command
2100
794
#: bzrlib/builtins.py:1894
2101
795
msgid ""
2102
796
"Specify a format for this repository. See \"bzr help formats\" for details."
2103
797
msgstr ""
2104
798
2105
799
# title of 'format' option of 'init-repository' command
2106
800
#: bzrlib/builtins.py:1898
2107
801
msgid "Repository format"
2108
802
msgstr ""
2109
803
2110
804
# help of 'no-trees' option of 'init-repository' command
2111
805
#: bzrlib/builtins.py:1900
2112
806
msgid "Branches in the repository will default to not having a working tree."
2113
807
msgstr ""
2114
808
2115
809
#: bzrlib/builtins.py:1924
2116
810
msgid "Show differences in the working tree, between revisions or branches."
2117
811
msgstr ""
2118
812
2119
813
#: bzrlib/builtins.py:1926
2120
814
msgid ""
2121
815
"If no arguments are given, all changes for the current tree are listed.\n"
2122
816
"If files are given, only the changes in those files are listed.\n"
2123
817
"Remote and multiple branches can be compared by using the --old and\n"
2124
818
"--new options. If not provided, the default for both is derived from\n"
2125
819
"the first argument, if any, or the current tree if no arguments are\n"
2126
820
"given."
2127
821
msgstr ""
2128
822
2129
823
#: bzrlib/builtins.py:1933
2130
824
msgid ""
2131
825
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
2132
826
"produces patches suitable for \"patch -p1\"."
2133
827
msgstr ""
2134
828
2135
829
#: bzrlib/builtins.py:1936
2136
830
msgid ""
2137
831
"Note that when using the -r argument with a range of revisions, the\n"
2138
832
"differences are computed between the two specified revisions.  That\n"
2139
833
"is, the command does not show the changes introduced by the first \n"
2140
834
"revision in the range.  This differs from the interpretation of \n"
2141
835
"revision ranges used by \"bzr log\" which includes the first revision\n"
2142
836
"in the range."
2143
837
msgstr ""
2144
838
2145
839
#: bzrlib/builtins.py:1943
2146
840
msgid ""
2147
841
":Exit values:\n"
2148
842
"    1 - changed\n"
2149
843
"    2 - unrepresentable changes\n"
2150
844
"    3 - error\n"
2151
845
"    0 - no change"
2152
846
msgstr ""
2153
847
2154
848
#: bzrlib/builtins.py:1949
2155
849
msgid ""
2156
850
":Examples:\n"
2157
851
"    Shows the difference in the working tree versus the last commit::"
2158
852
msgstr ""
2159
853
2160
854
#: bzrlib/builtins.py:1952
2161
855
msgid "        bzr diff"
2162
856
msgstr ""
2163
857
2164
858
#: bzrlib/builtins.py:1954
2165
859
msgid "    Difference between the working tree and revision 1::"
2166
860
msgstr ""
2167
861
2168
862
#: bzrlib/builtins.py:1956
2169
863
msgid "        bzr diff -r1"
2170
864
msgstr ""
2171
865
2172
866
#: bzrlib/builtins.py:1958
2173
867
msgid "    Difference between revision 3 and revision 1::"
2174
868
msgstr ""
2175
869
2176
870
#: bzrlib/builtins.py:1960
2177
871
msgid "        bzr diff -r1..3"
2178
872
msgstr ""
2179
873
2180
874
#: bzrlib/builtins.py:1962
2181
875
msgid "    Difference between revision 3 and revision 1 for branch xxx::"
2182
876
msgstr ""
2183
877
2184
878
#: bzrlib/builtins.py:1964
2185
879
msgid "        bzr diff -r1..3 xxx"
2186
880
msgstr ""
2187
881
2188
882
#: bzrlib/builtins.py:1966
2189
883
msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
2190
884
msgstr ""
2191
885
2192
886
#: bzrlib/builtins.py:1968
2193
887
msgid "        bzr diff -c2"
2194
888
msgstr ""
2195
889
2196
890
#: bzrlib/builtins.py:1970
2197
891
msgid ""
2198
892
"    To see the changes introduced by revision X::\n"
2199
893
"    \n"
2200
894
"        bzr diff -cX"
2201
895
msgstr ""
2202
896
2203
897
#: bzrlib/builtins.py:1974
2204
898
msgid ""
2205
899
"    Note that in the case of a merge, the -c option shows the changes\n"
2206
900
"    compared to the left hand parent. To see the changes against\n"
2207
901
"    another parent, use::"
2208
902
msgstr ""
2209
903
2210
904
#: bzrlib/builtins.py:1978
2211
905
msgid "        bzr diff -r<chosen_parent>..X"
2212
906
msgstr ""
2213
907
2214
908
#: bzrlib/builtins.py:1980
2215
909
msgid ""
2216
910
"    The changes between the current revision and the previous revision\n"
2217
911
"    (equivalent to -c-1 and -r-2..-1)"
2218
912
msgstr ""
2219
913
2220
914
#: bzrlib/builtins.py:1983
2221
915
msgid "        bzr diff -r-2.."
2222
916
msgstr ""
2223
917
2224
918
#: bzrlib/builtins.py:1985
2225
919
msgid "    Show just the differences for file NEWS::"
2226
920
msgstr ""
2227
921
2228
922
#: bzrlib/builtins.py:1987
2229
923
msgid "        bzr diff NEWS"
2230
924
msgstr ""
2231
925
2232
926
#: bzrlib/builtins.py:1989
2233
927
msgid "    Show the differences in working tree xxx for file NEWS::"
2234
928
msgstr ""
2235
929
2236
930
#: bzrlib/builtins.py:1991
2237
931
msgid "        bzr diff xxx/NEWS"
2238
932
msgstr ""
2239
933
2240
934
#: bzrlib/builtins.py:1993
2241
935
msgid "    Show the differences from branch xxx to this working tree:"
2242
936
msgstr ""
2243
937
2244
938
#: bzrlib/builtins.py:1995
2245
939
msgid "        bzr diff --old xxx"
2246
940
msgstr ""
2247
941
2248
942
#: bzrlib/builtins.py:1997
2249
943
msgid "    Show the differences between two branches for file NEWS::"
2250
944
msgstr ""
2251
945
2252
946
#: bzrlib/builtins.py:1999
2253
947
msgid "        bzr diff --old xxx --new yyy NEWS"
2254
948
msgstr ""
2255
949
2256
950
#: bzrlib/builtins.py:2001
2257
951
msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
2258
952
msgstr ""
2259
953
2260
954
#: bzrlib/builtins.py:2003
2261
955
msgid ""
2262
956
"        bzr diff --prefix old/:new/\n"
2263
957
"        \n"
2264
958
"    Show the differences using a custom diff program with options::\n"
2265
959
"    \n"
2266
960
"        bzr diff --using /usr/bin/diff --diff-options -wu"
2267
961
msgstr ""
2268
962
2269
963
# help of 'diff-options' option of 'diff' command
2270
964
#: bzrlib/builtins.py:2013
2271
965
msgid "Pass these options to the external diff program."
2272
966
msgstr ""
2273
967
2274
968
# help of 'prefix' option of 'diff' command
2275
969
#: bzrlib/builtins.py:2016
2276
970
msgid ""
2277
971
"Set prefixes added to old and new filenames, as two values separated by a "
2278
972
"colon. (eg \"old/:new/\")."
2279
973
msgstr ""
2280
974
2281
975
# help of 'old' option of 'diff' command
2282
976
#: bzrlib/builtins.py:2019
2283
977
msgid "Branch/tree to compare from."
2284
978
msgstr ""
2285
979
2286
980
# help of 'new' option of 'diff' command
2287
981
#: bzrlib/builtins.py:2023
2288
982
msgid "Branch/tree to compare to."
2289
983
msgstr ""
2290
984
2291
985
# help of 'using' option of 'diff' command
2292
986
#: bzrlib/builtins.py:2029
2293
987
msgid "Use this command to compare files."
2294
988
msgstr ""
2295
989
2296
990
# help of 'format' option of 'diff' command
2297
991
#: bzrlib/builtins.py:2034
2298
992
msgid "Diff format to use."
2299
993
msgstr ""
2300
994
2301
995
# title of 'format' option of 'diff' command
2302
996
#: bzrlib/builtins.py:2036
2303
997
msgid "Diff format"
2304
998
msgstr ""
2305
999
2306
1000
#: bzrlib/builtins.py:2086
2307
1001
msgid ""
2308
1002
"List files deleted in the working tree.\n"
2309
1003
"    "
2310
1004
msgstr ""
2311
1005
2312
1006
#: bzrlib/builtins.py:2164
2313
1007
msgid "Show the tree root directory."
2314
1008
msgstr ""
2315
1009
2316
1010
#: bzrlib/builtins.py:2166
2317
1011
msgid ""
2318
1012
"The root is the nearest enclosing directory with a .bzr control\n"
2319
1013
"directory."
2320
1014
msgstr ""
2321
1015
2322
1016
#: bzrlib/builtins.py:2194
2323
1017
msgid "Show historical log for a branch or subset of a branch."
2324
1018
msgstr ""
2325
1019
2326
1020
#: bzrlib/builtins.py:2196
2327
1021
msgid ""
2328
1022
"log is bzr's default tool for exploring the history of a branch.\n"
2329
1023
"The branch to use is taken from the first parameter. If no parameters\n"
2330
1024
"are given, the branch containing the working directory is logged.\n"
2331
1025
"Here are some simple examples::"
2332
1026
msgstr ""
2333
1027
2334
1028
#: bzrlib/builtins.py:2201
2335
1029
msgid ""
2336
1030
"  bzr log                       log the current branch\n"
2337
1031
"  bzr log foo.py                log a file in its branch\n"
2338
1032
"  bzr log http://server/branch  log a branch on a server"
2339
1033
msgstr ""
2340
1034
2341
1035
#: bzrlib/builtins.py:2205
2342
1036
msgid ""
2343
1037
"The filtering, ordering and information shown for each revision can\n"
2344
1038
"be controlled as explained below. By default, all revisions are\n"
2345
1039
"shown sorted (topologically) so that newer revisions appear before\n"
2346
1040
"older ones and descendants always appear before ancestors. If displayed,\n"
2347
1041
"merged revisions are shown indented under the revision in which they\n"
2348
1042
"were merged."
2349
1043
msgstr ""
2350
1044
2351
1045
#: bzrlib/builtins.py:2212
2352
1046
msgid ":Output control:"
2353
1047
msgstr ""
2354
1048
2355
1049
#: bzrlib/builtins.py:2214
2356
1050
msgid ""
2357
1051
"  The log format controls how information about each revision is\n"
2358
1052
"  displayed. The standard log formats are called ``long``, ``short``\n"
2359
1053
"  and ``line``. The default is long. See ``bzr help log-formats``\n"
2360
1054
"  for more details on log formats."
2361
1055
msgstr ""
2362
1056
2363
1057
#: bzrlib/builtins.py:2219
2364
1058
msgid ""
2365
1059
"  The following options can be used to control what information is\n"
2366
1060
"  displayed::"
2367
1061
msgstr ""
2368
1062
2369
1063
#: bzrlib/builtins.py:2222
2370
1064
msgid ""
2371
1065
"    -l N        display a maximum of N revisions\n"
2372
1066
"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
2373
1067
"    -v          display a status summary (delta) for each revision\n"
2374
1068
"    -p          display a diff (patch) for each revision\n"
2375
1069
"    --show-ids  display revision-ids (and file-ids), not just revnos"
2376
1070
msgstr ""
2377
1071
2378
1072
#: bzrlib/builtins.py:2228
2379
1073
msgid ""
2380
1074
"  Note that the default number of levels to display is a function of the\n"
2381
1075
"  log format. If the -n option is not used, the standard log formats show\n"
2382
1076
"  just the top level (mainline)."
2383
1077
msgstr ""
2384
1078
2385
1079
#: bzrlib/builtins.py:2232
2386
1080
msgid ""
2387
1081
"  Status summaries are shown using status flags like A, M, etc. To see\n"
2388
1082
"  the changes explained using words like ``added`` and ``modified``\n"
2389
1083
"  instead, use the -vv option."
2390
1084
msgstr ""
2391
1085
2392
1086
#: bzrlib/builtins.py:2236
2393
1087
msgid ":Ordering control:"
2394
1088
msgstr ""
2395
1089
2396
1090
#: bzrlib/builtins.py:2238
2397
1091
msgid ""
2398
1092
"  To display revisions from oldest to newest, use the --forward option.\n"
2399
1093
"  In most cases, using this option will have little impact on the total\n"
2400
1094
"  time taken to produce a log, though --forward does not incrementally\n"
2401
1095
"  display revisions like --reverse does when it can."
2402
1096
msgstr ""
2403
1097
2404
1098
#: bzrlib/builtins.py:2243
2405
1099
msgid ":Revision filtering:"
2406
1100
msgstr ""
2407
1101
2408
1102
#: bzrlib/builtins.py:2245
2409
1103
msgid ""
2410
1104
"  The -r option can be used to specify what revision or range of revisions\n"
2411
1105
"  to filter against. The various forms are shown below::"
2412
1106
msgstr ""
2413
1107
2414
1108
#: bzrlib/builtins.py:2248
2415
1109
msgid ""
2416
1110
"    -rX      display revision X\n"
2417
1111
"    -rX..    display revision X and later\n"
2418
1112
"    -r..Y    display up to and including revision Y\n"
2419
1113
"    -rX..Y   display from X to Y inclusive"
2420
1114
msgstr ""
2421
1115
2422
1116
#: bzrlib/builtins.py:2253
2423
1117
msgid ""
2424
1118
"  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
2425
1119
"  Some common examples are given below::"
2426
1120
msgstr ""
2427
1121
2428
1122
#: bzrlib/builtins.py:2256
2429
1123
msgid ""
2430
1124
"    -r-1                show just the tip\n"
2431
1125
"    -r-10..             show the last 10 mainline revisions\n"
2432
1126
"    -rsubmit:..         show what's new on this branch\n"
2433
1127
"    -rancestor:path..   show changes since the common ancestor of this\n"
2434
1128
"                        branch and the one at location path\n"
2435
1129
"    -rdate:yesterday..  show changes since yesterday"
2436
1130
msgstr ""
2437
1131
2438
1132
#: bzrlib/builtins.py:2263
2439
1133
msgid ""
2440
1134
"  When logging a range of revisions using -rX..Y, log starts at\n"
2441
1135
"  revision Y and searches back in history through the primary\n"
2442
1136
"  (\"left-hand\") parents until it finds X. When logging just the\n"
2443
1137
"  top level (using -n1), an error is reported if X is not found\n"
2444
1138
"  along the way. If multi-level logging is used (-n0), X may be\n"
2445
1139
"  a nested merge revision and the log will be truncated accordingly."
2446
1140
msgstr ""
2447
1141
2448
1142
#: bzrlib/builtins.py:2270
2449
1143
msgid ":Path filtering:"
2450
1144
msgstr ""
2451
1145
2452
1146
#: bzrlib/builtins.py:2272
2453
1147
msgid ""
2454
1148
"  If parameters are given and the first one is not a branch, the log\n"
2455
1149
"  will be filtered to show only those revisions that changed the\n"
2456
1150
"  nominated files or directories."
2457
1151
msgstr ""
2458
1152
2459
1153
#: bzrlib/builtins.py:2276
2460
1154
msgid ""
2461
1155
"  Filenames are interpreted within their historical context. To log a\n"
2462
1156
"  deleted file, specify a revision range so that the file existed at\n"
2463
1157
"  the end or start of the range."
2464
1158
msgstr ""
2465
1159
2466
1160
#: bzrlib/builtins.py:2280
2467
1161
msgid ""
2468
1162
"  Historical context is also important when interpreting pathnames of\n"
2469
1163
"  renamed files/directories. Consider the following example:"
2470
1164
msgstr ""
2471
1165
2472
1166
#: bzrlib/builtins.py:2283
2473
1167
msgid ""
2474
1168
"  * revision 1: add tutorial.txt\n"
2475
1169
"  * revision 2: modify tutorial.txt\n"
2476
1170
"  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
2477
1171
msgstr ""
2478
1172
2479
1173
#: bzrlib/builtins.py:2287
2480
1174
msgid "  In this case:"
2481
1175
msgstr ""
2482
1176
2483
1177
#: bzrlib/builtins.py:2289
2484
1178
msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
2485
1179
msgstr ""
2486
1180
2487
1181
#: bzrlib/builtins.py:2291
2488
1182
msgid "  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
2489
1183
msgstr ""
2490
1184
2491
1185
#: bzrlib/builtins.py:2293
2492
1186
msgid ""
2493
1187
"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
2494
1188
"    the original file in revision 2."
2495
1189
msgstr ""
2496
1190
2497
1191
#: bzrlib/builtins.py:2296
2498
1192
msgid ""
2499
1193
"  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
2500
1194
"    was no file called guide.txt in revision 2."
2501
1195
msgstr ""
2502
1196
2503
1197
#: bzrlib/builtins.py:2299
2504
1198
msgid ""
2505
1199
"  Renames are always followed by log. By design, there is no need to\n"
2506
1200
"  explicitly ask for this (and no way to stop logging a file back\n"
2507
1201
"  until it was last renamed)."
2508
1202
msgstr ""
2509
1203
2510
1204
#: bzrlib/builtins.py:2303
2511
1205
msgid ":Other filtering:"
2512
1206
msgstr ""
2513
1207
2514
1208
#: bzrlib/builtins.py:2305
2515
1209
msgid ""
2516
1210
"  The --message option can be used for finding revisions that match a\n"
2517
1211
"  regular expression in a commit message."
2518
1212
msgstr ""
2519
1213
2520
1214
#: bzrlib/builtins.py:2308
2521
1215
msgid ":Tips & tricks:"
2522
1216
msgstr ""
2523
1217
2524
1218
#: bzrlib/builtins.py:2310
2525
1219
msgid ""
2526
1220
"  GUI tools and IDEs are often better at exploring history than command\n"
2527
1221
"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
2528
1222
"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
2529
1223
"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
2530
1224
"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
2531
1225
msgstr ""
2532
1226
2533
1227
#: bzrlib/builtins.py:2316
2534
1228
msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
2535
1229
msgstr ""
2536
1230
2537
1231
#: bzrlib/builtins.py:2318
2538
1232
msgid ""
2539
1233
"    [ALIASES]\n"
2540
1234
"    tip = log -r-1\n"
2541
1235
"    top = log -l10 --line\n"
2542
1236
"    show = log -v -p"
2543
1237
msgstr ""
2544
1238
2545
1239
#: bzrlib/builtins.py:2323
2546
1240
msgid ""
2547
1241
"  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
2548
1242
"  will show the last 10 mainline revisions. To see the details of a\n"
2549
1243
"  particular revision X,  ``bzr show -rX``."
2550
1244
msgstr ""
2551
1245
2552
1246
#: bzrlib/builtins.py:2327
2553
1247
msgid ""
2554
1248
"  If you are interested in looking deeper into a particular merge X,\n"
2555
1249
"  use ``bzr log -n0 -rX``."
2556
1250
msgstr ""
2557
1251
2558
1252
#: bzrlib/builtins.py:2330
2559
1253
msgid ""
2560
1254
"  ``bzr log -v`` on a branch with lots of history is currently\n"
2561
1255
"  very slow. A fix for this issue is currently under development.\n"
2562
1256
"  With or without that fix, it is recommended that a revision range\n"
2563
1257
"  be given when using the -v option."
2564
1258
msgstr ""
2565
1259
2566
1260
#: bzrlib/builtins.py:2335
2567
1261
msgid ""
2568
1262
"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
2569
1263
"  used to find revisions matching user names, commit messages, etc.\n"
2570
1264
"  Among other features, this plugin can find all revisions containing\n"
2571
1265
"  a list of words but not others."
2572
1266
msgstr ""
2573
1267
2574
1268
#: bzrlib/builtins.py:2340
2575
1269
msgid ""
2576
1270
"  When exploring non-mainline history on large projects with deep\n"
2577
1271
"  history, the performance of log can be greatly improved by installing\n"
2578
1272
"  the historycache plugin. This plugin buffers historical information\n"
2579
1273
"  trading disk space for faster speed."
2580
1274
msgstr ""
2581
1275
2582
1276
# help of 'forward' option of 'log' command
2583
1277
#: bzrlib/builtins.py:2349
2584
1278
msgid "Show from oldest to newest."
2585
1279
msgstr ""
2586
1280
2587
1281
# help of 'verbose' option of 'log' command
2588
1282
#: bzrlib/builtins.py:2352
2589
1283
msgid "Show files changed in each revision."
2590
1284
msgstr ""
2591
1285
2592
1286
# help of 'change' option of 'log' command
2593
1287
#: bzrlib/builtins.py:2358
2594
1288
msgid "Show just the specified revision. See also \"help revisionspec\"."
2595
1289
msgstr ""
2596
1290
2597
1291
# help of 'authors' option of 'log' command
2598
1292
#: bzrlib/builtins.py:2362
2599
1293
msgid "What names to list as authors - first, all or committer."
2600
1294
msgstr ""
2601
1295
2602
1296
# title of 'authors' option of 'log' command
2603
1297
#: bzrlib/builtins.py:2363
2604
1298
msgid "Authors"
2605
1299
msgstr ""
2606
1300
2607
1301
# help of 'levels' option of 'log' command
2608
1302
#: bzrlib/builtins.py:2368
2609
1303
msgid "Number of levels to display - 0 for all, 1 for flat."
2610
1304
msgstr ""
2611
1305
2612
1306
# help of 'message' option of 'log' command
2613
1307
#: bzrlib/builtins.py:2373
2614
1308
msgid "Show revisions whose message matches this regular expression."
2615
1309
msgstr ""
2616
1310
2617
1311
# help of 'limit' option of 'log' command
2618
1312
#: bzrlib/builtins.py:2378
2619
1313
msgid "Limit the output to the first N revisions."
2620
1314
msgstr ""
2621
1315
2622
1316
# help of 'show-diff' option of 'log' command
2623
1317
#: bzrlib/builtins.py:2383
2624
1318
msgid "Show changes made in each revision as a patch."
2625
1319
msgstr ""
2626
1320
2627
1321
# help of 'include-merges' option of 'log' command
2628
1322
#: bzrlib/builtins.py:2385
2629
1323
msgid "Show merged revisions like --levels 0 does."
2630
1324
msgstr ""
2631
1325
2632
1326
# help of 'exclude-common-ancestry' option of 'log' command
2633
1327
#: bzrlib/builtins.py:2387
2634
1328
msgid ""
2635
1329
"Display only the revisions that are not part of both ancestries (require -"
2636
1330
"rX..Y)"
2637
1331
msgstr ""
2638
1332
2639
1333
#: bzrlib/builtins.py:2602
2640
1334
msgid ""
2641
1335
"List files in a tree.\n"
2642
1336
"    "
2643
1337
msgstr ""
2644
1338
2645
1339
# help of 'recursive' option of 'ls' command
2646
1340
#: bzrlib/builtins.py:2611
2647
1341
msgid "Recurse into subdirectories."
2648
1342
msgstr ""
2649
1343
2650
1344
# help of 'from-root' option of 'ls' command
2651
1345
#: bzrlib/builtins.py:2613
2652
1346
msgid "Print paths relative to the root of the branch."
2653
1347
msgstr ""
2654
1348
2655
1349
# help of 'unknown' option of 'ls' command
2656
1350
#: bzrlib/builtins.py:2615
2657
1351
msgid "Print unknown files."
2658
1352
msgstr ""
2659
1353
2660
1354
# help of 'versioned' option of 'ls' command
2661
1355
#: bzrlib/builtins.py:2616
2662
1356
msgid "Print versioned files."
2663
1357
msgstr ""
2664
1358
2665
1359
# help of 'ignored' option of 'ls' command
2666
1360
#: bzrlib/builtins.py:2619
2667
1361
msgid "Print ignored files."
2668
1362
msgstr ""
2669
1363
2670
1364
# help of 'kind' option of 'ls' command
2671
1365
#: bzrlib/builtins.py:2621
2672
1366
msgid "List entries of a particular kind: file, directory, symlink."
2673
1367
msgstr ""
2674
1368
2675
1369
#: bzrlib/builtins.py:2733
2676
1370
msgid "Ignore specified files or patterns."
2677
1371
msgstr ""
2678
1372
2679
1373
#: bzrlib/builtins.py:2735
2680
1374
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
2681
1375
msgstr ""
2682
1376
2683
1377
#: bzrlib/builtins.py:2737
2684
1378
msgid ""
2685
1379
"If a .bzrignore file does not exist, the ignore command\n"
2686
1380
"will create one and add the specified files or patterns to the newly\n"
2687
1381
"created file. The ignore command will also automatically add the \n"
2688
1382
".bzrignore file to be versioned. Creating a .bzrignore file without\n"
2689
1383
"the use of the ignore command will require an explicit add command."
2690
1384
msgstr ""
2691
1385
2692
1386
#: bzrlib/builtins.py:2743
2693
1387
msgid ""
2694
1388
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
2695
1389
"After adding, editing or deleting that file either indirectly by\n"
2696
1390
"using this command or directly by using an editor, be sure to commit\n"
2697
1391
"it."
2698
1392
msgstr ""
2699
1393
2700
1394
#: bzrlib/builtins.py:2748
2701
1395
msgid ""
2702
1396
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
2703
1397
"the global ignore file can be found in the application data directory as\n"
2704
1398
"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
2705
1399
"Global ignores are not touched by this command. The global ignore file\n"
2706
1400
"can be edited directly using an editor."
2707
1401
msgstr ""
2708
1402
2709
1403
#: bzrlib/builtins.py:2754
2710
1404
msgid ""
2711
1405
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
2712
1406
"precedence over regular ignores.  Such exceptions are used to specify\n"
2713
1407
"files that should be versioned which would otherwise be ignored."
2714
1408
msgstr ""
2715
1409
2716
1410
#: bzrlib/builtins.py:2758
2717
1411
msgid ""
2718
1412
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
2719
1413
"precedence over the '!' exception patterns."
2720
1414
msgstr ""
2721
1415
2722
1416
#: bzrlib/builtins.py:2761
2723
1417
msgid ""
2724
1418
":Notes: \n"
2725
1419
"    \n"
2726
1420
"* Ignore patterns containing shell wildcards must be quoted from\n"
2727
1421
"  the shell on Unix."
2728
1422
msgstr ""
2729
1423
2730
1424
#: bzrlib/builtins.py:2766
2731
1425
msgid ""
2732
1426
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
2733
1427
"  To ignore patterns that begin with that character, use the \"RE:\" prefix."
2734
1428
msgstr ""
2735
1429
2736
1430
#: bzrlib/builtins.py:2769
2737
1431
msgid ""
2738
1432
":Examples:\n"
2739
1433
"    Ignore the top level Makefile::"
2740
1434
msgstr ""
2741
1435
2742
1436
#: bzrlib/builtins.py:2772
2743
1437
msgid "        bzr ignore ./Makefile"
2744
1438
msgstr ""
2745
1439
2746
1440
#: bzrlib/builtins.py:2774
2747
1441
msgid "    Ignore .class files in all directories...::"
2748
1442
msgstr ""
2749
1443
2750
1444
#: bzrlib/builtins.py:2776
2751
1445
msgid "        bzr ignore \"*.class\""
2752
1446
msgstr ""
2753
1447
2754
1448
#: bzrlib/builtins.py:2778
2755
1449
msgid "    ...but do not ignore \"special.class\"::"
2756
1450
msgstr ""
2757
1451
2758
1452
#: bzrlib/builtins.py:2780
2759
1453
msgid "        bzr ignore \"!special.class\""
2760
1454
msgstr ""
2761
1455
2762
1456
#: bzrlib/builtins.py:2782
2763
1457
msgid "    Ignore files whose name begins with the \"#\" character::"
2764
1458
msgstr ""
2765
1459
2766
1460
#: bzrlib/builtins.py:2784
2767
1461
msgid "        bzr ignore \"RE:^#\""
2768
1462
msgstr ""
2769
1463
2770
1464
#: bzrlib/builtins.py:2786
2771
1465
msgid "    Ignore .o files under the lib directory::"
2772
1466
msgstr ""
2773
1467
2774
1468
#: bzrlib/builtins.py:2788
2775
1469
msgid "        bzr ignore \"lib/**/*.o\""
2776
1470
msgstr ""
2777
1471
2778
1472
#: bzrlib/builtins.py:2792
2779
1473
msgid "        bzr ignore \"RE:lib/.*\\.o\""
2780
1474
msgstr ""
2781
1475
2782
1476
#: bzrlib/builtins.py:2794
2783
1477
msgid "    Ignore everything but the \"debian\" toplevel directory::"
2784
1478
msgstr ""
2785
1479
2786
1480
#: bzrlib/builtins.py:2796
2787
1481
msgid ""
2788
1482
"        bzr ignore \"RE:(?!debian/).*\"\n"
2789
1483
"    \n"
2790
1484
"    Ignore everything except the \"local\" toplevel directory,\n"
2791
1485
"    but always ignore autosave files ending in ~, even under local/::\n"
2792
1486
"    \n"
2793
1487
"        bzr ignore \"*\"\n"
2794
1488
"        bzr ignore \"!./local\"\n"
2795
1489
"        bzr ignore \"!!*~\""
2796
1490
msgstr ""
2797
1491
2798
1492
# help of 'default-rules' option of 'ignore' command
2799
1493
#: bzrlib/builtins.py:2810
2800
1494
msgid "Display the default ignore rules that bzr uses."
2801
1495
msgstr ""
2802
1496
2803
1497
#: bzrlib/builtins.py:2858
2804
1498
msgid "List ignored files and the patterns that matched them."
2805
1499
msgstr ""
2806
1500
2807
1501
#: bzrlib/builtins.py:2860
2808
1502
msgid ""
2809
1503
"List all the ignored files and the ignore pattern that caused the file to\n"
2810
1504
"be ignored."
2811
1505
msgstr ""
2812
1506
2813
1507
#: bzrlib/builtins.py:2863
2814
1508
msgid "Alternatively, to list just the files::"
2815
1509
msgstr ""
2816
1510
2817
1511
#: bzrlib/builtins.py:2865
2818
1512
msgid "    bzr ls --ignored"
2819
1513
msgstr ""
2820
1514
2821
1515
#: bzrlib/builtins.py:2906
2822
1516
msgid "Export current or past revision to a destination directory or archive."
2823
1517
msgstr ""
2824
1518
2825
1519
#: bzrlib/builtins.py:2908
2826
1520
msgid "If no revision is specified this exports the last committed revision."
2827
1521
msgstr ""
2828
1522
2829
1523
#: bzrlib/builtins.py:2910
2830
1524
msgid ""
2831
1525
"Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
2832
1526
"given, try to find the format with the extension. If no extension\n"
2833
1527
"is found exports to a directory (equivalent to --format=dir)."
2834
1528
msgstr ""
2835
1529
2836
1530
#: bzrlib/builtins.py:2914
2837
1531
msgid ""
2838
1532
"If root is supplied, it will be used as the root directory inside\n"
2839
1533
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2840
1534
"to the exported filename. The root option has no effect for 'dir' format."
2841
1535
msgstr ""
2842
1536
2843
1537
#: bzrlib/builtins.py:2918
2844
1538
msgid ""
2845
1539
"If branch is omitted then the branch containing the current working\n"
2846
1540
"directory will be used."
2847
1541
msgstr ""
2848
1542
2849
1543
#: bzrlib/builtins.py:2921
2850
1544
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2851
1545
msgstr ""
2852
1546
2853
1547
#: bzrlib/builtins.py:2923
2854
1548
msgid ""
2855
1549
"  =================       =========================\n"
2856
1550
"  Supported formats       Autodetected by extension\n"
2857
1551
"  =================       =========================\n"
2858
1552
"     dir                         (none)\n"
2859
1553
"     tar                          .tar\n"
2860
1554
"     tbz2                    .tar.bz2, .tbz2\n"
2861
1555
"     tgz                      .tar.gz, .tgz\n"
2862
1556
"     zip                          .zip\n"
2863
1557
"  =================       ========================="
2864
1558
msgstr ""
2865
1559
2866
1560
# help of 'format' option of 'export' command
2867
1561
#: bzrlib/builtins.py:2937
2868
1562
msgid "Type of file to export to."
2869
1563
msgstr ""
2870
1564
2871
1565
# help of 'filters' option of 'export' command
2872
1566
#: bzrlib/builtins.py:2940
2873
1567
msgid "Apply content filters to export the convenient form."
2874
1568
msgstr ""
2875
1569
2876
1570
# help of 'root' option of 'export' command
2877
1571
#: bzrlib/builtins.py:2944
2878
1572
msgid "Name of the root directory inside the exported file."
2879
1573
msgstr ""
2880
1574
2881
1575
# help of 'per-file-timestamps' option of 'export' command
2882
1576
#: bzrlib/builtins.py:2946
2883
1577
msgid ""
2884
1578
"Set modification time of files to that of the last revision in which it was "
2885
1579
"changed."
2886
1580
msgstr ""
2887
1581
2888
1582
#: bzrlib/builtins.py:2970
2889
1583
msgid "Write the contents of a file as of a given revision to standard output."
2890
1584
msgstr ""
2891
1585
2892
1586
#: bzrlib/builtins.py:2972
2893
1587
msgid "If no revision is nominated, the last revision is used."
2894
1588
msgstr ""
2895
1589
2896
1590
#: bzrlib/builtins.py:2974
2897
1591
msgid ""
2898
1592
"Note: Take care to redirect standard output when using this command on a\n"
2899
1593
"binary file."
2900
1594
msgstr ""
2901
1595
2902
1596
# help of 'filters' option of 'cat' command
2903
1597
#: bzrlib/builtins.py:2981
2904
1598
msgid "Apply content filters to display the convenience form."
2905
1599
msgstr ""
2906
1600
2907
1601
#: bzrlib/builtins.py:3063
2908
1602
msgid "Commit changes into a new revision."
2909
1603
msgstr ""
2910
1604
2911
1605
#: bzrlib/builtins.py:3065
2912
1606
msgid ""
2913
1607
"An explanatory message needs to be given for each commit. This is\n"
2914
1608
"often done by using the --message option (getting the message from the\n"
2915
1609
"command line) or by using the --file option (getting the message from\n"
2916
1610
"a file). If neither of these options is given, an editor is opened for\n"
2917
1611
"the user to enter the message. To see the changed files in the\n"
2918
1612
"boilerplate text loaded into the editor, use the --show-diff option."
2919
1613
msgstr ""
2920
1614
2921
1615
#: bzrlib/builtins.py:3072
2922
1616
msgid ""
2923
1617
"By default, the entire tree is committed and the person doing the\n"
2924
1618
"commit is assumed to be the author. These defaults can be overridden\n"
2925
1619
"as explained below."
2926
1620
msgstr ""
2927
1621
2928
1622
#: bzrlib/builtins.py:3076
2929
1623
msgid ":Selective commits:"
2930
1624
msgstr ""
2931
1625
2932
1626
#: bzrlib/builtins.py:3078
2933
1627
msgid ""
2934
1628
"  If selected files are specified, only changes to those files are\n"
2935
1629
"  committed.  If a directory is specified then the directory and\n"
2936
1630
"  everything within it is committed."
2937
1631
msgstr ""
2938
1632
2939
1633
#: bzrlib/builtins.py:3082
2940
1634
msgid ""
2941
1635
"  When excludes are given, they take precedence over selected files.\n"
2942
1636
"  For example, to commit only changes within foo, but not changes\n"
2943
1637
"  within foo/bar::"
2944
1638
msgstr ""
2945
1639
2946
1640
#: bzrlib/builtins.py:3086
2947
1641
msgid "    bzr commit foo -x foo/bar"
2948
1642
msgstr ""
2949
1643
2950
1644
#: bzrlib/builtins.py:3088
2951
1645
msgid "  A selective commit after a merge is not yet supported."
2952
1646
msgstr ""
2953
1647
2954
1648
#: bzrlib/builtins.py:3090
2955
1649
msgid ":Custom authors:"
2956
1650
msgstr ""
2957
1651
2958
1652
#: bzrlib/builtins.py:3092
2959
1653
msgid ""
2960
1654
"  If the author of the change is not the same person as the committer,\n"
2961
1655
"  you can specify the author's name using the --author option. The\n"
2962
1656
"  name should be in the same format as a committer-id, e.g.\n"
2963
1657
"  \"John Doe <jdoe@example.com>\". If there is more than one author of\n"
2964
1658
"  the change you can specify the option multiple times, once for each\n"
2965
1659
"  author."
2966
1660
msgstr ""
2967
1661
2968
1662
#: bzrlib/builtins.py:3099
2969
1663
msgid ":Checks:"
2970
1664
msgstr ""
2971
1665
2972
1666
#: bzrlib/builtins.py:3101
2973
1667
msgid ""
2974
1668
"  A common mistake is to forget to add a new file or directory before\n"
2975
1669
"  running the commit command. The --strict option checks for unknown\n"
2976
1670
"  files and aborts the commit if any are found. More advanced pre-commit\n"
2977
1671
"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2978
1672
"  for details."
2979
1673
msgstr ""
2980
1674
2981
1675
#: bzrlib/builtins.py:3107
2982
1676
msgid ":Things to note:"
2983
1677
msgstr ""
2984
1678
2985
1679
#: bzrlib/builtins.py:3109
2986
1680
msgid ""
2987
1681
"  If you accidentially commit the wrong changes or make a spelling\n"
2988
1682
"  mistake in the commit message say, you can use the uncommit command\n"
2989
1683
"  to undo it. See ``bzr help uncommit`` for details."
2990
1684
msgstr ""
2991
1685
2992
1686
#: bzrlib/builtins.py:3113
2993
1687
msgid ""
2994
1688
"  Hooks can also be configured to run after a commit. This allows you\n"
2995
1689
"  to trigger updates to external systems like bug trackers. The --fixes\n"
2996
1690
"  option can be used to record the association between a revision and\n"
2997
1691
"  one or more bugs. See ``bzr help bugs`` for details."
2998
1692
msgstr ""
2999
1693
3000
1694
# help of 'exclude' option of 'commit' command
3001
1695
#: bzrlib/builtins.py:3123
3002
1696
msgid "Do not consider changes made to a given path."
3003
1697
msgstr ""
3004
1698
3005
1699
# help of 'message' option of 'commit' command
3006
1700
#: bzrlib/builtins.py:3126
3007
1701
msgid "Description of the new revision."
3008
1702
msgstr ""
3009
1703
3010
1704
# help of 'unchanged' option of 'commit' command
3011
1705
#: bzrlib/builtins.py:3129
3012
1706
msgid "Commit even if nothing has changed."
3013
1707
msgstr ""
3014
1708
3015
1709
# help of 'file' option of 'commit' command
3016
1710
#: bzrlib/builtins.py:3133
3017
1711
msgid "Take commit message from this file."
3018
1712
msgstr ""
3019
1713
3020
1714
# help of 'strict' option of 'commit' command
3021
1715
#: bzrlib/builtins.py:3135
3022
1716
msgid "Refuse to commit if there are unknown files in the working tree."
3023
1717
msgstr ""
3024
1718
3025
1719
# help of 'commit-time' option of 'commit' command
3026
1720
#: bzrlib/builtins.py:3138
3027
1721
msgid ""
3028
1722
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
3029
1723
"08:00:00 +0100'."
3030
1724
msgstr ""
3031
1725
3032
1726
# help of 'fixes' option of 'commit' command
3033
1727
#: bzrlib/builtins.py:3141
3034
1728
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
3035
1729
msgstr ""
3036
1730
3037
1731
# help of 'author' option of 'commit' command
3038
1732
#: bzrlib/builtins.py:3144
3039
1733
msgid "Set the author's name, if it's different from the committer."
3040
1734
msgstr ""
3041
1735
3042
1736
# help of 'local' option of 'commit' command
3043
1737
#: bzrlib/builtins.py:3147
3044
1738
msgid ""
3045
1739
"Perform a local commit in a bound branch.  Local commits are not pushed to "
3046
1740
"the master branch until a normal commit is performed."
3047
1741
msgstr ""
3048
1742
3049
1743
# help of 'show-diff' option of 'commit' command
3050
1744
#: bzrlib/builtins.py:3153
3051
1745
msgid ""
3052
1746
"When no message is supplied, show the diff along with the status summary in "
3053
1747
"the message editor."
3054
1748
msgstr ""
3055
1749
3056
1750
# help of 'lossy' option of 'commit' command
3057
1751
#: bzrlib/builtins.py:3156
3058
1752
msgid ""
3059
1753
"When committing to a foreign version control system do not push data that "
3060
1754
"can not be natively represented."
3061
1755
msgstr ""
3062
1756
3063
1757
#: bzrlib/builtins.py:3308
3064
1758
msgid ""
3065
1759
"Validate working tree structure, branch consistency and repository history."
3066
1760
msgstr ""
3067
1761
3068
1762
#: bzrlib/builtins.py:3310
3069
1763
msgid ""
3070
1764
"This command checks various invariants about branch and repository storage\n"
3071
1765
"to detect data corruption or bzr bugs."
3072
1766
msgstr ""
3073
1767
3074
1768
#: bzrlib/builtins.py:3313
3075
1769
msgid ""
3076
1770
"The working tree and branch checks will only give output if a problem is\n"
3077
1771
"detected. The output fields of the repository check are:"
3078
1772
msgstr ""
3079
1773
3080
1774
#: bzrlib/builtins.py:3316
3081
1775
msgid ""
3082
1776
"revisions\n"
3083
1777
"    This is just the number of revisions checked.  It doesn't\n"
3084
1778
"    indicate a problem."
3085
1779
msgstr ""
3086
1780
3087
1781
#: bzrlib/builtins.py:3320
3088
1782
msgid ""
3089
1783
"versionedfiles\n"
3090
1784
"    This is just the number of versionedfiles checked.  It\n"
3091
1785
"    doesn't indicate a problem."
3092
1786
msgstr ""
3093
1787
3094
1788
#: bzrlib/builtins.py:3324
3095
1789
msgid ""
3096
1790
"unreferenced ancestors\n"
3097
1791
"    Texts that are ancestors of other texts, but\n"
3098
1792
"    are not properly referenced by the revision ancestry.  This is a\n"
3099
1793
"    subtle problem that Bazaar can work around."
3100
1794
msgstr ""
3101
1795
3102
1796
#: bzrlib/builtins.py:3329
3103
1797
msgid ""
3104
1798
"unique file texts\n"
3105
1799
"    This is the total number of unique file contents\n"
3106
1800
"    seen in the checked revisions.  It does not indicate a problem."
3107
1801
msgstr ""
3108
1802
3109
1803
#: bzrlib/builtins.py:3333
3110
1804
msgid ""
3111
1805
"repeated file texts\n"
3112
1806
"    This is the total number of repeated texts seen\n"
3113
1807
"    in the checked revisions.  Texts can be repeated when their file\n"
3114
1808
"    entries are modified, but the file contents are not.  It does not\n"
3115
1809
"    indicate a problem."
3116
1810
msgstr ""
3117
1811
3118
1812
#: bzrlib/builtins.py:3339
3119
1813
msgid ""
3120
1814
"If no restrictions are specified, all Bazaar data that is found at the "
3121
1815
"given\n"
3122
1816
"location will be checked."
3123
1817
msgstr ""
3124
1818
3125
1819
#: bzrlib/builtins.py:3342
3126
1820
msgid ":Examples:"
3127
1821
msgstr ""
3128
1822
3129
1823
#: bzrlib/builtins.py:3344
3130
1824
msgid "    Check the tree and branch at 'foo'::"
3131
1825
msgstr ""
3132
1826
3133
1827
#: bzrlib/builtins.py:3346
3134
1828
msgid "        bzr check --tree --branch foo"
3135
1829
msgstr ""
3136
1830
3137
1831
#: bzrlib/builtins.py:3348
3138
1832
msgid "    Check only the repository at 'bar'::"
3139
1833
msgstr ""
3140
1834
3141
1835
#: bzrlib/builtins.py:3350
3142
1836
msgid "        bzr check --repo bar"
3143
1837
msgstr ""
3144
1838
3145
1839
#: bzrlib/builtins.py:3352
3146
1840
msgid "    Check everything at 'baz'::"
3147
1841
msgstr ""
3148
1842
3149
1843
#: bzrlib/builtins.py:3354
3150
1844
msgid "        bzr check baz"
3151
1845
msgstr ""
3152
1846
3153
1847
# help of 'branch' option of 'check' command
3154
1848
#: bzrlib/builtins.py:3360
3155
1849
msgid "Check the branch related to the current directory."
3156
1850
msgstr ""
3157
1851
3158
1852
# help of 'repo' option of 'check' command
3159
1853
#: bzrlib/builtins.py:3362
3160
1854
msgid "Check the repository related to the current directory."
3161
1855
msgstr ""
3162
1856
3163
1857
# help of 'tree' option of 'check' command
3164
1858
#: bzrlib/builtins.py:3364
3165
1859
msgid "Check the working tree related to the current directory."
3166
1860
msgstr ""
3167
1861
3168
1862
#: bzrlib/builtins.py:3378
3169
1863
msgid "Upgrade a repository, branch or working tree to a newer format."
3170
1864
msgstr ""
3171
1865
3172
1866
#: bzrlib/builtins.py:3380
3173
1867
msgid ""
3174
1868
"When the default format has changed after a major new release of\n"
3175
1869
"Bazaar, you may be informed during certain operations that you\n"
3176
1870
"should upgrade. Upgrading to a newer format may improve performance\n"
3177
1871
"or make new features available. It may however limit interoperability\n"
3178
1872
"with older repositories or with older versions of Bazaar."
3179
1873
msgstr ""
3180
1874
3181
1875
#: bzrlib/builtins.py:3386
3182
1876
msgid ""
3183
1877
"If you wish to upgrade to a particular format rather than the\n"
3184
1878
"current default, that can be specified using the --format option.\n"
3185
1879
"As a consequence, you can use the upgrade command this way to\n"
3186
1880
"\"downgrade\" to an earlier format, though some conversions are\n"
3187
1881
"a one way process (e.g. changing from the 1.x default to the\n"
3188
1882
"2.x default) so downgrading is not always possible."
3189
1883
msgstr ""
3190
1884
3191
1885
#: bzrlib/builtins.py:3393
3192
1886
msgid ""
3193
1887
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
3194
1888
"process (where # is a number). By default, this is left there on\n"
3195
1889
"completion. If the conversion fails, delete the new .bzr directory\n"
3196
1890
"and rename this one back in its place. Use the --clean option to ask\n"
3197
1891
"for the backup.bzr directory to be removed on successful conversion.\n"
3198
1892
"Alternatively, you can delete it by hand if everything looks good\n"
3199
1893
"afterwards."
3200
1894
msgstr ""
3201
1895
3202
1896
#: bzrlib/builtins.py:3401
3203
1897
msgid ""
3204
1898
"If the location given is a shared repository, dependent branches\n"
3205
1899
"are also converted provided the repository converts successfully.\n"
3206
1900
"If the conversion of a branch fails, remaining branches are still\n"
3207
1901
"tried."
3208
1902
msgstr ""
3209
1903
3210
1904
#: bzrlib/builtins.py:3406
3211
1905
msgid ""
3212
1906
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
3213
1907
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
3214
1908
msgstr ""
3215
1909
3216
1910
# help of 'format' option of 'upgrade' command
3217
1911
#: bzrlib/builtins.py:3414
3218
1912
msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
3219
1913
msgstr ""
3220
1914
3221
1915
# title of 'format' option of 'init' command
3222
1916
#: bzrlib/builtins.py:3418
3223
1917
msgid "Branch format"
3224
1918
msgstr ""
3225
1919
3226
1920
# help of 'clean' option of 'upgrade' command
3227
1921
#: bzrlib/builtins.py:3420
3228
1922
msgid "Remove the backup.bzr directory if successful."
3229
1923
msgstr ""
3230
1924
3231
1925
#: bzrlib/builtins.py:3437
3232
1926
msgid "Show or set bzr user id."
3233
1927
msgstr ""
3234
1928
3235
1929
#: bzrlib/builtins.py:3439
3236
1930
msgid ""
3237
1931
":Examples:\n"
3238
1932
"    Show the email of the current user::"
3239
1933
msgstr ""
3240
1934
3241
1935
#: bzrlib/builtins.py:3442
3242
1936
msgid "        bzr whoami --email"
3243
1937
msgstr ""
3244
1938
3245
1939
#: bzrlib/builtins.py:3444
3246
1940
msgid "    Set the current user::"
3247
1941
msgstr ""
3248
1942
3249
1943
#: bzrlib/builtins.py:3446
3250
1944
msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
3251
1945
msgstr ""
3252
1946
3253
1947
# help of 'email' option of 'whoami' command
3254
1948
#: bzrlib/builtins.py:3450
3255
1949
msgid "Display email address only."
3256
1950
msgstr ""
3257
1951
3258
1952
# help of 'branch' option of 'whoami' command
3259
1953
#: bzrlib/builtins.py:3452
3260
1954
msgid "Set identity for the current branch instead of globally."
3261
1955
msgstr ""
3262
1956
3263
1957
#: bzrlib/builtins.py:3498
3264
1958
msgid "Print or set the branch nickname."
3265
1959
msgstr ""
3266
1960
3267
1961
#: bzrlib/builtins.py:3500
3268
1962
msgid ""
3269
1963
"If unset, the tree root directory name is used as the nickname.\n"
3270
1964
"To print the current nickname, execute with no argument."
3271
1965
msgstr ""
3272
1966
3273
1967
#: bzrlib/builtins.py:3503
3274
1968
msgid ""
3275
1969
"Bound branches use the nickname of its master branch unless it is set\n"
3276
1970
"locally."
3277
1971
msgstr ""
3278
1972
3279
1973
#: bzrlib/builtins.py:3523
3280
1974
msgid "Set/unset and display aliases."
3281
1975
msgstr ""
3282
1976
3283
1977
#: bzrlib/builtins.py:3525
3284
1978
msgid ""
3285
1979
":Examples:\n"
3286
1980
"    Show the current aliases::"
3287
1981
msgstr ""
3288
1982
3289
1983
#: bzrlib/builtins.py:3528
3290
1984
msgid "        bzr alias"
3291
1985
msgstr ""
3292
1986
3293
1987
#: bzrlib/builtins.py:3530
3294
1988
msgid "    Show the alias specified for 'll'::"
3295
1989
msgstr ""
3296
1990
3297
1991
#: bzrlib/builtins.py:3532
3298
1992
msgid "        bzr alias ll"
3299
1993
msgstr ""
3300
1994
3301
1995
#: bzrlib/builtins.py:3534
3302
1996
msgid "    Set an alias for 'll'::"
3303
1997
msgstr ""
3304
1998
3305
1999
#: bzrlib/builtins.py:3536
3306
2000
msgid "        bzr alias ll=\"log --line -r-10..-1\""
3307
2001
msgstr ""
3308
2002
3309
2003
#: bzrlib/builtins.py:3538
3310
2004
msgid "    To remove an alias for 'll'::"
3311
2005
msgstr ""
3312
2006
3313
2007
#: bzrlib/builtins.py:3540
3314
2008
msgid "        bzr alias --remove ll"
3315
2009
msgstr ""
3316
2010
3317
2011
# help of 'remove' option of 'alias' command
3318
2012
#: bzrlib/builtins.py:3545
3319
2013
msgid "Remove the alias."
3320
2014
msgstr ""
3321
2015
3322
2016
#: bzrlib/builtins.py:3780
3323
2017
msgid "Show version of bzr."
3324
2018
msgstr ""
3325
2019
3326
2020
# help of 'short' option of 'version' command
3327
2021
#: bzrlib/builtins.py:3784
3328
2022
msgid "Print just the version number."
3329
2023
msgstr ""
3330
2024
3331
2025
#: bzrlib/builtins.py:3831
3332
2026
msgid "Perform a three-way merge."
3333
2027
msgstr ""
3334
2028
3335
2029
#: bzrlib/builtins.py:3833
3336
2030
msgid ""
3337
2031
"The source of the merge can be specified either in the form of a branch,\n"
3338
2032
"or in the form of a path to a file containing a merge directive generated\n"
3339
2033
"with bzr send. If neither is specified, the default is the upstream branch\n"
3340
2034
"or the branch most recently merged using --remember."
3341
2035
msgstr ""
3342
2036
3343
2037
#: bzrlib/builtins.py:3838
3344
2038
msgid ""
3345
2039
"When merging from a branch, by default bzr will try to merge in all new\n"
3346
2040
"work from the other branch, automatically determining an appropriate base\n"
3347
2041
"revision.  If this fails, you may need to give an explicit base."
3348
2042
msgstr ""
3349
2043
3350
2044
#: bzrlib/builtins.py:3842
3351
2045
msgid ""
3352
2046
"To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
3353
2047
"try to merge in all new work up to and including revision OTHER."
3354
2048
msgstr ""
3355
2049
3356
2050
#: bzrlib/builtins.py:3845
3357
2051
msgid ""
3358
2052
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
3359
2053
"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
3360
2054
"causes some revisions to be skipped, i.e. if the destination branch does\n"
3361
2055
"not already contain revision BASE, such a merge is commonly referred to as\n"
3362
2056
"a \"cherrypick\"."
3363
2057
msgstr ""
3364
2058
3365
2059
#: bzrlib/builtins.py:3851
3366
2060
msgid "Revision numbers are always relative to the source branch."
3367
2061
msgstr ""
3368
2062
3369
2063
#: bzrlib/builtins.py:3858
3370
2064
msgid "Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
3371
2065
msgstr ""
3372
2066
3373
2067
#: bzrlib/builtins.py:3860
3374
2068
msgid ""
3375
2069
"If there is no default branch set, the first merge will set it. After\n"
3376
2070
"that, you can omit the branch to use the default.  To change the\n"
3377
2071
"default, use --remember. The value will only be saved if the remote\n"
3378
2072
"location can be accessed."
3379
2073
msgstr ""
3380
2074
3381
2075
#: bzrlib/builtins.py:3865
3382
2076
msgid ""
3383
2077
"The results of the merge are placed into the destination working\n"
3384
2078
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
3385
2079
"committed to record the result of the merge."
3386
2080
msgstr ""
3387
2081
3388
2082
#: bzrlib/builtins.py:3869
3389
2083
msgid ""
3390
2084
"merge refuses to run if there are any uncommitted changes, unless\n"
3391
2085
"--force is given. The --force option can also be used to create a\n"
3392
2086
"merge revision which has more than two parents."
3393
2087
msgstr ""
3394
2088
3395
2089
#: bzrlib/builtins.py:3873
3396
2090
msgid ""
3397
2091
"If one would like to merge changes from the working tree of the other\n"
3398
2092
"branch without merging any committed revisions, the --uncommitted option\n"
3399
2093
"can be given."
3400
2094
msgstr ""
3401
2095
3402
2096
#: bzrlib/builtins.py:3877
3403
2097
msgid ""
3404
2098
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
3405
2099
"you to apply each diff hunk and file change, similar to \"shelve\"."
3406
2100
msgstr ""
3407
2101
3408
2102
#: bzrlib/builtins.py:3880
3409
2103
msgid ""
3410
2104
":Examples:\n"
3411
2105
"    To merge all new revisions from bzr.dev::"
3412
2106
msgstr ""
3413
2107
3414
2108
#: bzrlib/builtins.py:3883
3415
2109
msgid "        bzr merge ../bzr.dev"
3416
2110
msgstr ""
3417
2111
3418
2112
#: bzrlib/builtins.py:3885
3419
2113
msgid "    To merge changes up to and including revision 82 from bzr.dev::"
3420
2114
msgstr ""
3421
2115
3422
2116
#: bzrlib/builtins.py:3887
3423
2117
msgid "        bzr merge -r 82 ../bzr.dev"
3424
2118
msgstr ""
3425
2119
3426
2120
#: bzrlib/builtins.py:3889
3427
2121
msgid "    To merge the changes introduced by 82, without previous changes::"
3428
2122
msgstr ""
3429
2123
3430
2124
#: bzrlib/builtins.py:3891
3431
2125
msgid "        bzr merge -r 81..82 ../bzr.dev"
3432
2126
msgstr ""
3433
2127
3434
2128
#: bzrlib/builtins.py:3893
3435
2129
msgid "    To apply a merge directive contained in /tmp/merge::"
3436
2130
msgstr ""
3437
2131
3438
2132
#: bzrlib/builtins.py:3895
3439
2133
msgid "        bzr merge /tmp/merge"
3440
2134
msgstr ""
3441
2135
3442
2136
#: bzrlib/builtins.py:3897
3443
2137
msgid ""
3444
2138
"    To create a merge revision with three parents from two branches\n"
3445
2139
"    feature1a and feature1b:"
3446
2140
msgstr ""
3447
2141
3448
2142
#: bzrlib/builtins.py:3900
3449
2143
msgid ""
3450
2144
"        bzr merge ../feature1a\n"
3451
2145
"        bzr merge ../feature1b --force\n"
3452
2146
"        bzr commit -m 'revision with three parents'"
3453
2147
msgstr ""
3454
2148
3455
2149
# help of 'force' option of 'merge' command
3456
2150
#: bzrlib/builtins.py:3912
3457
2151
msgid "Merge even if the destination tree has uncommitted changes."
3458
2152
msgstr ""
3459
2153
3460
2154
# help of 'uncommitted' option of 'merge' command
3461
2155
#: bzrlib/builtins.py:3918
3462
2156
msgid ""
3463
2157
"Apply uncommitted changes from a working copy, instead of branch changes."
3464
2158
msgstr ""
3465
2159
3466
2160
# help of 'pull' option of 'merge' command
3467
2161
#: bzrlib/builtins.py:3920
3468
2162
msgid ""
3469
2163
"If the destination is already completely merged into the source, pull from "
3470
2164
"the source rather than merging.  When this happens, you do not need to "
3471
2165
"commit the result."
3472
2166
msgstr ""
3473
2167
3474
2168
# help of 'directory' option of 'merge' command
3475
2169
#: bzrlib/builtins.py:3925
3476
2170
msgid ""
3477
2171
"Branch to merge into, rather than the one containing the working directory."
3478
2172
msgstr ""
3479
2173
3480
2174
# help of 'preview' option of 'merge' command
3481
2175
#: bzrlib/builtins.py:3927
3482
2176
msgid "Instead of merging, show a diff of the merge."
3483
2177
msgstr ""
3484
2178
3485
2179
# help of 'interactive' option of 'merge' command
3486
2180
#: bzrlib/builtins.py:3929
3487
2181
msgid "Select changes interactively."
3488
2182
msgstr ""
3489
2183
3490
2184
#: bzrlib/builtins.py:4196
3491
2185
msgid "Redo a merge."
3492
2186
msgstr ""
3493
2187
3494
2188
#: bzrlib/builtins.py:4198
3495
2189
msgid ""
3496
2190
"Use this if you want to try a different merge technique while resolving\n"
3497
2191
"conflicts.  Some merge techniques are better than others, and remerge\n"
3498
2192
"lets you try different ones on different files."
3499
2193
msgstr ""
3500
2194
3501
2195
#: bzrlib/builtins.py:4202
3502
2196
msgid ""
3503
2197
"The options for remerge have the same meaning and defaults as the ones for\n"
3504
2198
"merge.  The difference is that remerge can (only) be run when there is a\n"
3505
2199
"pending merge, and it lets you specify particular files."
3506
2200
msgstr ""
3507
2201
3508
2202
#: bzrlib/builtins.py:4206
3509
2203
msgid ""
3510
2204
":Examples:\n"
3511
2205
"    Re-do the merge of all conflicted files, and show the base text in\n"
3512
2206
"    conflict regions, in addition to the usual THIS and OTHER texts::"
3513
2207
msgstr ""
3514
2208
3515
2209
#: bzrlib/builtins.py:4210
3516
2210
msgid "        bzr remerge --show-base"
3517
2211
msgstr ""
3518
2212
3519
2213
#: bzrlib/builtins.py:4212
3520
2214
msgid ""
3521
2215
"    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
3522
2216
"    additional processing to reduce the size of conflict regions::"
3523
2217
msgstr ""
3524
2218
3525
2219
#: bzrlib/builtins.py:4215
3526
2220
msgid "        bzr remerge --merge-type weave --reprocess foobar"
3527
2221
msgstr ""
3528
2222
3529
2223
# help of 'show-base' option of 'merge' command
3530
2224
#: bzrlib/builtins.py:4222
3531
2225
msgid "Show base revision text in conflicts."
3532
2226
msgstr ""
3533
2227
3534
2228
#: bzrlib/builtins.py:4290
3535
2229
msgid "Revert files to a previous revision."
3536
2230
msgstr ""
3537
2231
3538
2232
#: bzrlib/builtins.py:4292
3539
2233
msgid ""
3540
2234
"Giving a list of files will revert only those files.  Otherwise, all files\n"
3541
2235
"will be reverted.  If the revision is not specified with '--revision', the\n"
3542
2236
"last committed revision is used."
3543
2237
msgstr ""
3544
2238
3545
2239
#: bzrlib/builtins.py:4296
3546
2240
msgid ""
3547
2241
"To remove only some changes, without reverting to a prior version, use\n"
3548
2242
"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
3549
2243
"will remove the changes introduced by the second last commit (-2), without\n"
3550
2244
"affecting the changes introduced by the last commit (-1).  To remove\n"
3551
2245
"certain changes on a hunk-by-hunk basis, see the shelve command."
3552
2246
msgstr ""
3553
2247
3554
2248
#: bzrlib/builtins.py:4302
3555
2249
msgid ""
3556
2250
"By default, any files that have been manually changed will be backed up\n"
3557
2251
"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
3558
2252
"'.~#~' appended to their name, where # is a number."
3559
2253
msgstr ""
3560
2254
3561
2255
#: bzrlib/builtins.py:4306
3562
2256
msgid ""
3563
2257
"When you provide files, you can use their current pathname or the pathname\n"
3564
2258
"from the target revision.  So you can use revert to \"undelete\" a file by\n"
3565
2259
"name.  If you name a directory, all the contents of that directory will be\n"
3566
2260
"reverted."
3567
2261
msgstr ""
3568
2262
3569
2263
#: bzrlib/builtins.py:4311
3570
2264
msgid ""
3571
2265
"If you have newly added files since the target revision, they will be\n"
3572
2266
"removed.  If the files to be removed have been changed, backups will be\n"
3573
2267
"created as above.  Directories containing unknown files will not be\n"
3574
2268
"deleted."
3575
2269
msgstr ""
3576
2270
3577
2271
#: bzrlib/builtins.py:4316
3578
2272
msgid ""
3579
2273
"The working tree contains a list of revisions that have been merged but\n"
3580
2274
"not yet committed. These revisions will be included as additional parents\n"
3581
2275
"of the next commit.  Normally, using revert clears that list as well as\n"
3582
2276
"reverting the files.  If any files are specified, revert leaves the list\n"
3583
2277
"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
3584
2278
".`` in the tree root to revert all files but keep the recorded merges,\n"
3585
2279
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3586
2280
"reverting any files."
3587
2281
msgstr ""
3588
2282
3589
2283
#: bzrlib/builtins.py:4325
3590
2284
msgid ""
3591
2285
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3592
2286
"changes from a branch in a single revision.  To do this, perform the merge\n"
3593
2287
"as desired.  Then doing revert with the \"--forget-merges\" option will "
3594
2288
"keep\n"
3595
2289
"the content of the tree as it was, but it will clear the list of pending\n"
3596
2290
"merges.  The next commit will then contain all of the changes that are\n"
3597
2291
"present in the other branch, but without any other parent revisions.\n"
3598
2292
"Because this technique forgets where these changes originated, it may\n"
3599
2293
"cause additional conflicts on later merges involving the same source and\n"
3600
2294
"target branches."
3601
2295
msgstr ""
3602
2296
3603
2297
# help of 'no-backup' option of 'revert' command
3604
2298
#: bzrlib/builtins.py:4339
3605
2299
msgid "Do not save backups of reverted files."
3606
2300
msgstr ""
3607
2301
3608
2302
# help of 'forget-merges' option of 'revert' command
3609
2303
#: bzrlib/builtins.py:4341
3610
2304
msgid "Remove pending merge marker, without changing any files."
3611
2305
msgstr ""
3612
2306
3613
2307
#: bzrlib/builtins.py:4372
3614
2308
msgid ""
3615
2309
"Show help on a command or other topic.\n"
3616
2310
"    "
3617
2311
msgstr ""
3618
2312
3619
2313
# help of 'long' option of 'help' command
3620
2314
#: bzrlib/builtins.py:4377
3621
2315
msgid "Show help on all commands."
3622
2316
msgstr ""
3623
2317
3624
2318
#: bzrlib/builtins.py:4406
3625
2319
msgid "Show unmerged/unpulled revisions between two branches."
3626
2320
msgstr ""
3627
2321
3628
2322
#: bzrlib/builtins.py:4408
3629
2323
msgid "OTHER_BRANCH may be local or remote."
3630
2324
msgstr ""
3631
2325
3632
2326
#: bzrlib/builtins.py:4410
3633
2327
msgid ""
3634
2328
"To filter on a range of revisions, you can use the command -r begin..end\n"
3635
2329
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
3636
2330
"also valid.\n"
3637
2331
"        \n"
3638
2332
":Exit values:\n"
3639
2333
"    1 - some missing revisions\n"
3640
2334
"    0 - no missing revisions"
3641
2335
msgstr ""
3642
2336
3643
2337
#: bzrlib/builtins.py:4420
3644
2338
msgid ""
3645
2339
"    Determine the missing revisions between this and the branch at the\n"
3646
2340
"    remembered pull location::"
3647
2341
msgstr ""
3648
2342
3649
2343
#: bzrlib/builtins.py:4423
3650
2344
msgid "        bzr missing"
3651
2345
msgstr ""
3652
2346
3653
2347
#: bzrlib/builtins.py:4425
3654
2348
msgid "    Determine the missing revisions between this and another branch::"
3655
2349
msgstr ""
3656
2350
3657
2351
#: bzrlib/builtins.py:4427
3658
2352
msgid "        bzr missing http://server/branch"
3659
2353
msgstr ""
3660
2354
3661
2355
#: bzrlib/builtins.py:4429
3662
2356
msgid ""
3663
2357
"    Determine the missing revisions up to a specific revision on the other\n"
3664
2358
"    branch::"
3665
2359
msgstr ""
3666
2360
3667
2361
#: bzrlib/builtins.py:4432
3668
2362
msgid "        bzr missing -r ..-10"
3669
2363
msgstr ""
3670
2364
3671
2365
#: bzrlib/builtins.py:4434
3672
2366
msgid ""
3673
2367
"    Determine the missing revisions up to a specific revision on this\n"
3674
2368
"    branch::"
3675
2369
msgstr ""
3676
2370
3677
2371
#: bzrlib/builtins.py:4437
3678
2372
msgid "        bzr missing --my-revision ..-10"
3679
2373
msgstr ""
3680
2374
3681
2375
# help of 'reverse' option of 'missing' command
3682
2376
#: bzrlib/builtins.py:4444
3683
2377
msgid "Reverse the order of revisions."
3684
2378
msgstr ""
3685
2379
3686
2380
# help of 'mine-only' option of 'missing' command
3687
2381
#: bzrlib/builtins.py:4446
3688
2382
msgid "Display changes in the local branch only."
3689
2383
msgstr ""
3690
2384
3691
2385
# help of 'this' option of 'missing' command
3692
2386
#: bzrlib/builtins.py:4447
3693
2387
msgid "Same as --mine-only."
3694
2388
msgstr ""
3695
2389
3696
2390
# help of 'theirs-only' option of 'missing' command
3697
2391
#: bzrlib/builtins.py:4449
3698
2392
msgid "Display changes in the remote branch only."
3699
2393
msgstr ""
3700
2394
3701
2395
# help of 'other' option of 'missing' command
3702
2396
#: bzrlib/builtins.py:4450
3703
2397
msgid "Same as --theirs-only."
3704
2398
msgstr ""
3705
2399
3706
2400
# help of 'revision' option of 'missing' command
3707
2401
#: bzrlib/builtins.py:4455
3708
2402
msgid ""
3709
2403
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3710
2404
"details."
3711
2405
msgstr ""
3712
2406
3713
2407
# help of 'my-revision' option of 'missing' command
3714
2408
#: bzrlib/builtins.py:4459
3715
2409
msgid ""
3716
2410
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3717
2411
"details."
3718
2412
msgstr ""
3719
2413
3720
2414
# help of 'include-merges' option of 'missing' command
3721
2415
#: bzrlib/builtins.py:4462
3722
2416
msgid "Show all revisions in addition to the mainline ones."
3723
2417
msgstr ""
3724
2418
3725
2419
#: bzrlib/builtins.py:4578
3726
2420
msgid "Compress the data within a repository."
3727
2421
msgstr ""
3728
2422
3729
2423
#: bzrlib/builtins.py:4580
3730
2424
msgid ""
3731
2425
"This operation compresses the data within a bazaar repository. As\n"
3732
2426
"bazaar supports automatic packing of repository, this operation is\n"
3733
2427
"normally not required to be done manually."
3734
2428
msgstr ""
3735
2429
3736
2430
#: bzrlib/builtins.py:4584
3737
2431
msgid ""
3738
2432
"During the pack operation, bazaar takes a backup of existing repository\n"
3739
2433
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3740
2434
"automatically when it is safe to do so. To save disk space by removing\n"
3741
2435
"the backed up pack files, the --clean-obsolete-packs option may be\n"
3742
2436
"used."
3743
2437
msgstr ""
3744
2438
3745
2439
#: bzrlib/builtins.py:4590
3746
2440
msgid ""
3747
2441
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3748
2442
"during or immediately after repacking, you may be left with a state\n"
3749
2443
"where the deletion has been written to disk but the new packs have not\n"
3750
2444
"been. In this case the repository may be unusable."
3751
2445
msgstr ""
3752
2446
3753
2447
# help of 'clean-obsolete-packs' option of 'pack' command
3754
2448
#: bzrlib/builtins.py:4599
3755
2449
msgid "Delete obsolete packs to save disk space."
3756
2450
msgstr ""
3757
2451
3758
2452
#: bzrlib/builtins.py:4613
3759
2453
msgid "List the installed plugins."
3760
2454
msgstr ""
3761
2455
3762
2456
#: bzrlib/builtins.py:4615
3763
2457
msgid ""
3764
2458
"This command displays the list of installed plugins including\n"
3765
2459
"version of plugin and a short description of each."
3766
2460
msgstr ""
3767
2461
3768
2462
#: bzrlib/builtins.py:4618
3769
2463
msgid "--verbose shows the path where each plugin is located."
3770
2464
msgstr ""
3771
2465
3772
2466
#: bzrlib/builtins.py:4620
3773
2467
msgid ""
3774
2468
"A plugin is an external component for Bazaar that extends the\n"
3775
2469
"revision control system, by adding or replacing code in Bazaar.\n"
3776
2470
"Plugins can do a variety of things, including overriding commands,\n"
3777
2471
"adding new commands, providing additional network transports and\n"
3778
2472
"customizing log output."
3779
2473
msgstr ""
3780
2474
3781
2475
#: bzrlib/builtins.py:4626
3782
2476
msgid ""
3783
2477
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3784
2478
"for further information on plugins including where to find them and how to\n"
3785
2479
"install them. Instructions are also provided there on how to write new\n"
3786
2480
"plugins using the Python programming language."
3787
2481
msgstr ""
3788
2482
3789
2483
#: bzrlib/builtins.py:4641
3790
2484
msgid "Show testament (signing-form) of a revision."
3791
2485
msgstr ""
3792
2486
3793
2487
# help of 'long' option of 'testament' command
3794
2488
#: bzrlib/builtins.py:4644
3795
2489
msgid "Produce long-format testament."
3796
2490
msgstr ""
3797
2491
3798
2492
# help of 'strict' option of 'testament' command
3799
2493
#: bzrlib/builtins.py:4646
3800
2494
msgid "Produce a strict-format testament."
3801
2495
msgstr ""
3802
2496
3803
2497
#: bzrlib/builtins.py:4672
3804
2498
msgid "Show the origin of each line in a file."
3805
2499
msgstr ""
3806
2500
3807
2501
#: bzrlib/builtins.py:4674
3808
2502
msgid ""
3809
2503
"This prints out the given file with an annotation on the left side\n"
3810
2504
"indicating which revision, author and date introduced the change."
3811
2505
msgstr ""
3812
2506
3813
2507
#: bzrlib/builtins.py:4677
3814
2508
msgid ""
3815
2509
"If the origin is the same for a run of consecutive lines, it is\n"
3816
2510
"shown only at the top, unless the --all option is given."
3817
2511
msgstr ""
3818
2512
3819
2513
# help of 'all' option of 'annotate' command
3820
2514
#: bzrlib/builtins.py:4685
3821
2515
msgid "Show annotations on all lines."
3822
2516
msgstr ""
3823
2517
3824
2518
# help of 'long' option of 'annotate' command
3825
2519
#: bzrlib/builtins.py:4686
3826
2520
msgid "Show commit date in annotations."
3827
2521
msgstr ""
3828
2522
3829
2523
#: bzrlib/builtins.py:4789
3830
2524
msgid ""
3831
2525
"Convert the current branch into a checkout of the supplied branch.\n"
3832
2526
"If no branch is supplied, rebind to the last bound location."
3833
2527
msgstr ""
3834
2528
3835
2529
#: bzrlib/builtins.py:4792
3836
2530
msgid ""
3837
2531
"Once converted into a checkout, commits must succeed on the master branch\n"
3838
2532
"before they will be applied to the local branch."
3839
2533
msgstr ""
3840
2534
3841
2535
#: bzrlib/builtins.py:4795
3842
2536
msgid ""
3843
2537
"Bound branches use the nickname of its master branch unless it is set\n"
3844
2538
"locally, in which case binding will update the local nickname to be\n"
3845
2539
"that of the master."
3846
2540
msgstr ""
3847
2541
3848
2542
#: bzrlib/builtins.py:4830
3849
2543
msgid "Convert the current checkout into a regular branch."
3850
2544
msgstr ""
3851
2545
3852
2546
#: bzrlib/builtins.py:4832
3853
2547
msgid ""
3854
2548
"After unbinding, the local branch is considered independent and subsequent\n"
3855
2549
"commits will be local only."
3856
2550
msgstr ""
3857
2551
3858
2552
#: bzrlib/builtins.py:4847
3859
2553
msgid "Remove the last committed revision."
3860
2554
msgstr ""
3861
2555
3862
2556
#: bzrlib/builtins.py:4849
3863
2557
msgid ""
3864
2558
"--verbose will print out what is being removed.\n"
3865
2559
"--dry-run will go through all the motions, but not actually\n"
3866
2560
"remove anything."
3867
2561
msgstr ""
3868
2562
3869
2563
#: bzrlib/builtins.py:4853
3870
2564
msgid ""
3871
2565
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3872
2566
"specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
3873
2567
"branch at revision 15."
3874
2568
msgstr ""
3875
2569
3876
2570
#: bzrlib/builtins.py:4857
3877
2571
msgid ""
3878
2572
"Uncommit leaves the working tree ready for a new commit.  The only change\n"
3879
2573
"it may make is to restore any pending merges that were present before\n"
3880
2574
"the commit."
3881
2575
msgstr ""
3882
2576
3883
2577
# help of 'dry-run' option of 'uncommit' command
3884
2578
#: bzrlib/builtins.py:4868
3885
2579
msgid "Don't actually make changes."
3886
2580
msgstr ""
3887
2581
3888
2582
# help of 'force' option of 'uncommit' command
3889
2583
#: bzrlib/builtins.py:4869
3890
2584
msgid "Say yes to all questions."
3891
2585
msgstr ""
3892
2586
3893
2587
# help of 'local' option of 'uncommit' command
3894
2588
#: bzrlib/builtins.py:4871
3895
2589
msgid "Only remove the commits from the local branch when in a checkout."
3896
2590
msgstr ""
3897
2591
3898
2592
#: bzrlib/builtins.py:4956
3899
2593
msgid "Break a dead lock."
3900
2594
msgstr ""
3901
2595
3902
2596
#: bzrlib/builtins.py:4958
3903
2597
msgid ""
3904
2598
"This command breaks a lock on a repository, branch, working directory or\n"
3905
2599
"config file."
3906
2600
msgstr ""
3907
2601
3908
2602
#: bzrlib/builtins.py:4961
3909
2603
msgid ""
3910
2604
"CAUTION: Locks should only be broken when you are sure that the process\n"
3911
2605
"holding the lock has been stopped."
3912
2606
msgstr ""
3913
2607
3914
2608
#: bzrlib/builtins.py:4964
3915
2609
msgid ""
3916
2610
"You can get information on what locks are open via the 'bzr info\n"
3917
2611
"[location]' command."
3918
2612
msgstr ""
3919
2613
3920
2614
#: bzrlib/builtins.py:4967
3921
2615
msgid ""
3922
2616
":Examples:\n"
3923
2617
"    bzr break-lock\n"
3924
2618
"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3925
2619
"    bzr break-lock --conf ~/.bazaar"
3926
2620
msgstr ""
3927
2621
3928
2622
# help of 'config' option of 'break-lock' command
3929
2623
#: bzrlib/builtins.py:4976
3930
2624
msgid "LOCATION is the directory where the config lock is."
3931
2625
msgstr ""
3932
2626
3933
2627
# help of 'force' option of 'break-lock' command
3934
2628
#: bzrlib/builtins.py:4978
3935
2629
msgid "Do not ask for confirmation before breaking the lock."
3936
2630
msgstr ""
3937
2631
3938
2632
#: bzrlib/builtins.py:5014
3939
2633
msgid "Run the bzr server."
3940
2634
msgstr ""
3941
2635
3942
2636
# help of 'inet' option of 'serve' command
3943
2637
#: bzrlib/builtins.py:5020
3944
2638
msgid "Serve on stdin/out for use from inetd or sshd."
3945
2639
msgstr ""
3946
2640
3947
2641
# title of 'protocol' option of 'serve' command
3948
2642
#: bzrlib/builtins.py:5021
3949
2643
msgid "protocol"
3950
2644
msgstr ""
3951
2645
3952
2646
# help of 'protocol' option of 'serve' command
3953
2647
#: bzrlib/builtins.py:5022
3954
2648
msgid "Protocol to serve."
3955
2649
msgstr ""
3956
2650
3957
2651
# help of 'port' option of 'serve' command
3958
2652
#: bzrlib/builtins.py:5026
3959
2653
msgid ""
3960
2654
"Listen for connections on nominated port of the form [hostname:]portnumber.  "
3961
2655
"Passing 0 as the port number will result in a dynamically allocated port.  "
3962
2656
"The default port depends on the protocol."
3963
2657
msgstr ""
3964
2658
3965
2659
# help of 'directory' option of 'serve' command
3966
2660
#: bzrlib/builtins.py:5032
3967
2661
msgid "Serve contents of this directory."
3968
2662
msgstr ""
3969
2663
3970
2664
# help of 'allow-writes' option of 'serve' command
3971
2665
#: bzrlib/builtins.py:5034
3972
2666
msgid ""
3973
2667
"By default the server is a readonly server.  Supplying --allow-writes "
3974
2668
"enables write access to the contents of the served directory and below.  "
3975
2669
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3976
2670
"of external authentication is arranged supplying this option leads to global "
3977
2671
"uncontrolled write access to your file system."
3978
2672
msgstr ""
3979
2673
3980
2674
#: bzrlib/builtins.py:5079
3981
2675
msgid "Combine a tree into its containing tree."
3982
2676
msgstr ""
3983
2677
3984
2678
#: bzrlib/builtins.py:5081
3985
2679
msgid "This command requires the target tree to be in a rich-root format."
3986
2680
msgstr ""
3987
2681
3988
2682
#: bzrlib/builtins.py:5083
3989
2683
msgid ""
3990
2684
"The TREE argument should be an independent tree, inside another tree, but\n"
3991
2685
"not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
3992
2686
"running \"bzr branch\" with the target inside a tree.)"
3993
2687
msgstr ""
3994
2688
3995
2689
#: bzrlib/builtins.py:5087
3996
2690
msgid ""
3997
2691
"The result is a combined tree, with the subtree no longer an independent\n"
3998
2692
"part.  This is marked as a merge of the subtree into the containing tree,\n"
3999
2693
"and all history is preserved."
4000
2694
msgstr ""
4001
2695
4002
2696
#: bzrlib/builtins.py:5125
4003
2697
msgid "Split a subdirectory of a tree into a separate tree."
4004
2698
msgstr ""
4005
2699
4006
2700
#: bzrlib/builtins.py:5127
4007
2701
msgid ""
4008
2702
"This command will produce a target tree in a format that supports\n"
4009
2703
"rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
4010
2704
"converted into earlier formats like 'dirstate-tags'."
4011
2705
msgstr ""
4012
2706
4013
2707
#: bzrlib/builtins.py:5131
4014
2708
msgid ""
4015
2709
"The TREE argument should be a subdirectory of a working tree.  That\n"
4016
2710
"subdirectory will be converted into an independent tree, with its own\n"
4017
2711
"branch.  Commits in the top-level tree will not apply to the new subtree."
4018
2712
msgstr ""
4019
2713
4020
2714
#: bzrlib/builtins.py:5252
4021
2715
msgid "Mail or create a merge-directive for submitting changes."
4022
2716
msgstr ""
4023
2717
4024
2718
#: bzrlib/builtins.py:5254
4025
2719
msgid "A merge directive provides many things needed for requesting merges:"
4026
2720
msgstr ""
4027
2721
4028
2722
#: bzrlib/builtins.py:5256
4029
2723
msgid "* A machine-readable description of the merge to perform"
4030
2724
msgstr ""
4031
2725
4032
2726
#: bzrlib/builtins.py:5258
4033
2727
msgid "* An optional patch that is a preview of the changes requested"
4034
2728
msgstr ""
4035
2729
4036
2730
#: bzrlib/builtins.py:5260
4037
2731
msgid ""
4038
2732
"* An optional bundle of revision data, so that the changes can be applied\n"
4039
2733
"  directly from the merge directive, without retrieving data from a\n"
4040
2734
"  branch."
4041
2735
msgstr ""
4042
2736
4043
2737
#: bzrlib/builtins.py:5264
4044
2738
msgid ""
4045
2739
"`bzr send` creates a compact data set that, when applied using bzr\n"
4046
2740
"merge, has the same effect as merging from the source branch.  "
4047
2741
msgstr ""
4048
2742
4049
2743
#: bzrlib/builtins.py:5267
4050
2744
msgid ""
4051
2745
"By default the merge directive is self-contained and can be applied to any\n"
4052
2746
"branch containing submit_branch in its ancestory without needing access to\n"
4053
2747
"the source branch."
4054
2748
msgstr ""
4055
2749
4056
2750
#: bzrlib/builtins.py:5271
4057
2751
msgid ""
4058
2752
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
4059
2753
"revisions, but only a structured request to merge from the\n"
4060
2754
"public_location.  In that case the public_branch is needed and it must be\n"
4061
2755
"up-to-date and accessible to the recipient.  The public_branch is always\n"
4062
2756
"included if known, so that people can check it later."
4063
2757
msgstr ""
4064
2758
4065
2759
#: bzrlib/builtins.py:5277
4066
2760
msgid ""
4067
2761
"The submit branch defaults to the parent of the source branch, but can be\n"
4068
2762
"overridden.  Both submit branch and public branch will be remembered in\n"
4069
2763
"branch.conf the first time they are used for a particular branch.  The\n"
4070
2764
"source branch defaults to that containing the working directory, but can\n"
4071
2765
"be changed using --from."
4072
2766
msgstr ""
4073
2767
4074
2768
#: bzrlib/builtins.py:5283
4075
2769
msgid ""
4076
2770
"In order to calculate those changes, bzr must analyse the submit branch.\n"
4077
2771
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
4078
2772
"If a public location is known for the submit_branch, that location is used\n"
4079
2773
"in the merge directive."
4080
2774
msgstr ""
4081
2775
4082
2776
#: bzrlib/builtins.py:5288
4083
2777
msgid ""
4084
2778
"The default behaviour is to send the merge directive by mail, unless -o is\n"
4085
2779
"given, in which case it is sent to a file."
4086
2780
msgstr ""
4087
2781
4088
2782
#: bzrlib/builtins.py:5291
4089
2783
msgid ""
4090
2784
"Mail is sent using your preferred mail program.  This should be transparent\n"
4091
2785
"on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
4092
2786
"If the preferred client can't be found (or used), your editor will be used."
4093
2787
msgstr ""
4094
2788
4095
2789
#: bzrlib/builtins.py:5295
4096
2790
msgid ""
4097
2791
"To use a specific mail program, set the mail_client configuration option.\n"
4098
2792
"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
4099
2793
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
4100
2794
"\" (MacOS X's\n"
4101
2795
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
4102
2796
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
4103
2797
"add\n"
4104
2798
"supported clients."
4105
2799
msgstr ""
4106
2800
4107
2801
#: bzrlib/builtins.py:5302
4108
2802
msgid ""
4109
2803
"If mail is being sent, a to address is required.  This can be supplied\n"
4110
2804
"either on the commandline, by setting the submit_to configuration\n"
4111
2805
"option in the branch itself or the child_submit_to configuration option\n"
4112
2806
"in the submit branch."
4113
2807
msgstr ""
4114
2808
4115
2809
#: bzrlib/builtins.py:5307
4116
2810
msgid ""
4117
2811
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
4118
2812
"and\n"
4119
2813
"merge directive format 2.  It is significantly faster and smaller than\n"
4120
2814
"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
4121
2815
"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
4122
2816
"format 1.  It is compatible with Bazaar 0.12 - 0.18."
4123
2817
msgstr ""
4124
2818
4125
2819
#: bzrlib/builtins.py:5313
4126
2820
msgid ""
4127
2821
"The merge directives created by bzr send may be applied using bzr merge or\n"
4128
2822
"bzr pull by specifying a file containing a merge directive as the location."
4129
2823
msgstr ""
4130
2824
4131
2825
#: bzrlib/builtins.py:5316
4132
2826
msgid ""
4133
2827
"bzr send makes extensive use of public locations to map local locations "
4134
2828
"into\n"
4135
2829
"URLs that can be used by other people.  See `bzr help configuration` to\n"
4136
2830
"set them, and use `bzr info` to display them."
4137
2831
msgstr ""
4138
2832
4139
2833
# help of 'output' option of 'send' command
4140
2834
#: bzrlib/builtins.py:5340
4141
2835
msgid "Write merge directive to this file or directory; use - for stdout."
4142
2836
msgstr ""
4143
2837
4144
2838
# help of 'strict' option of 'send' command
4145
2839
#: bzrlib/builtins.py:5344
4146
2840
msgid ""
4147
2841
"Refuse to send if there are uncommitted changes in the working tree, --no-"
4148
2842
"strict disables the check."
4149
2843
msgstr ""
4150
2844
4151
2845
# help of 'mail-to' option of 'send' command
4152
2846
#: bzrlib/builtins.py:5346
4153
2847
msgid "Mail the request to this address."
4154
2848
msgstr ""
4155
2849
4156
2850
# help of 'body' option of 'send' command
4157
2851
#: bzrlib/builtins.py:5350
4158
2852
msgid "Body for the email."
4159
2853
msgstr ""
4160
2854
4161
2855
# help of 'no-bundle' option of 'send' command
4162
2856
#: bzrlib/builtins.py:5403
4163
2857
msgid "Do not include a bundle in the merge directive."
4164
2858
msgstr ""
4165
2859
4166
2860
# help of 'no-patch' option of 'send' command
4167
2861
#: bzrlib/builtins.py:5404
4168
2862
msgid "Do not include a preview patch in the merge directive."
4169
2863
msgstr ""
4170
2864
4171
2865
# help of 'remember' option of 'send' command
4172
2866
#: bzrlib/builtins.py:5407
4173
2867
msgid "Remember submit and public branch."
4174
2868
msgstr ""
4175
2869
4176
2870
# help of 'from' option of 'send' command
4177
2871
#: bzrlib/builtins.py:5409
4178
2872
msgid ""
4179
2873
"Branch to generate the submission from, rather than the one containing the "
4180
2874
"working directory."
4181
2875
msgstr ""
4182
2876
4183
2877
# title of 'format' option of 'send' command
4184
2878
#: bzrlib/builtins.py:5419
4185
2879
msgid "format"
4186
2880
msgstr ""
4187
2881
4188
2882
# help of 'format' option of 'send' command
4189
2883
#: bzrlib/builtins.py:5420
4190
2884
msgid "Use the specified output format."
4191
2885
msgstr ""
4192
2886
4193
2887
#: bzrlib/builtins.py:5442
4194
2888
msgid "Create, remove or modify a tag naming a revision."
4195
2889
msgstr ""
4196
2890
4197
2891
#: bzrlib/builtins.py:5444
4198
2892
msgid ""
4199
2893
"Tags give human-meaningful names to revisions.  Commands that take a -r\n"
4200
2894
"(--revision) option can be given -rtag:X, where X is any previously\n"
4201
2895
"created tag."
4202
2896
msgstr ""
4203
2897
4204
2898
#: bzrlib/builtins.py:5448
4205
2899
msgid ""
4206
2900
"Tags are stored in the branch.  Tags are copied from one branch to another\n"
4207
2901
"along when you branch, push, pull or merge."
4208
2902
msgstr ""
4209
2903
4210
2904
#: bzrlib/builtins.py:5451
4211
2905
msgid ""
4212
2906
"It is an error to give a tag name that already exists unless you pass\n"
4213
2907
"--force, in which case the tag is moved to point to the new revision."
4214
2908
msgstr ""
4215
2909
4216
2910
#: bzrlib/builtins.py:5454
4217
2911
msgid ""
4218
2912
"To rename a tag (change the name but keep it on the same revsion), run "
4219
2913
"``bzr\n"
4220
2914
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
4221
2915
msgstr ""
4222
2916
4223
2917
#: bzrlib/builtins.py:5457
4224
2918
msgid ""
4225
2919
"If no tag name is specified it will be determined through the \n"
4226
2920
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
4227
2921
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
4228
2922
"details."
4229
2923
msgstr ""
4230
2924
4231
2925
# help of 'delete' option of 'tag' command
4232
2926
#: bzrlib/builtins.py:5467
4233
2927
msgid "Delete this tag rather than placing it."
4234
2928
msgstr ""
4235
2929
4236
2930
# help of 'directory' option of 'tag' command
4237
2931
#: bzrlib/builtins.py:5470
4238
2932
msgid "Branch in which to place the tag."
4239
2933
msgstr ""
4240
2934
4241
2935
# help of 'force' option of 'tag' command
4242
2936
#: bzrlib/builtins.py:5472
4243
2937
msgid "Replace existing tags."
4244
2938
msgstr ""
4245
2939
4246
2940
#: bzrlib/builtins.py:5511
4247
2941
msgid "List tags."
4248
2942
msgstr ""
4249
2943
4250
2944
#: bzrlib/builtins.py:5513
4251
2945
msgid ""
4252
2946
"This command shows a table of tag names and the revisions they reference."
4253
2947
msgstr ""
4254
2948
4255
2949
# help of 'directory' option of 'tags' command
4256
2950
#: bzrlib/builtins.py:5519
4257
2951
msgid "Branch whose tags should be displayed."
4258
2952
msgstr ""
4259
2953
4260
2954
# help of 'sort' option of 'tags' command
4261
2955
#: bzrlib/builtins.py:5521
4262
2956
msgid "Sort tags by different criteria."
4263
2957
msgstr ""
4264
2958
4265
2959
# title of 'sort' option of 'tags' command
4266
2960
#: bzrlib/builtins.py:5521
4267
2961
msgid "Sorting"
4268
2962
msgstr ""
4269
2963
4270
2964
#: bzrlib/builtins.py:5566
4271
2965
msgid "Reconfigure the type of a bzr directory."
4272
2966
msgstr ""
4273
2967
4274
2968
#: bzrlib/builtins.py:5568
4275
2969
msgid "A target configuration must be specified."
4276
2970
msgstr ""
4277
2971
4278
2972
#: bzrlib/builtins.py:5570
4279
2973
msgid ""
4280
2974
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
4281
2975
"The order of preference is\n"
4282
2976
"1. For a lightweight checkout, the current bound location.\n"
4283
2977
"2. For branches that used to be checkouts, the previously-bound location.\n"
4284
2978
"3. The push location.\n"
4285
2979
"4. The parent location.\n"
4286
2980
"If none of these is available, --bind-to must be specified."
4287
2981
msgstr ""
4288
2982
4289
2983
# title of 'target_type' option of 'reconfigure' command
4290
2984
#: bzrlib/builtins.py:5584
4291
2985
msgid "Target type"
4292
2986
msgstr ""
4293
2987
4294
2988
# help of 'target_type' option of 'reconfigure' command
4295
2989
#: bzrlib/builtins.py:5585
4296
2990
msgid "The type to reconfigure the directory to."
4297
2991
msgstr ""
4298
2992
4299
2993
# help of 'bind-to' option of 'reconfigure' command
4300
2994
#: bzrlib/builtins.py:5600
4301
2995
msgid "Branch to bind checkout to."
4302
2996
msgstr ""
4303
2997
4304
2998
# help of 'force' option of 'reconfigure' command
4305
2999
#: bzrlib/builtins.py:5602
4306
3000
msgid "Perform reconfiguration even if local changes will be lost."
4307
3001
msgstr ""
4308
3002
4309
3003
# help of 'stacked-on' option of 'reconfigure' command
4310
3004
#: bzrlib/builtins.py:5605
4311
3005
msgid "Reconfigure a branch to be stacked on another branch."
4312
3006
msgstr ""
4313
3007
4314
3008
# help of 'unstacked' option of 'reconfigure' command
4315
3009
#: bzrlib/builtins.py:5609
4316
3010
msgid ""
4317
3011
"Reconfigure a branch to be unstacked.  This may require copying substantial "
4318
3012
"data into it."
4319
3013
msgstr ""
4320
3014
4321
3015
#: bzrlib/builtins.py:5657
4322
3016
msgid "Set the branch of a checkout and update."
4323
3017
msgstr ""
4324
3018
4325
3019
#: bzrlib/builtins.py:5659
4326
3020
msgid ""
4327
3021
"For lightweight checkouts, this changes the branch being referenced.\n"
4328
3022
"For heavyweight checkouts, this checks that there are no local commits\n"
4329
3023
"versus the current bound branch, then it makes the local branch a mirror\n"
4330
3024
"of the new location and binds to it."
4331
3025
msgstr ""
4332
3026
4333
3027
#: bzrlib/builtins.py:5664
4334
3028
msgid ""
4335
3029
"In both cases, the working tree is updated and uncommitted changes\n"
4336
3030
"are merged. The user can commit or revert these as they desire."
4337
3031
msgstr ""
4338
3032
4339
3033
#: bzrlib/builtins.py:5667
4340
3034
msgid "Pending merges need to be committed or reverted before using switch."
4341
3035
msgstr ""
4342
3036
4343
3037
#: bzrlib/builtins.py:5669
4344
3038
msgid ""
4345
3039
"The path to the branch to switch to can be specified relative to the parent\n"
4346
3040
"directory of the current branch. For example, if you are currently in a\n"
4347
3041
"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
4348
3042
"/path/to/newbranch."
4349
3043
msgstr ""
4350
3044
4351
3045
#: bzrlib/builtins.py:5674
4352
3046
msgid ""
4353
3047
"Bound branches use the nickname of its master branch unless it is set\n"
4354
3048
"locally, in which case switching will update the local nickname to be\n"
4355
3049
"that of the master."
4356
3050
msgstr ""
4357
3051
4358
3052
# help of 'force' option of 'switch' command
4359
3053
#: bzrlib/builtins.py:5682
4360
3054
msgid "Switch even if local commits will be lost."
4361
3055
msgstr ""
4362
3056
4363
3057
# help of 'create-branch' option of 'switch' command
4364
3058
#: bzrlib/builtins.py:5685
4365
3059
msgid "Create the target branch from this one before switching to it."
4366
3060
msgstr ""
4367
3061
4368
3062
#: bzrlib/builtins.py:5754
4369
3063
msgid "Manage filtered views."
4370
3064
msgstr ""
4371
3065
4372
3066
#: bzrlib/builtins.py:5756
4373
3067
msgid ""
4374
3068
"Views provide a mask over the tree so that users can focus on\n"
4375
3069
"a subset of a tree when doing their work. After creating a view,\n"
4376
3070
"commands that support a list of files - status, diff, commit, etc -\n"
4377
3071
"effectively have that list of files implicitly given each time.\n"
4378
3072
"An explicit list of files can still be given but those files\n"
4379
3073
"must be within the current view."
4380
3074
msgstr ""
4381
3075
4382
3076
#: bzrlib/builtins.py:5763
4383
3077
msgid ""
4384
3078
"In most cases, a view has a short life-span: it is created to make\n"
4385
3079
"a selected change and is deleted once that change is committed.\n"
4386
3080
"At other times, you may wish to create one or more named views\n"
4387
3081
"and switch between them."
4388
3082
msgstr ""
4389
3083
4390
3084
#: bzrlib/builtins.py:5768
4391
3085
msgid ""
4392
3086
"To disable the current view without deleting it, you can switch to\n"
4393
3087
"the pseudo view called ``off``. This can be useful when you need\n"
4394
3088
"to see the whole tree for an operation or two (e.g. merge) but\n"
4395
3089
"want to switch back to your view after that."
4396
3090
msgstr ""
4397
3091
4398
3092
#: bzrlib/builtins.py:5773
4399
3093
msgid ""
4400
3094
":Examples:\n"
4401
3095
"  To define the current view::"
4402
3096
msgstr ""
4403
3097
4404
3098
#: bzrlib/builtins.py:5776
4405
3099
msgid "    bzr view file1 dir1 ..."
4406
3100
msgstr ""
4407
3101
4408
3102
#: bzrlib/builtins.py:5778
4409
3103
msgid "  To list the current view::"
4410
3104
msgstr ""
4411
3105
4412
3106
#: bzrlib/builtins.py:5780
4413
3107
msgid "    bzr view"
4414
3108
msgstr ""
4415
3109
4416
3110
#: bzrlib/builtins.py:5782
4417
3111
msgid "  To delete the current view::"
4418
3112
msgstr ""
4419
3113
4420
3114
#: bzrlib/builtins.py:5784
4421
3115
msgid "    bzr view --delete"
4422
3116
msgstr ""
4423
3117
4424
3118
#: bzrlib/builtins.py:5786
4425
3119
msgid "  To disable the current view without deleting it::"
4426
3120
msgstr ""
4427
3121
4428
3122
#: bzrlib/builtins.py:5788
4429
3123
msgid "    bzr view --switch off"
4430
3124
msgstr ""
4431
3125
4432
3126
#: bzrlib/builtins.py:5790
4433
3127
msgid "  To define a named view and switch to it::"
4434
3128
msgstr ""
4435
3129
4436
3130
#: bzrlib/builtins.py:5792
4437
3131
msgid "    bzr view --name view-name file1 dir1 ..."
4438
3132
msgstr ""
4439
3133
4440
3134
#: bzrlib/builtins.py:5794
4441
3135
msgid "  To list a named view::"
4442
3136
msgstr ""
4443
3137
4444
3138
#: bzrlib/builtins.py:5796
4445
3139
msgid "    bzr view --name view-name"
4446
3140
msgstr ""
4447
3141
4448
3142
#: bzrlib/builtins.py:5798
4449
3143
msgid "  To delete a named view::"
4450
3144
msgstr ""
4451
3145
4452
3146
#: bzrlib/builtins.py:5800
4453
3147
msgid "    bzr view --name view-name --delete"
4454
3148
msgstr ""
4455
3149
4456
3150
#: bzrlib/builtins.py:5802
4457
3151
msgid "  To switch to a named view::"
4458
3152
msgstr ""
4459
3153
4460
3154
#: bzrlib/builtins.py:5804
4461
3155
msgid "    bzr view --switch view-name"
4462
3156
msgstr ""
4463
3157
4464
3158
#: bzrlib/builtins.py:5806
4465
3159
msgid "  To list all views defined::"
4466
3160
msgstr ""
4467
3161
4468
3162
#: bzrlib/builtins.py:5808
4469
3163
msgid "    bzr view --all"
4470
3164
msgstr ""
4471
3165
4472
3166
#: bzrlib/builtins.py:5810
4473
3167
msgid "  To delete all views::"
4474
3168
msgstr ""
4475
3169
4476
3170
#: bzrlib/builtins.py:5812
4477
3171
msgid "    bzr view --delete --all"
4478
3172
msgstr ""
4479
3173
4480
3174
# help of 'all' option of 'view' command
4481
3175
#: bzrlib/builtins.py:5819
4482
3176
msgid "Apply list or delete action to all views."
4483
3177
msgstr ""
4484
3178
4485
3179
# help of 'delete' option of 'view' command
4486
3180
#: bzrlib/builtins.py:5822
4487
3181
msgid "Delete the view."
4488
3182
msgstr ""
4489
3183
4490
3184
# help of 'name' option of 'view' command
4491
3185
#: bzrlib/builtins.py:5825
4492
3186
msgid "Name of the view to define, list or delete."
4493
3187
msgstr ""
4494
3188
4495
3189
# help of 'switch' option of 'view' command
4496
3190
#: bzrlib/builtins.py:5829
4497
3191
msgid "Name of the view to switch to."
4498
3192
msgstr ""
4499
3193
4500
3194
#: bzrlib/builtins.py:5929
4501
3195
msgid "Remove a branch."
4502
3196
msgstr ""
4503
3197
4504
3198
#: bzrlib/builtins.py:5931
4505
3199
msgid ""
4506
3200
"This will remove the branch from the specified location but \n"
4507
3201
"will keep any working tree or repository in place."
4508
3202
msgstr ""
4509
3203
4510
3204
#: bzrlib/builtins.py:5936
4511
3205
msgid "  Remove the branch at repo/trunk::"
4512
3206
msgstr ""
4513
3207
4514
3208
#: bzrlib/builtins.py:5938
4515
3209
msgid "    bzr remove-branch repo/trunk"
4516
3210
msgstr ""
4517
3211
4518
3212
#: bzrlib/builtins.py:5954
4519
3213
msgid "Temporarily set aside some changes from the current tree."
4520
3214
msgstr ""
4521
3215
4522
3216
#: bzrlib/builtins.py:5956
4523
3217
msgid ""
4524
3218
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4525
3219
"ie. out of the way, until a later time when you can bring them back from\n"
4526
3220
"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
4527
3221
"your working tree, and so they aren't propagated along with your branch nor\n"
4528
3222
"will they survive its deletion."
4529
3223
msgstr ""
4530
3224
4531
3225
#: bzrlib/builtins.py:5962
4532
3226
msgid "If shelve --list is specified, previously-shelved changes are listed."
4533
3227
msgstr ""
4534
3228
4535
3229
#: bzrlib/builtins.py:5964
4536
3230
msgid ""
4537
3231
"Shelve is intended to help separate several sets of changes that have\n"
4538
3232
"been inappropriately mingled.  If you just want to get rid of all changes\n"
4539
3233
"and you don't need to restore them later, use revert.  If you want to\n"
4540
3234
"shelve all text changes at once, use shelve --all."
4541
3235
msgstr ""
4542
3236
4543
3237
#: bzrlib/builtins.py:5969
4544
3238
msgid ""
4545
3239
"If filenames are specified, only the changes to those files will be\n"
4546
3240
"shelved. Other files will be left untouched."
4547
3241
msgstr ""
4548
3242
4549
3243
#: bzrlib/builtins.py:5972
4550
3244
msgid ""
4551
3245
"If a revision is specified, changes since that revision will be shelved."
4552
3246
msgstr ""
4553
3247
4554
3248
#: bzrlib/builtins.py:5974
4555
3249
msgid ""
4556
3250
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4557
3251
"restore the most recently shelved changes."
4558
3252
msgstr ""
4559
3253
4560
3254
#: bzrlib/builtins.py:5977
4561
3255
msgid ""
4562
3256
"For complicated changes, it is possible to edit the changes in a separate\n"
4563
3257
"editor program to decide what the file remaining in the working copy\n"
4564
3258
"should look like.  To do this, add the configuration option"
4565
3259
msgstr ""
4566
3260
4567
3261
#: bzrlib/builtins.py:5981
4568
3262
msgid "    change_editor = PROGRAM @new_path @old_path"
4569
3263
msgstr ""
4570
3264
4571
3265
#: bzrlib/builtins.py:5983
4572
3266
msgid ""
4573
3267
"where @new_path is replaced with the path of the new version of the \n"
4574
3268
"file and @old_path is replaced with the path of the old version of \n"
4575
3269
"the file.  The PROGRAM should save the new file with the desired \n"
4576
3270
"contents of the file in the working tree.\n"
4577
3271
"    "
4578
3272
msgstr ""
4579
3273
4580
3274
# help of 'all' option of 'shelve' command
4581
3275
#: bzrlib/builtins.py:5995
4582
3276
msgid "Shelve all changes."
4583
3277
msgstr ""
4584
3278
4585
3279
# help of 'writer' option of 'shelve' command
4586
3280
#: bzrlib/builtins.py:5997
4587
3281
msgid "Method to use for writing diffs."
4588
3282
msgstr ""
4589
3283
4590
3284
# title of 'writer' option of 'shelve' command
4591
3285
#: bzrlib/builtins.py:5997
4592
3286
msgid "writer"
4593
3287
msgstr ""
4594
3288
4595
3289
# help of 'list' option of 'shelve' command
4596
3290
#: bzrlib/builtins.py:6001
4597
3291
msgid "List shelved changes."
4598
3292
msgstr ""
4599
3293
4600
3294
# help of 'destroy' option of 'shelve' command
4601
3295
#: bzrlib/builtins.py:6003
4602
3296
msgid "Destroy removed changes instead of shelving them."
4603
3297
msgstr ""
4604
3298
4605
3299
#: bzrlib/builtins.py:6043
4606
3300
msgid "Restore shelved changes."
4607
3301
msgstr ""
4608
3302
4609
3303
#: bzrlib/builtins.py:6045
4610
3304
msgid ""
4611
3305
"By default, the most recently shelved changes are restored. However if you\n"
4612
3306
"specify a shelf by id those changes will be restored instead.  This works\n"
4613
3307
"best when the changes don't depend on each other."
4614
3308
msgstr ""
4615
3309
4616
3310
# help of 'action' option of 'unshelve' command
4617
3311
#: bzrlib/builtins.py:6054
4618
3312
msgid "The action to perform."
4619
3313
msgstr ""
4620
3314
4621
3315
#: bzrlib/builtins.py:6076
4622
3316
msgid "Remove unwanted files from working tree."
4623
3317
msgstr ""
4624
3318
4625
3319
#: bzrlib/builtins.py:6078
4626
3320
msgid ""
4627
3321
"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
4628
3322
"files are never deleted."
4629
3323
msgstr ""
4630
3324
4631
3325
#: bzrlib/builtins.py:6081
4632
3326
msgid ""
4633
3327
"Another class is 'detritus', which includes files emitted by bzr during\n"
4634
3328
"normal operations and selftests.  (The value of these files decreases with\n"
4635
3329
"time.)"
4636
3330
msgstr ""
4637
3331
4638
3332
#: bzrlib/builtins.py:6085
4639
3333
msgid ""
4640
3334
"If no options are specified, unknown files are deleted.  Otherwise, option\n"
4641
3335
"flags are respected, and may be combined."
4642
3336
msgstr ""
4643
3337
4644
3338
#: bzrlib/builtins.py:6088
4645
3339
msgid "To check what clean-tree will do, use --dry-run."
4646
3340
msgstr ""
4647
3341
4648
3342
# help of 'ignored' option of 'clean-tree' command
4649
3343
#: bzrlib/builtins.py:6091
4650
3344
msgid "Delete all ignored files."
4651
3345
msgstr ""
4652
3346
4653
3347
# help of 'detritus' option of 'clean-tree' command
4654
3348
#: bzrlib/builtins.py:6092
4655
3349
msgid ""
4656
3350
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4657
3351
msgstr ""
4658
3352
4659
3353
# help of 'unknown' option of 'clean-tree' command
4660
3354
#: bzrlib/builtins.py:6095
4661
3355
msgid "Delete files unknown to bzr (default)."
4662
3356
msgstr ""
4663
3357
4664
3358
# help of 'dry-run' option of 'clean-tree' command
4665
3359
#: bzrlib/builtins.py:6096
4666
3360
msgid "Show files to delete instead of deleting them."
4667
3361
msgstr ""
4668
3362
4669
3363
# help of 'force' option of 'clean-tree' command
4670
3364
#: bzrlib/builtins.py:6098
4671
3365
msgid "Do not prompt before deleting."
4672
3366
msgstr ""
4673
3367
4674
3368
#: bzrlib/cmd_version_info.py:50
4675
3369
msgid "Show version information about this tree."
4676
3370
msgstr ""
4677
3371
4678
3372
#: bzrlib/cmd_version_info.py:52
4679
3373
msgid ""
4680
3374
"You can use this command to add information about version into\n"
4681
3375
"source code of an application. The output can be in one of the\n"
4682
3376
"supported formats or in a custom format based on a template."
4683
3377
msgstr ""
4684
3378
4685
3379
#: bzrlib/cmd_version_info.py:56
4686
3380
msgid "For example::"
4687
3381
msgstr ""
4688
3382
4689
3383
#: bzrlib/cmd_version_info.py:58
4690
3384
msgid ""
4691
3385
"  bzr version-info --custom \\\n"
4692
3386
"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4693
3387
msgstr ""
4694
3388
4695
3389
#: bzrlib/cmd_version_info.py:61
4696
3390
msgid ""
4697
3391
"will produce a C header file with formatted string containing the\n"
4698
3392
"current revision number. Other supported variables in templates are:"
4699
3393
msgstr ""
4700
3394
4701
3395
#: bzrlib/cmd_version_info.py:64
4702
3396
msgid ""
4703
3397
"  * {date} - date of the last revision\n"
4704
3398
"  * {build_date} - current date\n"
4705
3399
"  * {revno} - revision number\n"
4706
3400
"  * {revision_id} - revision id\n"
4707
3401
"  * {branch_nick} - branch nickname\n"
4708
3402
"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
4709
3403
"              otherwise 1"
4710
3404
msgstr ""
4711
3405
4712
3406
# help of 'format' option of 'version-info' command
4713
3407
#: bzrlib/cmd_version_info.py:74
4714
3408
msgid "Select the output format."
4715
3409
msgstr ""
4716
3410
4717
3411
# help of 'all' option of 'version-info' command
4718
3412
#: bzrlib/cmd_version_info.py:78
4719
3413
msgid "Include all possible information."
4720
3414
msgstr ""
4721
3415
4722
3416
# help of 'check-clean' option of 'version-info' command
4723
3417
#: bzrlib/cmd_version_info.py:79
4724
3418
msgid "Check if tree is clean."
4725
3419
msgstr ""
4726
3420
4727
3421
# help of 'include-history' option of 'version-info' command
4728
3422
#: bzrlib/cmd_version_info.py:81
4729
3423
msgid "Include the revision-history."
4730
3424
msgstr ""
4731
3425
4732
3426
# help of 'include-file-revisions' option of 'version-info' command
4733
3427
#: bzrlib/cmd_version_info.py:83
4734
3428
msgid "Include the last revision for each file."
4735
3429
msgstr ""
4736
3430
4737
3431
# help of 'template' option of 'version-info' command
4738
3432
#: bzrlib/cmd_version_info.py:84
4739
3433
msgid "Template for the output."
4740
3434
msgstr ""
4741
3435
4742
3436
#: bzrlib/commands.py:516
4743
3437
msgid "Purpose"
4744
3438
msgstr ""
4745
3439
4746
3440
#: bzrlib/commands.py:518 bzrlib/commands.py:520
4747
3441
msgid "Usage"
4748
3442
msgstr ""
4749
3443
4750
3444
#: bzrlib/commands.py:538
4751
3445
msgid "Options"
4752
3446
msgstr ""
4753
3447
4754
3448
#: bzrlib/commands.py:549
4755
3449
msgid "Description"
4756
3450
msgstr ""
4757
3451
4758
3452
#: bzrlib/commands.py:564
4759
3453
msgid "Aliases"
4760
3454
msgstr ""
4761
3455
4762
3456
#: bzrlib/commands.py:583
4763
3457
msgid "See also"
4764
3458
msgstr ""
4765
3459
4766
3460
#: bzrlib/config.py:2098
4767
3461
msgid "Display, set or remove a configuration option."
4768
3462
msgstr ""
4769
3463
4770
3464
#: bzrlib/config.py:2100
4771
3465
msgid "Display the active value for a given option."
4772
3466
msgstr ""
4773
3467
4774
3468
#: bzrlib/config.py:2102
4775
3469
msgid ""
4776
3470
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4777
3471
"matching options are displayed mentioning their scope. The active value\n"
4778
3472
"that bzr will take into account is the first one displayed for each option."
4779
3473
msgstr ""
4780
3474
4781
3475
#: bzrlib/config.py:2106
4782
3476
msgid "If no NAME is given, --all .* is implied."
4783
3477
msgstr ""
4784
3478
4785
3479
#: bzrlib/config.py:2108
4786
3480
msgid ""
4787
3481
"Setting a value is achieved by using name=value without spaces. The value\n"
4788
3482
"is set in the most relevant scope and can be checked by displaying the\n"
4789
3483
"option again."
4790
3484
msgstr ""
4791
3485
4792
3486
# help of 'scope' option of 'config' command
4793
3487
#: bzrlib/config.py:2119
4794
3488
msgid "Reduce the scope to the specified configuration file"
4795
3489
msgstr ""
4796
3490
4797
3491
# help of 'all' option of 'config' command
4798
3492
#: bzrlib/config.py:2123
4799
3493
msgid "Display all the defined values for the matching options."
4800
3494
msgstr ""
4801
3495
4802
3496
# help of 'remove' option of 'config' command
4803
3497
#: bzrlib/config.py:2125
4804
3498
msgid "Remove the option from the configuration file"
4805
3499
msgstr ""
4806
3500
4807
3501
#: bzrlib/conflicts.py:47
4808
3502
msgid "List files with conflicts."
4809
3503
msgstr ""
4810
3504
4811
3505
#: bzrlib/conflicts.py:49
4812
3506
msgid ""
4813
3507
"Merge will do its best to combine the changes in two branches, but there\n"
4814
3508
"are some kinds of problems only a human can fix.  When it encounters those,\n"
4815
3509
"it will mark a conflict.  A conflict means that you need to fix something,\n"
4816
3510
"before you should commit."
4817
3511
msgstr ""
4818
3512
4819
3513
#: bzrlib/conflicts.py:54
4820
3514
msgid ""
4821
3515
"Conflicts normally are listed as short, human-readable messages.  If --text\n"
4822
3516
"is supplied, the pathnames of files with text conflicts are listed,\n"
4823
3517
"instead.  (This is useful for editing all files with text conflicts.)"
4824
3518
msgstr ""
4825
3519
4826
3520
#: bzrlib/conflicts.py:58
4827
3521
msgid "Use bzr resolve when you have fixed a problem."
4828
3522
msgstr ""
4829
3523
4830
3524
# help of 'text' option of 'conflicts' command
4831
3525
#: bzrlib/conflicts.py:63
4832
3526
msgid "List paths of files with text conflicts."
4833
3527
msgstr ""
4834
3528
4835
3529
# help of 'action' option of 'resolve' command
4836
3530
#: bzrlib/conflicts.py:95
4837
3531
msgid "How to resolve the conflict."
4838
3532
msgstr ""
4839
3533
4840
3534
#: bzrlib/conflicts.py:101
4841
3535
msgid "Mark a conflict as resolved."
4842
3536
msgstr ""
4843
3537
4844
3538
#: bzrlib/conflicts.py:108
4845
3539
msgid ""
4846
3540
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4847
3541
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4848
3542
"as\n"
4849
3543
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4850
3544
msgstr ""
4851
3545
4852
3546
# help of 'all' option of 'resolve' command
4853
3547
#: bzrlib/conflicts.py:116
4854
3548
msgid "Resolve all conflicts in this tree."
4855
3549
msgstr ""
4856
3550
4857
3551
# title of 'action' option of 'resolve' command
4858
3552
#: bzrlib/conflicts.py:678
4859
3553
msgid "action"
4860
3554
msgstr ""
4861
3555
4862
3556
#: bzrlib/errors.py:224
4863
3557
msgid "The tree builder is already building a tree."
4864
3558
msgstr ""
4865
3559
4866
3560
#: bzrlib/errors.py:245
4867
3561
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4868
3562
msgstr ""
4869
3563
4870
3564
#: bzrlib/errors.py:264
4871
3565
msgid ""
4872
3566
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4873
3567
"versions \"%(minimum)s\" to \"%(current)s\"."
4874
3568
msgstr ""
4875
3569
4876
3570
#: bzrlib/errors.py:276
4877
3571
msgid "The transport '%(transport)s' is only accessible within this process."
4878
3572
msgstr ""
4879
3573
4880
3574
#: bzrlib/errors.py:294
4881
3575
msgid "Invalid revision number %(revno)s"
4882
3576
msgstr ""
4883
3577
4884
3578
#: bzrlib/errors.py:303
4885
3579
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4886
3580
msgstr ""
4887
3581
4888
3582
#: bzrlib/errors.py:314
4889
3583
msgid "Reserved revision-id {%(revision_id)s}"
4890
3584
msgstr ""
4891
3585
4892
3586
#: bzrlib/errors.py:328
4893
3587
msgid "There is no public branch set for \"%(branch_url)s\"."
4894
3588
msgstr ""
4895
3589
4896
3590
#: bzrlib/errors.py:338
4897
3591
msgid ""
4898
3592
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4899
3593
"obtain a list of topics."
4900
3594
msgstr ""
4901
3595
4902
3596
#: bzrlib/errors.py:347
4903
3597
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4904
3598
msgstr ""
4905
3599
4906
3600
#: bzrlib/errors.py:357
4907
3601
msgid ""
4908
3602
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4909
3603
msgstr ""
4910
3604
4911
3605
#: bzrlib/errors.py:366
4912
3606
msgid "The branch '%(branch)s' is not stacked."
4913
3607
msgstr ""
4914
3608
4915
3609
#: bzrlib/errors.py:380
4916
3610
msgid "No WorkingTree exists for \"%(base)s\"."
4917
3611
msgstr ""
4918
3612
4919
3613
#: bzrlib/errors.py:389
4920
3614
msgid "Not currently building a tree."
4921
3615
msgstr ""
4922
3616
4923
3617
#: bzrlib/errors.py:394
4924
3618
msgid "%(url)s is not a local path."
4925
3619
msgstr ""
4926
3620
4927
3621
#: bzrlib/errors.py:422
4928
3622
msgid "%(not_locked)r is not write locked but needs to be."
4929
3623
msgstr ""
4930
3624
4931
3625
#: bzrlib/errors.py:430
4932
3626
msgid "Error in command line options"
4933
3627
msgstr ""
4934
3628
4935
3629
#: bzrlib/errors.py:435
4936
3630
msgid "%(value)s is not an index of type %(_type)s."
4937
3631
msgstr ""
4938
3632
4939
3633
#: bzrlib/errors.py:445
4940
3634
msgid "Error in data for index %(value)s."
4941
3635
msgstr ""
4942
3636
4943
3637
#: bzrlib/errors.py:454
4944
3638
msgid "The key '%(key)s' is already in index '%(index)s'."
4945
3639
msgstr ""
4946
3640
4947
3641
#: bzrlib/errors.py:464
4948
3642
msgid "The key '%(key)s' is not a valid key."
4949
3643
msgstr ""
4950
3644
4951
3645
#: bzrlib/errors.py:473
4952
3646
msgid "Could not parse options for index %(value)s."
4953
3647
msgstr ""
4954
3648
4955
3649
#: bzrlib/errors.py:482
4956
3650
msgid "The value '%(value)s' is not a valid value."
4957
3651
msgstr ""
4958
3652
4959
3653
#: bzrlib/errors.py:491
4960
3654
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
4961
3655
msgstr ""
4962
3656
4963
3657
#: bzrlib/errors.py:510
4964
3658
msgid "Generic path error: %(path)r%(extra)s)"
4965
3659
msgstr ""
4966
3660
4967
3661
#: bzrlib/errors.py:523
4968
3662
msgid "No such file: %(path)r%(extra)s"
4969
3663
msgstr ""
4970
3664
4971
3665
#: bzrlib/errors.py:528
4972
3666
msgid "File exists: %(path)r%(extra)s"
4973
3667
msgstr ""
4974
3668
4975
3669
#: bzrlib/errors.py:534
4976
3670
msgid ""
4977
3671
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
4978
3672
"after to tell bzr about a rename that has already happened)%(extra)s"
4979
3673
msgstr ""
4980
3674
4981
3675
#: bzrlib/errors.py:550
4982
3676
msgid "\"%(path)s\" is not a directory %(extra)s"
4983
3677
msgstr ""
4984
3678
4985
3679
#: bzrlib/errors.py:555
4986
3680
msgid "\"%(path)s\" is not in the working directory %(extra)s"
4987
3681
msgstr ""
4988
3682
4989
3683
#: bzrlib/errors.py:560
4990
3684
msgid "Directory not empty: \"%(path)s\"%(extra)s"
4991
3685
msgstr ""
4992
3686
4993
3687
#: bzrlib/errors.py:565
4994
3688
msgid "Hard-linking \"%(path)s\" is not supported"
4995
3689
msgstr ""
4996
3690
4997
3691
#: bzrlib/errors.py:580
4998
3692
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
4999
3693
msgstr ""
5000
3694
Reviewer	Review Type	Date Requested	Status
Vincent Ladeuil		2011-05-04	Needs Information on 2011-05-04
Review via email: mp+59890@code.launchpad.net