To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
« back to all changes in this revision
Viewing changes to po/id.po
- browse files at revision 6623
- compare with another revision
- download diff
- download tarball
- view history from revision 6623
- Committer: Jelmer Vernooij
- Date: 2017-05-21 19:09:26 UTC
- mfrom: (6622.1.36 breezy)
- Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.
- files added:
- doc/en/release-notes/brz-3.0.txt
- files removed:
- bzr.ico
- files renamed:
- apport/bzr-crashdb.conf => apport/brz-crashdb.conf
- apport/source_bzr.py => apport/source_brz.py
- bzrlib/ => breezy/
- bzr => brz
- contrib/bash/bzr => contrib/bash/brz
- contrib/bash/bzrbashprompt.sh => contrib/bash/brzbashprompt.sh
- contrib/bzr_access => contrib/brz_access
- contrib/emacs/bzr-mode.el => contrib/emacs/brz-mode.el
- doc/developers/_static/bzr-doc.css => doc/developers/_static/brz-doc.css
- doc/en/_static/en/bzr-en-quick-reference.pdf => doc/en/_static/en/brz-en-quick-reference.pdf
- doc/en/_static/en/bzr-en-quick-reference.png => doc/en/_static/en/brz-en-quick-reference.png
- doc/en/_static/en/bzr-en-quick-reference.svg => doc/en/_static/en/brz-en-quick-reference.svg
- doc/en/tutorials/using_bazaar_with_launchpad.txt => doc/en/tutorials/using_breezy_with_launchpad.txt
- po/bzr.pot => po/brz.pot
- tools/bzr_epydoc => tools/brz_epydoc
- tools/bzr_epydoc_uid.py => tools/brz_epydoc_uid.py
- tools/win32/bzr-win32-bdist-postinstall.py => tools/win32/brz-win32-bdist-postinstall.py
- tools/win32/bzr.iss.cog => tools/win32/brz.iss.cog
- tools/win32/bzr_postinstall.py => tools/win32/brz_postinstall.py
- tools/win32/start_bzr.bat => tools/win32/start_brz.bat
- files modified:
- .bzrignore
added
removed
po/id.po
1
# Indonesian translation for bzr
2
# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3
# This file is distributed under the same license as the bzr package.
4
# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
5
#
6
msgid ""
7
msgstr ""
8
"Project-Id-Version: bzr\n"
9
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10
"POT-Creation-Date: 2012-07-10 11:35+0200\n"
11
"PO-Revision-Date: 2013-07-10 08:51+0000\n"
12
"Last-Translator: dhardiputra <dhardiputra@gmail.com>\n"
13
"Language-Team: Indonesian <id@li.org>\n"
14
"MIME-Version: 1.0\n"
15
"Content-Type: text/plain; charset=UTF-8\n"
16
"Content-Transfer-Encoding: 8bit\n"
17
"Plural-Forms: nplurals=1; plural=0;\n"
18
"X-Launchpad-Export-Date: 2013-07-11 04:30+0000\n"
19
"X-Generator: Launchpad (build 16696)\n"
20
21
#: bzrlib/add.py:93
1
#: breezy/add.py:93
2
#, python-brace-format
22
3
msgid "skipping {0} (larger than {1} of {2} bytes)"
23
msgstr "melewatkan {0} (larger than {1} of {2} bytes)"
4
msgstr ""
24
5
25
#: bzrlib/branch.py:854
6
#: breezy/branch.py:872
26
7
msgid "Unstacking"
27
msgstr "Unstacking"
8
msgstr ""
28
9
29
#: bzrlib/branch.py:2955
10
#: breezy/branch.py:3012
30
11
#, python-format
31
12
msgid "Pushed up to revision %d."
32
msgstr "Mendorong ke revisi %d."
13
msgstr ""
33
14
34
#: bzrlib/branch.py:2957
15
#: breezy/branch.py:3014
35
16
#, python-format
36
17
msgid "%d tag updated."
37
18
msgid_plural "%d tags updated."
38
msgstr[0] "%d tag diperbarui."
19
msgstr[0] ""
20
msgstr[1] ""
39
21
40
#: bzrlib/branch.py:2960
22
#: breezy/branch.py:3017
41
23
msgid "No new revisions or tags to push."
42
msgstr "Tidak ada revisi baru atau tag."
24
msgstr ""
43
25
44
#: bzrlib/branch.py:2962
26
#: breezy/branch.py:3019
45
27
msgid "No new revisions to push."
46
msgstr "Tidak ada revisi baru."
28
msgstr ""
47
29
48
#: bzrlib/branch.py:2982
30
#: breezy/branch.py:3039
31
#, python-brace-format
49
32
msgid "checked branch {0} format {1}"
50
msgstr "diperiksa cabang {0} format {1}"
33
msgstr ""
51
34
52
#: bzrlib/branch.py:2985
35
#: breezy/branch.py:3042
53
36
#, python-format
54
37
msgid "found error:%s"
55
msgstr "ada kesalahan:%s"
38
msgstr ""
56
39
57
#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
40
#: breezy/builtins.py:251 breezy/builtins.py:3043 breezy/workingtree.py:324
58
41
#, python-format
59
42
msgid "Ignoring files outside view. View is %s"
60
msgstr "Mengabaikan file di luar viewn. View adalah %s"
43
msgstr ""
61
44
62
#: bzrlib/builtins.py:260
45
#: breezy/builtins.py:260
63
46
#, python-format
64
msgid "bzr %s --revision takes exactly one revision identifier"
65
msgstr "bzr %s --revisi memakan waktu tepat satu revisi mengidentifikasi"
47
msgid "brz %s --revision takes exactly one revision identifier"
48
msgstr ""
66
49
67
#: bzrlib/builtins.py:315
50
#: breezy/builtins.py:315
68
51
msgid "Display status summary."
69
msgstr "Tampilan ringkasan status."
52
msgstr ""
70
53
71
#: bzrlib/builtins.py:317
54
#: breezy/builtins.py:317
72
55
msgid ""
73
56
"This reports on versioned and unknown files, reporting them\n"
74
57
"grouped by state. Possible states are:"
75
58
msgstr ""
76
59
77
#: bzrlib/builtins.py:320
60
#: breezy/builtins.py:320
78
61
msgid ""
79
62
"added\n"
80
63
" Versioned in the working copy but not in the previous revision."
81
64
msgstr ""
82
"ditambahkan\n"
83
" Berversi dalam copy pekerjaan tetapi tidak dalam revisi sebelumnya."
84
65
85
#: bzrlib/builtins.py:323
66
#: breezy/builtins.py:323
86
67
msgid ""
87
68
"removed\n"
88
69
" Versioned in the previous revision but removed or deleted\n"
89
70
" in the working copy."
90
71
msgstr ""
91
"dihapus\n"
92
" Berversi dalam revisi sebelumnya tapi dihapus atau dihapus\n"
93
" dalam copy pekerjaan."
94
72
95
#: bzrlib/builtins.py:327
73
#: breezy/builtins.py:327
96
74
msgid ""
97
75
"renamed\n"
98
76
" Path of this file changed from the previous revision;\n"
100
78
" parent directory was renamed."
101
79
msgstr ""
102
80
103
#: bzrlib/builtins.py:332
81
#: breezy/builtins.py:332
104
82
msgid ""
105
83
"modified\n"
106
84
" Text has changed since the previous revision."
107
85
msgstr ""
108
"dimodifikasi\n"
109
" Teks telah berubah sejak revisi sebelumnya."
110
86
111
#: bzrlib/builtins.py:335
87
#: breezy/builtins.py:335
112
88
msgid ""
113
89
"kind changed\n"
114
90
" File kind has been changed (e.g. from file to directory)."
115
91
msgstr ""
116
"jenis berubah\n"
117
" Jenis file yang telah diubah (misalnya dari file ke direktori)."
118
92
119
#: bzrlib/builtins.py:338
93
#: breezy/builtins.py:338
120
94
msgid ""
121
95
"unknown\n"
122
96
" Not versioned and not matching an ignore pattern."
123
97
msgstr ""
124
"yang tidak dikenal\n"
125
" Tidak diversi dan tidak sesuai pola abaikan."
126
98
127
#: bzrlib/builtins.py:341
99
#: breezy/builtins.py:341
128
100
msgid ""
129
101
"Additionally for directories, symlinks and files with a changed\n"
130
102
"executable bit, Bazaar indicates their type using a trailing\n"
132
104
"disabled using the '--no-classify' option."
133
105
msgstr ""
134
106
135
#: bzrlib/builtins.py:346
107
#: breezy/builtins.py:346
136
108
msgid ""
137
"To see ignored files use 'bzr ignored'. For details on the\n"
138
"changes to file texts, use 'bzr diff'."
109
"To see ignored files use 'brz ignored'. For details on the\n"
110
"changes to file texts, use 'brz diff'."
139
111
msgstr ""
140
"Untuk melihat file diabaikan menggunakan 'bzr diabaikan'. Untuk rincian "
141
"tentang\n"
142
"perubahan teks berkas, penggunaan 'bzr diff'."
143
112
144
#: bzrlib/builtins.py:349
113
#: breezy/builtins.py:349
145
114
msgid ""
146
115
"Note that --short or -S gives status flags for each item, similar\n"
147
116
"to Subversion's status command. To get output similar to svn -q,\n"
148
"use bzr status -SV."
117
"use brz status -SV."
149
118
msgstr ""
150
119
151
#: bzrlib/builtins.py:353
120
#: breezy/builtins.py:353
152
121
msgid ""
153
122
"If no arguments are specified, the status of the entire working\n"
154
123
"directory is shown. Otherwise, only the status of the specified\n"
155
124
"files or directories is reported. If a directory is given, status\n"
156
125
"is reported for everything inside that directory."
157
126
msgstr ""
158
"Jika tidak ada argumen yang ditentukan, status seluruh pekerja\n"
159
"direktori ditampilkan. Jika tidak, hanya status tertentu\n"
160
"file atau direktori dilaporkan. Jika direktori yang diberikan, status\n"
161
"dilaporkan untuk segala sesuatu di dalam direktori tersebut."
162
127
163
#: bzrlib/builtins.py:358
128
#: breezy/builtins.py:358
164
129
msgid ""
165
130
"Before merges are committed, the pending merge tip revisions are\n"
166
131
"shown. To see all pending merge revisions, use the -v option.\n"
168
133
"the no-pending option or specify a file/directory."
169
134
msgstr ""
170
135
171
#: bzrlib/builtins.py:363
136
#: breezy/builtins.py:363
172
137
msgid ""
173
138
"To compare the working directory to a specific revision, pass a\n"
174
139
"single revision to the revision argument."
175
140
msgstr ""
176
141
177
#: bzrlib/builtins.py:366
142
#: breezy/builtins.py:366
178
143
msgid ""
179
144
"To see which files have changed in a specific revision, or between\n"
180
145
"two revisions, pass a revision range to the revision argument.\n"
181
"This will produce the same results as calling 'bzr diff --summarize'."
146
"This will produce the same results as calling 'brz diff --summarize'."
182
147
msgstr ""
183
148
184
#: bzrlib/builtins.py:375
149
# help of 'short' option of 'status' command
150
#: breezy/builtins.py:375
185
151
msgid "Use short status indicators."
186
msgstr "Gunakan indikator status."
152
msgstr ""
187
153
188
#: bzrlib/builtins.py:377
154
# help of 'versioned' option of 'status' command
155
#: breezy/builtins.py:377
189
156
msgid "Only show versioned files."
190
msgstr "Hanya menampilkan versi berkas."
157
msgstr ""
191
158
192
#: bzrlib/builtins.py:379
159
# help of 'no-pending' option of 'status' command
160
#: breezy/builtins.py:379
193
161
msgid "Don't show pending merges."
194
msgstr "Jangan tampilkan gabungan yang tertunda."
162
msgstr ""
195
163
196
#: bzrlib/builtins.py:382
164
# help of 'no-classify' option of 'status' command
165
#: breezy/builtins.py:382
197
166
msgid "Do not mark object type using indicator."
198
msgstr "Jangan menandai jenis objek dengan menggunakan indikator."
199
200
#: bzrlib/builtins.py:397
201
msgid "bzr status --revision takes exactly one or two revision specifiers"
202
msgstr ""
203
"status bzr -- revisi memakan waktu tepat satu atau dua revisi spesifikasi"
204
205
#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
167
msgstr ""
168
169
#: breezy/builtins.py:397
170
msgid "brz status --revision takes exactly one or two revision specifiers"
171
msgstr ""
172
173
#: breezy/builtins.py:441 breezy/builtins.py:5229
206
174
msgid "You can only supply one of revision_id or --revision"
207
msgstr "Anda hanya dapat menyediakan satu atau revision_id --revisi"
175
msgstr ""
208
176
209
#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
177
#: breezy/builtins.py:444 breezy/builtins.py:5231
210
178
msgid "You must supply either --revision or a revision_id"
211
msgstr "Anda harus memberikan baik --revisi atau revision_id"
179
msgstr ""
212
180
213
#: bzrlib/builtins.py:451
181
#: breezy/builtins.py:451
214
182
#, python-format
215
183
msgid "Repository %r does not support access to raw revision texts"
216
msgstr "Repositori %r tidak mendukung akses ke teks revisi baku"
184
msgstr ""
217
185
218
#: bzrlib/builtins.py:462
186
#: breezy/builtins.py:462
187
#, python-brace-format
219
188
msgid "The repository {0} contains no revision {1}."
220
msgstr "Repositori {0} tidak mengandung revisi {1}."
189
msgstr ""
221
190
222
#: bzrlib/builtins.py:469
191
#: breezy/builtins.py:469
223
192
msgid "You cannot specify a NULL revision."
224
msgstr "Anda tidak bisa menentukan revisi NULL."
193
msgstr ""
225
194
226
#: bzrlib/builtins.py:561
195
#: breezy/builtins.py:561
227
196
msgid "Remove the working tree from a given branch/checkout."
228
197
msgstr ""
229
198
230
#: bzrlib/builtins.py:563
199
#: breezy/builtins.py:563
231
200
msgid ""
232
201
"Since a lightweight checkout is little more than a working tree\n"
233
202
"this will refuse to run against one."
234
203
msgstr ""
235
204
236
#: bzrlib/builtins.py:566
237
msgid "To re-create the working tree, use \"bzr checkout\"."
238
msgstr ""
239
240
#: bzrlib/builtins.py:572
241
msgid ""
242
"Remove the working tree even if it has uncommitted or shelved changes."
243
msgstr ""
244
245
#: bzrlib/builtins.py:586
205
#: breezy/builtins.py:566
206
msgid "To re-create the working tree, use \"brz checkout\"."
207
msgstr ""
208
209
# help of 'force' option of 'remove-tree' command
210
#: breezy/builtins.py:572
211
msgid "Remove the working tree even if it has uncommitted or shelved changes."
212
msgstr ""
213
214
#: breezy/builtins.py:586
246
215
msgid "No working tree to remove"
247
216
msgstr ""
248
217
249
#: bzrlib/builtins.py:588
218
#: breezy/builtins.py:588
250
219
msgid "You cannot remove the working tree of a remote path"
251
220
msgstr ""
252
221
253
#: bzrlib/builtins.py:597
222
#: breezy/builtins.py:597
254
223
msgid "You cannot remove the working tree from a lightweight checkout"
255
224
msgstr ""
256
225
257
#: bzrlib/builtins.py:637
226
#: breezy/builtins.py:637
258
227
msgid ""
259
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
228
"The tree does not appear to be corrupt. You probably want \"brz revert\" "
260
229
"instead. Use \"--force\" if you are sure you want to reset the working tree."
261
230
msgstr ""
262
231
263
#: bzrlib/builtins.py:648
232
#: breezy/builtins.py:648
264
233
msgid ""
265
234
", the header appears corrupt, try passing -r -1 to set the state to the last "
266
235
"commit"
267
236
msgstr ""
268
237
269
#: bzrlib/builtins.py:652
238
#: breezy/builtins.py:652
239
#, python-brace-format
270
240
msgid "failed to reset the tree state{0}"
271
241
msgstr ""
272
242
273
#: bzrlib/builtins.py:656
243
#: breezy/builtins.py:656
274
244
msgid "Show current revision number."
275
msgstr "Tampilkan nomor revisi saat ini."
245
msgstr ""
276
246
277
#: bzrlib/builtins.py:658
247
#: breezy/builtins.py:658
278
248
msgid "This is equal to the number of revisions on this branch."
279
msgstr "Ini sama dengan jumlah revisi pada cabang ini."
249
msgstr ""
280
250
281
#: bzrlib/builtins.py:671
251
#: breezy/builtins.py:671
282
252
msgid "--tree and --revision can not be used together"
283
msgstr "--tree dan --revisi tidak dapat digunakan bersama-sama"
284
285
#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
286
msgid "Tags can only be placed on a single revision, not on a range"
287
msgstr "Tag hanya dapat ditempatkan pada revisi tunggal, bukan pada kisaran"
288
289
#: bzrlib/builtins.py:712
253
msgstr ""
254
255
#: breezy/builtins.py:688
256
msgid "Revision numbers only make sense for single revisions, not ranges"
257
msgstr ""
258
259
# help of 'tree' option of 'revno' command
260
#: breezy/builtins.py:712
290
261
msgid "Show revno of working tree."
291
262
msgstr ""
292
263
293
#: bzrlib/builtins.py:760
264
#: breezy/builtins.py:760
294
265
msgid "Add specified files or directories."
295
msgstr "Tambahkan file tertentu atau direktori."
266
msgstr ""
296
267
297
#: bzrlib/builtins.py:762
268
#: breezy/builtins.py:762
298
269
msgid ""
299
270
"In non-recursive mode, all the named items are added, regardless\n"
300
271
"of whether they were previously ignored. A warning is given if\n"
301
272
"any of the named files are already versioned."
302
273
msgstr ""
303
274
304
#: bzrlib/builtins.py:766
275
#: breezy/builtins.py:766
305
276
msgid ""
306
277
"In recursive mode (the default), files are treated the same way\n"
307
278
"but the behaviour for directories is different. Directories that\n"
312
283
"directories. If no names are given '.' is assumed."
313
284
msgstr ""
314
285
315
#: bzrlib/builtins.py:774
286
#: breezy/builtins.py:774
316
287
msgid ""
317
288
"A warning will be printed when nested trees are encountered,\n"
318
289
"unless they are explicitly ignored."
319
290
msgstr ""
320
291
321
#: bzrlib/builtins.py:777
292
#: breezy/builtins.py:777
322
293
msgid ""
323
"Therefore simply saying 'bzr add' will version all files that\n"
294
"Therefore simply saying 'brz add' will version all files that\n"
324
295
"are currently unknown."
325
296
msgstr ""
326
297
327
#: bzrlib/builtins.py:780
298
#: breezy/builtins.py:780
328
299
msgid ""
329
300
"Adding a file whose parent directory is not versioned will\n"
330
301
"implicitly add the parent, and so on up to the root. This means\n"
332
303
"get added when you add a file in the directory."
333
304
msgstr ""
334
305
335
#: bzrlib/builtins.py:785
306
#: breezy/builtins.py:785
336
307
msgid ""
337
308
"--dry-run will show which files would be added, but not actually\n"
338
309
"add them."
339
310
msgstr ""
340
"- dry-run akan menunjukkan file mana yang akan ditambahkan, tapi tidak benar-"
341
"benar\n"
342
"menambahkannya."
343
311
344
#: bzrlib/builtins.py:788
312
#: breezy/builtins.py:788
345
313
msgid ""
346
314
"--file-ids-from will try to use the file ids from the supplied path.\n"
347
315
"It looks up ids trying to find a matching parent directory with the\n"
352
320
"into a subdirectory of this one."
353
321
msgstr ""
354
322
355
#: bzrlib/builtins.py:796
323
#: breezy/builtins.py:796
356
324
msgid ""
357
325
"Any files matching patterns in the ignore list will not be added\n"
358
326
"unless they are explicitly mentioned."
359
327
msgstr ""
360
"Setiap file pola yang cocok dalam daftar diabaikan tidak akan ditambahkan\n"
361
"kecuali mereka secara eksplisit disebutkan."
362
328
363
#: bzrlib/builtins.py:799
329
#: breezy/builtins.py:799
364
330
msgid ""
365
331
"In recursive mode, files larger than the configuration option \n"
366
332
"add.maximum_file_size will be skipped. Named items are never skipped due\n"
367
333
"to file size."
368
334
msgstr ""
369
335
370
#: bzrlib/builtins.py:806
336
# help of 'no-recurse' option of 'add' command
337
#: breezy/builtins.py:806
371
338
msgid "Don't recursively add the contents of directories."
372
msgstr "Jangan menambahkan isi dari direktori."
339
msgstr ""
373
340
374
#: bzrlib/builtins.py:813
341
# help of 'file-ids-from' option of 'add' command
342
#: breezy/builtins.py:813
375
343
msgid "Lookup file ids from this tree."
376
344
msgstr ""
377
345
378
#: bzrlib/builtins.py:849
346
#: breezy/builtins.py:849
347
#, python-brace-format
379
348
msgid "ignored {0} matching \"{1}\"\n"
380
msgstr "diabaikan {0} pencocokan \"{1}\"\n"
349
msgstr ""
381
350
382
#: bzrlib/builtins.py:854
351
#: breezy/builtins.py:854
383
352
msgid "Create a new versioned directory."
384
msgstr "Buat direktori versi baru."
353
msgstr ""
385
354
386
#: bzrlib/builtins.py:856
355
#: breezy/builtins.py:856
387
356
msgid "This is equivalent to creating the directory and then adding it."
388
357
msgstr ""
389
"Hal ini setara dengan menciptakan direktori dan kemudian menambahkannya."
390
358
391
#: bzrlib/builtins.py:863
359
# help of 'parents' option of 'mkdir' command
360
#: breezy/builtins.py:863
392
361
msgid "No error if existing, make parent directories as needed."
393
msgstr "Jika tidak ada kesalahan, buat direktori induk yang diperlukan."
362
msgstr ""
394
363
395
#: bzrlib/builtins.py:897
364
#: breezy/builtins.py:897
396
365
#, python-format
397
366
msgid "added %s\n"
398
msgstr "menambahkan %s\n"
367
msgstr ""
399
368
400
#: bzrlib/builtins.py:939
369
#: breezy/builtins.py:939
401
370
#, python-format
402
371
msgid "invalid kind %r specified"
403
372
msgstr ""
404
373
405
#: bzrlib/builtins.py:976
374
#: breezy/builtins.py:976
406
375
msgid "Move or rename a file."
407
msgstr "Memindahkan atau mengganti nama file."
408
409
#: bzrlib/builtins.py:978
410
msgid " bzr mv SOURCE... DESTINATION"
411
msgstr " bzr mv SUMBER... TUJUAN"
412
413
#: bzrlib/builtins.py:980
376
msgstr ""
377
378
#: breezy/builtins.py:978
379
msgid " brz mv SOURCE... DESTINATION"
380
msgstr ""
381
382
#: breezy/builtins.py:980
414
383
msgid ""
415
384
"If the last argument is a versioned directory, all the other names\n"
416
385
"are moved into it. Otherwise, there must be exactly two arguments\n"
417
386
"and the file is changed to a new name."
418
387
msgstr ""
419
388
420
#: bzrlib/builtins.py:984
389
#: breezy/builtins.py:984
421
390
msgid ""
422
391
"If OLDNAME does not exist on the filesystem but is versioned and\n"
423
392
"NEWNAME does exist on the filesystem but is not versioned, mv\n"
426
395
"The same is valid when moving many SOURCE files to a DESTINATION."
427
396
msgstr ""
428
397
429
#: bzrlib/builtins.py:990
398
#: breezy/builtins.py:990
430
399
msgid "Files cannot be moved between branches."
431
msgstr "File tidak dapat dipindahkan antar cabang."
400
msgstr ""
432
401
433
#: bzrlib/builtins.py:997
402
# help of 'after' option of 'mv' command
403
#: breezy/builtins.py:997
434
404
msgid ""
435
"Move only the bzr identifier of the file, because the file has already been "
405
"Move only the brz identifier of the file, because the file has already been "
436
406
"moved."
437
407
msgstr ""
438
"Bergerak hanya identifier bzr file, karena file tersebut telah dipindahkan."
439
408
440
#: bzrlib/builtins.py:999
409
# help of 'auto' option of 'mv' command
410
#: breezy/builtins.py:999
441
411
msgid "Automatically guess renames."
442
msgstr "Secara otomatis mengganti nama."
412
msgstr ""
443
413
444
#: bzrlib/builtins.py:1000
414
# help of 'dry-run' option of 'mv' command
415
#: breezy/builtins.py:1000
445
416
msgid "Avoid making changes when guessing renames."
446
msgstr "Hindari membuat perubahan ketika menebak mengganti nama."
417
msgstr ""
447
418
448
#: bzrlib/builtins.py:1009
419
#: breezy/builtins.py:1009
449
420
msgid "--dry-run requires --auto."
450
msgstr "--dry-run membutuhkan --auto."
421
msgstr ""
451
422
452
#: bzrlib/builtins.py:1013
423
#: breezy/builtins.py:1013
453
424
msgid "missing file argument"
454
msgstr "argumen file hilang"
425
msgstr ""
455
426
456
#: bzrlib/builtins.py:1017
427
#: breezy/builtins.py:1017
457
428
msgid "can not move root of branch"
458
429
msgstr ""
459
430
460
#: bzrlib/builtins.py:1023
431
#: breezy/builtins.py:1023
461
432
msgid "Only one path may be specified to --auto."
462
msgstr "Hanya satu jalur dapat ditentukan untuk --auto."
433
msgstr ""
463
434
464
#: bzrlib/builtins.py:1026
435
#: breezy/builtins.py:1026
465
436
msgid "--after cannot be specified with --auto."
466
msgstr "--after tidak dapat ditentukan dengan --auto."
437
msgstr ""
467
438
468
#: bzrlib/builtins.py:1062
439
#: breezy/builtins.py:1062
469
440
msgid "to mv multiple files the destination must be a versioned directory"
470
msgstr "untuk mv beberapa file tujuan harus direktori berversi"
441
msgstr ""
471
442
472
#: bzrlib/builtins.py:1114
443
#: breezy/builtins.py:1114
473
444
msgid "Turn this branch into a mirror of another branch."
474
445
msgstr ""
475
446
476
#: bzrlib/builtins.py:1116
447
#: breezy/builtins.py:1116
477
448
msgid ""
478
449
"By default, this command only works on branches that have not diverged.\n"
479
450
"Branches are considered diverged if the destination branch's most recent \n"
481
452
"parent."
482
453
msgstr ""
483
454
484
#: bzrlib/builtins.py:1121
455
#: breezy/builtins.py:1121
485
456
msgid ""
486
"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
457
"If branches have diverged, you can use 'brz merge' to integrate the changes\n"
487
458
"from one into the other. Once one branch has merged, the other should\n"
488
459
"be able to pull it again."
489
460
msgstr ""
490
461
491
#: bzrlib/builtins.py:1125
462
#: breezy/builtins.py:1125
492
463
msgid ""
493
464
"If you want to replace your local changes and just want your branch to\n"
494
465
"match the remote one, use pull --overwrite. This will work even if the two\n"
495
466
"branches have diverged."
496
467
msgstr ""
497
468
498
#: bzrlib/builtins.py:1129
469
#: breezy/builtins.py:1129
499
470
msgid ""
500
471
"If there is no default location set, the first pull will set it (use\n"
501
472
"--no-remember to avoid setting it). After that, you can omit the\n"
503
474
"value will only be saved if the remote location can be accessed."
504
475
msgstr ""
505
476
506
#: bzrlib/builtins.py:1134
477
#: breezy/builtins.py:1134
507
478
msgid ""
508
479
"The --verbose option will display the revisions pulled using the log_format\n"
509
480
"configuration option. You can use a different format by overriding it with\n"
510
481
"-Olog_format=<other_format>."
511
482
msgstr ""
512
483
513
#: bzrlib/builtins.py:1138
484
#: breezy/builtins.py:1138
514
485
msgid ""
515
486
"Note: The location can be specified either in the form of a branch,\n"
516
487
"or in the form of a path to a file containing a merge directive generated\n"
517
"with bzr send."
488
"with brz send."
518
489
msgstr ""
519
490
520
#: bzrlib/builtins.py:1146
491
# help of 'verbose' option of 'pull' command
492
#: breezy/builtins.py:1146
521
493
msgid "Show logs of pulled revisions."
522
msgstr "Tampilkan log revisi ditarik."
494
msgstr ""
523
495
524
#: bzrlib/builtins.py:1148
496
# help of 'directory' option of 'pull' command
497
#: breezy/builtins.py:1148
525
498
msgid ""
526
499
"Branch to pull into, rather than the one containing the working directory."
527
500
msgstr ""
528
501
529
#: bzrlib/builtins.py:1151
502
# help of 'local' option of 'pull' command
503
#: breezy/builtins.py:1151
530
504
msgid ""
531
505
"Perform a local pull in a bound branch. Local pulls are not applied to the "
532
506
"master branch."
533
507
msgstr ""
534
508
535
#: bzrlib/builtins.py:1189
536
msgid "Need working tree for --show-base."
509
#: breezy/builtins.py:1188
510
msgid "No working tree, ignoring --show-base"
537
511
msgstr ""
538
512
539
#: bzrlib/builtins.py:1205
513
#: breezy/builtins.py:1204
540
514
msgid "No pull location known or specified."
541
msgstr "Tidak ada lokasi yang diketahui atau ditentukan."
515
msgstr ""
542
516
543
#: bzrlib/builtins.py:1211
517
#: breezy/builtins.py:1210
544
518
#, python-format
545
519
msgid "Using saved parent location: %s\n"
546
msgstr "Using saved parent location: %s\n"
520
msgstr ""
547
521
548
#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
522
#: breezy/builtins.py:1217 breezy/builtins.py:4423
549
523
msgid "Cannot use -r with merge directives or bundles"
550
msgstr "Tidak dapat menggunakan -r arahan merge atau bundel"
524
msgstr ""
551
525
552
#: bzrlib/builtins.py:1261
526
#: breezy/builtins.py:1260
553
527
msgid "Update a mirror of this branch."
554
msgstr "Perbarui cermin dari cabang ini."
528
msgstr ""
555
529
556
#: bzrlib/builtins.py:1263
530
#: breezy/builtins.py:1262
557
531
msgid ""
558
532
"The target branch will not have its working tree populated because this\n"
559
533
"is both expensive, and is not supported on remote file systems."
560
534
msgstr ""
561
535
562
#: bzrlib/builtins.py:1266
536
#: breezy/builtins.py:1265
563
537
msgid ""
564
538
"Some smart servers or protocols *may* put the working tree in place in\n"
565
539
"the future."
566
540
msgstr ""
567
541
568
#: bzrlib/builtins.py:1269
542
#: breezy/builtins.py:1268
569
543
msgid ""
570
544
"This command only works on branches that have not diverged. Branches are\n"
571
545
"considered diverged if the destination branch's most recent commit is one\n"
572
546
"that has not been merged (directly or indirectly) by the source branch."
573
547
msgstr ""
574
548
575
#: bzrlib/builtins.py:1273
549
#: breezy/builtins.py:1272
576
550
msgid ""
577
"If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
551
"If branches have diverged, you can use 'brz push --overwrite' to replace\n"
578
552
"the other branch completely, discarding its unmerged changes."
579
553
msgstr ""
580
554
581
#: bzrlib/builtins.py:1276
555
#: breezy/builtins.py:1275
582
556
msgid ""
583
557
"If you want to ensure you have the different changes in the other branch,\n"
584
"do a merge (see bzr help merge) from the other branch, and commit that.\n"
558
"do a merge (see brz help merge) from the other branch, and commit that.\n"
585
559
"After that you will be able to do a push without '--overwrite'."
586
560
msgstr ""
587
561
588
#: bzrlib/builtins.py:1280
562
#: breezy/builtins.py:1279
589
563
msgid ""
590
564
"If there is no default push location set, the first push will set it (use\n"
591
565
"--no-remember to avoid setting it). After that, you can omit the\n"
593
567
"value will only be saved if the remote location can be accessed."
594
568
msgstr ""
595
569
596
#: bzrlib/builtins.py:1285
570
#: breezy/builtins.py:1284
597
571
msgid ""
598
572
"The --verbose option will display the revisions pushed using the log_format\n"
599
573
"configuration option. You can use a different format by overriding it with\n"
600
574
"-Olog_format=<other_format>."
601
575
msgstr ""
602
576
603
#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
577
# help of 'directory' option of 'dpush' command
578
# help of 'directory' option of 'push' command
579
#: breezy/builtins.py:1295 breezy/foreign.py:272
604
580
msgid ""
605
581
"Branch to push from, rather than the one containing the working directory."
606
582
msgstr ""
607
583
608
#: bzrlib/builtins.py:1299
584
# help of 'use-existing-dir' option of 'push' command
585
#: breezy/builtins.py:1298
609
586
msgid ""
610
587
"By default push will fail if the target directory exists, but does not "
611
588
"already have a control directory. This flag will allow push to proceed."
612
589
msgstr ""
613
590
614
#: bzrlib/builtins.py:1304
591
# help of 'stacked' option of 'push' command
592
#: breezy/builtins.py:1303
615
593
msgid ""
616
594
"Create a stacked branch that references the public location of the parent "
617
595
"branch."
618
596
msgstr ""
619
597
620
#: bzrlib/builtins.py:1307
598
# help of 'stacked-on' option of 'push' command
599
#: breezy/builtins.py:1306
621
600
msgid ""
622
601
"Create a stacked branch that refers to another branch for the commit "
623
602
"history. Only the work not present in the referenced branch is included in "
624
603
"the branch created."
625
604
msgstr ""
626
605
627
#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
606
# help of 'strict' option of 'dpush' command
607
# help of 'strict' option of 'push' command
608
#: breezy/builtins.py:1311 breezy/foreign.py:279
628
609
msgid ""
629
610
"Refuse to push if there are uncommitted changes in the working tree, --no-"
630
611
"strict disables the check."
631
612
msgstr ""
632
613
633
#: bzrlib/builtins.py:1315
614
# help of 'no-tree' option of 'push' command
615
#: breezy/builtins.py:1314
634
616
msgid "Don't populate the working tree, even for protocols that support it."
635
617
msgstr ""
636
618
637
#: bzrlib/builtins.py:1318
619
# help of 'overwrite-tags' option of 'pull' command
620
# help of 'overwrite-tags' option of 'push' command
621
#: breezy/builtins.py:1317
638
622
msgid "Overwrite tags only."
639
msgstr "Timpa tag saja."
623
msgstr ""
640
624
641
#: bzrlib/builtins.py:1369
625
#: breezy/builtins.py:1368
642
626
msgid "Could not determine branch to refer to."
643
msgstr "Tidak dapat menentukan cabang untuk merujuk."
627
msgstr ""
644
628
645
#: bzrlib/builtins.py:1378
629
#: breezy/builtins.py:1377
646
630
#, python-format
647
631
msgid ""
648
632
"No push location known or specified. To push to the parent branch (at %s), "
649
"use 'bzr push :parent'."
633
"use 'brz push :parent'."
650
634
msgstr ""
651
635
652
#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
636
#: breezy/builtins.py:1383 breezy/foreign.py:306
653
637
msgid "No push location known or specified."
654
msgstr "Tidak ada lokasi mendorong diketahui atau ditentukan."
638
msgstr ""
655
639
656
#: bzrlib/builtins.py:1388
640
#: breezy/builtins.py:1387
657
641
#, python-format
658
642
msgid "Using saved push location: %s"
659
msgstr "Menggunakan lokasi mendorong disimpan: %s"
643
msgstr ""
660
644
661
#: bzrlib/builtins.py:1398
645
#: breezy/builtins.py:1397
662
646
msgid "Create a new branch that is a copy of an existing branch."
663
647
msgstr ""
664
648
665
#: bzrlib/builtins.py:1400
649
#: breezy/builtins.py:1399
666
650
msgid ""
667
651
"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
668
"be used. In other words, \"branch ../foo/bar\" will attempt to create "
669
"./bar.\n"
652
"be used. In other words, \"branch ../foo/bar\" will attempt to create ./"
653
"bar.\n"
670
654
"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
671
655
"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
672
656
"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
673
657
"create ./foo-bar."
674
658
msgstr ""
675
659
676
#: bzrlib/builtins.py:1407
660
#: breezy/builtins.py:1406
677
661
msgid ""
678
662
"To retrieve the branch as of a particular revision, supply the --revision\n"
679
663
"parameter, as in \"branch foo/bar -r 5\"."
680
664
msgstr ""
681
665
682
#: bzrlib/builtins.py:1410
666
#: breezy/builtins.py:1409
683
667
msgid "The synonyms 'clone' and 'get' for this command are deprecated."
684
668
msgstr ""
685
669
686
#: bzrlib/builtins.py:1420
670
# help of 'no-tree' option of 'branch' command
671
#: breezy/builtins.py:1419
687
672
msgid "Create a branch without a working-tree."
688
673
msgstr ""
689
674
690
#: bzrlib/builtins.py:1422
675
# help of 'switch' option of 'branch' command
676
#: breezy/builtins.py:1421
691
677
msgid "Switch the checkout in the current directory to the new branch."
692
678
msgstr ""
693
679
694
#: bzrlib/builtins.py:1425
680
# help of 'stacked' option of 'branch' command
681
#: breezy/builtins.py:1424
695
682
msgid ""
696
683
"Create a stacked branch referring to the source branch. The new branch will "
697
684
"depend on the availability of the source branch for all operations."
698
685
msgstr ""
699
686
700
#: bzrlib/builtins.py:1429
687
# help of 'standalone' option of 'branch' command
688
#: breezy/builtins.py:1428
701
689
msgid "Do not use a shared repository, even if available."
702
msgstr "Jangan menggunakan repositori, bahkan jika tersedia."
690
msgstr ""
703
691
704
#: bzrlib/builtins.py:1431
692
# help of 'use-existing-dir' option of 'branch' command
693
#: breezy/builtins.py:1430
705
694
msgid ""
706
695
"By default branch will fail if the target directory exists, but does not "
707
696
"already have a control directory. This flag will allow branch to proceed."
708
697
msgstr ""
709
698
710
#: bzrlib/builtins.py:1436
699
# help of 'bind' option of 'branch' command
700
#: breezy/builtins.py:1435
711
701
msgid "Bind new branch to from location."
712
702
msgstr ""
713
703
714
#: bzrlib/builtins.py:1483
704
#: breezy/builtins.py:1482
715
705
#, python-format
716
706
msgid "Target directory \"%s\" already exists."
717
707
msgstr ""
718
708
719
#: bzrlib/builtins.py:1495
709
#: breezy/builtins.py:1494
720
710
#, python-format
721
711
msgid "Parent of \"%s\" does not exist."
722
712
msgstr ""
723
713
724
#: bzrlib/builtins.py:1514
714
#: breezy/builtins.py:1513
715
#, python-brace-format
725
716
msgid "The branch {0} has no revision {1}."
726
717
msgstr ""
727
718
728
#: bzrlib/builtins.py:1529 bzrlib/push.py:53
719
#: breezy/builtins.py:1528 breezy/push.py:53
729
720
#, python-format
730
721
msgid "Created new stacked branch referring to %s."
731
722
msgstr ""
732
723
733
#: bzrlib/builtins.py:1533
724
#: breezy/builtins.py:1532
734
725
#, python-format
735
726
msgid "Branched %d revision."
736
727
msgid_plural "Branched %d revisions."
737
728
msgstr[0] ""
738
729
msgstr[1] ""
739
730
740
#: bzrlib/builtins.py:1538
731
#: breezy/builtins.py:1537
741
732
#, python-format
742
733
msgid "New branch bound to %s"
743
734
msgstr ""
744
735
745
#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
736
#: breezy/builtins.py:1542 breezy/builtins.py:6283
746
737
#, python-format
747
738
msgid "Switched to branch: %s"
748
739
msgstr ""
749
740
750
#: bzrlib/builtins.py:1548
741
#: breezy/builtins.py:1547
751
742
msgid "List the branches available at the current location."
752
743
msgstr ""
753
744
754
#: bzrlib/builtins.py:1550
745
#: breezy/builtins.py:1549
755
746
msgid ""
756
747
"This command will print the names of all the branches at the current\n"
757
748
"location."
758
749
msgstr ""
759
750
760
#: bzrlib/builtins.py:1557
751
# help of 'recursive' option of 'branches' command
752
#: breezy/builtins.py:1556
761
753
msgid ""
762
754
"Recursively scan for branches rather than just looking in the specified "
763
755
"location."
764
756
msgstr ""
765
757
766
#: bzrlib/builtins.py:1586
758
#: breezy/builtins.py:1585
767
759
msgid "(default)"
768
msgstr "(Standar)"
760
msgstr ""
769
761
770
#: bzrlib/builtins.py:1598
762
#: breezy/builtins.py:1597
771
763
msgid "Create a new checkout of an existing branch."
772
764
msgstr ""
773
765
774
#: bzrlib/builtins.py:1600
766
#: breezy/builtins.py:1599
775
767
msgid ""
776
768
"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
777
769
"for\n"
781
773
"location using SFTP."
782
774
msgstr ""
783
775
784
#: bzrlib/builtins.py:1605
776
#: breezy/builtins.py:1604
785
777
msgid ""
786
778
"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
787
779
"will\n"
788
"be used. In other words, \"checkout ../foo/bar\" will attempt to create "
789
"./bar.\n"
780
"be used. In other words, \"checkout ../foo/bar\" will attempt to create ./"
781
"bar.\n"
790
782
"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
791
783
"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
792
784
"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
793
785
"create ./foo-bar."
794
786
msgstr ""
795
787
796
#: bzrlib/builtins.py:1612
788
#: breezy/builtins.py:1611
797
789
msgid ""
798
790
"To retrieve the branch as of a particular revision, supply the --revision\n"
799
791
"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
803
795
"code.)"
804
796
msgstr ""
805
797
806
#: bzrlib/builtins.py:1622
798
# help of 'lightweight' option of 'checkout' command
799
#: breezy/builtins.py:1621
807
800
msgid ""
808
801
"Perform a lightweight checkout. Lightweight checkouts depend on access to "
809
802
"the branch for every operation. Normal checkouts can perform common "
811
804
"commits."
812
805
msgstr ""
813
806
814
#: bzrlib/builtins.py:1629
807
# help of 'files-from' option of 'branch' command
808
# help of 'files-from' option of 'checkout' command
809
#: breezy/builtins.py:1628
815
810
msgid "Get file contents from this tree."
816
811
msgstr ""
817
812
818
#: bzrlib/builtins.py:1631
813
# help of 'hardlink' option of 'branch' command
814
# help of 'hardlink' option of 'checkout' command
815
#: breezy/builtins.py:1630
819
816
msgid "Hard-link working tree files where possible."
820
817
msgstr ""
821
818
822
#: bzrlib/builtins.py:1672
819
#: breezy/builtins.py:1671
823
820
msgid ""
824
821
"Show list of renamed files.\n"
825
822
" "
826
823
msgstr ""
827
824
828
#: bzrlib/builtins.py:1700
825
#: breezy/builtins.py:1699
829
826
msgid "Update a working tree to a new revision."
830
827
msgstr ""
831
828
832
#: bzrlib/builtins.py:1702
829
#: breezy/builtins.py:1701
833
830
msgid ""
834
831
"This will perform a merge of the destination revision (the tip of the\n"
835
832
"branch, or the specified revision) into the working tree, and then make\n"
836
833
"that revision the basis revision for the working tree. "
837
834
msgstr ""
838
835
839
#: bzrlib/builtins.py:1706
836
#: breezy/builtins.py:1705
840
837
msgid ""
841
838
"You can use this to visit an older revision, or to update a working tree\n"
842
839
"that is out of date from its branch."
843
840
msgstr ""
844
841
845
#: bzrlib/builtins.py:1709
842
#: breezy/builtins.py:1708
846
843
msgid ""
847
844
"If there are any uncommitted changes in the tree, they will be carried\n"
848
845
"across and remain as uncommitted changes after the update. To discard\n"
849
"these changes, use 'bzr revert'. The uncommitted changes may conflict\n"
846
"these changes, use 'brz revert'. The uncommitted changes may conflict\n"
850
847
"with the changes brought in by the change in basis revision."
851
848
msgstr ""
852
849
853
#: bzrlib/builtins.py:1714
850
#: breezy/builtins.py:1713
854
851
msgid ""
855
"If the tree's branch is bound to a master branch, bzr will also update\n"
852
"If the tree's branch is bound to a master branch, brz will also update\n"
856
853
"the branch from the master."
857
854
msgstr ""
858
855
859
#: bzrlib/builtins.py:1717
856
#: breezy/builtins.py:1716
860
857
msgid ""
861
858
"You cannot update just a single file or directory, because each Bazaar\n"
862
859
"working tree has just a single basis revision. If you want to restore a\n"
863
"file that has been removed locally, use 'bzr revert' instead of 'bzr\n"
860
"file that has been removed locally, use 'brz revert' instead of 'brz\n"
864
861
"update'. If you want to restore a file to its state in a previous\n"
865
"revision, use 'bzr revert' with a '-r' option, or use 'bzr cat' to write\n"
862
"revision, use 'brz revert' with a '-r' option, or use 'brz cat' to write\n"
866
863
"out the old content of that file to a new location."
867
864
msgstr ""
868
865
869
#: bzrlib/builtins.py:1724
866
#: breezy/builtins.py:1723
870
867
msgid ""
871
868
"The 'dir' argument, if given, must be the location of the root of a\n"
872
869
"working tree to update. By default, the working tree that contains the \n"
873
870
"current working directory is used."
874
871
msgstr ""
875
872
876
#: bzrlib/builtins.py:1740
877
msgid "bzr update --revision takes exactly one revision"
878
msgstr ""
879
880
#: bzrlib/builtins.py:1748
881
msgid "bzr update can only update a whole tree, not a file or subdirectory"
882
msgstr ""
883
884
#: bzrlib/builtins.py:1779
873
#: breezy/builtins.py:1739
874
msgid "brz update --revision takes exactly one revision"
875
msgstr ""
876
877
#: breezy/builtins.py:1747
878
msgid "brz update can only update a whole tree, not a file or subdirectory"
879
msgstr ""
880
881
#: breezy/builtins.py:1778
882
#, python-brace-format
885
883
msgid "Tree is up to date at revision {0} of branch {1}"
886
884
msgstr ""
887
885
888
#: bzrlib/builtins.py:1795
886
#: breezy/builtins.py:1794
889
887
#, python-format
890
888
msgid ""
891
889
"branch has no revision %s\n"
892
"bzr update --revision only works for a revision in the branch history"
890
"brz update --revision only works for a revision in the branch history"
893
891
msgstr ""
894
892
895
#: bzrlib/builtins.py:1801
893
#: breezy/builtins.py:1800
894
#, python-brace-format
896
895
msgid "Updated to revision {0} of branch {1}"
897
896
msgstr ""
898
897
899
#: bzrlib/builtins.py:1805
898
#: breezy/builtins.py:1804
900
899
msgid ""
901
"Your local commits will now show as pending merges with 'bzr status', and "
902
"can be committed with 'bzr commit'."
900
"Your local commits will now show as pending merges with 'brz status', and "
901
"can be committed with 'brz commit'."
903
902
msgstr ""
904
903
905
#: bzrlib/builtins.py:1814
904
#: breezy/builtins.py:1813
906
905
msgid "Show information about a working tree, branch or repository."
907
906
msgstr ""
908
907
909
#: bzrlib/builtins.py:1816
908
#: breezy/builtins.py:1815
910
909
msgid ""
911
910
"This command will show all known locations and formats associated to the\n"
912
911
"tree, branch or repository."
913
912
msgstr ""
914
913
915
#: bzrlib/builtins.py:1819
914
#: breezy/builtins.py:1818
916
915
msgid ""
917
916
"In verbose mode, statistical information is included with each report.\n"
918
917
"To see extended statistic information, use a verbosity level of 2 or\n"
919
918
"higher by specifying the verbose option multiple times, e.g. -vv."
920
919
msgstr ""
921
920
922
#: bzrlib/builtins.py:1823
921
#: breezy/builtins.py:1822
923
922
msgid "Branches and working trees will also report any missing revisions."
924
923
msgstr ""
925
924
926
#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
927
#: bzrlib/builtins.py:6466
925
#: breezy/builtins.py:1824 breezy/builtins.py:3742 breezy/builtins.py:4883
926
#: breezy/builtins.py:6469
928
927
msgid ":Examples:"
929
msgstr ":Misal:"
928
msgstr ""
930
929
931
#: bzrlib/builtins.py:1827
930
#: breezy/builtins.py:1826
932
931
msgid " Display information on the format and related locations:"
933
932
msgstr ""
934
933
935
#: bzrlib/builtins.py:1829
936
msgid " bzr info"
934
#: breezy/builtins.py:1828
935
msgid " brz info"
937
936
msgstr ""
938
937
939
#: bzrlib/builtins.py:1831
938
#: breezy/builtins.py:1830
940
939
msgid ""
941
940
" Display the above together with extended format information and\n"
942
941
" basic statistics (like the number of files in the working tree and\n"
943
942
" number of revisions in the branch and repository):"
944
943
msgstr ""
945
944
946
#: bzrlib/builtins.py:1835
947
msgid " bzr info -v"
945
#: breezy/builtins.py:1834
946
msgid " brz info -v"
948
947
msgstr ""
949
948
950
#: bzrlib/builtins.py:1837
949
#: breezy/builtins.py:1836
951
950
msgid " Display the above together with number of committers to the branch:"
952
951
msgstr ""
953
952
954
#: bzrlib/builtins.py:1839
955
msgid " bzr info -vv"
953
#: breezy/builtins.py:1838
954
msgid " brz info -vv"
956
955
msgstr ""
957
956
958
#: bzrlib/builtins.py:1858
957
#: breezy/builtins.py:1857
959
958
msgid "Remove files or directories."
960
msgstr "Hapus file atau direktori."
959
msgstr ""
961
960
962
#: bzrlib/builtins.py:1860
961
#: breezy/builtins.py:1859
963
962
msgid ""
964
963
"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
965
964
"delete them if they can easily be recovered using revert otherwise they\n"
968
967
"Bazaar but missing in your tree and stop tracking them for you."
969
968
msgstr ""
970
969
971
#: bzrlib/builtins.py:1868
970
# help of 'new' option of 'remove' command
971
#: breezy/builtins.py:1867
972
972
msgid "Only remove files that have never been committed."
973
msgstr "Hanya menghapus file yang belum pernah dilakukan."
973
msgstr ""
974
974
975
#: bzrlib/builtins.py:1870
975
# help of 'file-deletion-strategy' option of 'remove' command
976
#: breezy/builtins.py:1869
976
977
msgid "The file deletion mode to be used."
977
msgstr "Modus penghapusan file yang akan digunakan."
978
msgstr ""
978
979
979
#: bzrlib/builtins.py:1871
980
# title of 'file-deletion-strategy' option of 'remove' command
981
#: breezy/builtins.py:1870
980
982
msgid "Deletion Strategy"
981
msgstr "Hapus Strategi"
983
msgstr ""
982
984
983
#: bzrlib/builtins.py:1872
985
# help of 'file-deletion-strategy=safe' option of 'remove' command
986
#: breezy/builtins.py:1871
984
987
msgid "Backup changed files (default)."
985
988
msgstr ""
986
989
987
#: bzrlib/builtins.py:1873
988
msgid "Delete from bzr but leave the working copy."
990
# help of 'file-deletion-strategy=keep' option of 'remove' command
991
#: breezy/builtins.py:1872
992
msgid "Delete from brz but leave the working copy."
989
993
msgstr ""
990
994
991
#: bzrlib/builtins.py:1874
995
# help of 'file-deletion-strategy=no-backup' option of 'remove' command
996
#: breezy/builtins.py:1873
992
997
msgid "Don't backup changed files."
993
998
msgstr ""
994
999
995
#: bzrlib/builtins.py:1875
996
msgid ""
997
"Delete all the specified files, even if they can not be recovered and even "
998
"if they are non-empty directories. (deprecated, use no-backup)"
999
msgstr ""
1000
1001
#: bzrlib/builtins.py:1884
1002
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
1003
msgstr ""
1004
1005
#: bzrlib/builtins.py:1901
1000
#: breezy/builtins.py:1894
1006
1001
msgid "No matching files."
1007
msgstr "Tidak ada file yang cocok."
1008
1009
#: bzrlib/builtins.py:1962
1010
msgid "Reconcile bzr metadata in a branch."
1011
msgstr ""
1012
1013
#: bzrlib/builtins.py:1964
1002
msgstr ""
1003
1004
#: breezy/builtins.py:1955
1005
msgid "Reconcile brz metadata in a branch."
1006
msgstr ""
1007
1008
#: breezy/builtins.py:1957
1014
1009
msgid ""
1015
1010
"This can correct data mismatches that may have been caused by\n"
1016
"previous ghost operations or bzr upgrades. You should only\n"
1017
"need to run this command if 'bzr check' or a bzr developer\n"
1011
"previous ghost operations or brz upgrades. You should only\n"
1012
"need to run this command if 'brz check' or a brz developer\n"
1018
1013
"advises you to run it."
1019
1014
msgstr ""
1020
1015
1021
#: bzrlib/builtins.py:1969
1016
#: breezy/builtins.py:1962
1022
1017
msgid ""
1023
1018
"If a second branch is provided, cross-branch reconciliation is\n"
1024
1019
"also attempted, which will check that data like the tree root\n"
1025
"id which was not present in very early bzr versions is represented\n"
1020
"id which was not present in very early brz versions is represented\n"
1026
1021
"correctly in both branches."
1027
1022
msgstr ""
1028
1023
1029
#: bzrlib/builtins.py:1974
1024
#: breezy/builtins.py:1967
1030
1025
msgid ""
1031
1026
"At the same time it is run it may recompress data resulting in\n"
1032
1027
"a potential saving in disk space or performance gain."
1033
1028
msgstr ""
1034
1029
1035
#: bzrlib/builtins.py:1977
1030
#: breezy/builtins.py:1970
1036
1031
msgid "The branch *MUST* be on a listable system such as local disk or sftp."
1037
1032
msgstr ""
1038
1033
1039
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1034
# help of 'format=2a' option of 'init' command
1035
# help of 'format=default' option of 'init' command
1036
# help of 'format=2a' option of 'init-repository' command
1037
# help of 'format=default' option of 'init-repository' command
1038
# help of 'format=2a' option of 'upgrade' command
1039
# help of 'format=default' option of 'upgrade' command
1040
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1040
1041
msgid ""
1041
1042
"Format for the bzr 2.0 series.\n"
1042
1043
"Uses group-compress storage.\n"
1043
1044
"Provides rich roots which are a one-way transition.\n"
1044
1045
msgstr ""
1045
1046
1046
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1047
# help of 'format=pack-0.92' option of 'init' command
1048
# help of 'format=pack-0.92' option of 'init-repository' command
1049
# help of 'format=pack-0.92' option of 'upgrade' command
1050
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1047
1051
msgid ""
1048
1052
"Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
1049
1053
"bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
1050
1054
msgstr ""
1051
1055
1052
#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
1056
# help of 'format=development-colo' option of 'init' command
1057
# help of 'format=development-colo' option of 'init-repository' command
1058
# help of 'format=development-colo' option of 'upgrade' command
1059
#: breezy/builtins.py:2037 breezy/builtins.py:2155 breezy/builtins.py:3777
1053
1060
msgid "The 2a format with experimental support for colocated branches.\n"
1054
1061
msgstr ""
1055
1062
1056
#: bzrlib/builtins.py:2045
1063
#: breezy/builtins.py:2038
1057
1064
msgid "Make a directory into a versioned branch."
1058
1065
msgstr ""
1059
1066
1060
#: bzrlib/builtins.py:2047
1067
#: breezy/builtins.py:2040
1061
1068
msgid ""
1062
1069
"Use this to create an empty branch, or before importing an\n"
1063
1070
"existing project."
1064
1071
msgstr ""
1065
1072
1066
#: bzrlib/builtins.py:2050
1073
#: breezy/builtins.py:2043
1067
1074
msgid ""
1068
1075
"If there is a repository in a parent directory of the location, then\n"
1069
1076
"the history of the branch will be stored in the repository. Otherwise\n"
1071
1078
"in the .bzr directory."
1072
1079
msgstr ""
1073
1080
1074
#: bzrlib/builtins.py:2055
1081
#: breezy/builtins.py:2048
1075
1082
msgid ""
1076
1083
"If there is already a branch at the location but it has no working tree,\n"
1077
"the tree can be populated with 'bzr checkout'."
1084
"the tree can be populated with 'brz checkout'."
1078
1085
msgstr ""
1079
1086
1080
#: bzrlib/builtins.py:2058
1087
#: breezy/builtins.py:2051
1081
1088
msgid "Recipe for importing a tree of files::"
1082
1089
msgstr ""
1083
1090
1084
#: bzrlib/builtins.py:2060
1091
#: breezy/builtins.py:2053
1085
1092
msgid ""
1086
1093
" cd ~/project\n"
1087
" bzr init\n"
1088
" bzr add .\n"
1089
" bzr status\n"
1090
" bzr commit -m \"imported project\""
1091
msgstr ""
1092
1093
#: bzrlib/builtins.py:2071
1094
msgid ""
1095
"Create the path leading up to the branch if it does not already exist."
1096
msgstr ""
1097
1098
#: bzrlib/builtins.py:2074
1094
" brz init\n"
1095
" brz add .\n"
1096
" brz status\n"
1097
" brz commit -m \"imported project\""
1098
msgstr ""
1099
1100
# help of 'create-prefix' option of 'init' command
1101
# help of 'create-prefix' option of 'push' command
1102
#: breezy/builtins.py:2064
1103
msgid "Create the path leading up to the branch if it does not already exist."
1104
msgstr ""
1105
1106
# help of 'format' option of 'init' command
1107
#: breezy/builtins.py:2067
1099
1108
msgid "Specify a format for this branch. See \"help formats\"."
1100
1109
msgstr ""
1101
1110
1102
#: bzrlib/builtins.py:2082
1103
msgid ""
1104
"Never change revnos or the existing log. Append revisions to it only."
1111
# help of 'append-revisions-only' option of 'init' command
1112
#: breezy/builtins.py:2075
1113
msgid "Never change revnos or the existing log. Append revisions to it only."
1105
1114
msgstr ""
1106
1115
1107
#: bzrlib/builtins.py:2085
1116
# help of 'no-tree' option of 'init' command
1117
#: breezy/builtins.py:2078
1108
1118
msgid "Create a branch without a working tree."
1109
1119
msgstr ""
1110
1120
1111
#: bzrlib/builtins.py:2105 bzrlib/push.py:110
1121
#: breezy/builtins.py:2098 breezy/push.py:110
1112
1122
#, python-format
1113
1123
msgid ""
1114
1124
"Parent directory of %s does not exist.\n"
1115
1125
"You may supply --create-prefix to create all leading parent directories."
1116
1126
msgstr ""
1117
1127
1118
#: bzrlib/builtins.py:2139
1128
#: breezy/builtins.py:2132
1119
1129
msgid ""
1120
1130
"This branch format cannot be set to append-revisions-only. Try --default."
1121
1131
msgstr ""
1122
1132
1123
#: bzrlib/builtins.py:2150
1133
#: breezy/builtins.py:2143
1134
#, python-brace-format
1124
1135
msgid "Created a {0} (format: {1})\n"
1125
1136
msgstr ""
1126
1137
1127
#: bzrlib/builtins.py:2159
1138
#: breezy/builtins.py:2152
1128
1139
#, python-format
1129
1140
msgid "Using shared repository: %s\n"
1130
1141
msgstr ""
1131
1142
1132
#: bzrlib/builtins.py:2163
1143
#: breezy/builtins.py:2156
1133
1144
msgid "Create a shared repository for branches to share storage space."
1134
1145
msgstr ""
1135
1146
1136
#: bzrlib/builtins.py:2165
1147
#: breezy/builtins.py:2158
1137
1148
msgid ""
1138
1149
"New branches created under the repository directory will store their\n"
1139
1150
"revisions in the repository, not in the branch directory. For branches\n"
1141
1152
"speeds up the creation of new branches."
1142
1153
msgstr ""
1143
1154
1144
#: bzrlib/builtins.py:2170
1155
#: breezy/builtins.py:2163
1145
1156
msgid ""
1146
1157
"If the --no-trees option is given then the branches in the repository\n"
1147
1158
"will not have working trees by default. They will still exist as \n"
1151
1162
"branches, such as on a server."
1152
1163
msgstr ""
1153
1164
1154
#: bzrlib/builtins.py:2177
1165
#: breezy/builtins.py:2170
1155
1166
msgid ""
1156
1167
":Examples:\n"
1157
1168
" Create a shared repository holding just branches::"
1158
1169
msgstr ""
1159
1170
1160
#: bzrlib/builtins.py:2180
1171
#: breezy/builtins.py:2173
1161
1172
msgid ""
1162
" bzr init-repo --no-trees repo\n"
1163
" bzr init repo/trunk"
1173
" brz init-repo --no-trees repo\n"
1174
" brz init repo/trunk"
1164
1175
msgstr ""
1165
1176
1166
#: bzrlib/builtins.py:2183
1177
#: breezy/builtins.py:2176
1167
1178
msgid " Make a lightweight checkout elsewhere::"
1168
1179
msgstr ""
1169
1180
1170
#: bzrlib/builtins.py:2185
1181
#: breezy/builtins.py:2178
1171
1182
msgid ""
1172
" bzr checkout --lightweight repo/trunk trunk-checkout\n"
1183
" brz checkout --lightweight repo/trunk trunk-checkout\n"
1173
1184
" cd trunk-checkout\n"
1174
1185
" (add files here)"
1175
1186
msgstr ""
1176
1187
1177
#: bzrlib/builtins.py:2193
1188
# help of 'format' option of 'init-repository' command
1189
#: breezy/builtins.py:2186
1178
1190
msgid ""
1179
"Specify a format for this repository. See \"bzr help formats\" for details."
1191
"Specify a format for this repository. See \"brz help formats\" for details."
1180
1192
msgstr ""
1181
1193
1182
#: bzrlib/builtins.py:2197
1194
# title of 'format' option of 'init-repository' command
1195
#: breezy/builtins.py:2190
1183
1196
msgid "Repository format"
1184
msgstr "Format Repositori"
1197
msgstr ""
1185
1198
1186
#: bzrlib/builtins.py:2199
1199
# help of 'no-trees' option of 'init-repository' command
1200
#: breezy/builtins.py:2192
1187
1201
msgid "Branches in the repository will default to not having a working tree."
1188
1202
msgstr ""
1189
1203
1190
#: bzrlib/builtins.py:2225
1204
#: breezy/builtins.py:2218
1191
1205
msgid "Show differences in the working tree, between revisions or branches."
1192
1206
msgstr ""
1193
1207
1194
#: bzrlib/builtins.py:2227
1208
#: breezy/builtins.py:2220
1195
1209
msgid ""
1196
1210
"If no arguments are given, all changes for the current tree are listed.\n"
1197
1211
"If files are given, only the changes in those files are listed.\n"
1201
1215
"given."
1202
1216
msgstr ""
1203
1217
1204
#: bzrlib/builtins.py:2234
1218
#: breezy/builtins.py:2227
1205
1219
msgid ""
1206
"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
1220
"\"brz diff -p1\" is equivalent to \"brz diff --prefix old/:new/\", and\n"
1207
1221
"produces patches suitable for \"patch -p1\"."
1208
1222
msgstr ""
1209
1223
1210
#: bzrlib/builtins.py:2237
1224
#: breezy/builtins.py:2230
1211
1225
msgid ""
1212
1226
"Note that when using the -r argument with a range of revisions, the\n"
1213
1227
"differences are computed between the two specified revisions. That\n"
1214
1228
"is, the command does not show the changes introduced by the first \n"
1215
1229
"revision in the range. This differs from the interpretation of \n"
1216
"revision ranges used by \"bzr log\" which includes the first revision\n"
1230
"revision ranges used by \"brz log\" which includes the first revision\n"
1217
1231
"in the range."
1218
1232
msgstr ""
1219
1233
1220
#: bzrlib/builtins.py:2244
1234
#: breezy/builtins.py:2237
1221
1235
msgid ""
1222
1236
":Exit values:\n"
1223
1237
" 1 - changed\n"
1226
1240
" 0 - no change"
1227
1241
msgstr ""
1228
1242
1229
#: bzrlib/builtins.py:2250
1243
#: breezy/builtins.py:2243
1230
1244
msgid ""
1231
1245
":Examples:\n"
1232
1246
" Shows the difference in the working tree versus the last commit::"
1233
1247
msgstr ""
1234
1248
1235
#: bzrlib/builtins.py:2253
1236
msgid " bzr diff"
1249
#: breezy/builtins.py:2246
1250
msgid " brz diff"
1237
1251
msgstr ""
1238
1252
1239
#: bzrlib/builtins.py:2255
1253
#: breezy/builtins.py:2248
1240
1254
msgid " Difference between the working tree and revision 1::"
1241
1255
msgstr ""
1242
1256
1243
#: bzrlib/builtins.py:2257
1244
msgid " bzr diff -r1"
1257
#: breezy/builtins.py:2250
1258
msgid " brz diff -r1"
1245
1259
msgstr ""
1246
1260
1247
#: bzrlib/builtins.py:2259
1261
#: breezy/builtins.py:2252
1248
1262
msgid " Difference between revision 3 and revision 1::"
1249
1263
msgstr ""
1250
1264
1251
#: bzrlib/builtins.py:2261
1252
msgid " bzr diff -r1..3"
1265
#: breezy/builtins.py:2254
1266
msgid " brz diff -r1..3"
1253
1267
msgstr ""
1254
1268
1255
#: bzrlib/builtins.py:2263
1269
#: breezy/builtins.py:2256
1256
1270
msgid " Difference between revision 3 and revision 1 for branch xxx::"
1257
1271
msgstr ""
1258
1272
1259
#: bzrlib/builtins.py:2265
1260
msgid " bzr diff -r1..3 xxx"
1273
#: breezy/builtins.py:2258
1274
msgid " brz diff -r1..3 xxx"
1261
1275
msgstr ""
1262
1276
1263
#: bzrlib/builtins.py:2267
1277
#: breezy/builtins.py:2260
1264
1278
msgid " The changes introduced by revision 2 (equivalent to -r1..2)::"
1265
1279
msgstr ""
1266
1280
1267
#: bzrlib/builtins.py:2269
1268
msgid " bzr diff -c2"
1281
#: breezy/builtins.py:2262
1282
msgid " brz diff -c2"
1269
1283
msgstr ""
1270
1284
1271
#: bzrlib/builtins.py:2271
1285
#: breezy/builtins.py:2264
1272
1286
msgid ""
1273
1287
" To see the changes introduced by revision X::\n"
1274
1288
" \n"
1275
" bzr diff -cX"
1289
" brz diff -cX"
1276
1290
msgstr ""
1277
1291
1278
#: bzrlib/builtins.py:2275
1292
#: breezy/builtins.py:2268
1279
1293
msgid ""
1280
1294
" Note that in the case of a merge, the -c option shows the changes\n"
1281
1295
" compared to the left hand parent. To see the changes against\n"
1282
1296
" another parent, use::"
1283
1297
msgstr ""
1284
1298
1285
#: bzrlib/builtins.py:2279
1286
msgid " bzr diff -r<chosen_parent>..X"
1299
#: breezy/builtins.py:2272
1300
msgid " brz diff -r<chosen_parent>..X"
1287
1301
msgstr ""
1288
1302
1289
#: bzrlib/builtins.py:2281
1303
#: breezy/builtins.py:2274
1290
1304
msgid ""
1291
1305
" The changes between the current revision and the previous revision\n"
1292
1306
" (equivalent to -c-1 and -r-2..-1)"
1293
1307
msgstr ""
1294
1308
1295
#: bzrlib/builtins.py:2284
1296
msgid " bzr diff -r-2.."
1309
#: breezy/builtins.py:2277
1310
msgid " brz diff -r-2.."
1297
1311
msgstr ""
1298
1312
1299
#: bzrlib/builtins.py:2286
1313
#: breezy/builtins.py:2279
1300
1314
msgid " Show just the differences for file NEWS::"
1301
1315
msgstr ""
1302
1316
1303
#: bzrlib/builtins.py:2288
1304
msgid " bzr diff NEWS"
1317
#: breezy/builtins.py:2281
1318
msgid " brz diff NEWS"
1305
1319
msgstr ""
1306
1320
1307
#: bzrlib/builtins.py:2290
1321
#: breezy/builtins.py:2283
1308
1322
msgid " Show the differences in working tree xxx for file NEWS::"
1309
1323
msgstr ""
1310
1324
1311
#: bzrlib/builtins.py:2292
1312
msgid " bzr diff xxx/NEWS"
1325
#: breezy/builtins.py:2285
1326
msgid " brz diff xxx/NEWS"
1313
1327
msgstr ""
1314
1328
1315
#: bzrlib/builtins.py:2294
1329
#: breezy/builtins.py:2287
1316
1330
msgid " Show the differences from branch xxx to this working tree:"
1317
1331
msgstr ""
1318
1332
1319
#: bzrlib/builtins.py:2296
1320
msgid " bzr diff --old xxx"
1333
#: breezy/builtins.py:2289
1334
msgid " brz diff --old xxx"
1321
1335
msgstr ""
1322
1336
1323
#: bzrlib/builtins.py:2298
1337
#: breezy/builtins.py:2291
1324
1338
msgid " Show the differences between two branches for file NEWS::"
1325
1339
msgstr ""
1326
1340
1327
#: bzrlib/builtins.py:2300
1328
msgid " bzr diff --old xxx --new yyy NEWS"
1329
msgstr ""
1330
1331
#: bzrlib/builtins.py:2302
1332
msgid " Same as 'bzr diff' but prefix paths with old/ and new/::"
1333
msgstr ""
1334
1335
#: bzrlib/builtins.py:2304
1341
#: breezy/builtins.py:2293
1342
msgid " brz diff --old xxx --new yyy NEWS"
1343
msgstr ""
1344
1345
#: breezy/builtins.py:2295
1346
msgid " Same as 'brz diff' but prefix paths with old/ and new/::"
1347
msgstr ""
1348
1349
#: breezy/builtins.py:2297
1336
1350
msgid ""
1337
" bzr diff --prefix old/:new/\n"
1351
" brz diff --prefix old/:new/\n"
1338
1352
" \n"
1339
1353
" Show the differences using a custom diff program with options::\n"
1340
1354
" \n"
1341
" bzr diff --using /usr/bin/diff --diff-options -wu"
1355
" brz diff --using /usr/bin/diff --diff-options -wu"
1342
1356
msgstr ""
1343
1357
1344
#: bzrlib/builtins.py:2314
1358
# help of 'diff-options' option of 'diff' command
1359
#: breezy/builtins.py:2307
1345
1360
msgid "Pass these options to the external diff program."
1346
msgstr "Melewati pilihan ini untuk program diff eksternal."
1361
msgstr ""
1347
1362
1348
#: bzrlib/builtins.py:2317
1363
# help of 'prefix' option of 'diff' command
1364
#: breezy/builtins.py:2310
1349
1365
msgid ""
1350
1366
"Set prefixes added to old and new filenames, as two values separated by a "
1351
1367
"colon. (eg \"old/:new/\")."
1352
1368
msgstr ""
1353
1369
1354
#: bzrlib/builtins.py:2320
1370
# help of 'old' option of 'diff' command
1371
#: breezy/builtins.py:2313
1355
1372
msgid "Branch/tree to compare from."
1356
1373
msgstr ""
1357
1374
1358
#: bzrlib/builtins.py:2324
1375
# help of 'new' option of 'diff' command
1376
#: breezy/builtins.py:2317
1359
1377
msgid "Branch/tree to compare to."
1360
1378
msgstr ""
1361
1379
1362
#: bzrlib/builtins.py:2330
1380
# help of 'using' option of 'diff' command
1381
#: breezy/builtins.py:2323
1363
1382
msgid "Use this command to compare files."
1364
msgstr "Gunakan perintah ini untuk membandingkan file."
1383
msgstr ""
1365
1384
1366
#: bzrlib/builtins.py:2335
1385
# help of 'format' option of 'diff' command
1386
#: breezy/builtins.py:2328
1367
1387
msgid "Diff format to use."
1368
1388
msgstr ""
1369
1389
1370
#: bzrlib/builtins.py:2337
1390
# title of 'format' option of 'diff' command
1391
#: breezy/builtins.py:2330
1371
1392
msgid "Diff format"
1372
1393
msgstr ""
1373
1394
1374
#: bzrlib/builtins.py:2359
1395
# help of 'context' option of 'diff' command
1396
#: breezy/builtins.py:2332
1397
msgid "How many lines of context to show."
1398
msgstr ""
1399
1400
#: breezy/builtins.py:2357
1375
1401
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1376
1402
msgstr ""
1377
1403
1378
#: bzrlib/builtins.py:2363
1379
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1404
#: breezy/builtins.py:2361
1405
msgid "brz diff --revision takes exactly one or two revision specifiers"
1380
1406
msgstr ""
1381
1407
1382
#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
1383
#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
1408
#: breezy/builtins.py:2366 breezy/builtins.py:2763 breezy/builtins.py:2776
1409
#: breezy/builtins.py:2784 breezy/builtins.py:4957
1410
#, python-brace-format
1384
1411
msgid "{0} and {1} are mutually exclusive"
1385
1412
msgstr ""
1386
1413
1387
#: bzrlib/builtins.py:2388
1414
#: breezy/builtins.py:2386
1388
1415
msgid ""
1389
1416
"List files deleted in the working tree.\n"
1390
1417
" "
1391
1418
msgstr ""
1392
1419
1393
#: bzrlib/builtins.py:2465
1420
#: breezy/builtins.py:2463
1394
1421
msgid "Show the tree root directory."
1395
1422
msgstr ""
1396
1423
1397
#: bzrlib/builtins.py:2467
1424
#: breezy/builtins.py:2465
1398
1425
msgid ""
1399
1426
"The root is the nearest enclosing directory with a .bzr control\n"
1400
1427
"directory."
1401
1428
msgstr ""
1402
1429
1403
#: bzrlib/builtins.py:2482
1430
#: breezy/builtins.py:2480
1404
1431
msgid "The limit argument must be an integer."
1405
msgstr "Argumen batas harus berupa angka."
1432
msgstr ""
1406
1433
1407
#: bzrlib/builtins.py:2490
1434
#: breezy/builtins.py:2488
1408
1435
msgid "The levels argument must be an integer."
1409
msgstr "Argumen tingkat harus integer."
1436
msgstr ""
1410
1437
1411
#: bzrlib/builtins.py:2495
1438
#: breezy/builtins.py:2493
1412
1439
msgid "Show historical log for a branch or subset of a branch."
1413
1440
msgstr ""
1414
1441
1415
#: bzrlib/builtins.py:2497
1442
#: breezy/builtins.py:2495
1416
1443
msgid ""
1417
"log is bzr's default tool for exploring the history of a branch.\n"
1444
"log is brz's default tool for exploring the history of a branch.\n"
1418
1445
"The branch to use is taken from the first parameter. If no parameters\n"
1419
1446
"are given, the branch containing the working directory is logged.\n"
1420
1447
"Here are some simple examples::"
1421
1448
msgstr ""
1422
1449
1423
#: bzrlib/builtins.py:2502
1450
#: breezy/builtins.py:2500
1424
1451
msgid ""
1425
" bzr log log the current branch\n"
1426
" bzr log foo.py log a file in its branch\n"
1427
" bzr log http://server/branch log a branch on a server"
1452
" brz log log the current branch\n"
1453
" brz log foo.py log a file in its branch\n"
1454
" brz log http://server/branch log a branch on a server"
1428
1455
msgstr ""
1429
1456
1430
#: bzrlib/builtins.py:2506
1457
#: breezy/builtins.py:2504
1431
1458
msgid ""
1432
1459
"The filtering, ordering and information shown for each revision can\n"
1433
1460
"be controlled as explained below. By default, all revisions are\n"
1437
1464
"were merged."
1438
1465
msgstr ""
1439
1466
1440
#: bzrlib/builtins.py:2513
1467
#: breezy/builtins.py:2511
1441
1468
msgid ":Output control:"
1442
msgstr ":Kontrol Output:"
1469
msgstr ""
1443
1470
1444
#: bzrlib/builtins.py:2515
1471
#: breezy/builtins.py:2513
1445
1472
msgid ""
1446
1473
" The log format controls how information about each revision is\n"
1447
1474
" displayed. The standard log formats are called ``long``, ``short``\n"
1448
" and ``line``. The default is long. See ``bzr help log-formats``\n"
1475
" and ``line``. The default is long. See ``brz help log-formats``\n"
1449
1476
" for more details on log formats."
1450
1477
msgstr ""
1451
1478
1452
#: bzrlib/builtins.py:2520
1479
#: breezy/builtins.py:2518
1453
1480
msgid ""
1454
1481
" The following options can be used to control what information is\n"
1455
1482
" displayed::"
1456
1483
msgstr ""
1457
1484
1458
#: bzrlib/builtins.py:2523
1485
#: breezy/builtins.py:2521
1459
1486
msgid ""
1460
1487
" -l N display a maximum of N revisions\n"
1461
1488
" -n N display N levels of revisions (0 for all, 1 for collapsed)\n"
1464
1491
" --show-ids display revision-ids (and file-ids), not just revnos"
1465
1492
msgstr ""
1466
1493
1467
#: bzrlib/builtins.py:2529
1494
#: breezy/builtins.py:2527
1468
1495
msgid ""
1469
1496
" Note that the default number of levels to display is a function of the\n"
1470
1497
" log format. If the -n option is not used, the standard log formats show\n"
1471
1498
" just the top level (mainline)."
1472
1499
msgstr ""
1473
1500
1474
#: bzrlib/builtins.py:2533
1501
#: breezy/builtins.py:2531
1475
1502
msgid ""
1476
1503
" Status summaries are shown using status flags like A, M, etc. To see\n"
1477
1504
" the changes explained using words like ``added`` and ``modified``\n"
1478
1505
" instead, use the -vv option."
1479
1506
msgstr ""
1480
1507
1481
#: bzrlib/builtins.py:2537
1508
#: breezy/builtins.py:2535
1482
1509
msgid ":Ordering control:"
1483
1510
msgstr ""
1484
1511
1485
#: bzrlib/builtins.py:2539
1512
#: breezy/builtins.py:2537
1486
1513
msgid ""
1487
1514
" To display revisions from oldest to newest, use the --forward option.\n"
1488
1515
" In most cases, using this option will have little impact on the total\n"
1490
1517
" display revisions like --reverse does when it can."
1491
1518
msgstr ""
1492
1519
1493
#: bzrlib/builtins.py:2544
1520
#: breezy/builtins.py:2542
1494
1521
msgid ":Revision filtering:"
1495
1522
msgstr ""
1496
1523
1497
#: bzrlib/builtins.py:2546
1524
#: breezy/builtins.py:2544
1498
1525
msgid ""
1499
1526
" The -r option can be used to specify what revision or range of revisions\n"
1500
1527
" to filter against. The various forms are shown below::"
1501
1528
msgstr ""
1502
1529
1503
#: bzrlib/builtins.py:2549
1530
#: breezy/builtins.py:2547
1504
1531
msgid ""
1505
1532
" -rX display revision X\n"
1506
1533
" -rX.. display revision X and later\n"
1508
1535
" -rX..Y display from X to Y inclusive"
1509
1536
msgstr ""
1510
1537
1511
#: bzrlib/builtins.py:2554
1538
#: breezy/builtins.py:2552
1512
1539
msgid ""
1513
" See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
1540
" See ``brz help revisionspec`` for details on how to specify X and Y.\n"
1514
1541
" Some common examples are given below::"
1515
1542
msgstr ""
1516
1543
1517
#: bzrlib/builtins.py:2557
1544
#: breezy/builtins.py:2555
1518
1545
msgid ""
1519
1546
" -r-1 show just the tip\n"
1520
1547
" -r-10.. show the last 10 mainline revisions\n"
1524
1551
" -rdate:yesterday.. show changes since yesterday"
1525
1552
msgstr ""
1526
1553
1527
#: bzrlib/builtins.py:2564
1554
#: breezy/builtins.py:2562
1528
1555
msgid ""
1529
1556
" When logging a range of revisions using -rX..Y, log starts at\n"
1530
1557
" revision Y and searches back in history through the primary\n"
1534
1561
" a nested merge revision and the log will be truncated accordingly."
1535
1562
msgstr ""
1536
1563
1537
#: bzrlib/builtins.py:2571
1564
#: breezy/builtins.py:2569
1538
1565
msgid ":Path filtering:"
1539
1566
msgstr ""
1540
1567
1541
#: bzrlib/builtins.py:2573
1568
#: breezy/builtins.py:2571
1542
1569
msgid ""
1543
1570
" If parameters are given and the first one is not a branch, the log\n"
1544
1571
" will be filtered to show only those revisions that changed the\n"
1545
1572
" nominated files or directories."
1546
1573
msgstr ""
1547
1574
1548
#: bzrlib/builtins.py:2577
1575
#: breezy/builtins.py:2575
1549
1576
msgid ""
1550
1577
" Filenames are interpreted within their historical context. To log a\n"
1551
1578
" deleted file, specify a revision range so that the file existed at\n"
1552
1579
" the end or start of the range."
1553
1580
msgstr ""
1554
1581
1555
#: bzrlib/builtins.py:2581
1582
#: breezy/builtins.py:2579
1556
1583
msgid ""
1557
1584
" Historical context is also important when interpreting pathnames of\n"
1558
1585
" renamed files/directories. Consider the following example:"
1559
1586
msgstr ""
1560
1587
1561
#: bzrlib/builtins.py:2584
1588
#: breezy/builtins.py:2582
1562
1589
msgid ""
1563
1590
" * revision 1: add tutorial.txt\n"
1564
1591
" * revision 2: modify tutorial.txt\n"
1565
1592
" * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
1566
1593
msgstr ""
1567
1594
1568
#: bzrlib/builtins.py:2588
1595
#: breezy/builtins.py:2586
1569
1596
msgid " In this case:"
1570
1597
msgstr ""
1571
1598
1572
#: bzrlib/builtins.py:2590
1573
msgid " * ``bzr log guide.txt`` will log the file added in revision 1"
1574
msgstr ""
1575
1576
#: bzrlib/builtins.py:2592
1577
msgid ""
1578
" * ``bzr log tutorial.txt`` will log the new file added in revision 3"
1579
msgstr ""
1580
1581
#: bzrlib/builtins.py:2594
1582
msgid ""
1583
" * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
1599
#: breezy/builtins.py:2588
1600
msgid " * ``brz log guide.txt`` will log the file added in revision 1"
1601
msgstr ""
1602
1603
#: breezy/builtins.py:2590
1604
msgid " * ``brz log tutorial.txt`` will log the new file added in revision 3"
1605
msgstr ""
1606
1607
#: breezy/builtins.py:2592
1608
msgid ""
1609
" * ``brz log -r2 -p tutorial.txt`` will show the changes made to\n"
1584
1610
" the original file in revision 2."
1585
1611
msgstr ""
1586
1612
1587
#: bzrlib/builtins.py:2597
1613
#: breezy/builtins.py:2595
1588
1614
msgid ""
1589
" * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
1615
" * ``brz log -r2 -p guide.txt`` will display an error message as there\n"
1590
1616
" was no file called guide.txt in revision 2."
1591
1617
msgstr ""
1592
1618
1593
#: bzrlib/builtins.py:2600
1619
#: breezy/builtins.py:2598
1594
1620
msgid ""
1595
1621
" Renames are always followed by log. By design, there is no need to\n"
1596
1622
" explicitly ask for this (and no way to stop logging a file back\n"
1597
1623
" until it was last renamed)."
1598
1624
msgstr ""
1599
1625
1600
#: bzrlib/builtins.py:2604
1626
#: breezy/builtins.py:2602
1601
1627
msgid ":Other filtering:"
1602
1628
msgstr ""
1603
1629
1604
#: bzrlib/builtins.py:2606
1630
#: breezy/builtins.py:2604
1605
1631
msgid ""
1606
1632
" The --match option can be used for finding revisions that match a\n"
1607
1633
" regular expression in a commit message, committer, author or bug.\n"
1610
1636
" --match-message can be used to only match a specific field."
1611
1637
msgstr ""
1612
1638
1613
#: bzrlib/builtins.py:2612
1639
#: breezy/builtins.py:2610
1614
1640
msgid ":Tips & tricks:"
1615
msgstr ":Tip & trik:"
1641
msgstr ""
1616
1642
1617
#: bzrlib/builtins.py:2614
1643
#: breezy/builtins.py:2612
1618
1644
msgid ""
1619
1645
" GUI tools and IDEs are often better at exploring history than command\n"
1620
1646
" line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
1621
" bzr-explorer shell, or the Loggerhead web interface. See the Plugin\n"
1622
" Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1647
" bzr-explorer shell, or the Loggerhead web interface. See the Bazaar\n"
1648
" Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
1623
1649
" <http://wiki.bazaar.canonical.com/IDEIntegration>. "
1624
1650
msgstr ""
1625
1651
1626
#: bzrlib/builtins.py:2620
1627
msgid ""
1628
" You may find it useful to add the aliases below to ``bazaar.conf``::"
1652
#: breezy/builtins.py:2618
1653
msgid " You may find it useful to add the aliases below to ``bazaar.conf``::"
1629
1654
msgstr ""
1630
1655
1631
#: bzrlib/builtins.py:2622
1656
#: breezy/builtins.py:2620
1632
1657
msgid ""
1633
1658
" [ALIASES]\n"
1634
1659
" tip = log -r-1\n"
1636
1661
" show = log -v -p"
1637
1662
msgstr ""
1638
1663
1639
#: bzrlib/builtins.py:2627
1664
#: breezy/builtins.py:2625
1640
1665
msgid ""
1641
" ``bzr tip`` will then show the latest revision while ``bzr top``\n"
1666
" ``brz tip`` will then show the latest revision while ``brz top``\n"
1642
1667
" will show the last 10 mainline revisions. To see the details of a\n"
1643
" particular revision X, ``bzr show -rX``."
1668
" particular revision X, ``brz show -rX``."
1644
1669
msgstr ""
1645
1670
1646
#: bzrlib/builtins.py:2631
1671
#: breezy/builtins.py:2629
1647
1672
msgid ""
1648
1673
" If you are interested in looking deeper into a particular merge X,\n"
1649
" use ``bzr log -n0 -rX``."
1674
" use ``brz log -n0 -rX``."
1650
1675
msgstr ""
1651
1676
1652
#: bzrlib/builtins.py:2634
1677
#: breezy/builtins.py:2632
1653
1678
msgid ""
1654
" ``bzr log -v`` on a branch with lots of history is currently\n"
1679
" ``brz log -v`` on a branch with lots of history is currently\n"
1655
1680
" very slow. A fix for this issue is currently under development.\n"
1656
1681
" With or without that fix, it is recommended that a revision range\n"
1657
1682
" be given when using the -v option."
1658
1683
msgstr ""
1659
1684
1660
#: bzrlib/builtins.py:2639
1685
#: breezy/builtins.py:2637
1661
1686
msgid ""
1662
" bzr has a generic full-text matching plugin, bzr-search, that can be\n"
1687
" brz has a generic full-text matching plugin, brz-search, that can be\n"
1663
1688
" used to find revisions matching user names, commit messages, etc.\n"
1664
1689
" Among other features, this plugin can find all revisions containing\n"
1665
1690
" a list of words but not others."
1666
1691
msgstr ""
1667
1692
1668
#: bzrlib/builtins.py:2644
1693
#: breezy/builtins.py:2642
1669
1694
msgid ""
1670
1695
" When exploring non-mainline history on large projects with deep\n"
1671
1696
" history, the performance of log can be greatly improved by installing\n"
1673
1698
" trading disk space for faster speed."
1674
1699
msgstr ""
1675
1700
1676
#: bzrlib/builtins.py:2653
1701
# help of 'forward' option of 'log' command
1702
#: breezy/builtins.py:2651
1677
1703
msgid "Show from oldest to newest."
1678
msgstr "Tampilkan dari yang lama ke baru."
1704
msgstr ""
1679
1705
1680
#: bzrlib/builtins.py:2656
1706
# help of 'verbose' option of 'log' command
1707
#: breezy/builtins.py:2654
1681
1708
msgid "Show files changed in each revision."
1682
msgstr "Tampilkan file yang diubah dalam setiap revisi."
1709
msgstr ""
1683
1710
1684
#: bzrlib/builtins.py:2662
1711
# help of 'change' option of 'log' command
1712
#: breezy/builtins.py:2660
1685
1713
msgid "Show just the specified revision. See also \"help revisionspec\"."
1686
1714
msgstr ""
1687
1715
1688
#: bzrlib/builtins.py:2666
1716
# help of 'authors' option of 'log' command
1717
#: breezy/builtins.py:2664
1689
1718
msgid "What names to list as authors - first, all or committer."
1690
1719
msgstr ""
1691
1720
1692
#: bzrlib/builtins.py:2667
1721
# title of 'authors' option of 'log' command
1722
#: breezy/builtins.py:2665
1693
1723
msgid "Authors"
1694
1724
msgstr ""
1695
1725
1696
#: bzrlib/builtins.py:2672
1726
# help of 'levels' option of 'log' command
1727
#: breezy/builtins.py:2670
1697
1728
msgid "Number of levels to display - 0 for all, 1 for flat."
1698
1729
msgstr ""
1699
1730
1700
#: bzrlib/builtins.py:2682
1731
# help of 'limit' option of 'log' command
1732
#: breezy/builtins.py:2680
1701
1733
msgid "Limit the output to the first N revisions."
1702
1734
msgstr ""
1703
1735
1704
#: bzrlib/builtins.py:2687
1736
# help of 'show-diff' option of 'log' command
1737
#: breezy/builtins.py:2685
1705
1738
msgid "Show changes made in each revision as a patch."
1706
1739
msgstr ""
1707
"Tampilkan perubahan yang dibuat dalam revisi masing-masing sebagai patch."
1708
1740
1709
#: bzrlib/builtins.py:2689
1741
# help of 'include-merged' option of 'log' command
1742
#: breezy/builtins.py:2687
1710
1743
msgid "Show merged revisions like --levels 0 does."
1711
1744
msgstr ""
1712
1745
1713
#: bzrlib/builtins.py:2693
1746
# help of 'omit-merges' option of 'log' command
1747
#: breezy/builtins.py:2691
1714
1748
msgid "Do not report commits with more than one parent."
1715
1749
msgstr ""
1716
1750
1717
#: bzrlib/builtins.py:2695
1751
# help of 'exclude-common-ancestry' option of 'log' command
1752
#: breezy/builtins.py:2693
1718
1753
msgid ""
1719
1754
"Display only the revisions that are not part of both ancestries (require -"
1720
1755
"rX..Y)."
1721
1756
msgstr ""
1722
1757
1723
#: bzrlib/builtins.py:2699
1758
# help of 'signatures' option of 'log' command
1759
#: breezy/builtins.py:2697
1724
1760
msgid "Show digital signature validity."
1725
msgstr "Tampilkan validitas tanda tangan digital."
1761
msgstr ""
1726
1762
1727
#: bzrlib/builtins.py:2702
1763
# help of 'match' option of 'log' command
1764
#: breezy/builtins.py:2700
1728
1765
msgid "Show revisions whose properties match this expression."
1729
msgstr "Tampilkan revisi yang sifat sesuai dengan ungkapan ini."
1766
msgstr ""
1730
1767
1731
#: bzrlib/builtins.py:2706
1768
# help of 'match-message' option of 'log' command
1769
#: breezy/builtins.py:2704
1732
1770
msgid "Show revisions whose message matches this expression."
1733
1771
msgstr ""
1734
1772
1735
#: bzrlib/builtins.py:2710
1773
# help of 'match-committer' option of 'log' command
1774
#: breezy/builtins.py:2708
1736
1775
msgid "Show revisions whose committer matches this expression."
1737
1776
msgstr ""
1738
1777
1739
#: bzrlib/builtins.py:2714
1778
# help of 'match-author' option of 'log' command
1779
#: breezy/builtins.py:2712
1740
1780
msgid "Show revisions whose authors match this expression."
1741
1781
msgstr ""
1742
1782
1743
#: bzrlib/builtins.py:2718
1783
# help of 'match-bugs' option of 'log' command
1784
#: breezy/builtins.py:2716
1744
1785
msgid "Show revisions whose bugs match this expression."
1745
1786
msgstr ""
1746
1787
1747
#: bzrlib/builtins.py:2772
1788
#: breezy/builtins.py:2770
1748
1789
msgid "--exclude-common-ancestry requires -r with two revisions"
1749
1790
msgstr ""
1750
1791
1751
#: bzrlib/builtins.py:2800
1792
#: breezy/builtins.py:2798
1752
1793
#, python-format
1753
1794
msgid "Path unknown at end or start of revision range: %s"
1754
1795
msgstr ""
1755
1796
1756
#: bzrlib/builtins.py:2917
1757
#, python-format
1758
msgid "bzr %s doesn't accept two revisions in different branches."
1759
msgstr ""
1760
1761
#: bzrlib/builtins.py:2933
1762
#, python-format
1763
msgid "bzr %s --revision takes one or two values."
1764
msgstr ""
1765
1766
#: bzrlib/builtins.py:2978
1797
#: breezy/builtins.py:2915
1798
#, python-format
1799
msgid "brz %s doesn't accept two revisions in different branches."
1800
msgstr ""
1801
1802
#: breezy/builtins.py:2931
1803
#, python-format
1804
msgid "brz %s --revision takes one or two values."
1805
msgstr ""
1806
1807
#: breezy/builtins.py:2976
1767
1808
msgid ""
1768
1809
"List files in a tree.\n"
1769
1810
" "
1770
1811
msgstr ""
1771
1812
1772
#: bzrlib/builtins.py:2987
1813
# help of 'recursive' option of 'ls' command
1814
#: breezy/builtins.py:2985
1773
1815
msgid "Recurse into subdirectories."
1774
1816
msgstr ""
1775
1817
1776
#: bzrlib/builtins.py:2989
1818
# help of 'from-root' option of 'ls' command
1819
#: breezy/builtins.py:2987
1777
1820
msgid "Print paths relative to the root of the branch."
1778
1821
msgstr ""
1779
1822
1780
#: bzrlib/builtins.py:2991
1823
# help of 'unknown' option of 'ls' command
1824
#: breezy/builtins.py:2989
1781
1825
msgid "Print unknown files."
1782
msgstr "Mencetak file tidak diketahui."
1826
msgstr ""
1783
1827
1784
#: bzrlib/builtins.py:2992
1828
# help of 'versioned' option of 'ls' command
1829
#: breezy/builtins.py:2990
1785
1830
msgid "Print versioned files."
1786
msgstr "Mencetak file berversi."
1831
msgstr ""
1787
1832
1788
#: bzrlib/builtins.py:2995
1833
# help of 'ignored' option of 'ls' command
1834
#: breezy/builtins.py:2993
1789
1835
msgid "Print ignored files."
1790
msgstr "Mencetak file diabaikan."
1836
msgstr ""
1791
1837
1792
#: bzrlib/builtins.py:2997
1838
# help of 'kind' option of 'ls' command
1839
#: breezy/builtins.py:2995
1793
1840
msgid "List entries of a particular kind: file, directory, symlink."
1794
1841
msgstr ""
1795
1842
1796
#: bzrlib/builtins.py:3010
1843
#: breezy/builtins.py:3008
1797
1844
msgid "invalid kind specified"
1798
1845
msgstr ""
1799
1846
1800
#: bzrlib/builtins.py:3013
1847
#: breezy/builtins.py:3011
1801
1848
msgid "Cannot set both --verbose and --null"
1802
1849
msgstr ""
1803
1850
1804
#: bzrlib/builtins.py:3022
1851
#: breezy/builtins.py:3020
1805
1852
msgid "cannot specify both --from-root and PATH"
1806
1853
msgstr ""
1807
1854
1808
#: bzrlib/builtins.py:3109
1855
#: breezy/builtins.py:3107
1809
1856
msgid "Ignore specified files or patterns."
1810
msgstr "Abaikan file tertentu atau pola."
1811
1812
#: bzrlib/builtins.py:3111
1813
msgid "See ``bzr help patterns`` for details on the syntax of patterns."
1814
msgstr ""
1815
1816
#: bzrlib/builtins.py:3113
1857
msgstr ""
1858
1859
#: breezy/builtins.py:3109
1860
msgid "See ``brz help patterns`` for details on the syntax of patterns."
1861
msgstr ""
1862
1863
#: breezy/builtins.py:3111
1817
1864
msgid ""
1818
1865
"If a .bzrignore file does not exist, the ignore command\n"
1819
1866
"will create one and add the specified files or patterns to the newly\n"
1822
1869
"the use of the ignore command will require an explicit add command."
1823
1870
msgstr ""
1824
1871
1825
#: bzrlib/builtins.py:3119
1872
#: breezy/builtins.py:3117
1826
1873
msgid ""
1827
1874
"To remove patterns from the ignore list, edit the .bzrignore file.\n"
1828
1875
"After adding, editing or deleting that file either indirectly by\n"
1830
1877
"it."
1831
1878
msgstr ""
1832
1879
1833
#: bzrlib/builtins.py:3124
1880
#: breezy/builtins.py:3122
1834
1881
msgid ""
1835
1882
"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
1836
1883
"the global ignore file can be found in the application data directory as\n"
1839
1886
"can be edited directly using an editor."
1840
1887
msgstr ""
1841
1888
1842
#: bzrlib/builtins.py:3130
1889
#: breezy/builtins.py:3128
1843
1890
msgid ""
1844
1891
"Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
1845
1892
"precedence over regular ignores. Such exceptions are used to specify\n"
1846
1893
"files that should be versioned which would otherwise be ignored."
1847
1894
msgstr ""
1848
1895
1849
#: bzrlib/builtins.py:3134
1896
#: breezy/builtins.py:3132
1850
1897
msgid ""
1851
1898
"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
1852
1899
"precedence over the '!' exception patterns."
1853
1900
msgstr ""
1854
1901
1855
#: bzrlib/builtins.py:3137
1902
#: breezy/builtins.py:3135
1856
1903
msgid ""
1857
1904
":Notes: \n"
1858
1905
" \n"
1860
1907
" the shell on Unix."
1861
1908
msgstr ""
1862
1909
1863
#: bzrlib/builtins.py:3142
1910
#: breezy/builtins.py:3140
1864
1911
msgid ""
1865
1912
"* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
1866
1913
" To ignore patterns that begin with that character, use the \"RE:\" prefix."
1867
1914
msgstr ""
1868
1915
1869
#: bzrlib/builtins.py:3145
1916
#: breezy/builtins.py:3143
1870
1917
msgid ""
1871
1918
":Examples:\n"
1872
1919
" Ignore the top level Makefile::"
1873
1920
msgstr ""
1874
1921
1875
#: bzrlib/builtins.py:3148
1876
msgid " bzr ignore ./Makefile"
1922
#: breezy/builtins.py:3146
1923
msgid " brz ignore ./Makefile"
1877
1924
msgstr ""
1878
1925
1879
#: bzrlib/builtins.py:3150
1926
#: breezy/builtins.py:3148
1880
1927
msgid " Ignore .class files in all directories...::"
1881
1928
msgstr ""
1882
1929
1883
#: bzrlib/builtins.py:3152
1884
msgid " bzr ignore \"*.class\""
1930
#: breezy/builtins.py:3150
1931
msgid " brz ignore \"*.class\""
1885
1932
msgstr ""
1886
1933
1887
#: bzrlib/builtins.py:3154
1934
#: breezy/builtins.py:3152
1888
1935
msgid " ...but do not ignore \"special.class\"::"
1889
1936
msgstr ""
1890
1937
1891
#: bzrlib/builtins.py:3156
1892
msgid " bzr ignore \"!special.class\""
1938
#: breezy/builtins.py:3154
1939
msgid " brz ignore \"!special.class\""
1893
1940
msgstr ""
1894
1941
1895
#: bzrlib/builtins.py:3158
1942
#: breezy/builtins.py:3156
1896
1943
msgid " Ignore files whose name begins with the \"#\" character::"
1897
1944
msgstr ""
1898
1945
1899
#: bzrlib/builtins.py:3160
1900
msgid " bzr ignore \"RE:^#\""
1946
#: breezy/builtins.py:3158
1947
msgid " brz ignore \"RE:^#\""
1901
1948
msgstr ""
1902
1949
1903
#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
1950
#: breezy/builtins.py:3160 breezy/builtins.py:3164
1904
1951
msgid " Ignore .o files under the lib directory::"
1905
1952
msgstr ""
1906
1953
1907
#: bzrlib/builtins.py:3164
1908
msgid " bzr ignore \"lib/**/*.o\""
1909
msgstr ""
1910
1911
#: bzrlib/builtins.py:3168
1912
msgid " bzr ignore \"RE:lib/.*\\.o\""
1913
msgstr ""
1914
1915
#: bzrlib/builtins.py:3170
1954
#: breezy/builtins.py:3162
1955
msgid " brz ignore \"lib/**/*.o\""
1956
msgstr ""
1957
1958
#: breezy/builtins.py:3166
1959
msgid " brz ignore \"RE:lib/.*\\.o\""
1960
msgstr ""
1961
1962
#: breezy/builtins.py:3168
1916
1963
msgid " Ignore everything but the \"debian\" toplevel directory::"
1917
1964
msgstr ""
1918
1965
1919
#: bzrlib/builtins.py:3172
1966
#: breezy/builtins.py:3170
1920
1967
msgid ""
1921
" bzr ignore \"RE:(?!debian/).*\"\n"
1968
" brz ignore \"RE:(?!debian/).*\"\n"
1922
1969
" \n"
1923
1970
" Ignore everything except the \"local\" toplevel directory,\n"
1924
1971
" but always ignore autosave files ending in ~, even under local/::\n"
1925
1972
" \n"
1926
" bzr ignore \"*\"\n"
1927
" bzr ignore \"!./local\"\n"
1928
" bzr ignore \"!!*~\""
1929
msgstr ""
1930
1931
#: bzrlib/builtins.py:3186
1932
msgid "Display the default ignore rules that bzr uses."
1933
msgstr ""
1934
1935
#: bzrlib/builtins.py:3198
1973
" brz ignore \"*\"\n"
1974
" brz ignore \"!./local\"\n"
1975
" brz ignore \"!!*~\""
1976
msgstr ""
1977
1978
# help of 'default-rules' option of 'ignore' command
1979
#: breezy/builtins.py:3184
1980
msgid "Display the default ignore rules that brz uses."
1981
msgstr ""
1982
1983
#: breezy/builtins.py:3196
1936
1984
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1937
1985
msgstr ""
1938
1986
1939
#: bzrlib/builtins.py:3209
1987
#: breezy/builtins.py:3207
1940
1988
#, python-format
1941
1989
msgid "Invalid ignore pattern found. %s"
1942
1990
msgid_plural "Invalid ignore patterns found. %s"
1943
1991
msgstr[0] ""
1944
1992
msgstr[1] ""
1945
1993
1946
#: bzrlib/builtins.py:3218
1994
#: breezy/builtins.py:3216
1947
1995
msgid "NAME_PATTERN should not be an absolute path"
1948
1996
msgstr ""
1949
1997
1950
#: bzrlib/builtins.py:3231
1998
#: breezy/builtins.py:3229
1951
1999
#, python-format
1952
2000
msgid ""
1953
2001
"Warning: the following files are version controlled and match your ignore "
1954
2002
"pattern:\n"
1955
2003
"%s\n"
1956
"These files will continue to be version controlled unless you 'bzr remove' "
2004
"These files will continue to be version controlled unless you 'brz remove' "
1957
2005
"them.\n"
1958
2006
msgstr ""
1959
2007
1960
#: bzrlib/builtins.py:3238
2008
#: breezy/builtins.py:3236
1961
2009
msgid "List ignored files and the patterns that matched them."
1962
2010
msgstr ""
1963
2011
1964
#: bzrlib/builtins.py:3240
2012
#: breezy/builtins.py:3238
1965
2013
msgid ""
1966
2014
"List all the ignored files and the ignore pattern that caused the file to\n"
1967
2015
"be ignored."
1968
2016
msgstr ""
1969
2017
1970
#: bzrlib/builtins.py:3243
2018
#: breezy/builtins.py:3241
1971
2019
msgid "Alternatively, to list just the files::"
1972
msgstr "Atau, untuk daftar hanya file ::"
1973
1974
#: bzrlib/builtins.py:3245
1975
msgid " bzr ls --ignored"
1976
msgstr ""
1977
1978
#: bzrlib/builtins.py:3279
2020
msgstr ""
2021
2022
#: breezy/builtins.py:3243
2023
msgid " brz ls --ignored"
2024
msgstr ""
2025
2026
#: breezy/builtins.py:3277
1979
2027
#, python-format
1980
2028
msgid "not a valid revision-number: %r"
1981
2029
msgstr ""
1982
2030
1983
#: bzrlib/builtins.py:3286
1984
msgid ""
1985
"Export current or past revision to a destination directory or archive."
2031
#: breezy/builtins.py:3284
2032
msgid "Export current or past revision to a destination directory or archive."
1986
2033
msgstr ""
1987
2034
1988
#: bzrlib/builtins.py:3288
2035
#: breezy/builtins.py:3286
1989
2036
msgid "If no revision is specified this exports the last committed revision."
1990
2037
msgstr ""
1991
2038
1992
#: bzrlib/builtins.py:3290
2039
#: breezy/builtins.py:3288
1993
2040
msgid ""
1994
2041
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1995
2042
"given, try to find the format with the extension. If no extension\n"
1996
2043
"is found exports to a directory (equivalent to --format=dir)."
1997
2044
msgstr ""
1998
2045
1999
#: bzrlib/builtins.py:3294
2046
#: breezy/builtins.py:3292
2000
2047
msgid ""
2001
2048
"If root is supplied, it will be used as the root directory inside\n"
2002
2049
"container formats (tar, zip, etc). If it is not supplied it will default\n"
2003
2050
"to the exported filename. The root option has no effect for 'dir' format."
2004
2051
msgstr ""
2005
2052
2006
#: bzrlib/builtins.py:3298
2053
#: breezy/builtins.py:3296
2007
2054
msgid ""
2008
2055
"If branch is omitted then the branch containing the current working\n"
2009
2056
"directory will be used."
2010
2057
msgstr ""
2011
2058
2012
#: bzrlib/builtins.py:3301
2013
msgid ""
2014
"Note: Export of tree with non-ASCII filenames to zip is not supported."
2059
#: breezy/builtins.py:3299
2060
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
2015
2061
msgstr ""
2016
2062
2017
#: bzrlib/builtins.py:3303
2063
#: breezy/builtins.py:3301
2018
2064
msgid ""
2019
2065
" ================= =========================\n"
2020
2066
" Supported formats Autodetected by extension\n"
2027
2073
" ================= ========================="
2028
2074
msgstr ""
2029
2075
2030
#: bzrlib/builtins.py:3317
2076
# help of 'format' option of 'export' command
2077
#: breezy/builtins.py:3315
2031
2078
msgid "Type of file to export to."
2032
2079
msgstr ""
2033
2080
2034
#: bzrlib/builtins.py:3320
2081
# help of 'filters' option of 'export' command
2082
#: breezy/builtins.py:3318
2035
2083
msgid "Apply content filters to export the convenient form."
2036
2084
msgstr ""
2037
2085
2038
#: bzrlib/builtins.py:3324
2086
# help of 'root' option of 'export' command
2087
#: breezy/builtins.py:3322
2039
2088
msgid "Name of the root directory inside the exported file."
2040
2089
msgstr ""
2041
2090
2042
#: bzrlib/builtins.py:3326
2091
# help of 'per-file-timestamps' option of 'export' command
2092
#: breezy/builtins.py:3324
2043
2093
msgid ""
2044
2094
"Set modification time of files to that of the last revision in which it was "
2045
2095
"changed."
2046
2096
msgstr ""
2047
2097
2048
#: bzrlib/builtins.py:3329
2049
msgid ""
2050
"Export the working tree contents rather than that of the last revision."
2098
# help of 'uncommitted' option of 'export' command
2099
#: breezy/builtins.py:3327
2100
msgid "Export the working tree contents rather than that of the last revision."
2051
2101
msgstr ""
2052
2102
2053
#: bzrlib/builtins.py:3348
2103
#: breezy/builtins.py:3346
2054
2104
msgid "--uncommitted requires a working tree"
2055
2105
msgstr ""
2056
2106
2057
#: bzrlib/builtins.py:3357
2107
#: breezy/builtins.py:3355
2058
2108
#, python-format
2059
2109
msgid "Unsupported export format: %s"
2060
2110
msgstr ""
2061
2111
2062
#: bzrlib/builtins.py:3361
2063
msgid ""
2064
"Write the contents of a file as of a given revision to standard output."
2065
msgstr "Menulis isi file pada revisi yang diberikan ke output standar."
2112
#: breezy/builtins.py:3359
2113
msgid "Write the contents of a file as of a given revision to standard output."
2114
msgstr ""
2066
2115
2067
#: bzrlib/builtins.py:3363
2116
#: breezy/builtins.py:3361
2068
2117
msgid "If no revision is nominated, the last revision is used."
2069
msgstr "Jika tidak ada revisi lagi, revisi terakhir digunakan."
2118
msgstr ""
2070
2119
2071
#: bzrlib/builtins.py:3365
2120
#: breezy/builtins.py:3363
2072
2121
msgid ""
2073
2122
"Note: Take care to redirect standard output when using this command on a\n"
2074
2123
"binary file."
2075
2124
msgstr ""
2076
2125
2077
#: bzrlib/builtins.py:3371
2126
# help of 'name-from-revision' option of 'cat' command
2127
#: breezy/builtins.py:3369
2078
2128
msgid "The path name in the old tree."
2079
2129
msgstr ""
2080
2130
2081
#: bzrlib/builtins.py:3372
2131
# help of 'filters' option of 'cat' command
2132
#: breezy/builtins.py:3370
2082
2133
msgid "Apply content filters to display the convenience form."
2083
2134
msgstr ""
2084
2135
2085
#: bzrlib/builtins.py:3383
2086
msgid "bzr cat --revision takes exactly one revision specifier"
2136
#: breezy/builtins.py:3381
2137
msgid "brz cat --revision takes exactly one revision specifier"
2087
2138
msgstr ""
2088
2139
2089
#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
2140
#: breezy/builtins.py:3406 breezy/builtins.py:3418
2090
2141
msgid "{0!r} is not present in revision {1}"
2091
2142
msgstr ""
2092
2143
2093
#: bzrlib/builtins.py:3443
2144
#: breezy/builtins.py:3441
2094
2145
msgid "Commit changes into a new revision."
2095
2146
msgstr ""
2096
2147
2097
#: bzrlib/builtins.py:3445
2148
#: breezy/builtins.py:3443
2098
2149
msgid ""
2099
2150
"An explanatory message needs to be given for each commit. This is\n"
2100
2151
"often done by using the --message option (getting the message from the\n"
2104
2155
"boilerplate text loaded into the editor, use the --show-diff option."
2105
2156
msgstr ""
2106
2157
2107
#: bzrlib/builtins.py:3452
2158
#: breezy/builtins.py:3450
2108
2159
msgid ""
2109
2160
"By default, the entire tree is committed and the person doing the\n"
2110
2161
"commit is assumed to be the author. These defaults can be overridden\n"
2111
2162
"as explained below."
2112
2163
msgstr ""
2113
2164
2114
#: bzrlib/builtins.py:3456
2165
#: breezy/builtins.py:3454
2115
2166
msgid ":Selective commits:"
2116
2167
msgstr ""
2117
2168
2118
#: bzrlib/builtins.py:3458
2169
#: breezy/builtins.py:3456
2119
2170
msgid ""
2120
2171
" If selected files are specified, only changes to those files are\n"
2121
2172
" committed. If a directory is specified then the directory and\n"
2122
2173
" everything within it is committed."
2123
2174
msgstr ""
2124
2175
2125
#: bzrlib/builtins.py:3462
2176
#: breezy/builtins.py:3460
2126
2177
msgid ""
2127
2178
" When excludes are given, they take precedence over selected files.\n"
2128
2179
" For example, to commit only changes within foo, but not changes\n"
2129
2180
" within foo/bar::"
2130
2181
msgstr ""
2131
2182
2132
#: bzrlib/builtins.py:3466
2133
msgid " bzr commit foo -x foo/bar"
2183
#: breezy/builtins.py:3464
2184
msgid " brz commit foo -x foo/bar"
2134
2185
msgstr ""
2135
2186
2136
#: bzrlib/builtins.py:3468
2187
#: breezy/builtins.py:3466
2137
2188
msgid " A selective commit after a merge is not yet supported."
2138
2189
msgstr ""
2139
2190
2140
#: bzrlib/builtins.py:3470
2191
#: breezy/builtins.py:3468
2141
2192
msgid ":Custom authors:"
2142
2193
msgstr ""
2143
2194
2144
#: bzrlib/builtins.py:3472
2195
#: breezy/builtins.py:3470
2145
2196
msgid ""
2146
2197
" If the author of the change is not the same person as the committer,\n"
2147
2198
" you can specify the author's name using the --author option. The\n"
2151
2202
" author."
2152
2203
msgstr ""
2153
2204
2154
#: bzrlib/builtins.py:3479
2205
#: breezy/builtins.py:3477
2155
2206
msgid ":Checks:"
2156
msgstr ":Cek:"
2207
msgstr ""
2157
2208
2158
#: bzrlib/builtins.py:3481
2209
#: breezy/builtins.py:3479
2159
2210
msgid ""
2160
2211
" A common mistake is to forget to add a new file or directory before\n"
2161
2212
" running the commit command. The --strict option checks for unknown\n"
2162
2213
" files and aborts the commit if any are found. More advanced pre-commit\n"
2163
" checks can be implemented by defining hooks. See ``bzr help hooks``\n"
2214
" checks can be implemented by defining hooks. See ``brz help hooks``\n"
2164
2215
" for details."
2165
2216
msgstr ""
2166
2217
2167
#: bzrlib/builtins.py:3487
2218
#: breezy/builtins.py:3485
2168
2219
msgid ":Things to note:"
2169
2220
msgstr ""
2170
2221
2171
#: bzrlib/builtins.py:3489
2222
#: breezy/builtins.py:3487
2172
2223
msgid ""
2173
2224
" If you accidentially commit the wrong changes or make a spelling\n"
2174
2225
" mistake in the commit message say, you can use the uncommit command\n"
2175
" to undo it. See ``bzr help uncommit`` for details."
2226
" to undo it. See ``brz help uncommit`` for details."
2176
2227
msgstr ""
2177
2228
2178
#: bzrlib/builtins.py:3493
2229
#: breezy/builtins.py:3491
2179
2230
msgid ""
2180
2231
" Hooks can also be configured to run after a commit. This allows you\n"
2181
2232
" to trigger updates to external systems like bug trackers. The --fixes\n"
2182
2233
" option can be used to record the association between a revision and\n"
2183
" one or more bugs. See ``bzr help bugs`` for details."
2234
" one or more bugs. See ``brz help bugs`` for details."
2184
2235
msgstr ""
2185
2236
2186
#: bzrlib/builtins.py:3503
2237
# help of 'exclude' option of 'commit' command
2238
#: breezy/builtins.py:3501
2187
2239
msgid "Do not consider changes made to a given path."
2188
2240
msgstr ""
2189
2241
2190
#: bzrlib/builtins.py:3506
2242
# help of 'message' option of 'commit' command
2243
#: breezy/builtins.py:3504
2191
2244
msgid "Description of the new revision."
2192
msgstr "Deskripsi revisi baru."
2245
msgstr ""
2193
2246
2194
#: bzrlib/builtins.py:3509
2247
# help of 'unchanged' option of 'commit' command
2248
#: breezy/builtins.py:3507
2195
2249
msgid "Commit even if nothing has changed."
2196
2250
msgstr ""
2197
2251
2198
#: bzrlib/builtins.py:3513
2252
# help of 'file' option of 'commit' command
2253
#: breezy/builtins.py:3511
2199
2254
msgid "Take commit message from this file."
2200
2255
msgstr ""
2201
2256
2202
#: bzrlib/builtins.py:3515
2257
# help of 'strict' option of 'commit' command
2258
#: breezy/builtins.py:3513
2203
2259
msgid "Refuse to commit if there are unknown files in the working tree."
2204
2260
msgstr ""
2205
2261
2206
#: bzrlib/builtins.py:3518
2262
# help of 'commit-time' option of 'commit' command
2263
#: breezy/builtins.py:3516
2207
2264
msgid ""
2208
2265
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2209
2266
"08:00:00 +0100'."
2210
2267
msgstr ""
2211
2268
2212
#: bzrlib/builtins.py:3521
2213
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2269
# help of 'fixes' option of 'commit' command
2270
#: breezy/builtins.py:3519
2271
msgid "Mark a bug as being fixed by this revision (see \"brz help bugs\")."
2214
2272
msgstr ""
2215
2273
2216
#: bzrlib/builtins.py:3524
2274
# help of 'author' option of 'commit' command
2275
#: breezy/builtins.py:3522
2217
2276
msgid "Set the author's name, if it's different from the committer."
2218
2277
msgstr ""
2219
2278
2220
#: bzrlib/builtins.py:3527
2279
# help of 'local' option of 'commit' command
2280
#: breezy/builtins.py:3525
2221
2281
msgid ""
2222
2282
"Perform a local commit in a bound branch. Local commits are not pushed to "
2223
2283
"the master branch until a normal commit is performed."
2224
2284
msgstr ""
2225
2285
2226
#: bzrlib/builtins.py:3533
2286
# help of 'show-diff' option of 'commit' command
2287
#: breezy/builtins.py:3531
2227
2288
msgid ""
2228
2289
"When no message is supplied, show the diff along with the status summary in "
2229
2290
"the message editor."
2230
2291
msgstr ""
2231
2292
2232
#: bzrlib/builtins.py:3536
2293
# help of 'lossy' option of 'commit' command
2294
#: breezy/builtins.py:3534
2233
2295
msgid ""
2234
2296
"When committing to a foreign version control system do not push data that "
2235
2297
"can not be natively represented."
2236
2298
msgstr ""
2237
2299
2238
#: bzrlib/builtins.py:3554
2300
#: breezy/builtins.py:3552
2239
2301
#, python-format
2240
2302
msgid ""
2241
2303
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2242
2304
"default bug tracker using the `bugtracker` option.\n"
2243
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2305
"See \"brz help bugs\" for more information on this feature. Commit refused."
2244
2306
msgstr ""
2245
2307
2246
#: bzrlib/builtins.py:3563
2308
#: breezy/builtins.py:3561
2247
2309
#, python-format
2248
2310
msgid ""
2249
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2311
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"brz help bugs\" "
2250
2312
"for more information on this feature.\n"
2251
2313
"Commit refused."
2252
2314
msgstr ""
2253
2315
2254
#: bzrlib/builtins.py:3572
2316
#: breezy/builtins.py:3570
2255
2317
#, python-format
2256
2318
msgid "Unrecognized bug %s. Commit refused."
2257
2319
msgstr ""
2258
2320
2259
#: bzrlib/builtins.py:3575
2321
#: breezy/builtins.py:3573
2260
2322
#, python-format
2261
2323
msgid ""
2262
2324
"%s\n"
2263
2325
"Commit refused."
2264
2326
msgstr ""
2265
2327
2266
#: bzrlib/builtins.py:3599
2328
#: breezy/builtins.py:3597
2267
2329
msgid "Could not parse --commit-time: "
2268
2330
msgstr ""
2269
2331
2270
#: bzrlib/builtins.py:3639
2332
#: breezy/builtins.py:3637
2271
2333
msgid "please specify either --message or --file"
2272
2334
msgstr ""
2273
2335
2274
#: bzrlib/builtins.py:3668
2336
#: breezy/builtins.py:3666
2275
2337
msgid "please specify a commit message with either --message or --file"
2276
2338
msgstr ""
2277
2339
2278
#: bzrlib/builtins.py:3671
2279
msgid ""
2280
"Empty commit message specified. Please specify a commit message with either -"
2281
"-message or --file or leave a blank message with --message \"\"."
2282
msgstr ""
2283
2284
#: bzrlib/builtins.py:3691
2285
msgid ""
2286
"No changes to commit. Please 'bzr add' the files you want to commit, or use -"
2287
"-unchanged to force an empty commit."
2288
msgstr ""
2289
2290
#: bzrlib/builtins.py:3695
2291
msgid ""
2292
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2340
#: breezy/builtins.py:3669
2341
msgid ""
2342
"Empty commit message specified. Please specify a commit message with either "
2343
"--message or --file or leave a blank message with --message \"\"."
2344
msgstr ""
2345
2346
#: breezy/builtins.py:3689
2347
msgid ""
2348
"No changes to commit. Please 'brz add' the files you want to commit, or use "
2349
"--unchanged to force an empty commit."
2350
msgstr ""
2351
2352
#: breezy/builtins.py:3693
2353
msgid ""
2354
"Conflicts detected in working tree. Use \"brz conflicts\" to list, \"brz "
2293
2355
"resolve FILE\" to resolve."
2294
2356
msgstr ""
2295
2357
2296
#: bzrlib/builtins.py:3699
2358
#: breezy/builtins.py:3697
2297
2359
msgid "Commit refused because there are unknown files in the working tree."
2298
2360
msgstr ""
2299
2361
2300
#: bzrlib/builtins.py:3702
2362
#: breezy/builtins.py:3700
2301
2363
msgid ""
2302
2364
"\n"
2303
2365
"To commit to master branch, run update and then commit.\n"
2304
2366
"You can also pass --local to commit to continue working disconnected."
2305
2367
msgstr ""
2306
2368
2307
#: bzrlib/builtins.py:3710
2369
#: breezy/builtins.py:3708
2308
2370
msgid ""
2309
2371
"Validate working tree structure, branch consistency and repository history."
2310
2372
msgstr ""
2311
2373
2312
#: bzrlib/builtins.py:3712
2374
#: breezy/builtins.py:3710
2313
2375
msgid ""
2314
2376
"This command checks various invariants about branch and repository storage\n"
2315
"to detect data corruption or bzr bugs."
2377
"to detect data corruption or brz bugs."
2316
2378
msgstr ""
2317
2379
2318
#: bzrlib/builtins.py:3715
2380
#: breezy/builtins.py:3713
2319
2381
msgid ""
2320
2382
"The working tree and branch checks will only give output if a problem is\n"
2321
2383
"detected. The output fields of the repository check are:"
2322
2384
msgstr ""
2323
2385
2324
#: bzrlib/builtins.py:3718
2386
#: breezy/builtins.py:3716
2325
2387
msgid ""
2326
2388
"revisions\n"
2327
2389
" This is just the number of revisions checked. It doesn't\n"
2328
2390
" indicate a problem."
2329
2391
msgstr ""
2330
2392
2331
#: bzrlib/builtins.py:3722
2393
#: breezy/builtins.py:3720
2332
2394
msgid ""
2333
2395
"versionedfiles\n"
2334
2396
" This is just the number of versionedfiles checked. It\n"
2335
2397
" doesn't indicate a problem."
2336
2398
msgstr ""
2337
2399
2338
#: bzrlib/builtins.py:3726
2400
#: breezy/builtins.py:3724
2339
2401
msgid ""
2340
2402
"unreferenced ancestors\n"
2341
2403
" Texts that are ancestors of other texts, but\n"
2343
2405
" subtle problem that Bazaar can work around."
2344
2406
msgstr ""
2345
2407
2346
#: bzrlib/builtins.py:3731
2408
#: breezy/builtins.py:3729
2347
2409
msgid ""
2348
2410
"unique file texts\n"
2349
2411
" This is the total number of unique file contents\n"
2350
2412
" seen in the checked revisions. It does not indicate a problem."
2351
2413
msgstr ""
2352
2414
2353
#: bzrlib/builtins.py:3735
2415
#: breezy/builtins.py:3733
2354
2416
msgid ""
2355
2417
"repeated file texts\n"
2356
2418
" This is the total number of repeated texts seen\n"
2359
2421
" indicate a problem."
2360
2422
msgstr ""
2361
2423
2362
#: bzrlib/builtins.py:3741
2424
#: breezy/builtins.py:3739
2363
2425
msgid ""
2364
2426
"If no restrictions are specified, all Bazaar data that is found at the "
2365
2427
"given\n"
2366
2428
"location will be checked."
2367
2429
msgstr ""
2368
2430
2369
#: bzrlib/builtins.py:3746
2431
#: breezy/builtins.py:3744
2370
2432
msgid " Check the tree and branch at 'foo'::"
2371
2433
msgstr ""
2372
2434
2373
#: bzrlib/builtins.py:3748
2374
msgid " bzr check --tree --branch foo"
2435
#: breezy/builtins.py:3746
2436
msgid " brz check --tree --branch foo"
2375
2437
msgstr ""
2376
2438
2377
#: bzrlib/builtins.py:3750
2439
#: breezy/builtins.py:3748
2378
2440
msgid " Check only the repository at 'bar'::"
2379
2441
msgstr ""
2380
2442
2381
#: bzrlib/builtins.py:3752
2382
msgid " bzr check --repo bar"
2443
#: breezy/builtins.py:3750
2444
msgid " brz check --repo bar"
2383
2445
msgstr ""
2384
2446
2385
#: bzrlib/builtins.py:3754
2447
#: breezy/builtins.py:3752
2386
2448
msgid " Check everything at 'baz'::"
2387
2449
msgstr ""
2388
2450
2389
#: bzrlib/builtins.py:3756
2390
msgid " bzr check baz"
2451
#: breezy/builtins.py:3754
2452
msgid " brz check baz"
2391
2453
msgstr ""
2392
2454
2393
#: bzrlib/builtins.py:3762
2455
# help of 'branch' option of 'check' command
2456
#: breezy/builtins.py:3760
2394
2457
msgid "Check the branch related to the current directory."
2395
2458
msgstr ""
2396
2459
2397
#: bzrlib/builtins.py:3764
2460
# help of 'repo' option of 'check' command
2461
#: breezy/builtins.py:3762
2398
2462
msgid "Check the repository related to the current directory."
2399
2463
msgstr ""
2400
2464
2401
#: bzrlib/builtins.py:3766
2465
# help of 'tree' option of 'check' command
2466
#: breezy/builtins.py:3764
2402
2467
msgid "Check the working tree related to the current directory."
2403
2468
msgstr ""
2404
2469
2405
#: bzrlib/builtins.py:3780
2470
#: breezy/builtins.py:3778
2406
2471
msgid "Upgrade a repository, branch or working tree to a newer format."
2407
2472
msgstr ""
2408
2473
2409
#: bzrlib/builtins.py:3782
2474
#: breezy/builtins.py:3780
2410
2475
msgid ""
2411
2476
"When the default format has changed after a major new release of\n"
2412
2477
"Bazaar, you may be informed during certain operations that you\n"
2415
2480
"with older repositories or with older versions of Bazaar."
2416
2481
msgstr ""
2417
2482
2418
#: bzrlib/builtins.py:3788
2483
#: breezy/builtins.py:3786
2419
2484
msgid ""
2420
2485
"If you wish to upgrade to a particular format rather than the\n"
2421
2486
"current default, that can be specified using the --format option.\n"
2425
2490
"2.x default) so downgrading is not always possible."
2426
2491
msgstr ""
2427
2492
2428
#: bzrlib/builtins.py:3795
2493
#: breezy/builtins.py:3793
2429
2494
msgid ""
2430
2495
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2431
2496
"process (where # is a number). By default, this is left there on\n"
2436
2501
"afterwards."
2437
2502
msgstr ""
2438
2503
2439
#: bzrlib/builtins.py:3803
2504
#: breezy/builtins.py:3801
2440
2505
msgid ""
2441
2506
"If the location given is a shared repository, dependent branches\n"
2442
2507
"are also converted provided the repository converts successfully.\n"
2444
2509
"tried."
2445
2510
msgstr ""
2446
2511
2447
#: bzrlib/builtins.py:3808
2512
#: breezy/builtins.py:3806
2448
2513
msgid ""
2449
2514
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2450
2515
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2451
2516
msgstr ""
2452
2517
2453
#: bzrlib/builtins.py:3816
2454
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2518
# help of 'format' option of 'upgrade' command
2519
#: breezy/builtins.py:3814
2520
msgid "Upgrade to a specific format. See \"brz help formats\" for details."
2455
2521
msgstr ""
2456
2522
2457
#: bzrlib/builtins.py:3820
2523
# title of 'format' option of 'init' command
2524
# title of 'format' option of 'upgrade' command
2525
#: breezy/builtins.py:3818
2458
2526
msgid "Branch format"
2459
2527
msgstr ""
2460
2528
2461
#: bzrlib/builtins.py:3822
2529
# help of 'clean' option of 'upgrade' command
2530
#: breezy/builtins.py:3820
2462
2531
msgid "Remove the backup.bzr directory if successful."
2463
msgstr "Menghapus direktori backup.bzr jika berhasil."
2532
msgstr ""
2464
2533
2465
#: bzrlib/builtins.py:3824
2534
# help of 'dry-run' option of 'add' command
2535
# help of 'dry-run' option of 'upgrade' command
2536
#: breezy/builtins.py:3822
2466
2537
msgid "Show what would be done, but don't actually do anything."
2467
msgstr "Tampilkan apa yang akan dilakukan, tetapi tidak melakukan apa-apa."
2468
2469
#: bzrlib/builtins.py:3839
2470
msgid "Show or set bzr user id."
2471
msgstr "Tampilkan atau mengatur id bzr pengguna."
2472
2473
#: bzrlib/builtins.py:3841
2538
msgstr ""
2539
2540
#: breezy/builtins.py:3837
2541
msgid "Show or set brz user id."
2542
msgstr ""
2543
2544
#: breezy/builtins.py:3839
2474
2545
msgid ""
2475
2546
":Examples:\n"
2476
2547
" Show the email of the current user::"
2477
2548
msgstr ""
2478
2549
2479
#: bzrlib/builtins.py:3844
2480
msgid " bzr whoami --email"
2550
#: breezy/builtins.py:3842
2551
msgid " brz whoami --email"
2481
2552
msgstr ""
2482
2553
2483
#: bzrlib/builtins.py:3846
2554
#: breezy/builtins.py:3844
2484
2555
msgid " Set the current user::"
2485
2556
msgstr ""
2486
2557
2487
#: bzrlib/builtins.py:3848
2488
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2558
#: breezy/builtins.py:3846
2559
msgid " brz whoami \"Frank Chu <fchu@example.com>\""
2489
2560
msgstr ""
2490
2561
2491
#: bzrlib/builtins.py:3852
2562
# help of 'email' option of 'whoami' command
2563
#: breezy/builtins.py:3850
2492
2564
msgid "Display email address only."
2493
msgstr "Menampilkan alamat email saja."
2565
msgstr ""
2494
2566
2495
#: bzrlib/builtins.py:3854
2567
# help of 'branch' option of 'whoami' command
2568
#: breezy/builtins.py:3852
2496
2569
msgid "Set identity for the current branch instead of globally."
2497
2570
msgstr ""
2498
2571
2499
#: bzrlib/builtins.py:3880
2572
#: breezy/builtins.py:3878
2500
2573
msgid "--email can only be used to display existing identity"
2501
2574
msgstr ""
2502
2575
2503
#: bzrlib/builtins.py:3904
2576
#: breezy/builtins.py:3902
2504
2577
msgid "Print or set the branch nickname."
2505
2578
msgstr ""
2506
2579
2507
#: bzrlib/builtins.py:3906
2580
#: breezy/builtins.py:3904
2508
2581
msgid ""
2509
2582
"If unset, the colocated branch name is used for colocated branches, and\n"
2510
2583
"the branch directory name is used for other branches. To print the\n"
2511
2584
"current nickname, execute with no argument."
2512
2585
msgstr ""
2513
2586
2514
#: bzrlib/builtins.py:3910
2587
#: breezy/builtins.py:3908
2515
2588
msgid ""
2516
2589
"Bound branches use the nickname of its master branch unless it is set\n"
2517
2590
"locally."
2518
2591
msgstr ""
2519
2592
2520
#: bzrlib/builtins.py:3930
2593
#: breezy/builtins.py:3928
2521
2594
msgid "Set/unset and display aliases."
2522
2595
msgstr ""
2523
2596
2524
#: bzrlib/builtins.py:3932
2597
#: breezy/builtins.py:3930
2525
2598
msgid ""
2526
2599
":Examples:\n"
2527
2600
" Show the current aliases::"
2528
2601
msgstr ""
2529
2602
2530
#: bzrlib/builtins.py:3935
2531
msgid " bzr alias"
2603
#: breezy/builtins.py:3933
2604
msgid " brz alias"
2532
2605
msgstr ""
2533
2606
2534
#: bzrlib/builtins.py:3937
2607
#: breezy/builtins.py:3935
2535
2608
msgid " Show the alias specified for 'll'::"
2536
2609
msgstr ""
2537
2610
2538
#: bzrlib/builtins.py:3939
2539
msgid " bzr alias ll"
2611
#: breezy/builtins.py:3937
2612
msgid " brz alias ll"
2540
2613
msgstr ""
2541
2614
2542
#: bzrlib/builtins.py:3941
2615
#: breezy/builtins.py:3939
2543
2616
msgid " Set an alias for 'll'::"
2544
2617
msgstr ""
2545
2618
2546
#: bzrlib/builtins.py:3943
2547
msgid " bzr alias ll=\"log --line -r-10..-1\""
2619
#: breezy/builtins.py:3941
2620
msgid " brz alias ll=\"log --line -r-10..-1\""
2548
2621
msgstr ""
2549
2622
2550
#: bzrlib/builtins.py:3945
2623
#: breezy/builtins.py:3943
2551
2624
msgid " To remove an alias for 'll'::"
2552
2625
msgstr ""
2553
2626
2554
#: bzrlib/builtins.py:3947
2555
msgid " bzr alias --remove ll"
2627
#: breezy/builtins.py:3945
2628
msgid " brz alias --remove ll"
2556
2629
msgstr ""
2557
2630
2558
#: bzrlib/builtins.py:3952
2631
# help of 'remove' option of 'alias' command
2632
#: breezy/builtins.py:3950
2559
2633
msgid "Remove the alias."
2560
2634
msgstr ""
2561
2635
2562
#: bzrlib/builtins.py:3970
2563
msgid "bzr alias --remove expects an alias to remove."
2564
msgstr ""
2565
2566
#: bzrlib/builtins.py:4151
2567
msgid ""
2568
"subunit not available. subunit needs to be installed to use --subunit."
2569
msgstr ""
2570
2571
#: bzrlib/builtins.py:4168
2572
msgid ""
2573
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2574
msgstr ""
2575
2576
#: bzrlib/builtins.py:4215
2577
msgid "Show version of bzr."
2578
msgstr "Tampilkan versi bzr."
2579
2580
#: bzrlib/builtins.py:4219
2636
#: breezy/builtins.py:3968
2637
msgid "brz alias --remove expects an alias to remove."
2638
msgstr ""
2639
2640
#: breezy/builtins.py:4149
2641
msgid "subunit not available. subunit needs to be installed to use --subunit."
2642
msgstr ""
2643
2644
#: breezy/builtins.py:4166
2645
msgid ""
2646
"--benchmark is no longer supported from brz 2.2; use bzr-usertest instead"
2647
msgstr ""
2648
2649
#: breezy/builtins.py:4213
2650
msgid "Show version of brz."
2651
msgstr ""
2652
2653
# help of 'short' option of 'version' command
2654
#: breezy/builtins.py:4217
2581
2655
msgid "Print just the version number."
2582
msgstr "Mencetak hanya nomor versi."
2656
msgstr ""
2583
2657
2584
#: bzrlib/builtins.py:4238
2658
#: breezy/builtins.py:4236
2585
2659
msgid "It sure does!\n"
2586
2660
msgstr ""
2587
2661
2588
#: bzrlib/builtins.py:4262
2662
#: breezy/builtins.py:4260
2589
2663
#, python-format
2590
2664
msgid "merge base is revision %s\n"
2591
2665
msgstr ""
2592
2666
2593
#: bzrlib/builtins.py:4266
2667
#: breezy/builtins.py:4264
2594
2668
msgid "Perform a three-way merge."
2595
2669
msgstr ""
2596
2670
2597
#: bzrlib/builtins.py:4268
2671
#: breezy/builtins.py:4266
2598
2672
msgid ""
2599
2673
"The source of the merge can be specified either in the form of a branch,\n"
2600
2674
"or in the form of a path to a file containing a merge directive generated\n"
2601
"with bzr send. If neither is specified, the default is the upstream branch\n"
2675
"with brz send. If neither is specified, the default is the upstream branch\n"
2602
2676
"or the branch most recently merged using --remember. The source of the\n"
2603
2677
"merge may also be specified in the form of a path to a file in another\n"
2604
2678
"branch: in this case, only the modifications to that file are merged into\n"
2605
2679
"the current working tree."
2606
2680
msgstr ""
2607
2681
2608
#: bzrlib/builtins.py:4276
2682
#: breezy/builtins.py:4274
2609
2683
msgid ""
2610
"When merging from a branch, by default bzr will try to merge in all new\n"
2684
"When merging from a branch, by default brz will try to merge in all new\n"
2611
2685
"work from the other branch, automatically determining an appropriate base\n"
2612
2686
"revision. If this fails, you may need to give an explicit base."
2613
2687
msgstr ""
2614
2688
2615
#: bzrlib/builtins.py:4280
2689
#: breezy/builtins.py:4278
2616
2690
msgid ""
2617
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2691
"To pick a different ending revision, pass \"--revision OTHER\". brz will\n"
2618
2692
"try to merge in all new work up to and including revision OTHER."
2619
2693
msgstr ""
2620
2694
2621
#: bzrlib/builtins.py:4283
2695
#: breezy/builtins.py:4281
2622
2696
msgid ""
2623
2697
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2624
2698
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2629
2703
"changes from the other branch is not stored in the commit."
2630
2704
msgstr ""
2631
2705
2632
#: bzrlib/builtins.py:4291
2706
#: breezy/builtins.py:4289
2633
2707
msgid "Revision numbers are always relative to the source branch."
2634
2708
msgstr ""
2635
2709
2636
#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
2710
#: breezy/builtins.py:4291 breezy/conflicts.py:52 breezy/conflicts.py:106
2637
2711
msgid ""
2638
2712
"Merge will do its best to combine the changes in two branches, but there\n"
2639
2713
"are some kinds of problems only a human can fix. When it encounters those,\n"
2641
2715
"before you can commit."
2642
2716
msgstr ""
2643
2717
2644
#: bzrlib/builtins.py:4298
2645
msgid ""
2646
"Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2718
#: breezy/builtins.py:4296
2719
msgid "Use brz resolve when you have fixed a problem. See also brz conflicts."
2647
2720
msgstr ""
2648
2721
2649
#: bzrlib/builtins.py:4300
2722
#: breezy/builtins.py:4298
2650
2723
msgid ""
2651
2724
"If there is no default branch set, the first merge will set it (use\n"
2652
2725
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2654
2727
"only be saved if the remote location can be accessed."
2655
2728
msgstr ""
2656
2729
2657
#: bzrlib/builtins.py:4305
2730
#: breezy/builtins.py:4303
2658
2731
msgid ""
2659
2732
"The results of the merge are placed into the destination working\n"
2660
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2733
"directory, where they can be reviewed (with brz diff), tested, and then\n"
2661
2734
"committed to record the result of the merge."
2662
2735
msgstr ""
2663
2736
2664
#: bzrlib/builtins.py:4309
2737
#: breezy/builtins.py:4307
2665
2738
msgid ""
2666
2739
"merge refuses to run if there are any uncommitted changes, unless\n"
2667
2740
"--force is given. If --force is given, then the changes from the source \n"
2670
2743
"merge revision which has more than two parents."
2671
2744
msgstr ""
2672
2745
2673
#: bzrlib/builtins.py:4315
2746
#: breezy/builtins.py:4313
2674
2747
msgid ""
2675
2748
"If one would like to merge changes from the working tree of the other\n"
2676
2749
"branch without merging any committed revisions, the --uncommitted option\n"
2677
2750
"can be given."
2678
2751
msgstr ""
2679
2752
2680
#: bzrlib/builtins.py:4319
2753
#: breezy/builtins.py:4317
2681
2754
msgid ""
2682
2755
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2683
2756
"you to apply each diff hunk and file change, similar to \"shelve\"."
2684
2757
msgstr ""
2685
2758
2686
#: bzrlib/builtins.py:4322
2759
#: breezy/builtins.py:4320
2687
2760
msgid ""
2688
2761
":Examples:\n"
2689
" To merge all new revisions from bzr.dev::"
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4325
2693
msgid " bzr merge ../bzr.dev"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4327
2697
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2698
msgstr ""
2699
2700
#: bzrlib/builtins.py:4329
2701
msgid " bzr merge -r 82 ../bzr.dev"
2702
msgstr ""
2703
2704
#: bzrlib/builtins.py:4331
2762
" To merge all new revisions from brz.dev::"
2763
msgstr ""
2764
2765
#: breezy/builtins.py:4323
2766
msgid " brz merge ../brz.dev"
2767
msgstr ""
2768
2769
#: breezy/builtins.py:4325
2770
msgid " To merge changes up to and including revision 82 from brz.dev::"
2771
msgstr ""
2772
2773
#: breezy/builtins.py:4327
2774
msgid " brz merge -r 82 ../brz.dev"
2775
msgstr ""
2776
2777
#: breezy/builtins.py:4329
2705
2778
msgid " To merge the changes introduced by 82, without previous changes::"
2706
2779
msgstr ""
2707
2780
2708
#: bzrlib/builtins.py:4333
2709
msgid " bzr merge -r 81..82 ../bzr.dev"
2781
#: breezy/builtins.py:4331
2782
msgid " brz merge -r 81..82 ../brz.dev"
2710
2783
msgstr ""
2711
2784
2712
#: bzrlib/builtins.py:4335
2785
#: breezy/builtins.py:4333
2713
2786
msgid " To apply a merge directive contained in /tmp/merge::"
2714
2787
msgstr ""
2715
2788
2716
#: bzrlib/builtins.py:4337
2717
msgid " bzr merge /tmp/merge"
2789
#: breezy/builtins.py:4335
2790
msgid " brz merge /tmp/merge"
2718
2791
msgstr ""
2719
2792
2720
#: bzrlib/builtins.py:4339
2793
#: breezy/builtins.py:4337
2721
2794
msgid ""
2722
2795
" To create a merge revision with three parents from two branches\n"
2723
2796
" feature1a and feature1b:"
2724
2797
msgstr ""
2725
2798
2726
#: bzrlib/builtins.py:4342
2799
#: breezy/builtins.py:4340
2727
2800
msgid ""
2728
" bzr merge ../feature1a\n"
2729
" bzr merge ../feature1b --force\n"
2730
" bzr commit -m 'revision with three parents'"
2801
" brz merge ../feature1a\n"
2802
" brz merge ../feature1b --force\n"
2803
" brz commit -m 'revision with three parents'"
2731
2804
msgstr ""
2732
2805
2733
#: bzrlib/builtins.py:4354
2806
# help of 'force' option of 'merge' command
2807
#: breezy/builtins.py:4352
2734
2808
msgid "Merge even if the destination tree has uncommitted changes."
2735
2809
msgstr ""
2736
2810
2737
#: bzrlib/builtins.py:4360
2811
# help of 'uncommitted' option of 'merge' command
2812
#: breezy/builtins.py:4358
2738
2813
msgid ""
2739
2814
"Apply uncommitted changes from a working copy, instead of branch changes."
2740
2815
msgstr ""
2741
2816
2742
#: bzrlib/builtins.py:4362
2817
# help of 'pull' option of 'merge' command
2818
#: breezy/builtins.py:4360
2743
2819
msgid ""
2744
2820
"If the destination is already completely merged into the source, pull from "
2745
2821
"the source rather than merging. When this happens, you do not need to "
2746
2822
"commit the result."
2747
2823
msgstr ""
2748
2824
2749
#: bzrlib/builtins.py:4367
2825
# help of 'directory' option of 'merge' command
2826
#: breezy/builtins.py:4365
2750
2827
msgid ""
2751
2828
"Branch to merge into, rather than the one containing the working directory."
2752
2829
msgstr ""
2753
2830
2754
#: bzrlib/builtins.py:4369
2831
# help of 'preview' option of 'merge' command
2832
#: breezy/builtins.py:4367
2755
2833
msgid "Instead of merging, show a diff of the merge."
2756
2834
msgstr ""
2757
2835
2758
#: bzrlib/builtins.py:4371
2836
# help of 'interactive' option of 'merge' command
2837
#: breezy/builtins.py:4369
2759
2838
msgid "Select changes interactively."
2760
2839
msgstr ""
2761
2840
2762
#: bzrlib/builtins.py:4393
2841
#: breezy/builtins.py:4391
2763
2842
msgid ""
2764
"Merging into empty branches not currently supported, "
2765
"https://bugs.launchpad.net/bzr/+bug/308562"
2843
"Merging into empty branches not currently supported, https://bugs.launchpad."
2844
"net/brz/+bug/308562"
2766
2845
msgstr ""
2767
2846
2768
#: bzrlib/builtins.py:4420
2847
#: breezy/builtins.py:4418
2769
2848
msgid "Cannot use --uncommitted with bundles or merge directives."
2770
2849
msgstr ""
2771
2850
2772
#: bzrlib/builtins.py:4431
2851
#: breezy/builtins.py:4429
2773
2852
msgid "Cannot use --uncommitted and --revision at the same time."
2774
2853
msgstr ""
2775
2854
2776
#: bzrlib/builtins.py:4451
2855
#: breezy/builtins.py:4449
2777
2856
msgid "merger: "
2778
2857
msgstr ""
2779
2858
2780
#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
2859
#: breezy/builtins.py:4451 breezy/bundle/apply_bundle.py:71
2781
2860
msgid "Nothing to do."
2782
2861
msgstr ""
2783
2862
2784
#: bzrlib/builtins.py:4457
2863
#: breezy/builtins.py:4455
2785
2864
msgid "Cannot pull individual files"
2786
2865
msgstr ""
2787
2866
2788
#: bzrlib/builtins.py:4465
2789
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2867
#: breezy/builtins.py:4463
2868
msgid "This branch has no commits. (perhaps you would prefer 'brz pull')"
2790
2869
msgstr ""
2791
2870
2792
#: bzrlib/builtins.py:4523
2871
#: breezy/builtins.py:4521
2793
2872
#, python-format
2794
2873
msgid "Show-base is not supported for this merge type. %s"
2795
2874
msgstr ""
2796
2875
2797
#: bzrlib/builtins.py:4532
2876
#: breezy/builtins.py:4530
2798
2877
#, python-format
2799
2878
msgid "Conflict reduction is not supported for merge type %s."
2800
2879
msgstr ""
2801
2880
2802
#: bzrlib/builtins.py:4536
2881
#: breezy/builtins.py:4534
2803
2882
msgid "Cannot do conflict reduction and show base."
2804
2883
msgstr ""
2805
2884
2806
#: bzrlib/builtins.py:4647
2885
#: breezy/builtins.py:4645
2807
2886
msgid "No location specified or remembered"
2808
msgstr "Tidak ada lokasi yang ditentukan atau diingat"
2887
msgstr ""
2809
2888
2810
#: bzrlib/builtins.py:4649
2889
#: breezy/builtins.py:4647
2890
#, python-brace-format
2811
2891
msgid "{0} remembered {1} location {2}"
2812
2892
msgstr ""
2813
2893
2814
#: bzrlib/builtins.py:4655
2894
#: breezy/builtins.py:4653
2815
2895
msgid "Redo a merge."
2816
2896
msgstr ""
2817
2897
2818
#: bzrlib/builtins.py:4657
2898
#: breezy/builtins.py:4655
2819
2899
msgid ""
2820
2900
"Use this if you want to try a different merge technique while resolving\n"
2821
2901
"conflicts. Some merge techniques are better than others, and remerge\n"
2822
2902
"lets you try different ones on different files."
2823
2903
msgstr ""
2824
2904
2825
#: bzrlib/builtins.py:4661
2905
#: breezy/builtins.py:4659
2826
2906
msgid ""
2827
2907
"The options for remerge have the same meaning and defaults as the ones for\n"
2828
2908
"merge. The difference is that remerge can (only) be run when there is a\n"
2829
2909
"pending merge, and it lets you specify particular files."
2830
2910
msgstr ""
2831
2911
2832
#: bzrlib/builtins.py:4665
2912
#: breezy/builtins.py:4663
2833
2913
msgid ""
2834
2914
":Examples:\n"
2835
2915
" Re-do the merge of all conflicted files, and show the base text in\n"
2836
2916
" conflict regions, in addition to the usual THIS and OTHER texts::"
2837
2917
msgstr ""
2838
2918
2839
#: bzrlib/builtins.py:4669
2840
msgid " bzr remerge --show-base"
2919
#: breezy/builtins.py:4667
2920
msgid " brz remerge --show-base"
2841
2921
msgstr ""
2842
2922
2843
#: bzrlib/builtins.py:4671
2923
#: breezy/builtins.py:4669
2844
2924
msgid ""
2845
2925
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2846
2926
" additional processing to reduce the size of conflict regions::"
2847
2927
msgstr ""
2848
2928
2849
#: bzrlib/builtins.py:4674
2850
msgid " bzr remerge --merge-type weave --reprocess foobar"
2929
#: breezy/builtins.py:4672
2930
msgid " brz remerge --merge-type weave --reprocess foobar"
2851
2931
msgstr ""
2852
2932
2853
#: bzrlib/builtins.py:4681
2933
# help of 'show-base' option of 'merge' command
2934
# help of 'show-base' option of 'pull' command
2935
# help of 'show-base' option of 'remerge' command
2936
# help of 'show-base' option of 'update' command
2937
#: breezy/builtins.py:4679
2854
2938
msgid "Show base revision text in conflicts."
2855
msgstr "Tampilkan revisi dasar teks dalam konflik."
2939
msgstr ""
2856
2940
2857
#: bzrlib/builtins.py:4693
2941
#: breezy/builtins.py:4691
2858
2942
msgid ""
2859
2943
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2860
2944
"merges."
2861
2945
msgstr ""
2862
2946
2863
#: bzrlib/builtins.py:4751
2947
#: breezy/builtins.py:4749
2864
2948
msgid ""
2865
2949
"Set files in the working tree back to the contents of a previous revision."
2866
2950
msgstr ""
2867
2951
2868
#: bzrlib/builtins.py:4753
2952
#: breezy/builtins.py:4751
2869
2953
msgid ""
2870
2954
"Giving a list of files will revert only those files. Otherwise, all files\n"
2871
2955
"will be reverted. If the revision is not specified with '--revision', the\n"
2874
2958
"the working tree basis revision."
2875
2959
msgstr ""
2876
2960
2877
#: bzrlib/builtins.py:4759
2961
#: breezy/builtins.py:4757
2878
2962
msgid ""
2879
2963
"To remove only some changes, without reverting to a prior version, use\n"
2880
2964
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2886
2970
"update command."
2887
2971
msgstr ""
2888
2972
2889
#: bzrlib/builtins.py:4768
2973
#: breezy/builtins.py:4766
2890
2974
msgid ""
2891
2975
"Uncommitted changes to files that are reverted will be discarded.\n"
2892
2976
"Howver, by default, any files that have been manually changed will be\n"
2894
2978
"files have '.~#~' appended to their name, where # is a number."
2895
2979
msgstr ""
2896
2980
2897
#: bzrlib/builtins.py:4773
2981
#: breezy/builtins.py:4771
2898
2982
msgid ""
2899
2983
"When you provide files, you can use their current pathname or the pathname\n"
2900
2984
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2902
2986
"reverted."
2903
2987
msgstr ""
2904
2988
2905
#: bzrlib/builtins.py:4778
2989
#: breezy/builtins.py:4776
2906
2990
msgid ""
2907
2991
"If you have newly added files since the target revision, they will be\n"
2908
2992
"removed. If the files to be removed have been changed, backups will be\n"
2910
2994
"deleted."
2911
2995
msgstr ""
2912
2996
2913
#: bzrlib/builtins.py:4783
2997
#: breezy/builtins.py:4781
2914
2998
msgid ""
2915
2999
"The working tree contains a list of revisions that have been merged but\n"
2916
3000
"not yet committed. These revisions will be included as additional parents\n"
2917
3001
"of the next commit. Normally, using revert clears that list as well as\n"
2918
3002
"reverting the files. If any files are specified, revert leaves the list\n"
2919
"of uncommitted merges alone and reverts only the files. Use ``bzr revert\n"
3003
"of uncommitted merges alone and reverts only the files. Use ``brz revert\n"
2920
3004
".`` in the tree root to revert all files but keep the recorded merges,\n"
2921
"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
3005
"and ``brz revert --forget-merges`` to clear the pending merge list without\n"
2922
3006
"reverting any files."
2923
3007
msgstr ""
2924
3008
2925
#: bzrlib/builtins.py:4792
3009
#: breezy/builtins.py:4790
2926
3010
msgid ""
2927
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
3011
"Using \"brz revert --forget-merges\", it is possible to apply all of the\n"
2928
3012
"changes from a branch in a single revision. To do this, perform the merge\n"
2929
3013
"as desired. Then doing revert with the \"--forget-merges\" option will "
2930
3014
"keep\n"
2936
3020
"target branches."
2937
3021
msgstr ""
2938
3022
2939
#: bzrlib/builtins.py:4806
3023
# help of 'no-backup' option of 'revert' command
3024
#: breezy/builtins.py:4804
2940
3025
msgid "Do not save backups of reverted files."
2941
3026
msgstr ""
2942
3027
2943
#: bzrlib/builtins.py:4808
3028
# help of 'forget-merges' option of 'revert' command
3029
#: breezy/builtins.py:4806
2944
3030
msgid "Remove pending merge marker, without changing any files."
2945
3031
msgstr ""
2946
3032
2947
#: bzrlib/builtins.py:4839
3033
#: breezy/builtins.py:4837
2948
3034
msgid ""
2949
3035
"Show help on a command or other topic.\n"
2950
3036
" "
2951
3037
msgstr ""
2952
3038
2953
#: bzrlib/builtins.py:4844
3039
# help of 'long' option of 'help' command
3040
#: breezy/builtins.py:4842
2954
3041
msgid "Show help on all commands."
2955
msgstr "Tampilkan bantuan pada semua perintah."
3042
msgstr ""
2956
3043
2957
#: bzrlib/builtins.py:4873
3044
#: breezy/builtins.py:4871
2958
3045
msgid "Show unmerged/unpulled revisions between two branches."
2959
3046
msgstr ""
2960
3047
2961
#: bzrlib/builtins.py:4875
3048
#: breezy/builtins.py:4873
2962
3049
msgid "OTHER_BRANCH may be local or remote."
2963
3050
msgstr ""
2964
3051
2965
#: bzrlib/builtins.py:4877
3052
#: breezy/builtins.py:4875
2966
3053
msgid ""
2967
3054
"To filter on a range of revisions, you can use the command -r begin..end\n"
2968
3055
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2973
3060
" 0 - no missing revisions"
2974
3061
msgstr ""
2975
3062
2976
#: bzrlib/builtins.py:4887
3063
#: breezy/builtins.py:4885
2977
3064
msgid ""
2978
3065
" Determine the missing revisions between this and the branch at the\n"
2979
3066
" remembered pull location::"
2980
3067
msgstr ""
2981
3068
2982
#: bzrlib/builtins.py:4890
2983
msgid " bzr missing"
3069
#: breezy/builtins.py:4888
3070
msgid " brz missing"
2984
3071
msgstr ""
2985
3072
2986
#: bzrlib/builtins.py:4892
3073
#: breezy/builtins.py:4890
2987
3074
msgid " Determine the missing revisions between this and another branch::"
2988
3075
msgstr ""
2989
3076
2990
#: bzrlib/builtins.py:4894
2991
msgid " bzr missing http://server/branch"
3077
#: breezy/builtins.py:4892
3078
msgid " brz missing http://server/branch"
2992
3079
msgstr ""
2993
3080
2994
#: bzrlib/builtins.py:4896
3081
#: breezy/builtins.py:4894
2995
3082
msgid ""
2996
3083
" Determine the missing revisions up to a specific revision on the other\n"
2997
3084
" branch::"
2998
3085
msgstr ""
2999
3086
3000
#: bzrlib/builtins.py:4899
3001
msgid " bzr missing -r ..-10"
3087
#: breezy/builtins.py:4897
3088
msgid " brz missing -r ..-10"
3002
3089
msgstr ""
3003
3090
3004
#: bzrlib/builtins.py:4901
3091
#: breezy/builtins.py:4899
3005
3092
msgid ""
3006
3093
" Determine the missing revisions up to a specific revision on this\n"
3007
3094
" branch::"
3008
3095
msgstr ""
3009
3096
3010
#: bzrlib/builtins.py:4904
3011
msgid " bzr missing --my-revision ..-10"
3097
#: breezy/builtins.py:4902
3098
msgid " brz missing --my-revision ..-10"
3012
3099
msgstr ""
3013
3100
3014
#: bzrlib/builtins.py:4911
3101
# help of 'reverse' option of 'missing' command
3102
#: breezy/builtins.py:4909
3015
3103
msgid "Reverse the order of revisions."
3016
msgstr "Membalik urutan revisi."
3104
msgstr ""
3017
3105
3018
#: bzrlib/builtins.py:4913
3106
# help of 'mine-only' option of 'missing' command
3107
#: breezy/builtins.py:4911
3019
3108
msgid "Display changes in the local branch only."
3020
3109
msgstr ""
3021
3110
3022
#: bzrlib/builtins.py:4914
3111
# help of 'this' option of 'missing' command
3112
#: breezy/builtins.py:4912
3023
3113
msgid "Same as --mine-only."
3024
3114
msgstr ""
3025
3115
3026
#: bzrlib/builtins.py:4916
3116
# help of 'theirs-only' option of 'missing' command
3117
#: breezy/builtins.py:4914
3027
3118
msgid "Display changes in the remote branch only."
3028
3119
msgstr ""
3029
3120
3030
#: bzrlib/builtins.py:4917
3121
# help of 'other' option of 'missing' command
3122
#: breezy/builtins.py:4915
3031
3123
msgid "Same as --theirs-only."
3032
3124
msgstr ""
3033
3125
3034
#: bzrlib/builtins.py:4922
3126
# help of 'revision' option of 'missing' command
3127
#: breezy/builtins.py:4920
3035
3128
msgid ""
3036
3129
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
3037
3130
"details."
3038
3131
msgstr ""
3039
3132
3040
#: bzrlib/builtins.py:4926
3133
# help of 'my-revision' option of 'missing' command
3134
#: breezy/builtins.py:4924
3041
3135
msgid ""
3042
3136
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
3043
3137
"details."
3044
3138
msgstr ""
3045
3139
3046
#: bzrlib/builtins.py:4929
3140
# help of 'include-merged' option of 'missing' command
3141
#: breezy/builtins.py:4927
3047
3142
msgid "Show all revisions in addition to the mainline ones."
3048
msgstr "Tampilkan semua revisi selain yang utama."
3143
msgstr ""
3049
3144
3050
#: bzrlib/builtins.py:4983
3145
#: breezy/builtins.py:4981
3051
3146
msgid "No peer location known or specified."
3052
3147
msgstr ""
3053
3148
3054
#: bzrlib/builtins.py:4987
3149
#: breezy/builtins.py:4985
3150
#, python-brace-format
3055
3151
msgid "Using saved parent location: {0}\n"
3056
3152
msgstr ""
3057
3153
3058
#: bzrlib/builtins.py:5020
3154
#: breezy/builtins.py:5018
3059
3155
#, python-format
3060
3156
msgid "You have %d extra revision:\n"
3061
3157
msgid_plural "You have %d extra revisions:\n"
3062
3158
msgstr[0] ""
3063
3159
msgstr[1] ""
3064
3160
3065
#: bzrlib/builtins.py:5040
3161
#: breezy/builtins.py:5038
3066
3162
#, python-format
3067
3163
msgid "You are missing %d revision:\n"
3068
3164
msgid_plural "You are missing %d revisions:\n"
3069
3165
msgstr[0] ""
3070
3166
msgstr[1] ""
3071
3167
3072
#: bzrlib/builtins.py:5055
3168
#: breezy/builtins.py:5053
3073
3169
msgid "This branch has no new revisions.\n"
3074
3170
msgstr ""
3075
3171
3076
#: bzrlib/builtins.py:5058
3172
#: breezy/builtins.py:5056
3077
3173
msgid "Other branch has no new revisions.\n"
3078
3174
msgstr ""
3079
3175
3080
#: bzrlib/builtins.py:5063
3176
#: breezy/builtins.py:5061
3081
3177
msgid "Branches are up to date.\n"
3082
3178
msgstr ""
3083
3179
3084
#: bzrlib/builtins.py:5074
3180
#: breezy/builtins.py:5072
3085
3181
msgid "Compress the data within a repository."
3086
3182
msgstr ""
3087
3183
3088
#: bzrlib/builtins.py:5076
3184
#: breezy/builtins.py:5074
3089
3185
msgid ""
3090
3186
"This operation compresses the data within a bazaar repository. As\n"
3091
3187
"bazaar supports automatic packing of repository, this operation is\n"
3092
3188
"normally not required to be done manually."
3093
3189
msgstr ""
3094
3190
3095
#: bzrlib/builtins.py:5080
3191
#: breezy/builtins.py:5078
3096
3192
msgid ""
3097
3193
"During the pack operation, bazaar takes a backup of existing repository\n"
3098
3194
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3101
3197
"used."
3102
3198
msgstr ""
3103
3199
3104
#: bzrlib/builtins.py:5086
3200
#: breezy/builtins.py:5084
3105
3201
msgid ""
3106
3202
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3107
3203
"during or immediately after repacking, you may be left with a state\n"
3109
3205
"been. In this case the repository may be unusable."
3110
3206
msgstr ""
3111
3207
3112
#: bzrlib/builtins.py:5095
3208
# help of 'clean-obsolete-packs' option of 'pack' command
3209
#: breezy/builtins.py:5093
3113
3210
msgid "Delete obsolete packs to save disk space."
3114
msgstr "Hapus paket usang untuk menghemat ruang disk."
3211
msgstr ""
3115
3212
3116
#: bzrlib/builtins.py:5109
3213
#: breezy/builtins.py:5107
3117
3214
msgid "List the installed plugins."
3118
msgstr "Daftar plugin yang terpasang."
3215
msgstr ""
3119
3216
3120
#: bzrlib/builtins.py:5111
3217
#: breezy/builtins.py:5109
3121
3218
msgid ""
3122
3219
"This command displays the list of installed plugins including\n"
3123
3220
"version of plugin and a short description of each."
3124
3221
msgstr ""
3125
3222
3126
#: bzrlib/builtins.py:5114
3223
#: breezy/builtins.py:5112
3127
3224
msgid "--verbose shows the path where each plugin is located."
3128
3225
msgstr ""
3129
3226
3130
#: bzrlib/builtins.py:5116
3227
#: breezy/builtins.py:5114
3131
3228
msgid ""
3132
3229
"A plugin is an external component for Bazaar that extends the\n"
3133
3230
"revision control system, by adding or replacing code in Bazaar.\n"
3136
3233
"customizing log output."
3137
3234
msgstr ""
3138
3235
3139
#: bzrlib/builtins.py:5122
3236
#: breezy/builtins.py:5120
3140
3237
msgid ""
3141
3238
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3142
3239
"for further information on plugins including where to find them and how to\n"
3144
3241
"plugins using the Python programming language."
3145
3242
msgstr ""
3146
3243
3147
#: bzrlib/builtins.py:5138
3244
#: breezy/builtins.py:5136
3148
3245
msgid "Show testament (signing-form) of a revision."
3149
3246
msgstr ""
3150
3247
3151
#: bzrlib/builtins.py:5141
3248
# help of 'long' option of 'testament' command
3249
#: breezy/builtins.py:5139
3152
3250
msgid "Produce long-format testament."
3153
3251
msgstr ""
3154
3252
3155
#: bzrlib/builtins.py:5143
3253
# help of 'strict' option of 'testament' command
3254
#: breezy/builtins.py:5141
3156
3255
msgid "Produce a strict-format testament."
3157
3256
msgstr ""
3158
3257
3159
#: bzrlib/builtins.py:5169
3258
#: breezy/builtins.py:5168
3160
3259
msgid "Show the origin of each line in a file."
3161
3260
msgstr ""
3162
3261
3163
#: bzrlib/builtins.py:5171
3262
#: breezy/builtins.py:5170
3164
3263
msgid ""
3165
3264
"This prints out the given file with an annotation on the left side\n"
3166
3265
"indicating which revision, author and date introduced the change."
3167
3266
msgstr ""
3168
3267
3169
#: bzrlib/builtins.py:5174
3268
#: breezy/builtins.py:5173
3170
3269
msgid ""
3171
3270
"If the origin is the same for a run of consecutive lines, it is\n"
3172
3271
"shown only at the top, unless the --all option is given."
3173
3272
msgstr ""
3174
3273
3175
#: bzrlib/builtins.py:5182
3274
# help of 'all' option of 'annotate' command
3275
#: breezy/builtins.py:5181
3176
3276
msgid "Show annotations on all lines."
3177
3277
msgstr ""
3178
3278
3179
#: bzrlib/builtins.py:5183
3279
# help of 'long' option of 'annotate' command
3280
#: breezy/builtins.py:5182
3180
3281
msgid "Show commit date in annotations."
3181
3282
msgstr ""
3182
3283
3183
#: bzrlib/builtins.py:5270
3284
#: breezy/builtins.py:5269
3184
3285
msgid "Cannot sign a range of non-revision-history revisions"
3185
3286
msgstr ""
3186
3287
3187
#: bzrlib/builtins.py:5282
3288
#: breezy/builtins.py:5281
3188
3289
msgid "Please supply either one revision, or a range."
3189
3290
msgstr ""
3190
3291
3191
#: bzrlib/builtins.py:5286
3292
#: breezy/builtins.py:5285
3192
3293
msgid ""
3193
3294
"Convert the current branch into a checkout of the supplied branch.\n"
3194
3295
"If no branch is supplied, rebind to the last bound location."
3195
3296
msgstr ""
3196
3297
3197
#: bzrlib/builtins.py:5289
3298
#: breezy/builtins.py:5288
3198
3299
msgid ""
3199
3300
"Once converted into a checkout, commits must succeed on the master branch\n"
3200
3301
"before they will be applied to the local branch."
3201
3302
msgstr ""
3202
3303
3203
#: bzrlib/builtins.py:5292
3304
#: breezy/builtins.py:5291
3204
3305
msgid ""
3205
3306
"Bound branches use the nickname of its master branch unless it is set\n"
3206
3307
"locally, in which case binding will update the local nickname to be\n"
3207
3308
"that of the master."
3208
3309
msgstr ""
3209
3310
3210
#: bzrlib/builtins.py:5307
3311
#: breezy/builtins.py:5306
3211
3312
msgid "No location supplied. This format does not remember old locations."
3212
3313
msgstr ""
3213
3314
3214
#: bzrlib/builtins.py:5313
3315
#: breezy/builtins.py:5312
3215
3316
msgid "Branch is already bound"
3216
3317
msgstr ""
3217
3318
3218
#: bzrlib/builtins.py:5316
3319
#: breezy/builtins.py:5315
3219
3320
msgid "No location supplied and no previous location known"
3220
3321
msgstr ""
3221
3322
3222
#: bzrlib/builtins.py:5322
3323
#: breezy/builtins.py:5321
3223
3324
msgid "These branches have diverged. Try merging, and then bind again."
3224
3325
msgstr ""
3225
3326
3226
#: bzrlib/builtins.py:5329
3327
#: breezy/builtins.py:5328
3227
3328
msgid "Convert the current checkout into a regular branch."
3228
3329
msgstr ""
3229
3330
3230
#: bzrlib/builtins.py:5331
3331
#: breezy/builtins.py:5330
3231
3332
msgid ""
3232
3333
"After unbinding, the local branch is considered independent and subsequent\n"
3233
3334
"commits will be local only."
3234
3335
msgstr ""
3235
3336
3236
#: bzrlib/builtins.py:5342
3337
#: breezy/builtins.py:5341
3237
3338
msgid "Local branch is not bound"
3238
3339
msgstr ""
3239
3340
3240
#: bzrlib/builtins.py:5346
3341
#: breezy/builtins.py:5345
3241
3342
msgid "Remove the last committed revision."
3242
3343
msgstr ""
3243
3344
3244
#: bzrlib/builtins.py:5348
3345
#: breezy/builtins.py:5347
3245
3346
msgid ""
3246
3347
"--verbose will print out what is being removed.\n"
3247
3348
"--dry-run will go through all the motions, but not actually\n"
3248
3349
"remove anything."
3249
3350
msgstr ""
3250
3351
3251
#: bzrlib/builtins.py:5352
3352
#: breezy/builtins.py:5351
3252
3353
msgid ""
3253
3354
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3254
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3355
"specified revision. For example, \"brz uncommit -r 15\" will leave the\n"
3255
3356
"branch at revision 15."
3256
3357
msgstr ""
3257
3358
3258
#: bzrlib/builtins.py:5356
3359
#: breezy/builtins.py:5355
3259
3360
msgid ""
3260
3361
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3261
3362
"it may make is to restore any pending merges that were present before\n"
3262
3363
"the commit."
3263
3364
msgstr ""
3264
3365
3265
#: bzrlib/builtins.py:5367
3366
# help of 'dry-run' option of 'uncommit' command
3367
#: breezy/builtins.py:5366
3266
3368
msgid "Don't actually make changes."
3267
3369
msgstr ""
3268
3370
3269
#: bzrlib/builtins.py:5368
3371
# help of 'force' option of 'uncommit' command
3372
#: breezy/builtins.py:5367
3270
3373
msgid "Say yes to all questions."
3271
3374
msgstr ""
3272
3375
3273
#: bzrlib/builtins.py:5370
3376
# help of 'keep-tags' option of 'uncommit' command
3377
#: breezy/builtins.py:5369
3274
3378
msgid "Keep tags that point to removed revisions."
3275
3379
msgstr ""
3276
3380
3277
#: bzrlib/builtins.py:5372
3381
# help of 'local' option of 'uncommit' command
3382
#: breezy/builtins.py:5371
3278
3383
msgid "Only remove the commits from the local branch when in a checkout."
3279
3384
msgstr ""
3280
3385
3281
#: bzrlib/builtins.py:5421
3386
#: breezy/builtins.py:5420
3282
3387
msgid "No revisions to uncommit.\n"
3283
3388
msgstr ""
3284
3389
3285
#: bzrlib/builtins.py:5436
3390
#: breezy/builtins.py:5435
3286
3391
msgid "Dry-run, pretending to remove the above revisions.\n"
3287
3392
msgstr ""
3288
3393
3289
#: bzrlib/builtins.py:5439
3394
#: breezy/builtins.py:5438
3290
3395
msgid "The above revision(s) will be removed.\n"
3291
3396
msgstr ""
3292
3397
3293
#: bzrlib/builtins.py:5443
3398
#: breezy/builtins.py:5442
3294
3399
msgid "Uncommit these revisions"
3295
3400
msgstr ""
3296
3401
3297
#: bzrlib/builtins.py:5446
3402
#: breezy/builtins.py:5445
3298
3403
msgid "Canceled\n"
3299
3404
msgstr ""
3300
3405
3301
#: bzrlib/builtins.py:5453
3406
#: breezy/builtins.py:5452
3302
3407
#, python-format
3303
3408
msgid ""
3304
3409
"You can restore the old tip by running:\n"
3305
" bzr pull . -r revid:%s\n"
3410
" brz pull . -r revid:%s\n"
3306
3411
msgstr ""
3307
3412
3308
#: bzrlib/builtins.py:5458
3413
#: breezy/builtins.py:5457
3309
3414
msgid "Break a dead lock."
3310
3415
msgstr ""
3311
3416
3312
#: bzrlib/builtins.py:5460
3417
#: breezy/builtins.py:5459
3313
3418
msgid ""
3314
3419
"This command breaks a lock on a repository, branch, working directory or\n"
3315
3420
"config file."
3316
3421
msgstr ""
3317
3422
3318
#: bzrlib/builtins.py:5463
3423
#: breezy/builtins.py:5462
3319
3424
msgid ""
3320
3425
"CAUTION: Locks should only be broken when you are sure that the process\n"
3321
3426
"holding the lock has been stopped."
3322
3427
msgstr ""
3323
3428
3324
#: bzrlib/builtins.py:5466
3429
#: breezy/builtins.py:5465
3325
3430
msgid ""
3326
"You can get information on what locks are open via the 'bzr info\n"
3431
"You can get information on what locks are open via the 'brz info\n"
3327
3432
"[location]' command."
3328
3433
msgstr ""
3329
3434
3330
#: bzrlib/builtins.py:5469
3435
#: breezy/builtins.py:5468
3331
3436
msgid ""
3332
3437
":Examples:\n"
3333
" bzr break-lock\n"
3334
" bzr break-lock bzr+ssh://example.com/bzr/foo\n"
3335
" bzr break-lock --conf ~/.bazaar"
3438
" brz break-lock\n"
3439
" brz break-lock brz+ssh://example.com/brz/foo\n"
3440
" brz break-lock --conf ~/.bazaar"
3336
3441
msgstr ""
3337
3442
3338
#: bzrlib/builtins.py:5478
3443
# help of 'config' option of 'break-lock' command
3444
#: breezy/builtins.py:5477
3339
3445
msgid "LOCATION is the directory where the config lock is."
3340
3446
msgstr ""
3341
3447
3342
#: bzrlib/builtins.py:5480
3448
# help of 'force' option of 'break-lock' command
3449
#: breezy/builtins.py:5479
3343
3450
msgid "Do not ask for confirmation before breaking the lock."
3344
3451
msgstr ""
3345
3452
3346
#: bzrlib/builtins.py:5515
3453
# help of 'protocol=bzr' option of 'serve' command
3454
#: breezy/builtins.py:5514
3347
3455
msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
3348
3456
msgstr ""
3349
3457
3350
#: bzrlib/builtins.py:5516
3351
msgid "Run the bzr server."
3458
#: breezy/builtins.py:5515
3459
msgid "Run the brz server."
3352
3460
msgstr ""
3353
3461
3354
#: bzrlib/builtins.py:5522
3462
# help of 'inet' option of 'serve' command
3463
#: breezy/builtins.py:5521
3355
3464
msgid "Serve on stdin/out for use from inetd or sshd."
3356
3465
msgstr ""
3357
3466
3358
#: bzrlib/builtins.py:5523
3467
# title of 'protocol' option of 'serve' command
3468
#: breezy/builtins.py:5522
3359
3469
msgid "protocol"
3360
3470
msgstr ""
3361
3471
3362
#: bzrlib/builtins.py:5524
3472
# help of 'protocol' option of 'serve' command
3473
#: breezy/builtins.py:5523
3363
3474
msgid "Protocol to serve."
3364
3475
msgstr ""
3365
3476
3366
#: bzrlib/builtins.py:5528
3477
# help of 'listen' option of 'serve' command
3478
#: breezy/builtins.py:5527
3367
3479
msgid "Listen for connections on nominated address."
3368
3480
msgstr ""
3369
3481
3370
#: bzrlib/builtins.py:5530
3482
# help of 'port' option of 'serve' command
3483
#: breezy/builtins.py:5529
3371
3484
msgid ""
3372
3485
"Listen for connections on nominated port. Passing 0 as the port number will "
3373
3486
"result in a dynamically allocated port. The default port depends on the "
3374
3487
"protocol."
3375
3488
msgstr ""
3376
3489
3377
#: bzrlib/builtins.py:5535
3490
# help of 'directory' option of 'serve' command
3491
#: breezy/builtins.py:5534
3378
3492
msgid "Serve contents of this directory."
3379
3493
msgstr ""
3380
3494
3381
#: bzrlib/builtins.py:5537
3495
# help of 'allow-writes' option of 'serve' command
3496
#: breezy/builtins.py:5536
3382
3497
msgid ""
3383
3498
"By default the server is a readonly server. Supplying --allow-writes "
3384
3499
"enables write access to the contents of the served directory and below. "
3385
"Note that ``bzr serve`` does not perform authentication, so unless some form "
3500
"Note that ``brz serve`` does not perform authentication, so unless some form "
3386
3501
"of external authentication is arranged supplying this option leads to global "
3387
3502
"uncontrolled write access to your file system."
3388
3503
msgstr ""
3389
3504
3390
#: bzrlib/builtins.py:5546
3505
# help of 'client-timeout' option of 'serve' command
3506
#: breezy/builtins.py:5545
3391
3507
msgid "Override the default idle client timeout (5min)."
3392
3508
msgstr ""
3393
3509
3394
#: bzrlib/builtins.py:5564
3510
#: breezy/builtins.py:5563
3395
3511
msgid "Combine a tree into its containing tree."
3396
3512
msgstr ""
3397
3513
3398
#: bzrlib/builtins.py:5566
3514
#: breezy/builtins.py:5565
3399
3515
msgid "This command requires the target tree to be in a rich-root format."
3400
3516
msgstr ""
3401
3517
3402
#: bzrlib/builtins.py:5568
3518
#: breezy/builtins.py:5567
3403
3519
msgid ""
3404
3520
"The TREE argument should be an independent tree, inside another tree, but\n"
3405
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3406
"running \"bzr branch\" with the target inside a tree.)"
3521
"not part of it. (Such trees can be produced by \"brz split\", but also by\n"
3522
"running \"brz branch\" with the target inside a tree.)"
3407
3523
msgstr ""
3408
3524
3409
#: bzrlib/builtins.py:5572
3525
#: breezy/builtins.py:5571
3410
3526
msgid ""
3411
3527
"The result is a combined tree, with the subtree no longer an independent\n"
3412
3528
"part. This is marked as a merge of the subtree into the containing tree,\n"
3413
3529
"and all history is preserved."
3414
3530
msgstr ""
3415
3531
3416
#: bzrlib/builtins.py:5590
3532
#: breezy/builtins.py:5589
3417
3533
#, python-format
3418
3534
msgid ""
3419
3535
"Can't join trees because %s doesn't support rich root data.\n"
3420
"You can use bzr upgrade on the repository."
3536
"You can use brz upgrade on the repository."
3421
3537
msgstr ""
3422
3538
3423
#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
3539
#: breezy/builtins.py:5599 breezy/builtins.py:5605
3540
#, python-brace-format
3424
3541
msgid "Cannot join {0}. {1}"
3425
3542
msgstr ""
3426
3543
3427
#: bzrlib/builtins.py:5610
3544
#: breezy/builtins.py:5609
3428
3545
msgid "Split a subdirectory of a tree into a separate tree."
3429
3546
msgstr ""
3430
3547
3431
#: bzrlib/builtins.py:5612
3548
#: breezy/builtins.py:5611
3432
3549
msgid ""
3433
3550
"This command will produce a target tree in a format that supports\n"
3434
3551
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3435
3552
"converted into earlier formats like 'dirstate-tags'."
3436
3553
msgstr ""
3437
3554
3438
#: bzrlib/builtins.py:5616
3555
#: breezy/builtins.py:5615
3439
3556
msgid ""
3440
3557
"The TREE argument should be a subdirectory of a working tree. That\n"
3441
3558
"subdirectory will be converted into an independent tree, with its own\n"
3442
3559
"branch. Commits in the top-level tree will not apply to the new subtree."
3443
3560
msgstr ""
3444
3561
3445
#: bzrlib/builtins.py:5696
3562
#: breezy/builtins.py:5695
3446
3563
msgid "No submit branch specified or known"
3447
3564
msgstr ""
3448
3565
3449
#: bzrlib/builtins.py:5705 bzrlib/send.py:109
3566
#: breezy/builtins.py:5704 breezy/send.py:109
3450
3567
msgid "No public branch specified or known"
3451
3568
msgstr ""
3452
3569
3453
#: bzrlib/builtins.py:5710
3454
msgid "bzr merge-directive takes at most two one revision identifiers"
3570
#: breezy/builtins.py:5709
3571
msgid "brz merge-directive takes at most two one revision identifiers"
3455
3572
msgstr ""
3456
3573
3457
#: bzrlib/builtins.py:5719
3574
#: breezy/builtins.py:5718
3458
3575
msgid "No revisions to bundle."
3459
3576
msgstr ""
3460
3577
3461
#: bzrlib/builtins.py:5738
3578
#: breezy/builtins.py:5737
3462
3579
msgid "Mail or create a merge-directive for submitting changes."
3463
3580
msgstr ""
3464
3581
3465
#: bzrlib/builtins.py:5740
3582
#: breezy/builtins.py:5739
3466
3583
msgid "A merge directive provides many things needed for requesting merges:"
3467
3584
msgstr ""
3468
3585
3469
#: bzrlib/builtins.py:5742
3586
#: breezy/builtins.py:5741
3470
3587
msgid "* A machine-readable description of the merge to perform"
3471
3588
msgstr ""
3472
3589
3473
#: bzrlib/builtins.py:5744
3590
#: breezy/builtins.py:5743
3474
3591
msgid "* An optional patch that is a preview of the changes requested"
3475
3592
msgstr ""
3476
3593
3477
#: bzrlib/builtins.py:5746
3594
#: breezy/builtins.py:5745
3478
3595
msgid ""
3479
3596
"* An optional bundle of revision data, so that the changes can be applied\n"
3480
3597
" directly from the merge directive, without retrieving data from a\n"
3481
3598
" branch."
3482
3599
msgstr ""
3483
3600
3484
#: bzrlib/builtins.py:5750
3601
#: breezy/builtins.py:5749
3485
3602
msgid ""
3486
"`bzr send` creates a compact data set that, when applied using bzr\n"
3603
"`brz send` creates a compact data set that, when applied using brz\n"
3487
3604
"merge, has the same effect as merging from the source branch. "
3488
3605
msgstr ""
3489
3606
3490
#: bzrlib/builtins.py:5753
3607
#: breezy/builtins.py:5752
3491
3608
msgid ""
3492
3609
"By default the merge directive is self-contained and can be applied to any\n"
3493
3610
"branch containing submit_branch in its ancestory without needing access to\n"
3494
3611
"the source branch."
3495
3612
msgstr ""
3496
3613
3497
#: bzrlib/builtins.py:5757
3614
#: breezy/builtins.py:5756
3498
3615
msgid ""
3499
3616
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3500
3617
"revisions, but only a structured request to merge from the\n"
3503
3620
"included if known, so that people can check it later."
3504
3621
msgstr ""
3505
3622
3506
#: bzrlib/builtins.py:5763
3623
#: breezy/builtins.py:5762
3507
3624
msgid ""
3508
3625
"The submit branch defaults to the parent of the source branch, but can be\n"
3509
3626
"overridden. Both submit branch and public branch will be remembered in\n"
3512
3629
"be changed using --from."
3513
3630
msgstr ""
3514
3631
3515
#: bzrlib/builtins.py:5769
3632
#: breezy/builtins.py:5768
3516
3633
msgid ""
3517
3634
"Both the submit branch and the public branch follow the usual behavior with\n"
3518
3635
"respect to --remember: If there is no default location set, the first send\n"
3521
3638
"--remember. The value will only be saved if the location can be accessed."
3522
3639
msgstr ""
3523
3640
3524
#: bzrlib/builtins.py:5775
3641
#: breezy/builtins.py:5774
3525
3642
msgid ""
3526
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3643
"In order to calculate those changes, brz must analyse the submit branch.\n"
3527
3644
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3528
3645
"If a public location is known for the submit_branch, that location is used\n"
3529
3646
"in the merge directive."
3530
3647
msgstr ""
3531
3648
3532
#: bzrlib/builtins.py:5780
3649
#: breezy/builtins.py:5779
3533
3650
msgid ""
3534
3651
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3535
3652
"given, in which case it is sent to a file."
3536
3653
msgstr ""
3537
3654
3538
#: bzrlib/builtins.py:5783
3655
#: breezy/builtins.py:5782
3539
3656
msgid ""
3540
3657
"Mail is sent using your preferred mail program. This should be transparent\n"
3541
3658
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3542
3659
"If the preferred client can't be found (or used), your editor will be used."
3543
3660
msgstr ""
3544
3661
3545
#: bzrlib/builtins.py:5787
3662
#: breezy/builtins.py:5786
3546
3663
msgid ""
3547
3664
"To use a specific mail program, set the mail_client configuration option.\n"
3548
3665
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3549
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app\" "
3550
"(MacOS X's\n"
3666
"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
3667
"\" (MacOS X's\n"
3551
3668
"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
3552
3669
"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\". Plugins may also "
3553
3670
"add\n"
3554
3671
"supported clients."
3555
3672
msgstr ""
3556
3673
3557
#: bzrlib/builtins.py:5794
3674
#: breezy/builtins.py:5793
3558
3675
msgid ""
3559
3676
"If mail is being sent, a to address is required. This can be supplied\n"
3560
3677
"either on the commandline, by setting the submit_to configuration\n"
3562
3679
"in the submit branch."
3563
3680
msgstr ""
3564
3681
3565
#: bzrlib/builtins.py:5799
3682
#: breezy/builtins.py:5798
3566
3683
msgid ""
3567
3684
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3568
3685
"and\n"
3572
3689
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3573
3690
msgstr ""
3574
3691
3575
#: bzrlib/builtins.py:5805
3692
#: breezy/builtins.py:5804
3576
3693
msgid ""
3577
"The merge directives created by bzr send may be applied using bzr merge or\n"
3578
"bzr pull by specifying a file containing a merge directive as the location."
3694
"The merge directives created by brz send may be applied using brz merge or\n"
3695
"brz pull by specifying a file containing a merge directive as the location."
3579
3696
msgstr ""
3580
3697
3581
#: bzrlib/builtins.py:5808
3698
#: breezy/builtins.py:5807
3582
3699
msgid ""
3583
"bzr send makes extensive use of public locations to map local locations "
3700
"brz send makes extensive use of public locations to map local locations "
3584
3701
"into\n"
3585
"URLs that can be used by other people. See `bzr help configuration` to\n"
3586
"set them, and use `bzr info` to display them."
3702
"URLs that can be used by other people. See `brz help configuration` to\n"
3703
"set them, and use `brz info` to display them."
3587
3704
msgstr ""
3588
3705
3589
#: bzrlib/builtins.py:5832
3706
# help of 'output' option of 'send' command
3707
#: breezy/builtins.py:5831
3590
3708
msgid "Write merge directive to this file or directory; use - for stdout."
3591
3709
msgstr ""
3592
3710
3593
#: bzrlib/builtins.py:5836
3711
# help of 'strict' option of 'send' command
3712
#: breezy/builtins.py:5835
3594
3713
msgid ""
3595
3714
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3596
3715
"strict disables the check."
3597
3716
msgstr ""
3598
3717
3599
#: bzrlib/builtins.py:5838
3718
# help of 'mail-to' option of 'send' command
3719
#: breezy/builtins.py:5837
3600
3720
msgid "Mail the request to this address."
3601
3721
msgstr ""
3602
3722
3603
#: bzrlib/builtins.py:5842
3723
# help of 'body' option of 'send' command
3724
#: breezy/builtins.py:5841
3604
3725
msgid "Body for the email."
3605
3726
msgstr ""
3606
3727
3607
#: bzrlib/builtins.py:5895
3728
# help of 'no-bundle' option of 'send' command
3729
#: breezy/builtins.py:5894
3608
3730
msgid "Do not include a bundle in the merge directive."
3609
3731
msgstr ""
3610
3732
3611
#: bzrlib/builtins.py:5896
3733
# help of 'no-patch' option of 'send' command
3734
#: breezy/builtins.py:5895
3612
3735
msgid "Do not include a preview patch in the merge directive."
3613
3736
msgstr ""
3614
3737
3615
#: bzrlib/builtins.py:5899
3738
# help of 'remember' option of 'send' command
3739
#: breezy/builtins.py:5898
3616
3740
msgid "Remember submit and public branch."
3617
3741
msgstr ""
3618
3742
3619
#: bzrlib/builtins.py:5901
3743
# help of 'from' option of 'send' command
3744
#: breezy/builtins.py:5900
3620
3745
msgid ""
3621
3746
"Branch to generate the submission from, rather than the one containing the "
3622
3747
"working directory."
3623
3748
msgstr ""
3624
3749
3625
#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
3750
# title of 'format' option of 'send' command
3751
# title of 'format' option of 'version-info' command
3752
#: breezy/builtins.py:5910 breezy/cmd_version_info.py:76
3626
3753
msgid "format"
3627
3754
msgstr ""
3628
3755
3629
#: bzrlib/builtins.py:5912
3756
# help of 'format' option of 'send' command
3757
#: breezy/builtins.py:5911
3630
3758
msgid "Use the specified output format."
3631
3759
msgstr ""
3632
3760
3633
#: bzrlib/builtins.py:5934
3761
#: breezy/builtins.py:5933
3634
3762
msgid "Create, remove or modify a tag naming a revision."
3635
3763
msgstr ""
3636
3764
3637
#: bzrlib/builtins.py:5936
3765
#: breezy/builtins.py:5935
3638
3766
msgid ""
3639
3767
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3640
3768
"(--revision) option can be given -rtag:X, where X is any previously\n"
3641
3769
"created tag."
3642
3770
msgstr ""
3643
3771
3644
#: bzrlib/builtins.py:5940
3772
#: breezy/builtins.py:5939
3645
3773
msgid ""
3646
3774
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3647
3775
"along when you branch, push, pull or merge."
3648
3776
msgstr ""
3649
3777
3650
#: bzrlib/builtins.py:5943
3778
#: breezy/builtins.py:5942
3651
3779
msgid ""
3652
3780
"It is an error to give a tag name that already exists unless you pass\n"
3653
3781
"--force, in which case the tag is moved to point to the new revision."
3654
3782
msgstr ""
3655
3783
3656
#: bzrlib/builtins.py:5946
3784
#: breezy/builtins.py:5945
3657
3785
msgid ""
3658
3786
"To rename a tag (change the name but keep it on the same revsion), run "
3659
3787
"``bzr\n"
3660
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3788
"tag new-name -r tag:old-name`` and then ``brz tag --delete oldname``."
3661
3789
msgstr ""
3662
3790
3663
#: bzrlib/builtins.py:5949
3791
#: breezy/builtins.py:5948
3664
3792
msgid ""
3665
3793
"If no tag name is specified it will be determined through the \n"
3666
3794
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3667
"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
3795
"upstream releases by reading configure.ac. See ``brz help hooks`` for\n"
3668
3796
"details."
3669
3797
msgstr ""
3670
3798
3671
#: bzrlib/builtins.py:5959
3799
# help of 'delete' option of 'tag' command
3800
#: breezy/builtins.py:5958
3672
3801
msgid "Delete this tag rather than placing it."
3673
3802
msgstr ""
3674
3803
3675
#: bzrlib/builtins.py:5962
3804
# help of 'directory' option of 'tag' command
3805
#: breezy/builtins.py:5961
3676
3806
msgid "Branch in which to place the tag."
3677
3807
msgstr ""
3678
3808
3679
#: bzrlib/builtins.py:5964
3809
# help of 'force' option of 'tag' command
3810
#: breezy/builtins.py:5963
3680
3811
msgid "Replace existing tags."
3681
3812
msgstr ""
3682
3813
3683
#: bzrlib/builtins.py:5979
3814
#: breezy/builtins.py:5978
3684
3815
msgid "No tag specified to delete."
3685
3816
msgstr ""
3686
3817
3687
#: bzrlib/builtins.py:5981
3818
#: breezy/builtins.py:5980
3688
3819
#, python-format
3689
3820
msgid "Deleted tag %s."
3690
3821
msgstr ""
3691
3822
3692
#: bzrlib/builtins.py:5995
3823
#: breezy/builtins.py:5985
3824
msgid "Tags can only be placed on a single revision, not on a range"
3825
msgstr ""
3826
3827
#: breezy/builtins.py:5994
3693
3828
msgid "Please specify a tag name."
3694
3829
msgstr ""
3695
3830
3696
#: bzrlib/builtins.py:6003
3831
#: breezy/builtins.py:6002
3697
3832
#, python-format
3698
3833
msgid "Tag %s already exists for that revision."
3699
3834
msgstr ""
3700
3835
3701
#: bzrlib/builtins.py:6007
3836
#: breezy/builtins.py:6006
3702
3837
#, python-format
3703
3838
msgid "Created tag %s."
3704
3839
msgstr ""
3705
3840
3706
#: bzrlib/builtins.py:6009
3841
#: breezy/builtins.py:6008
3707
3842
#, python-format
3708
3843
msgid "Updated tag %s."
3709
3844
msgstr ""
3710
3845
3711
#: bzrlib/builtins.py:6013
3846
#: breezy/builtins.py:6012
3712
3847
msgid "List tags."
3713
3848
msgstr ""
3714
3849
3715
#: bzrlib/builtins.py:6015
3850
#: breezy/builtins.py:6014
3716
3851
msgid ""
3717
3852
"This command shows a table of tag names and the revisions they reference."
3718
3853
msgstr ""
3719
3854
3720
#: bzrlib/builtins.py:6021
3855
# help of 'directory' option of 'tags' command
3856
#: breezy/builtins.py:6020
3721
3857
msgid "Branch whose tags should be displayed."
3722
3858
msgstr ""
3723
3859
3724
#: bzrlib/builtins.py:6023
3860
# help of 'sort' option of 'tags' command
3861
#: breezy/builtins.py:6022
3725
3862
msgid "Sort tags by different criteria."
3726
3863
msgstr ""
3727
3864
3728
#: bzrlib/builtins.py:6023
3865
# title of 'sort' option of 'tags' command
3866
#: breezy/builtins.py:6022
3729
3867
msgid "Sorting"
3730
3868
msgstr ""
3731
3869
3732
#: bzrlib/builtins.py:6092
3733
msgid "Reconfigure the type of a bzr directory."
3870
#: breezy/builtins.py:6091
3871
msgid "Reconfigure the type of a brz directory."
3734
3872
msgstr ""
3735
3873
3736
#: bzrlib/builtins.py:6094
3874
#: breezy/builtins.py:6093
3737
3875
msgid "A target configuration must be specified."
3738
3876
msgstr ""
3739
3877
3740
#: bzrlib/builtins.py:6096
3878
#: breezy/builtins.py:6095
3741
3879
msgid ""
3742
3880
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3743
3881
"The order of preference is\n"
3748
3886
"If none of these is available, --bind-to must be specified."
3749
3887
msgstr ""
3750
3888
3751
#: bzrlib/builtins.py:6110
3889
# title of 'tree_type' option of 'reconfigure' command
3890
#: breezy/builtins.py:6109
3752
3891
msgid "Tree type"
3753
3892
msgstr ""
3754
3893
3755
#: bzrlib/builtins.py:6111
3894
# help of 'tree_type' option of 'reconfigure' command
3895
#: breezy/builtins.py:6110
3756
3896
msgid "The relation between branch and tree."
3757
3897
msgstr ""
3758
3898
3759
#: bzrlib/builtins.py:6113
3899
# help of 'tree_type=branch' option of 'reconfigure' command
3900
#: breezy/builtins.py:6112
3760
3901
msgid "Reconfigure to be an unbound branch with no working tree."
3761
3902
msgstr ""
3762
3903
3763
#: bzrlib/builtins.py:6114
3904
# help of 'tree_type=tree' option of 'reconfigure' command
3905
#: breezy/builtins.py:6113
3764
3906
msgid "Reconfigure to be an unbound branch with a working tree."
3765
3907
msgstr ""
3766
3908
3767
#: bzrlib/builtins.py:6115
3909
# help of 'tree_type=checkout' option of 'reconfigure' command
3910
#: breezy/builtins.py:6114
3768
3911
msgid "Reconfigure to be a bound branch with a working tree."
3769
3912
msgstr ""
3770
3913
3771
#: bzrlib/builtins.py:6116
3914
# help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
3915
#: breezy/builtins.py:6115
3772
3916
msgid "Reconfigure to be a lightweight checkout (with no local history)."
3773
3917
msgstr ""
3774
3918
3775
#: bzrlib/builtins.py:6121
3919
# title of 'repository_type' option of 'reconfigure' command
3920
#: breezy/builtins.py:6120
3776
3921
msgid "Repository type"
3777
3922
msgstr ""
3778
3923
3779
#: bzrlib/builtins.py:6122
3924
# help of 'repository_type' option of 'reconfigure' command
3925
#: breezy/builtins.py:6121
3780
3926
msgid "Location fo the repository."
3781
3927
msgstr ""
3782
3928
3783
#: bzrlib/builtins.py:6124
3929
# help of 'repository_type=standalone' option of 'reconfigure' command
3930
#: breezy/builtins.py:6123
3784
3931
msgid ""
3785
3932
"Reconfigure to be a standalone branch (i.e. stop using shared repository)."
3786
3933
msgstr ""
3787
3934
3788
#: bzrlib/builtins.py:6126
3935
# help of 'repository_type=use-shared' option of 'reconfigure' command
3936
#: breezy/builtins.py:6125
3789
3937
msgid "Reconfigure to use a shared repository."
3790
3938
msgstr ""
3791
3939
3792
#: bzrlib/builtins.py:6130
3940
# title of 'repository_trees' option of 'reconfigure' command
3941
#: breezy/builtins.py:6129
3793
3942
msgid "Trees in Repository"
3794
3943
msgstr ""
3795
3944
3796
#: bzrlib/builtins.py:6131
3945
# help of 'repository_trees' option of 'reconfigure' command
3946
#: breezy/builtins.py:6130
3797
3947
msgid "Whether new branches in the repository have trees."
3798
3948
msgstr ""
3799
3949
3800
#: bzrlib/builtins.py:6133
3801
msgid ""
3802
"Reconfigure repository to create working trees on branches by default."
3950
# help of 'repository_trees=with-trees' option of 'reconfigure' command
3951
#: breezy/builtins.py:6132
3952
msgid "Reconfigure repository to create working trees on branches by default."
3803
3953
msgstr ""
3804
3954
3805
#: bzrlib/builtins.py:6135
3955
# help of 'repository_trees=with-no-trees' option of 'reconfigure' command
3956
#: breezy/builtins.py:6134
3806
3957
msgid ""
3807
3958
"Reconfigure repository to not create working trees on branches by default."
3808
3959
msgstr ""
3809
3960
3810
#: bzrlib/builtins.py:6138
3961
# help of 'bind-to' option of 'reconfigure' command
3962
#: breezy/builtins.py:6137
3811
3963
msgid "Branch to bind checkout to."
3812
3964
msgstr ""
3813
3965
3814
#: bzrlib/builtins.py:6140
3966
# help of 'force' option of 'reconfigure' command
3967
#: breezy/builtins.py:6139
3815
3968
msgid "Perform reconfiguration even if local changes will be lost."
3816
3969
msgstr ""
3817
3970
3818
#: bzrlib/builtins.py:6143
3971
# help of 'stacked-on' option of 'reconfigure' command
3972
#: breezy/builtins.py:6142
3819
3973
msgid "Reconfigure a branch to be stacked on another branch."
3820
3974
msgstr ""
3821
3975
3822
#: bzrlib/builtins.py:6147
3976
# help of 'unstacked' option of 'reconfigure' command
3977
#: breezy/builtins.py:6146
3823
3978
msgid ""
3824
3979
"Reconfigure a branch to be unstacked. This may require copying substantial "
3825
3980
"data into it."
3826
3981
msgstr ""
3827
3982
3828
#: bzrlib/builtins.py:6157
3983
#: breezy/builtins.py:6156
3829
3984
msgid "Can't use both --stacked-on and --unstacked"
3830
3985
msgstr ""
3831
3986
3832
#: bzrlib/builtins.py:6171
3987
#: breezy/builtins.py:6170
3833
3988
msgid "No target configuration specified"
3834
3989
msgstr ""
3835
3990
3836
#: bzrlib/builtins.py:6206
3991
#: breezy/builtins.py:6205
3837
3992
msgid "Set the branch of a checkout and update."
3838
3993
msgstr ""
3839
3994
3840
#: bzrlib/builtins.py:6208
3995
#: breezy/builtins.py:6207
3841
3996
msgid ""
3842
3997
"For lightweight checkouts, this changes the branch being referenced.\n"
3843
3998
"For heavyweight checkouts, this checks that there are no local commits\n"
3845
4000
"of the new location and binds to it."
3846
4001
msgstr ""
3847
4002
3848
#: bzrlib/builtins.py:6213
4003
#: breezy/builtins.py:6212
3849
4004
msgid ""
3850
4005
"In both cases, the working tree is updated and uncommitted changes\n"
3851
4006
"are merged. The user can commit or revert these as they desire."
3852
4007
msgstr ""
3853
4008
3854
#: bzrlib/builtins.py:6216
4009
#: breezy/builtins.py:6215
3855
4010
msgid "Pending merges need to be committed or reverted before using switch."
3856
4011
msgstr ""
3857
4012
3858
#: bzrlib/builtins.py:6218
4013
#: breezy/builtins.py:6217
3859
4014
msgid ""
3860
4015
"The path to the branch to switch to can be specified relative to the parent\n"
3861
4016
"directory of the current branch. For example, if you are currently in a\n"
3863
4018
"/path/to/newbranch."
3864
4019
msgstr ""
3865
4020
3866
#: bzrlib/builtins.py:6223
4021
#: breezy/builtins.py:6222
3867
4022
msgid ""
3868
4023
"Bound branches use the nickname of its master branch unless it is set\n"
3869
4024
"locally, in which case switching will update the local nickname to be\n"
3870
4025
"that of the master."
3871
4026
msgstr ""
3872
4027
3873
#: bzrlib/builtins.py:6231
4028
# help of 'force' option of 'switch' command
4029
#: breezy/builtins.py:6230
3874
4030
msgid "Switch even if local commits will be lost."
3875
4031
msgstr ""
3876
4032
3877
#: bzrlib/builtins.py:6234
4033
# help of 'create-branch' option of 'switch' command
4034
#: breezy/builtins.py:6233
3878
4035
msgid "Create the target branch from this one before switching to it."
3879
4036
msgstr ""
3880
4037
3881
#: bzrlib/builtins.py:6248
4038
# help of 'store' option of 'switch' command
4039
#: breezy/builtins.py:6236
4040
msgid "Store and restore uncommitted changes in the branch."
4041
msgstr ""
4042
4043
#: breezy/builtins.py:6250
3882
4044
msgid "You must supply either a revision or a location"
3883
4045
msgstr ""
3884
4046
3885
#: bzrlib/builtins.py:6261
4047
#: breezy/builtins.py:6263
3886
4048
msgid "cannot create branch without source branch"
3887
4049
msgstr ""
3888
4050
3889
#: bzrlib/builtins.py:6286
4051
#: breezy/builtins.py:6289
3890
4052
msgid "Manage filtered views."
3891
4053
msgstr ""
3892
4054
3893
#: bzrlib/builtins.py:6288
4055
#: breezy/builtins.py:6291
3894
4056
msgid ""
3895
4057
"Views provide a mask over the tree so that users can focus on\n"
3896
4058
"a subset of a tree when doing their work. After creating a view,\n"
3900
4062
"must be within the current view."
3901
4063
msgstr ""
3902
4064
3903
#: bzrlib/builtins.py:6295
4065
#: breezy/builtins.py:6298
3904
4066
msgid ""
3905
4067
"In most cases, a view has a short life-span: it is created to make\n"
3906
4068
"a selected change and is deleted once that change is committed.\n"
3908
4070
"and switch between them."
3909
4071
msgstr ""
3910
4072
3911
#: bzrlib/builtins.py:6300
4073
#: breezy/builtins.py:6303
3912
4074
msgid ""
3913
4075
"To disable the current view without deleting it, you can switch to\n"
3914
4076
"the pseudo view called ``off``. This can be useful when you need\n"
3916
4078
"want to switch back to your view after that."
3917
4079
msgstr ""
3918
4080
3919
#: bzrlib/builtins.py:6305
4081
#: breezy/builtins.py:6308
3920
4082
msgid ""
3921
4083
":Examples:\n"
3922
4084
" To define the current view::"
3923
4085
msgstr ""
3924
4086
3925
#: bzrlib/builtins.py:6308
3926
msgid " bzr view file1 dir1 ..."
4087
#: breezy/builtins.py:6311
4088
msgid " brz view file1 dir1 ..."
3927
4089
msgstr ""
3928
4090
3929
#: bzrlib/builtins.py:6310
4091
#: breezy/builtins.py:6313
3930
4092
msgid " To list the current view::"
3931
4093
msgstr ""
3932
4094
3933
#: bzrlib/builtins.py:6312
3934
msgid " bzr view"
4095
#: breezy/builtins.py:6315
4096
msgid " brz view"
3935
4097
msgstr ""
3936
4098
3937
#: bzrlib/builtins.py:6314
4099
#: breezy/builtins.py:6317
3938
4100
msgid " To delete the current view::"
3939
4101
msgstr ""
3940
4102
3941
#: bzrlib/builtins.py:6316
3942
msgid " bzr view --delete"
4103
#: breezy/builtins.py:6319
4104
msgid " brz view --delete"
3943
4105
msgstr ""
3944
4106
3945
#: bzrlib/builtins.py:6318
4107
#: breezy/builtins.py:6321
3946
4108
msgid " To disable the current view without deleting it::"
3947
4109
msgstr ""
3948
4110
3949
#: bzrlib/builtins.py:6320
3950
msgid " bzr view --switch off"
4111
#: breezy/builtins.py:6323
4112
msgid " brz view --switch off"
3951
4113
msgstr ""
3952
4114
3953
#: bzrlib/builtins.py:6322
4115
#: breezy/builtins.py:6325
3954
4116
msgid " To define a named view and switch to it::"
3955
4117
msgstr ""
3956
4118
3957
#: bzrlib/builtins.py:6324
3958
msgid " bzr view --name view-name file1 dir1 ..."
4119
#: breezy/builtins.py:6327
4120
msgid " brz view --name view-name file1 dir1 ..."
3959
4121
msgstr ""
3960
4122
3961
#: bzrlib/builtins.py:6326
4123
#: breezy/builtins.py:6329
3962
4124
msgid " To list a named view::"
3963
4125
msgstr ""
3964
4126
3965
#: bzrlib/builtins.py:6328
3966
msgid " bzr view --name view-name"
4127
#: breezy/builtins.py:6331
4128
msgid " brz view --name view-name"
3967
4129
msgstr ""
3968
4130
3969
#: bzrlib/builtins.py:6330
4131
#: breezy/builtins.py:6333
3970
4132
msgid " To delete a named view::"
3971
4133
msgstr ""
3972
4134
3973
#: bzrlib/builtins.py:6332
3974
msgid " bzr view --name view-name --delete"
4135
#: breezy/builtins.py:6335
4136
msgid " brz view --name view-name --delete"
3975
4137
msgstr ""
3976
4138
3977
#: bzrlib/builtins.py:6334
4139
#: breezy/builtins.py:6337
3978
4140
msgid " To switch to a named view::"
3979
4141
msgstr ""
3980
4142
3981
#: bzrlib/builtins.py:6336
3982
msgid " bzr view --switch view-name"
4143
#: breezy/builtins.py:6339
4144
msgid " brz view --switch view-name"
3983
4145
msgstr ""
3984
4146
3985
#: bzrlib/builtins.py:6338
4147
#: breezy/builtins.py:6341
3986
4148
msgid " To list all views defined::"
3987
4149
msgstr ""
3988
4150
3989
#: bzrlib/builtins.py:6340
3990
msgid " bzr view --all"
4151
#: breezy/builtins.py:6343
4152
msgid " brz view --all"
3991
4153
msgstr ""
3992
4154
3993
#: bzrlib/builtins.py:6342
4155
#: breezy/builtins.py:6345
3994
4156
msgid " To delete all views::"
3995
4157
msgstr ""
3996
4158
3997
#: bzrlib/builtins.py:6344
3998
msgid " bzr view --delete --all"
4159
#: breezy/builtins.py:6347
4160
msgid " brz view --delete --all"
3999
4161
msgstr ""
4000
4162
4001
#: bzrlib/builtins.py:6351
4163
# help of 'all' option of 'view' command
4164
#: breezy/builtins.py:6354
4002
4165
msgid "Apply list or delete action to all views."
4003
4166
msgstr ""
4004
4167
4005
#: bzrlib/builtins.py:6354
4168
# help of 'delete' option of 'view' command
4169
#: breezy/builtins.py:6357
4006
4170
msgid "Delete the view."
4007
4171
msgstr ""
4008
4172
4009
#: bzrlib/builtins.py:6357
4173
# help of 'name' option of 'view' command
4174
#: breezy/builtins.py:6360
4010
4175
msgid "Name of the view to define, list or delete."
4011
4176
msgstr ""
4012
4177
4013
#: bzrlib/builtins.py:6361
4178
# help of 'switch' option of 'view' command
4179
#: breezy/builtins.py:6364
4014
4180
msgid "Name of the view to switch to."
4015
4181
msgstr ""
4016
4182
4017
#: bzrlib/builtins.py:6380
4183
#: breezy/builtins.py:6383
4018
4184
msgid "Both --delete and a file list specified"
4019
4185
msgstr ""
4020
4186
4021
#: bzrlib/builtins.py:6383
4187
#: breezy/builtins.py:6386
4022
4188
msgid "Both --delete and --switch specified"
4023
4189
msgstr ""
4024
4190
4025
#: bzrlib/builtins.py:6386
4191
#: breezy/builtins.py:6389
4026
4192
msgid "Deleted all views.\n"
4027
4193
msgstr ""
4028
4194
4029
#: bzrlib/builtins.py:6388
4195
#: breezy/builtins.py:6391
4030
4196
msgid "No current view to delete"
4031
4197
msgstr ""
4032
4198
4033
#: bzrlib/builtins.py:6391
4199
#: breezy/builtins.py:6394
4034
4200
#, python-format
4035
4201
msgid "Deleted '%s' view.\n"
4036
4202
msgstr ""
4037
4203
4038
#: bzrlib/builtins.py:6395
4204
#: breezy/builtins.py:6398
4039
4205
msgid "Both --switch and a file list specified"
4040
4206
msgstr ""
4041
4207
4042
#: bzrlib/builtins.py:6398
4208
#: breezy/builtins.py:6401
4043
4209
msgid "Both --switch and --all specified"
4044
4210
msgstr ""
4045
4211
4046
#: bzrlib/builtins.py:6401
4212
#: breezy/builtins.py:6404
4047
4213
msgid "No current view to disable"
4048
4214
msgstr ""
4049
4215
4050
#: bzrlib/builtins.py:6403
4216
#: breezy/builtins.py:6406
4051
4217
#, python-format
4052
4218
msgid "Disabled '%s' view.\n"
4053
4219
msgstr ""
4054
4220
4055
#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
4221
#: breezy/builtins.py:6410 breezy/builtins.py:6432
4222
#, python-brace-format
4056
4223
msgid "Using '{0}' view: {1}\n"
4057
4224
msgstr ""
4058
4225
4059
#: bzrlib/builtins.py:6410
4226
#: breezy/builtins.py:6413
4060
4227
msgid "Views defined:\n"
4061
4228
msgstr ""
4062
4229
4063
#: bzrlib/builtins.py:6419
4230
#: breezy/builtins.py:6422
4064
4231
msgid "No views defined.\n"
4065
4232
msgstr ""
4066
4233
4067
#: bzrlib/builtins.py:6426
4234
#: breezy/builtins.py:6429
4068
4235
msgid "Cannot change the 'off' pseudo view"
4069
4236
msgstr ""
4070
4237
4071
#: bzrlib/builtins.py:6434
4238
#: breezy/builtins.py:6437
4072
4239
msgid "No current view.\n"
4073
4240
msgstr ""
4074
4241
4075
#: bzrlib/builtins.py:6437
4242
#: breezy/builtins.py:6440
4243
#, python-brace-format
4076
4244
msgid "'{0}' view is: {1}\n"
4077
4245
msgstr ""
4078
4246
4079
#: bzrlib/builtins.py:6457
4247
#: breezy/builtins.py:6460
4080
4248
msgid " <no hooks installed>\n"
4081
4249
msgstr ""
4082
4250
4083
#: bzrlib/builtins.py:6461
4251
#: breezy/builtins.py:6464
4084
4252
msgid "Remove a branch."
4085
4253
msgstr ""
4086
4254
4087
#: bzrlib/builtins.py:6463
4255
#: breezy/builtins.py:6466
4088
4256
msgid ""
4089
4257
"This will remove the branch from the specified location but \n"
4090
4258
"will keep any working tree or repository in place."
4091
4259
msgstr ""
4092
4260
4093
#: bzrlib/builtins.py:6468
4261
#: breezy/builtins.py:6471
4094
4262
msgid " Remove the branch at repo/trunk::"
4095
4263
msgstr ""
4096
4264
4097
#: bzrlib/builtins.py:6470
4265
#: breezy/builtins.py:6473
4098
4266
msgid " bzr remove-branch repo/trunk"
4099
4267
msgstr ""
4100
4268
4101
#: bzrlib/builtins.py:6477
4269
# help of 'force' option of 'remove-branch' command
4270
#: breezy/builtins.py:6480
4102
4271
msgid "Remove branch even if it is the active branch."
4103
4272
msgstr ""
4104
4273
4105
#: bzrlib/builtins.py:6491
4274
#: breezy/builtins.py:6494
4106
4275
msgid "Branch is active. Use --force to remove it."
4107
4276
msgstr ""
4108
4277
4109
#: bzrlib/builtins.py:6495
4278
# help of 'writer=plain' option of 'shelve' command
4279
#: breezy/builtins.py:6498
4110
4280
msgid "Plaintext diff output."
4111
4281
msgstr ""
4112
4282
4113
#: bzrlib/builtins.py:6496
4283
#: breezy/builtins.py:6499
4114
4284
msgid "Temporarily set aside some changes from the current tree."
4115
4285
msgstr ""
4116
4286
4117
#: bzrlib/builtins.py:6498
4287
#: breezy/builtins.py:6501
4118
4288
msgid ""
4119
4289
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4120
4290
"ie. out of the way, until a later time when you can bring them back from\n"
4123
4293
"will they survive its deletion."
4124
4294
msgstr ""
4125
4295
4126
#: bzrlib/builtins.py:6504
4296
#: breezy/builtins.py:6507
4127
4297
msgid "If shelve --list is specified, previously-shelved changes are listed."
4128
4298
msgstr ""
4129
4299
4130
#: bzrlib/builtins.py:6506
4300
#: breezy/builtins.py:6509
4131
4301
msgid ""
4132
4302
"Shelve is intended to help separate several sets of changes that have\n"
4133
4303
"been inappropriately mingled. If you just want to get rid of all changes\n"
4135
4305
"shelve all text changes at once, use shelve --all."
4136
4306
msgstr ""
4137
4307
4138
#: bzrlib/builtins.py:6511
4308
#: breezy/builtins.py:6514
4139
4309
msgid ""
4140
4310
"If filenames are specified, only the changes to those files will be\n"
4141
4311
"shelved. Other files will be left untouched."
4142
4312
msgstr ""
4143
4313
4144
#: bzrlib/builtins.py:6514
4314
#: breezy/builtins.py:6517
4145
4315
msgid ""
4146
4316
"If a revision is specified, changes since that revision will be shelved."
4147
4317
msgstr ""
4148
4318
4149
#: bzrlib/builtins.py:6516
4319
#: breezy/builtins.py:6519
4150
4320
msgid ""
4151
4321
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4152
4322
"restore the most recently shelved changes."
4153
4323
msgstr ""
4154
4324
4155
#: bzrlib/builtins.py:6519
4325
#: breezy/builtins.py:6522
4156
4326
msgid ""
4157
4327
"For complicated changes, it is possible to edit the changes in a separate\n"
4158
4328
"editor program to decide what the file remaining in the working copy\n"
4159
4329
"should look like. To do this, add the configuration option"
4160
4330
msgstr ""
4161
4331
4162
#: bzrlib/builtins.py:6523
4332
#: breezy/builtins.py:6526
4163
4333
msgid " change_editor = PROGRAM @new_path @old_path"
4164
4334
msgstr ""
4165
4335
4166
#: bzrlib/builtins.py:6525
4336
#: breezy/builtins.py:6528
4167
4337
msgid ""
4168
4338
"where @new_path is replaced with the path of the new version of the \n"
4169
4339
"file and @old_path is replaced with the path of the old version of \n"
4172
4342
" "
4173
4343
msgstr ""
4174
4344
4175
#: bzrlib/builtins.py:6537
4345
# help of 'all' option of 'shelve' command
4346
#: breezy/builtins.py:6540
4176
4347
msgid "Shelve all changes."
4177
4348
msgstr ""
4178
4349
4179
#: bzrlib/builtins.py:6539
4350
# help of 'writer' option of 'shelve' command
4351
#: breezy/builtins.py:6542
4180
4352
msgid "Method to use for writing diffs."
4181
4353
msgstr ""
4182
4354
4183
#: bzrlib/builtins.py:6539
4355
# title of 'writer' option of 'shelve' command
4356
#: breezy/builtins.py:6542
4184
4357
msgid "writer"
4185
4358
msgstr ""
4186
4359
4187
#: bzrlib/builtins.py:6543
4360
# help of 'list' option of 'shelve' command
4361
#: breezy/builtins.py:6546
4188
4362
msgid "List shelved changes."
4189
4363
msgstr ""
4190
4364
4191
#: bzrlib/builtins.py:6545
4365
# help of 'destroy' option of 'shelve' command
4366
#: breezy/builtins.py:6548
4192
4367
msgid "Destroy removed changes instead of shelving them."
4193
4368
msgstr ""
4194
4369
4195
#: bzrlib/builtins.py:6574
4370
#: breezy/builtins.py:6577
4196
4371
msgid "No shelved changes."
4197
4372
msgstr ""
4198
4373
4199
#: bzrlib/builtins.py:6585
4374
#: breezy/builtins.py:6588
4200
4375
msgid "Restore shelved changes."
4201
4376
msgstr ""
4202
4377
4203
#: bzrlib/builtins.py:6587
4378
#: breezy/builtins.py:6590
4204
4379
msgid ""
4205
4380
"By default, the most recently shelved changes are restored. However if you\n"
4206
4381
"specify a shelf by id those changes will be restored instead. This works\n"
4207
4382
"best when the changes don't depend on each other."
4208
4383
msgstr ""
4209
4384
4210
#: bzrlib/builtins.py:6596
4385
# help of 'action' option of 'unshelve' command
4386
#: breezy/builtins.py:6599
4211
4387
msgid "The action to perform."
4212
4388
msgstr ""
4213
4389
4214
#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
4390
# title of 'action' option of 'resolve' command
4391
# title of 'action' option of 'unshelve' command
4392
#: breezy/builtins.py:6599 breezy/conflicts.py:694
4215
4393
msgid "action"
4216
4394
msgstr ""
4217
4395
4218
#: bzrlib/builtins.py:6598
4396
# help of 'action=apply' option of 'unshelve' command
4397
#: breezy/builtins.py:6601
4219
4398
msgid "Apply changes and remove from the shelf."
4220
4399
msgstr ""
4221
4400
4222
#: bzrlib/builtins.py:6599
4401
# help of 'action=dry-run' option of 'unshelve' command
4402
#: breezy/builtins.py:6602
4223
4403
msgid "Show changes, but do not apply or remove them."
4224
4404
msgstr ""
4225
4405
4226
#: bzrlib/builtins.py:6600
4406
# help of 'action=preview' option of 'unshelve' command
4407
#: breezy/builtins.py:6603
4227
4408
msgid ""
4228
4409
"Instead of unshelving the changes, show the diff that would result from "
4229
4410
"unshelving."
4230
4411
msgstr ""
4231
4412
4232
#: bzrlib/builtins.py:6602
4413
# help of 'action=delete-only' option of 'unshelve' command
4414
#: breezy/builtins.py:6605
4233
4415
msgid "Delete changes without applying them."
4234
4416
msgstr ""
4235
4417
4236
#: bzrlib/builtins.py:6603
4418
# help of 'action=keep' option of 'unshelve' command
4419
#: breezy/builtins.py:6606
4237
4420
msgid "Apply changes but don't delete them."
4238
4421
msgstr ""
4239
4422
4240
#: bzrlib/builtins.py:6618
4423
#: breezy/builtins.py:6621
4241
4424
msgid "Remove unwanted files from working tree."
4242
4425
msgstr ""
4243
4426
4244
#: bzrlib/builtins.py:6620
4427
#: breezy/builtins.py:6623
4245
4428
msgid ""
4246
4429
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4247
4430
"files are never deleted."
4248
4431
msgstr ""
4249
4432
4250
#: bzrlib/builtins.py:6623
4433
#: breezy/builtins.py:6626
4251
4434
msgid ""
4252
"Another class is 'detritus', which includes files emitted by bzr during\n"
4435
"Another class is 'detritus', which includes files emitted by brz during\n"
4253
4436
"normal operations and selftests. (The value of these files decreases with\n"
4254
4437
"time.)"
4255
4438
msgstr ""
4256
4439
4257
#: bzrlib/builtins.py:6627
4440
#: breezy/builtins.py:6630
4258
4441
msgid ""
4259
4442
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4260
4443
"flags are respected, and may be combined."
4261
4444
msgstr ""
4262
4445
4263
#: bzrlib/builtins.py:6630
4446
#: breezy/builtins.py:6633
4264
4447
msgid "To check what clean-tree will do, use --dry-run."
4265
4448
msgstr ""
4266
4449
4267
#: bzrlib/builtins.py:6633
4450
# help of 'ignored' option of 'clean-tree' command
4451
#: breezy/builtins.py:6636
4268
4452
msgid "Delete all ignored files."
4269
4453
msgstr ""
4270
4454
4271
#: bzrlib/builtins.py:6634
4455
# help of 'detritus' option of 'clean-tree' command
4456
#: breezy/builtins.py:6637
4272
4457
msgid ""
4273
4458
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4274
4459
msgstr ""
4275
4460
4276
#: bzrlib/builtins.py:6637
4277
msgid "Delete files unknown to bzr (default)."
4461
# help of 'unknown' option of 'clean-tree' command
4462
#: breezy/builtins.py:6640
4463
msgid "Delete files unknown to brz (default)."
4278
4464
msgstr ""
4279
4465
4280
#: bzrlib/builtins.py:6638
4466
# help of 'dry-run' option of 'clean-tree' command
4467
#: breezy/builtins.py:6641
4281
4468
msgid "Show files to delete instead of deleting them."
4282
4469
msgstr ""
4283
4470
4284
#: bzrlib/builtins.py:6640
4471
# help of 'force' option of 'clean-tree' command
4472
#: breezy/builtins.py:6643
4285
4473
msgid "Do not prompt before deleting."
4286
4474
msgstr ""
4287
4475
4288
#: bzrlib/bundle/__init__.py:59
4476
#: breezy/bundle/__init__.py:59
4289
4477
msgid "A directory cannot be a bundle"
4290
4478
msgstr ""
4291
4479
4292
#: bzrlib/bundle/apply_bundle.py:40
4480
#: breezy/bundle/apply_bundle.py:40
4293
4481
msgid "Install revisions"
4294
4482
msgstr ""
4295
4483
4296
#: bzrlib/bundle/commands.py:64
4484
#: breezy/bundle/commands.py:64
4297
4485
msgid "--verbose requires a merge directive"
4298
4486
msgstr ""
4299
4487
4300
#: bzrlib/bundle/commands.py:67
4488
#: breezy/bundle/commands.py:67
4301
4489
msgid "Bundle format not supported"
4302
4490
msgstr ""
4303
4491
4304
#: bzrlib/bundle/commands.py:77
4492
#: breezy/bundle/commands.py:77
4305
4493
msgid "Records\n"
4306
4494
msgstr ""
4307
4495
4308
#: bzrlib/bundle/commands.py:81
4496
#: breezy/bundle/commands.py:81
4497
#, python-brace-format
4309
4498
msgid "{0}: {1} ({2} multiparent)\n"
4310
4499
msgstr ""
4311
4500
4312
#: bzrlib/bundle/commands.py:83
4501
#: breezy/bundle/commands.py:83
4313
4502
#, python-format
4314
4503
msgid "unique files: %d\n"
4315
4504
msgstr ""
4316
4505
4317
#: bzrlib/bundle/commands.py:92
4506
#: breezy/bundle/commands.py:92
4318
4507
msgid "Revisions\n"
4319
4508
msgstr ""
4320
4509
4321
#: bzrlib/bundle/commands.py:93
4510
#: breezy/bundle/commands.py:93
4322
4511
#, python-format
4323
4512
msgid "nicks: %s\n"
4324
4513
msgstr ""
4325
4514
4326
#: bzrlib/bundle/commands.py:95
4515
#: breezy/bundle/commands.py:95
4327
4516
#, python-format
4328
4517
msgid ""
4329
4518
"committers: \n"
4330
4519
"%s\n"
4331
4520
msgstr ""
4332
4521
4333
#: bzrlib/bundle/commands.py:103
4522
#: breezy/bundle/commands.py:103
4334
4523
msgid "Decoded contents\n"
4335
4524
msgstr ""
4336
4525
4337
#: bzrlib/bundle/serializer/v4.py:327
4526
#: breezy/bundle/serializer/v4.py:327
4338
4527
#, python-format
4339
4528
msgid "Bundling %d revision."
4340
4529
msgid_plural "Bundling %d revisions."
4341
4530
msgstr[0] ""
4342
4531
msgstr[1] ""
4343
4532
4344
#: bzrlib/bzrdir.py:487
4533
#: breezy/bzrdir.py:487
4534
#, python-brace-format
4345
4535
msgid ""
4346
4536
"making backup of {0}\n"
4347
4537
" to {1}"
4348
4538
msgstr ""
4349
4539
4350
#: bzrlib/bzrdir.py:510
4540
#: breezy/bzrdir.py:510
4541
#, python-brace-format
4351
4542
msgid "renamed {0} to {1}"
4352
4543
msgstr ""
4353
4544
4354
#: bzrlib/bzrdir.py:1639
4545
#: breezy/bzrdir.py:1639
4355
4546
#, python-format
4356
4547
msgid ""
4357
4548
"Source repository format does not support stacking, using format:\n"
4358
4549
" %s"
4359
4550
msgstr ""
4360
4551
4361
#: bzrlib/bzrdir.py:1659
4552
#: breezy/bzrdir.py:1659
4362
4553
#, python-format
4363
4554
msgid ""
4364
4555
"Source branch format does not support stacking, using format:\n"
4365
4556
" %s"
4366
4557
msgstr ""
4367
4558
4368
#: bzrlib/bzrdir.py:1805
4559
#: breezy/bzrdir.py:1805
4369
4560
msgid "starting repository conversion"
4370
4561
msgstr ""
4371
4562
4372
#: bzrlib/bzrdir.py:2026
4563
#: breezy/bzrdir.py:2026
4564
#, python-brace-format
4373
4565
msgid "Using default stacking branch {0} at {1}"
4374
4566
msgstr ""
4375
4567
4376
#: bzrlib/check.py:108
4568
#: breezy/check.py:108
4377
4569
msgid "check"
4378
4570
msgstr ""
4379
4571
4380
#: bzrlib/check.py:110
4572
#: breezy/check.py:110
4381
4573
msgid "checking revisions"
4382
4574
msgstr ""
4383
4575
4384
#: bzrlib/check.py:112
4576
#: breezy/check.py:112
4385
4577
msgid "checking commit contents"
4386
4578
msgstr ""
4387
4579
4388
#: bzrlib/check.py:114
4580
#: breezy/check.py:114
4389
4581
msgid "checking file graphs"
4390
4582
msgstr ""
4391
4583
4392
#: bzrlib/check.py:118
4584
#: breezy/check.py:118
4393
4585
msgid "checking branches and trees"
4394
4586
msgstr ""
4395
4587
4396
#: bzrlib/check.py:205
4588
#: breezy/check.py:205
4589
#, python-brace-format
4397
4590
msgid "checked repository {0} format {1}"
4398
4591
msgstr ""
4399
4592
4400
#: bzrlib/check.py:208
4593
#: breezy/check.py:208
4401
4594
#, python-format
4402
4595
msgid "%6d revisions"
4403
4596
msgstr ""
4404
4597
4405
#: bzrlib/check.py:209
4598
#: breezy/check.py:209
4406
4599
#, python-format
4407
4600
msgid "%6d file-ids"
4408
4601
msgstr ""
4409
4602
4410
#: bzrlib/check.py:211
4603
#: breezy/check.py:211
4411
4604
#, python-format
4412
4605
msgid "%6d unreferenced text versions"
4413
4606
msgstr ""
4414
4607
4415
#: bzrlib/check.py:215
4608
#: breezy/check.py:215
4609
#, python-brace-format
4416
4610
msgid "unreferenced version: {{{0}}} in {1}"
4417
4611
msgstr ""
4418
4612
4419
#: bzrlib/check.py:218
4613
#: breezy/check.py:218
4420
4614
#, python-format
4421
4615
msgid "%6d revisions are missing inventory_sha1"
4422
4616
msgstr ""
4423
4617
4424
#: bzrlib/check.py:221
4618
#: breezy/check.py:221
4425
4619
#, python-format
4426
4620
msgid "%6d revisions are mentioned but not present"
4427
4621
msgstr ""
4428
4622
4429
#: bzrlib/check.py:224
4623
#: breezy/check.py:224
4430
4624
#, python-format
4431
4625
msgid "%6d ghost revisions"
4432
4626
msgstr ""
4433
4627
4434
#: bzrlib/check.py:229
4628
#: breezy/check.py:229
4435
4629
#, python-format
4436
4630
msgid "%6d revisions missing parents in ancestry"
4437
4631
msgstr ""
4438
4632
4439
#: bzrlib/check.py:233
4633
#: breezy/check.py:233
4440
4634
#, python-format
4441
4635
msgid " %s should be in the ancestry for:"
4442
4636
msgstr ""
4443
4637
4444
#: bzrlib/check.py:237
4638
#: breezy/check.py:237
4445
4639
#, python-format
4446
4640
msgid "%6d inconsistent parents"
4447
4641
msgstr ""
4448
4642
4449
#: bzrlib/check.py:241
4643
#: breezy/check.py:241
4450
4644
msgid " * {0} version {1} has parents {2!r} but should have {3!r}"
4451
4645
msgstr ""
4452
4646
4453
#: bzrlib/check.py:247
4647
#: breezy/check.py:247
4454
4648
#, python-format
4455
4649
msgid "%6d revisions have incorrect parents in the revision index"
4456
4650
msgstr ""
4457
4651
4458
#: bzrlib/check.py:253
4652
#: breezy/check.py:253
4459
4653
msgid " {0} has wrong parents in index: {1!r} should be {2!r}"
4460
4654
msgstr ""
4461
4655
4462
#: bzrlib/check.py:267
4656
#: breezy/check.py:267
4657
#, python-brace-format
4463
4658
msgid "Mismatched internal revid {{{0}}} and index revid {{{1}}}"
4464
4659
msgstr ""
4465
4660
4466
#: bzrlib/check.py:296
4661
#: breezy/check.py:296
4662
#, python-brace-format
4467
4663
msgid ""
4468
4664
"Multiple expected sha1s for {0}. {{{1}}} expects {{{2}}}, {{{3}}} expects "
4469
4665
"{{{4}}}"
4470
4666
msgstr ""
4471
4667
4472
#: bzrlib/check.py:354
4668
#: breezy/check.py:354
4473
4669
#, python-format
4474
4670
msgid "Checking branch at '%s'."
4475
4671
msgstr ""
4476
4672
4477
#: bzrlib/check.py:374
4673
#: breezy/check.py:374
4478
4674
#, python-format
4479
4675
msgid "Checking working tree at '%s'."
4480
4676
msgstr ""
4481
4677
4482
#: bzrlib/check.py:427 bzrlib/check.py:441
4678
#: breezy/check.py:427 breezy/check.py:441
4483
4679
msgid "No branch found at specified location."
4484
4680
msgstr ""
4485
4681
4486
#: bzrlib/check.py:429 bzrlib/check.py:439
4682
#: breezy/check.py:429 breezy/check.py:439
4487
4683
msgid "No working tree found at specified location."
4488
4684
msgstr ""
4489
4685
4490
#: bzrlib/check.py:432
4686
#: breezy/check.py:432
4491
4687
#, python-format
4492
4688
msgid "Checking repository at '%s'."
4493
4689
msgstr ""
4494
4690
4495
#: bzrlib/check.py:443
4691
#: breezy/check.py:443
4496
4692
msgid "No repository found at specified location."
4497
4693
msgstr ""
4498
4694
4499
#: bzrlib/clean_tree.py:63
4695
#: breezy/clean_tree.py:63
4500
4696
msgid "Nothing to delete."
4501
4697
msgstr ""
4502
4698
4503
#: bzrlib/clean_tree.py:68
4699
#: breezy/clean_tree.py:68
4504
4700
msgid "Are you sure you wish to delete these"
4505
4701
msgstr ""
4506
4702
4507
#: bzrlib/clean_tree.py:70
4703
#: breezy/clean_tree.py:70
4508
4704
msgid "Canceled"
4509
4705
msgstr ""
4510
4706
4511
#: bzrlib/clean_tree.py:107
4707
#: breezy/clean_tree.py:107
4512
4708
#, python-format
4513
4709
msgid "unable to remove %s"
4514
4710
msgstr ""
4515
4711
4516
#: bzrlib/clean_tree.py:111
4712
#: breezy/clean_tree.py:111
4517
4713
msgid "deleting paths:"
4518
4714
msgstr ""
4519
4715
4520
#: bzrlib/clean_tree.py:125
4716
#: breezy/clean_tree.py:125
4717
#, python-brace-format
4521
4718
msgid "unable to remove \"{0}\": {1}."
4522
4719
msgstr ""
4523
4720
4524
#: bzrlib/clean_tree.py:130
4721
#: breezy/clean_tree.py:130
4525
4722
msgid "No files deleted."
4526
4723
msgstr ""
4527
4724
4528
#: bzrlib/cmd_version_info.py:47
4725
#: breezy/cmd_version_info.py:47
4726
#, python-brace-format
4529
4727
msgid "No known version info format {0}. Supported types are: {1}"
4530
4728
msgstr ""
4531
4729
4532
#: bzrlib/cmd_version_info.py:52
4730
# help of 'format=custom' option of 'version-info' command
4731
#: breezy/cmd_version_info.py:52
4533
4732
msgid "Version info in Custom template-based format."
4534
4733
msgstr ""
4535
4734
4536
#: bzrlib/cmd_version_info.py:52
4735
# help of 'format=python' option of 'version-info' command
4736
#: breezy/cmd_version_info.py:52
4537
4737
msgid "Version info in Python format."
4538
4738
msgstr ""
4539
4739
4540
#: bzrlib/cmd_version_info.py:52
4740
# help of 'format=rio' option of 'version-info' command
4741
#: breezy/cmd_version_info.py:52
4541
4742
msgid "Version info in RIO (simple text) format (default)."
4542
4743
msgstr ""
4543
4744
4544
#: bzrlib/cmd_version_info.py:53
4745
#: breezy/cmd_version_info.py:53
4545
4746
msgid "Show version information about this tree."
4546
4747
msgstr ""
4547
4748
4548
#: bzrlib/cmd_version_info.py:55
4749
#: breezy/cmd_version_info.py:55
4549
4750
msgid ""
4550
4751
"You can use this command to add information about version into\n"
4551
4752
"source code of an application. The output can be in one of the\n"
4552
4753
"supported formats or in a custom format based on a template."
4553
4754
msgstr ""
4554
4755
4555
#: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4556
#: en/help_topics/configuration.txt:722
4756
#: breezy/cmd_version_info.py:59 en/help_topics/configuration.txt:712
4757
#: en/help_topics/configuration.txt:738
4557
4758
msgid "For example::"
4558
4759
msgstr ""
4559
4760
4560
#: bzrlib/cmd_version_info.py:61
4761
#: breezy/cmd_version_info.py:61
4561
4762
msgid ""
4562
4763
" bzr version-info --custom \\\n"
4563
4764
" --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
4564
4765
msgstr ""
4565
4766
4566
#: bzrlib/cmd_version_info.py:64
4767
#: breezy/cmd_version_info.py:64
4567
4768
msgid ""
4568
4769
"will produce a C header file with formatted string containing the\n"
4569
4770
"current revision number. Other supported variables in templates are:"
4570
4771
msgstr ""
4571
4772
4572
#: bzrlib/cmd_version_info.py:67
4773
#: breezy/cmd_version_info.py:67
4573
4774
msgid ""
4574
4775
" * {date} - date of the last revision\n"
4575
4776
" * {build_date} - current date\n"
4580
4781
" otherwise 1"
4581
4782
msgstr ""
4582
4783
4583
#: bzrlib/cmd_version_info.py:77
4784
# help of 'format' option of 'version-info' command
4785
#: breezy/cmd_version_info.py:77
4584
4786
msgid "Select the output format."
4585
4787
msgstr ""
4586
4788
4587
#: bzrlib/cmd_version_info.py:81
4789
# help of 'all' option of 'version-info' command
4790
#: breezy/cmd_version_info.py:81
4588
4791
msgid "Include all possible information."
4589
4792
msgstr ""
4590
4793
4591
#: bzrlib/cmd_version_info.py:82
4794
# help of 'check-clean' option of 'version-info' command
4795
#: breezy/cmd_version_info.py:82
4592
4796
msgid "Check if tree is clean."
4593
4797
msgstr ""
4594
4798
4595
#: bzrlib/cmd_version_info.py:84
4799
# help of 'include-history' option of 'version-info' command
4800
#: breezy/cmd_version_info.py:84
4596
4801
msgid "Include the revision-history."
4597
4802
msgstr ""
4598
4803
4599
#: bzrlib/cmd_version_info.py:86
4804
# help of 'include-file-revisions' option of 'version-info' command
4805
#: breezy/cmd_version_info.py:86
4600
4806
msgid "Include the last revision for each file."
4601
4807
msgstr ""
4602
4808
4603
#: bzrlib/cmd_version_info.py:87
4809
# help of 'template' option of 'version-info' command
4810
#: breezy/cmd_version_info.py:87
4604
4811
msgid "Template for the output."
4605
4812
msgstr ""
4606
4813
4607
#: bzrlib/cmd_version_info.py:101
4814
#: breezy/cmd_version_info.py:101
4608
4815
msgid "bzr version-info --revision takes exactly one revision specifier"
4609
4816
msgstr ""
4610
4817
4611
#: bzrlib/commands.py:229
4818
#: breezy/commands.py:229
4612
4819
#, python-format
4613
4820
msgid "unknown command \"%s\""
4614
4821
msgstr ""
4615
4822
4616
#: bzrlib/commands.py:476
4823
#: breezy/commands.py:476
4617
4824
msgid "No help for this command."
4618
4825
msgstr ""
4619
4826
4620
#: bzrlib/commands.py:489
4827
#: breezy/commands.py:489
4621
4828
#, python-format
4622
4829
msgid ":Purpose: %s\n"
4623
4830
msgstr ""
4624
4831
4625
#: bzrlib/commands.py:491
4832
#: breezy/commands.py:491
4626
4833
#, python-format
4627
4834
msgid ""
4628
4835
":Usage:\n"
4629
4836
"%s\n"
4630
4837
msgstr ""
4631
4838
4632
#: bzrlib/commands.py:493
4839
#: breezy/commands.py:493
4633
4840
#, python-format
4634
4841
msgid ":Usage: %s\n"
4635
4842
msgstr ""
4636
4843
4637
#: bzrlib/commands.py:512
4844
#: breezy/commands.py:512
4638
4845
#, python-format
4639
4846
msgid ":Options:%s"
4640
4847
msgstr ""
4641
4848
4642
#: bzrlib/commands.py:523
4849
#: breezy/commands.py:523
4643
4850
#, python-format
4644
4851
msgid ""
4645
4852
":Description:\n"
4647
4854
"\n"
4648
4855
msgstr ""
4649
4856
4650
#: bzrlib/commands.py:533
4857
#: breezy/commands.py:533
4651
4858
#, python-format
4652
4859
msgid ""
4653
4860
"See bzr help %s for more details and examples.\n"
4654
4861
"\n"
4655
4862
msgstr ""
4656
4863
4657
#: bzrlib/commands.py:538
4864
#: breezy/commands.py:538
4658
4865
msgid ":Aliases: "
4659
4866
msgstr ""
4660
4867
4661
#: bzrlib/commands.py:542
4868
#: breezy/commands.py:542
4662
4869
#, python-format
4663
4870
msgid ":From: plugin \"%s\"\n"
4664
4871
msgstr ""
4665
4872
4666
#: bzrlib/commands.py:554
4873
#: breezy/commands.py:554
4874
#, python-brace-format
4667
4875
msgid ":doc:`{0} <{1}-help>`"
4668
4876
msgstr ""
4669
4877
4670
#: bzrlib/commands.py:558
4878
#: breezy/commands.py:558
4671
4879
#, python-format
4672
4880
msgid ":See also: %s"
4673
4881
msgstr ""
4674
4882
4675
#: bzrlib/commands.py:826 bzrlib/gpg.py:347
4883
#: breezy/commands.py:826
4676
4884
msgid "Only ASCII permitted in option names"
4677
4885
msgstr ""
4678
4886
4679
#: bzrlib/commands.py:851 bzrlib/commands.py:859
4887
#: breezy/commands.py:851 breezy/commands.py:859
4680
4888
msgid "command {0!r} needs one or more {1}"
4681
4889
msgstr ""
4682
4890
4683
#: bzrlib/commands.py:868
4891
#: breezy/commands.py:868
4684
4892
msgid "command {0!r} requires argument {1}"
4685
4893
msgstr ""
4686
4894
4687
#: bzrlib/commands.py:875
4895
#: breezy/commands.py:875
4896
#, python-brace-format
4688
4897
msgid "extra argument to command {0}: {1}"
4689
4898
msgstr ""
4690
4899
4691
#: bzrlib/commands.py:972
4900
#: breezy/commands.py:952
4692
4901
#, python-format
4693
4902
msgid "Profile data written to \"%s\"."
4694
4903
msgstr ""
4695
4904
4696
#: bzrlib/commit.py:117 bzrlib/commit.py:740
4905
#: breezy/commit.py:117 breezy/commit.py:740
4697
4906
msgid "added"
4698
4907
msgstr ""
4699
4908
4700
#: bzrlib/commit.py:117 bzrlib/commit.py:748
4909
#: breezy/commit.py:117 breezy/commit.py:748
4701
4910
msgid "modified"
4702
4911
msgstr ""
4703
4912
4704
#: bzrlib/commit.py:131
4913
#: breezy/commit.py:131
4705
4914
#, python-format
4706
4915
msgid "Committing%s"
4707
4916
msgstr ""
4708
4917
4709
#: bzrlib/commit.py:134
4918
#: breezy/commit.py:134
4710
4919
#, python-format
4711
4920
msgid "Committed revision %d."
4712
4921
msgstr ""
4713
4922
4714
#: bzrlib/commit.py:143
4923
#: breezy/commit.py:143
4715
4924
#, python-format
4716
4925
msgid "deleted %s"
4717
4926
msgstr ""
4718
4927
4719
#: bzrlib/commit.py:146
4928
#: breezy/commit.py:146
4720
4929
#, python-format
4721
4930
msgid "missing %s"
4722
4931
msgstr ""
4723
4932
4724
#: bzrlib/commit.py:511
4933
#: breezy/commit.py:511
4934
#, python-brace-format
4725
4935
msgid ""
4726
4936
"Conflicting tags in bound branch:\n"
4727
4937
"{0}"
4728
4938
msgstr ""
4729
4939
4730
#: bzrlib/commit.py:742
4940
#: breezy/commit.py:742
4731
4941
msgid "renamed"
4732
4942
msgstr ""
4733
4943
4734
#: bzrlib/commit.py:976
4944
#: breezy/commit.py:976
4735
4945
msgid "unchanged"
4736
4946
msgstr ""
4737
4947
4738
#: bzrlib/commit.py:998
4948
#: breezy/commit.py:998
4949
#, python-brace-format
4739
4950
msgid "{0} [{1}] - Stage"
4740
4951
msgstr ""
4741
4952
4742
#: bzrlib/commit.py:1001
4953
#: breezy/commit.py:1001
4743
4954
#, python-format
4744
4955
msgid "%s - Stage"
4745
4956
msgstr ""
4746
4957
4747
#: bzrlib/commit_signature_commands.py:34
4958
#: breezy/commit_signature_commands.py:34
4748
4959
msgid "Sign all commits by a given committer."
4749
4960
msgstr ""
4750
4961
4751
#: bzrlib/commit_signature_commands.py:36
4962
#: breezy/commit_signature_commands.py:36
4752
4963
msgid ""
4753
4964
"If location is not specified the local tree is used.\n"
4754
4965
"If committer is not specified the default committer is used."
4755
4966
msgstr ""
4756
4967
4757
#: bzrlib/commit_signature_commands.py:39
4968
#: breezy/commit_signature_commands.py:39
4758
4969
msgid "This does not sign commits that already have signatures."
4759
4970
msgstr ""
4760
4971
4761
#: bzrlib/commit_signature_commands.py:47
4972
# help of 'dry-run' option of 'sign-my-commits' command
4973
#: breezy/commit_signature_commands.py:47
4762
4974
msgid ""
4763
4975
"Don't actually sign anything, just print the revisions that would be signed."
4764
4976
msgstr ""
4765
4977
4766
#: bzrlib/commit_signature_commands.py:98
4978
#: breezy/commit_signature_commands.py:98
4767
4979
#, python-format
4768
4980
msgid "Signed %d revision.\n"
4769
4981
msgid_plural "Signed %d revisions.\n"
4770
4982
msgstr[0] ""
4771
4983
msgstr[1] ""
4772
4984
4773
#: bzrlib/commit_signature_commands.py:103
4985
#: breezy/commit_signature_commands.py:103
4774
4986
msgid "Verify all commit signatures."
4775
4987
msgstr ""
4776
4988
4777
#: bzrlib/commit_signature_commands.py:105
4778
msgid ""
4779
"Verifies that all commits in the branch are signed by known GnuPG keys."
4989
#: breezy/commit_signature_commands.py:105
4990
msgid "Verifies that all commits in the branch are signed by known GnuPG keys."
4780
4991
msgstr ""
4781
4992
4782
#: bzrlib/commit_signature_commands.py:110
4993
# help of 'acceptable-keys' option of 'verify-signatures' command
4994
#: breezy/commit_signature_commands.py:110
4783
4995
msgid ""
4784
4996
"Comma separated list of GPG key patterns which are acceptable for "
4785
4997
"verification."
4786
4998
msgstr ""
4787
4999
4788
#: bzrlib/commit_signature_commands.py:148
5000
#: breezy/commit_signature_commands.py:148
4789
5001
msgid "Cannot verify a range of non-revision-history revisions"
4790
5002
msgstr ""
4791
5003
4792
#: bzrlib/commit_signature_commands.py:166
5004
#: breezy/commit_signature_commands.py:166
4793
5005
msgid "All commits signed with verifiable keys"
4794
5006
msgstr ""
4795
5007
4796
#: bzrlib/config.py:436
5008
#: breezy/config.py:438
4797
5009
msgid "Invalid config value for \"{0}\" value {1!r} is not an SI unit."
4798
5010
msgstr ""
4799
5011
4800
#: bzrlib/config.py:2452
5012
#: breezy/config.py:2465
5013
#, python-brace-format
4801
5014
msgid "{0} is not an SI unit."
4802
5015
msgstr ""
4803
5016
4804
#: bzrlib/config.py:2971
5017
#: breezy/config.py:3013
5018
#, python-brace-format
4805
5019
msgid ""
4806
5020
"Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
4807
5021
"will be saved."
4808
5022
msgstr ""
4809
5023
4810
#: bzrlib/config.py:3116
5024
#: breezy/config.py:3158
4811
5025
#, python-format
4812
5026
msgid "Invalid '%s', should be of the form 'name=value'"
4813
5027
msgstr ""
4814
5028
4815
#: bzrlib/config.py:4018
5029
#: breezy/config.py:4096
4816
5030
msgid "Display, set or remove a configuration option."
4817
5031
msgstr ""
4818
5032
4819
#: bzrlib/config.py:4020
4820
msgid "Display the active value for a given option."
5033
#: breezy/config.py:4098
5034
msgid "Display the active value for option NAME."
4821
5035
msgstr ""
4822
5036
4823
#: bzrlib/config.py:4022
5037
#: breezy/config.py:4100
4824
5038
msgid ""
4825
5039
"If --all is specified, NAME is interpreted as a regular expression and all\n"
4826
"matching options are displayed mentioning their scope. The active value\n"
4827
"that bzr will take into account is the first one displayed for each option."
4828
msgstr ""
4829
4830
#: bzrlib/config.py:4026
4831
msgid "If no NAME is given, --all .* is implied."
4832
msgstr ""
4833
4834
#: bzrlib/config.py:4028
4835
msgid ""
4836
"Setting a value is achieved by using name=value without spaces. The value\n"
5040
"matching options are displayed mentioning their scope and without resolving\n"
5041
"option references in the value). The active value that bzr will take into\n"
5042
"account is the first one displayed for each option."
5043
msgstr ""
5044
5045
#: breezy/config.py:4105
5046
msgid ""
5047
"If NAME is not given, --all .* is implied (all options are displayed for "
5048
"the\n"
5049
"current scope)."
5050
msgstr ""
5051
5052
#: breezy/config.py:4108
5053
msgid ""
5054
"Setting a value is achieved by using NAME=value without spaces. The value\n"
4837
5055
"is set in the most relevant scope and can be checked by displaying the\n"
4838
5056
"option again."
4839
5057
msgstr ""
4840
5058
4841
#: bzrlib/config.py:4040
5059
#: breezy/config.py:4112
5060
msgid "Removing a value is achieved by using --remove NAME."
5061
msgstr ""
5062
5063
# help of 'scope' option of 'config' command
5064
#: breezy/config.py:4122
4842
5065
msgid "Reduce the scope to the specified configuration file."
4843
5066
msgstr ""
4844
5067
4845
#: bzrlib/config.py:4044
5068
# help of 'all' option of 'config' command
5069
#: breezy/config.py:4126
4846
5070
msgid "Display all the defined values for the matching options."
4847
5071
msgstr ""
4848
5072
4849
#: bzrlib/config.py:4046
5073
# help of 'remove' option of 'config' command
5074
#: breezy/config.py:4128
4850
5075
msgid "Remove the option from the configuration file."
4851
5076
msgstr ""
4852
5077
4853
#: bzrlib/conflicts.py:50
5078
#: breezy/conflicts.py:50
4854
5079
msgid "List files with conflicts."
4855
5080
msgstr ""
4856
5081
4857
#: bzrlib/conflicts.py:57
5082
#: breezy/conflicts.py:57
4858
5083
msgid ""
4859
5084
"Conflicts normally are listed as short, human-readable messages. If --text\n"
4860
5085
"is supplied, the pathnames of files with text conflicts are listed,\n"
4861
5086
"instead. (This is useful for editing all files with text conflicts.)"
4862
5087
msgstr ""
4863
5088
4864
#: bzrlib/conflicts.py:61
5089
#: breezy/conflicts.py:61
4865
5090
msgid "Use bzr resolve when you have fixed a problem."
4866
5091
msgstr ""
4867
5092
4868
#: bzrlib/conflicts.py:66
5093
# help of 'text' option of 'conflicts' command
5094
#: breezy/conflicts.py:66
4869
5095
msgid "List paths of files with text conflicts."
4870
5096
msgstr ""
4871
5097
4872
#: bzrlib/conflicts.py:85
5098
# help of 'action=done' option of 'resolve' command
5099
#: breezy/conflicts.py:85
4873
5100
msgid "Marks the conflict as resolved."
4874
5101
msgstr ""
4875
5102
4876
#: bzrlib/conflicts.py:88
5103
# help of 'action=take-this' option of 'resolve' command
5104
#: breezy/conflicts.py:88
4877
5105
msgid "Resolve the conflict preserving the version in the working tree."
4878
5106
msgstr ""
4879
5107
4880
#: bzrlib/conflicts.py:91
5108
# help of 'action=take-other' option of 'resolve' command
5109
#: breezy/conflicts.py:91
4881
5110
msgid "Resolve the conflict taking the merged version into account."
4882
5111
msgstr ""
4883
5112
4884
#: bzrlib/conflicts.py:98
5113
# help of 'action' option of 'resolve' command
5114
#: breezy/conflicts.py:98
4885
5115
msgid "How to resolve the conflict."
4886
5116
msgstr ""
4887
5117
4888
#: bzrlib/conflicts.py:104
5118
#: breezy/conflicts.py:104
4889
5119
msgid "Mark a conflict as resolved."
4890
5120
msgstr ""
4891
5121
4892
#: bzrlib/conflicts.py:111
5122
#: breezy/conflicts.py:111
4893
5123
msgid ""
4894
5124
"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
4895
5125
"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
4897
5127
"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
4898
5128
msgstr ""
4899
5129
4900
#: bzrlib/conflicts.py:119
5130
# help of 'all' option of 'resolve' command
5131
#: breezy/conflicts.py:119
4901
5132
msgid "Resolve all conflicts in this tree."
4902
5133
msgstr ""
4903
5134
4904
#: bzrlib/conflicts.py:126
5135
#: breezy/conflicts.py:126
4905
5136
msgid "If --all is specified, no FILE may be provided"
4906
5137
msgstr ""
4907
5138
4908
#: bzrlib/conflicts.py:151
5139
#: breezy/conflicts.py:151
4909
5140
#, python-format
4910
5141
msgid "%d conflict auto-resolved."
4911
5142
msgid_plural "%d conflicts auto-resolved."
4912
5143
msgstr[0] ""
4913
5144
msgstr[1] ""
4914
5145
4915
#: bzrlib/conflicts.py:154
5146
#: breezy/conflicts.py:154
4916
5147
msgid "Remaining conflicts:"
4917
5148
msgstr ""
4918
5149
4919
#: bzrlib/conflicts.py:159
5150
#: breezy/conflicts.py:159
4920
5151
msgid "All conflicts resolved."
4921
5152
msgstr ""
4922
5153
4923
#: bzrlib/conflicts.py:168
5154
#: breezy/conflicts.py:168
5155
#, python-brace-format
4924
5156
msgid "{0} conflict resolved, {1} remaining"
4925
5157
msgid_plural "{0} conflicts resolved, {1} remaining"
4926
5158
msgstr[0] ""
4927
5159
msgstr[1] ""
4928
5160
4929
#: bzrlib/controldir.py:712
5161
#: breezy/controldir.py:712
5162
#, python-brace-format
4930
5163
msgid "{0} is{1} redirected to {2}"
4931
5164
msgstr ""
4932
5165
4933
#: bzrlib/diff.py:399
5166
#: breezy/diff.py:413
4934
5167
#, python-format
4935
5168
msgid "*** Ignoring files outside view. View is %s"
4936
5169
msgstr ""
4937
5170
4938
#: bzrlib/errors.py:157
5171
#: breezy/errors.py:157
4939
5172
msgid "The tree builder is already building a tree."
4940
5173
msgstr ""
4941
5174
4942
#: bzrlib/errors.py:178
5175
#: breezy/errors.py:178
4943
5176
msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
4944
5177
msgstr ""
4945
5178
4946
#: bzrlib/errors.py:197
5179
#: breezy/errors.py:197
4947
5180
msgid ""
4948
5181
"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
4949
5182
"versions \"%(minimum)s\" to \"%(current)s\"."
4950
5183
msgstr ""
4951
5184
4952
#: bzrlib/errors.py:209
5185
#: breezy/errors.py:209
4953
5186
msgid "The transport '%(transport)s' is only accessible within this process."
4954
5187
msgstr ""
4955
5188
4956
#: bzrlib/errors.py:227
5189
#: breezy/errors.py:227
4957
5190
msgid "Invalid revision number %(revno)s"
4958
5191
msgstr ""
4959
5192
4960
#: bzrlib/errors.py:236
5193
#: breezy/errors.py:236
4961
5194
msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
4962
5195
msgstr ""
4963
5196
4964
#: bzrlib/errors.py:247
5197
#: breezy/errors.py:247
4965
5198
msgid "Reserved revision-id {%(revision_id)s}"
4966
5199
msgstr ""
4967
5200
4968
#: bzrlib/errors.py:261
5201
#: breezy/errors.py:261
4969
5202
msgid "There is no public branch set for \"%(branch_url)s\"."
4970
5203
msgstr ""
4971
5204
4972
#: bzrlib/errors.py:271
5205
#: breezy/errors.py:271
4973
5206
msgid ""
4974
5207
"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
4975
5208
"obtain a list of topics."
4976
5209
msgstr ""
4977
5210
4978
#: bzrlib/errors.py:280
5211
#: breezy/errors.py:280
4979
5212
msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
4980
5213
msgstr ""
4981
5214
4982
#: bzrlib/errors.py:290
5215
#: breezy/errors.py:290
4983
5216
msgid ""
4984
5217
"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
4985
5218
msgstr ""
4986
5219
4987
#: bzrlib/errors.py:299
5220
#: breezy/errors.py:299
4988
5221
msgid "The branch '%(branch)s' is not stacked."
4989
5222
msgstr ""
4990
5223
4991
#: bzrlib/errors.py:313
5224
#: breezy/errors.py:313
4992
5225
msgid "No WorkingTree exists for \"%(base)s\"."
4993
5226
msgstr ""
4994
5227
4995
#: bzrlib/errors.py:322
5228
#: breezy/errors.py:322
4996
5229
msgid "Not currently building a tree."
4997
5230
msgstr ""
4998
5231
4999
#: bzrlib/errors.py:327
5232
#: breezy/errors.py:327
5000
5233
msgid "%(url)s is not a local path."
5001
5234
msgstr ""
5002
5235
5003
#: bzrlib/errors.py:355
5236
#: breezy/errors.py:355
5004
5237
msgid "%(not_locked)r is not write locked but needs to be."
5005
5238
msgstr ""
5006
5239
5007
#: bzrlib/errors.py:363
5240
#: breezy/errors.py:363
5008
5241
msgid "Error in command line options"
5009
5242
msgstr ""
5010
5243
5011
#: bzrlib/errors.py:368
5244
#: breezy/errors.py:368
5012
5245
msgid "%(value)s is not an index of type %(_type)s."
5013
5246
msgstr ""
5014
5247
5015
#: bzrlib/errors.py:378
5248
#: breezy/errors.py:378
5016
5249
msgid "Error in data for index %(value)s."
5017
5250
msgstr ""
5018
5251
5019
#: bzrlib/errors.py:387
5252
#: breezy/errors.py:387
5020
5253
msgid "The key '%(key)s' is already in index '%(index)s'."
5021
5254
msgstr ""
5022
5255
5023
#: bzrlib/errors.py:397
5256
#: breezy/errors.py:397
5024
5257
msgid "The key '%(key)s' is not a valid key."
5025
5258
msgstr ""
5026
5259
5027
#: bzrlib/errors.py:406
5260
#: breezy/errors.py:406
5028
5261
msgid "Could not parse options for index %(value)s."
5029
5262
msgstr ""
5030
5263
5031
#: bzrlib/errors.py:415
5264
#: breezy/errors.py:415
5032
5265
msgid "The value '%(value)s' is not a valid value."
5033
5266
msgstr ""
5034
5267
5035
#: bzrlib/errors.py:424
5268
#: breezy/errors.py:424
5036
5269
msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
5037
5270
msgstr ""
5038
5271
5039
#: bzrlib/errors.py:443
5272
#: breezy/errors.py:443
5040
5273
msgid "Generic path error: %(path)r%(extra)s)"
5041
5274
msgstr ""
5042
5275
5043
#: bzrlib/errors.py:456
5276
#: breezy/errors.py:456
5044
5277
msgid "No such file: %(path)r%(extra)s"
5045
5278
msgstr ""
5046
5279
5047
#: bzrlib/errors.py:461
5280
#: breezy/errors.py:461
5048
5281
msgid "File exists: %(path)r%(extra)s"
5049
5282
msgstr ""
5050
5283
5051
#: bzrlib/errors.py:467
5284
#: breezy/errors.py:467
5052
5285
msgid ""
5053
5286
"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
5054
5287
"after to tell bzr about a rename that has already happened)%(extra)s"
5055
5288
msgstr ""
5056
5289
5057
#: bzrlib/errors.py:483
5290
#: breezy/errors.py:483
5058
5291
msgid "\"%(path)s\" is not a directory %(extra)s"
5059
5292
msgstr ""
5060
5293
5061
#: bzrlib/errors.py:488
5294
#: breezy/errors.py:488
5062
5295
msgid "\"%(path)s\" is not in the working directory %(extra)s"
5063
5296
msgstr ""
5064
5297
5065
#: bzrlib/errors.py:493
5298
#: breezy/errors.py:493
5066
5299
msgid "Directory not empty: \"%(path)s\"%(extra)s"
5067
5300
msgstr ""
5068
5301
5069
#: bzrlib/errors.py:498
5302
#: breezy/errors.py:498
5070
5303
msgid "Hard-linking \"%(path)s\" is not supported"
5071
5304
msgstr ""
5072
5305
5073
#: bzrlib/errors.py:513
5306
#: breezy/errors.py:513
5074
5307
msgid "Device or resource busy: \"%(path)s\"%(extra)s"
5075
5308
msgstr ""
5076
5309
5077
#: bzrlib/errors.py:518
5310
#: breezy/errors.py:518
5078
5311
msgid "Permission denied: \"%(path)s\"%(extra)s"
5079
5312
msgstr ""
5080
5313
5081
#: bzrlib/errors.py:523
5314
#: breezy/errors.py:523
5082
5315
msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
5083
5316
msgstr ""
5084
5317
5085
#: bzrlib/errors.py:528
5318
#: breezy/errors.py:528
5086
5319
msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
5087
5320
msgstr ""
5088
5321
5089
#: bzrlib/errors.py:539
5322
#: breezy/errors.py:539
5090
5323
msgid "URLs differ by more than path: %(from_)r and %(to)r"
5091
5324
msgstr ""
5092
5325
5093
#: bzrlib/errors.py:561
5094
msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
5326
#: breezy/errors.py:561
5327
msgid "The %(type)s hook '%(hook)s' is unknown in this version of breezy."
5095
5328
msgstr ""
5096
5329
5097
#: bzrlib/errors.py:571
5330
#: breezy/errors.py:571
5098
5331
msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
5099
5332
msgstr ""
5100
5333
5101
#: bzrlib/errors.py:579
5334
#: breezy/errors.py:579
5102
5335
msgid ""
5103
5336
"The branch '%(url)s'(%(format)s) is not a stackable format. You will need to "
5104
5337
"upgrade the branch to permit branch stacking."
5105
5338
msgstr ""
5106
5339
5107
#: bzrlib/errors.py:590
5340
#: breezy/errors.py:590
5108
5341
msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
5109
5342
msgstr ""
5110
5343
5111
#: bzrlib/errors.py:600
5344
#: breezy/errors.py:600
5112
5345
msgid ""
5113
5346
"The repository '%(url)s'(%(format)s) is not a stackable format. You will "
5114
5347
"need to upgrade the repository to permit branch stacking."
5115
5348
msgstr ""
5116
5349
5117
#: bzrlib/errors.py:611
5350
#: breezy/errors.py:611
5118
5351
msgid "Error reading from %(path)r."
5119
5352
msgstr ""
5120
5353
5121
#: bzrlib/errors.py:630
5354
#: breezy/errors.py:630
5122
5355
msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
5123
5356
msgstr ""
5124
5357
5125
#: bzrlib/errors.py:646
5358
#: breezy/errors.py:646
5126
5359
msgid "Path \"%(path)s\" is not unicode normalized"
5127
5360
msgstr ""
5128
5361
5129
#: bzrlib/errors.py:654
5362
#: breezy/errors.py:654
5130
5363
msgid "Not a branch: \"%(path)s\"%(detail)s."
5131
5364
msgstr ""
5132
5365
5133
#: bzrlib/errors.py:696
5366
#: breezy/errors.py:696
5134
5367
msgid "No submit branch available for branch \"%(path)s\""
5135
5368
msgstr ""
5136
5369
5137
#: bzrlib/errors.py:705
5370
#: breezy/errors.py:705
5138
5371
msgid "A control directory already exists: \"%(path)s\"."
5139
5372
msgstr ""
5140
5373
5141
#: bzrlib/errors.py:710
5374
#: breezy/errors.py:710
5142
5375
msgid "Already a branch: \"%(path)s\"."
5143
5376
msgstr ""
5144
5377
5145
#: bzrlib/errors.py:715
5378
#: breezy/errors.py:715
5146
5379
msgid "Invalid branch name: %(name)s"
5147
5380
msgstr ""
5148
5381
5149
#: bzrlib/errors.py:724
5382
#: breezy/errors.py:724
5150
5383
msgid "Parent branch already exists: \"%(path)s\"."
5151
5384
msgstr ""
5152
5385
5153
#: bzrlib/errors.py:730
5386
#: breezy/errors.py:730
5154
5387
msgid ""
5155
5388
"Directory contains a branch, but no working tree (use bzr checkout if you "
5156
5389
"wish to build a working tree): \"%(path)s\""
5157
5390
msgstr ""
5158
5391
5159
#: bzrlib/errors.py:735
5392
#: breezy/errors.py:735
5160
5393
msgid ""
5161
5394
"\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
5162
5395
msgstr ""
5163
5396
5164
#: bzrlib/errors.py:745
5397
#: breezy/errors.py:745
5165
5398
msgid ""
5166
5399
"Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
5167
5400
msgstr ""
5168
5401
5169
#: bzrlib/errors.py:755
5402
#: breezy/errors.py:755
5170
5403
msgid "No repository present: \"%(path)s\""
5171
5404
msgstr ""
5172
5405
5173
#: bzrlib/errors.py:762
5406
#: breezy/errors.py:762
5174
5407
msgid ""
5175
5408
"Unsupported branch format: %(format)s\n"
5176
5409
"Please run 'bzr upgrade'"
5177
5410
msgstr ""
5178
5411
5179
#: bzrlib/errors.py:768
5412
#: breezy/errors.py:768
5180
5413
msgid "Unknown %(kind)s format: %(format)r"
5181
5414
msgstr ""
5182
5415
5183
#: bzrlib/errors.py:777
5416
#: breezy/errors.py:777
5184
5417
msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
5185
5418
msgstr ""
5186
5419
5187
#: bzrlib/errors.py:787
5420
#: breezy/errors.py:787
5188
5421
msgid "Parse error on line %(lineno)d of %(format)s format: %(line)s"
5189
5422
msgstr ""
5190
5423
5191
#: bzrlib/errors.py:802
5424
#: breezy/errors.py:802
5192
5425
msgid ""
5193
5426
"%(target)s\n"
5194
5427
"is not compatible with\n"
5196
5429
"%(details)s"
5197
5430
msgstr ""
5198
5431
5199
#: bzrlib/errors.py:818
5432
#: breezy/errors.py:818
5200
5433
msgid "Revision is not compatible with %(repo_format)s"
5201
5434
msgstr ""
5202
5435
5203
#: bzrlib/errors.py:828
5436
#: breezy/errors.py:828
5204
5437
msgid "%(context_info)s%(path)s is already versioned."
5205
5438
msgstr ""
5206
5439
5207
#: bzrlib/errors.py:849
5440
#: breezy/errors.py:849
5208
5441
msgid "%(context_info)s%(path)s is not versioned."
5209
5442
msgstr ""
5210
5443
5211
#: bzrlib/errors.py:870
5444
#: breezy/errors.py:870
5212
5445
msgid "Path(s) are not versioned: %(paths_as_string)s"
5213
5446
msgstr ""
5214
5447
5215
#: bzrlib/errors.py:881
5448
#: breezy/errors.py:881
5216
5449
msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
5217
5450
msgstr ""
5218
5451
5219
#: bzrlib/errors.py:900
5452
#: breezy/errors.py:900
5220
5453
msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
5221
5454
msgstr ""
5222
5455
5223
#: bzrlib/errors.py:908
5456
#: breezy/errors.py:908
5224
5457
msgid ""
5225
5458
"Filename %(filename)r is not valid in your current filesystem encoding "
5226
5459
"%(fs_encoding)s"
5227
5460
msgstr ""
5228
5461
5229
#: bzrlib/errors.py:919
5462
#: breezy/errors.py:919
5230
5463
msgid "Cannot operate on \"%(filename)s\" because it is a control file"
5231
5464
msgstr ""
5232
5465
5233
#: bzrlib/errors.py:937
5466
#: breezy/errors.py:937
5234
5467
msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
5235
5468
msgstr ""
5236
5469
5237
#: bzrlib/errors.py:976
5470
#: breezy/errors.py:976
5238
5471
msgid "Cannot lock %(lock)s: %(why)s"
5239
5472
msgstr ""
5240
5473
5241
#: bzrlib/errors.py:986
5474
#: breezy/errors.py:986
5242
5475
msgid ""
5243
5476
"A transaction related operation was attempted after the transaction finished."
5244
5477
msgstr ""
5245
5478
5246
#: bzrlib/errors.py:1013
5479
#: breezy/errors.py:1013
5247
5480
msgid "Cannot lock: transport is read only: %(transport)s"
5248
5481
msgstr ""
5249
5482
5250
#: bzrlib/errors.py:1021
5483
#: breezy/errors.py:1021
5251
5484
msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
5252
5485
msgstr ""
5253
5486
5254
#: bzrlib/errors.py:1032
5255
msgid ""
5256
"Lock was broken while still open: %(lock)s - check storage consistency!"
5487
#: breezy/errors.py:1032
5488
msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
5257
5489
msgstr ""
5258
5490
5259
#: bzrlib/errors.py:1043
5491
#: breezy/errors.py:1043
5260
5492
msgid ""
5261
5493
"Lock was released and re-acquired before being broken: %(lock)s: held by "
5262
5494
"%(holder)r, wanted to break %(target)r"
5263
5495
msgstr ""
5264
5496
5265
#: bzrlib/errors.py:1055
5497
#: breezy/errors.py:1055
5266
5498
msgid ""
5267
5499
"Lock is apparently held, but corrupted: %(corruption_info)s\n"
5268
5500
"Use 'bzr break-lock' to clear it"
5269
5501
msgstr ""
5270
5502
5271
#: bzrlib/errors.py:1068
5503
#: breezy/errors.py:1068
5272
5504
msgid "Lock not held: %(lock)s"
5273
5505
msgstr ""
5274
5506
5275
#: bzrlib/errors.py:1097
5507
#: breezy/errors.py:1097
5276
5508
msgid "No changes to commit"
5277
5509
msgstr ""
5278
5510
5279
#: bzrlib/errors.py:1102
5511
#: breezy/errors.py:1102
5280
5512
msgid ""
5281
5513
"Selected-file commit of merges is not supported yet: files %(files_str)s"
5282
5514
msgstr ""
5283
5515
5284
#: bzrlib/errors.py:1112
5516
#: breezy/errors.py:1112
5285
5517
msgid ""
5286
5518
"Excluding paths during commit is not supported by repository at "
5287
5519
"%(repository)r."
5288
5520
msgstr ""
5289
5521
5290
#: bzrlib/errors.py:1121
5522
#: breezy/errors.py:1121
5291
5523
msgid ""
5292
5524
"The specified commit message contains characters unsupported by the current "
5293
5525
"encoding."
5294
5526
msgstr ""
5295
5527
5296
#: bzrlib/errors.py:1127
5528
#: breezy/errors.py:1127
5297
5529
msgid "Upgrade URL cannot work with readonly URLs."
5298
5530
msgstr ""
5299
5531
5300
#: bzrlib/errors.py:1132
5532
#: breezy/errors.py:1132
5301
5533
msgid "The branch format %(format)s is already at the most recent format."
5302
5534
msgstr ""
5303
5535
5304
#: bzrlib/errors.py:1155
5536
#: breezy/errors.py:1155
5305
5537
msgid "Option --change does not accept revision ranges"
5306
5538
msgstr ""
5307
5539
5308
#: bzrlib/errors.py:1160
5540
#: breezy/errors.py:1160
5309
5541
msgid "No namespace registered for string: %(spec)r"
5310
5542
msgstr ""
5311
5543
5312
#: bzrlib/errors.py:1179
5544
#: breezy/errors.py:1179
5313
5545
msgid ""
5314
"Requested revision: '%(spec)s' does not exist in branch: "
5315
"%(branch_url)s%(extra)s"
5546
"Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
5547
"%(extra)s"
5316
5548
msgstr ""
5317
5549
5318
#: bzrlib/errors.py:1193
5550
#: breezy/errors.py:1193
5319
5551
msgid ""
5320
5552
"Operation denied because it would change the main history, which is not "
5321
5553
"permitted by the append_revisions_only setting on branch \"%(location)s\"."
5322
5554
msgstr ""
5323
5555
5324
#: bzrlib/errors.py:1204
5556
#: breezy/errors.py:1204
5325
5557
msgid ""
5326
5558
"These branches have diverged. Use the missing command to see how.\n"
5327
5559
"Use the merge command to reconcile them."
5328
5560
msgstr ""
5329
5561
5330
#: bzrlib/errors.py:1224
5562
#: breezy/errors.py:1224
5331
5563
msgid ""
5332
5564
"Branches have no common ancestor, and no merge base revision was specified."
5333
5565
msgstr ""
5334
5566
5335
#: bzrlib/errors.py:1230
5567
#: breezy/errors.py:1230
5336
5568
msgid ""
5337
5569
"Selected merge cannot perform reverse cherrypicks. Try merge3 or diff3."
5338
5570
msgstr ""
5339
5571
5340
#: bzrlib/errors.py:1236
5572
#: breezy/errors.py:1236
5341
5573
msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
5342
5574
msgstr ""
5343
5575
5344
#: bzrlib/errors.py:1245
5576
#: breezy/errors.py:1245
5345
5577
msgid ""
5346
5578
"Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
5347
5579
msgstr ""
5348
5580
5349
#: bzrlib/errors.py:1254
5581
#: breezy/errors.py:1254
5350
5582
msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
5351
5583
msgstr ""
5352
5584
5353
#: bzrlib/errors.py:1263
5585
#: breezy/errors.py:1263
5354
5586
msgid "Branch %(branch)s has no commits."
5355
5587
msgstr ""
5356
5588
5357
#: bzrlib/errors.py:1281
5589
#: breezy/errors.py:1281
5358
5590
msgid ""
5359
"Bound branch %(branch)s is out of date with master branch "
5360
"%(master)s.%(extra_help)s"
5591
"Bound branch %(branch)s is out of date with master branch %(master)s."
5592
"%(extra_help)s"
5361
5593
msgstr ""
5362
5594
5363
#: bzrlib/errors.py:1293
5595
#: breezy/errors.py:1293
5364
5596
msgid ""
5365
5597
"Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
5366
5598
"bound to %(remote)s."
5367
5599
msgstr ""
5368
5600
5369
#: bzrlib/errors.py:1305
5601
#: breezy/errors.py:1305
5370
5602
msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
5371
5603
msgstr ""
5372
5604
5373
#: bzrlib/errors.py:1314
5605
#: breezy/errors.py:1314
5374
5606
msgid ""
5375
5607
"Unable to connect to target of bound branch %(branch)s => %(target)s: "
5376
5608
"%(error)s"
5377
5609
msgstr ""
5378
5610
5379
#: bzrlib/errors.py:1326
5611
#: breezy/errors.py:1326
5380
5612
msgid "Error in processing weave: %(msg)s"
5381
5613
msgstr ""
5382
5614
5383
#: bzrlib/errors.py:1335
5615
#: breezy/errors.py:1335
5384
5616
msgid "Revision {%(revision_id)s} already present in %(weave)s"
5385
5617
msgstr ""
5386
5618
5387
#: bzrlib/errors.py:1346
5619
#: breezy/errors.py:1346
5388
5620
msgid "Revision {%(revision_id)s} not present in %(weave)s"
5389
5621
msgstr ""
5390
5622
5391
#: bzrlib/errors.py:1356
5623
#: breezy/errors.py:1356
5392
5624
msgid "Weave invariant violated: %(what)s"
5393
5625
msgstr ""
5394
5626
5395
#: bzrlib/errors.py:1365
5627
#: breezy/errors.py:1365
5396
5628
msgid "Parents are mismatched between two revisions. %(msg)s"
5397
5629
msgstr ""
5398
5630
5399
#: bzrlib/errors.py:1387
5631
#: breezy/errors.py:1387
5400
5632
msgid ""
5401
5633
"Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
5402
5634
"%(weave_b)s"
5403
5635
msgstr ""
5404
5636
5405
#: bzrlib/errors.py:1399
5637
#: breezy/errors.py:1399
5406
5638
msgid "Versioned file error"
5407
5639
msgstr ""
5408
5640
5409
#: bzrlib/errors.py:1404
5641
#: breezy/errors.py:1404
5410
5642
msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
5411
5643
msgstr ""
5412
5644
5413
#: bzrlib/errors.py:1414
5645
#: breezy/errors.py:1414
5414
5646
msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
5415
5647
msgstr ""
5416
5648
5417
#: bzrlib/errors.py:1424
5649
#: breezy/errors.py:1424
5418
5650
msgid "Text did not match its checksum: %(msg)s"
5419
5651
msgstr ""
5420
5652
5421
#: bzrlib/errors.py:1550
5653
#: breezy/errors.py:1550
5422
5654
msgid "Export format %(format)r not supported"
5423
5655
msgstr ""
5424
5656
5425
#: bzrlib/errors.py:1559
5657
#: breezy/errors.py:1559
5426
5658
msgid "Transport error: %(msg)s %(orig_error)s"
5427
5659
msgstr ""
5428
5660
5429
#: bzrlib/errors.py:1585
5661
#: breezy/errors.py:1585
5430
5662
msgid "Generic bzr smart protocol error: %(details)s"
5431
5663
msgstr ""
5432
5664
5433
#: bzrlib/errors.py:1593
5665
#: breezy/errors.py:1593
5434
5666
msgid "Received bad protocol version marker: %(marker)r"
5435
5667
msgstr ""
5436
5668
5437
#: bzrlib/errors.py:1625
5669
#: breezy/errors.py:1625
5438
5670
msgid "Transport operation not possible: %(msg)s %(orig_error)s"
5439
5671
msgstr ""
5440
5672
5441
#: bzrlib/errors.py:1630
5673
#: breezy/errors.py:1630
5442
5674
msgid "Connection error: %(msg)s %(orig_error)s"
5443
5675
msgstr ""
5444
5676
5445
#: bzrlib/errors.py:1635
5677
#: breezy/errors.py:1635
5446
5678
msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
5447
5679
msgstr ""
5448
5680
5449
#: bzrlib/errors.py:1656
5681
#: breezy/errors.py:1656
5450
5682
msgid "Connection closed: %(msg)s %(orig_error)s"
5451
5683
msgstr ""
5452
5684
5453
#: bzrlib/errors.py:1661
5685
#: breezy/errors.py:1661
5454
5686
msgid "Connection Timeout: %(msg)s%(orig_error)s"
5455
5687
msgstr ""
5456
5688
5457
#: bzrlib/errors.py:1666
5689
#: breezy/errors.py:1666
5458
5690
msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
5459
5691
msgstr ""
5460
5692
5461
#: bzrlib/errors.py:1676
5693
#: breezy/errors.py:1676
5462
5694
msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
5463
5695
msgstr ""
5464
5696
5465
#: bzrlib/errors.py:1691
5466
msgid "Certificate error: %(error)s"
5467
msgstr ""
5468
5469
#: bzrlib/errors.py:1699
5697
#: breezy/errors.py:1691
5470
5698
msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
5471
5699
msgstr ""
5472
5700
5473
#: bzrlib/errors.py:1713
5701
#: breezy/errors.py:1705
5474
5702
msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
5475
5703
msgstr ""
5476
5704
5477
#: bzrlib/errors.py:1721
5705
#: breezy/errors.py:1713
5478
5706
msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
5479
5707
msgstr ""
5480
5708
5481
#: bzrlib/errors.py:1730
5709
#: breezy/errors.py:1722
5482
5710
msgid "%(source)s is%(permanently)s redirected to %(target)s"
5483
5711
msgstr ""
5484
5712
5485
#: bzrlib/errors.py:1744
5713
#: breezy/errors.py:1736
5486
5714
msgid "Too many redirections"
5487
5715
msgstr ""
5488
5716
5489
#: bzrlib/errors.py:1749
5717
#: breezy/errors.py:1741
5490
5718
msgid "Working tree has conflicts."
5491
5719
msgstr ""
5492
5720
5493
#: bzrlib/errors.py:1753
5721
#: breezy/errors.py:1745
5494
5722
msgid "Config file %(filename)s is not UTF-8 encoded\n"
5495
5723
msgstr ""
5496
5724
5497
#: bzrlib/errors.py:1762
5725
#: breezy/errors.py:1754
5498
5726
msgid ""
5499
5727
"Error(s) parsing config file %(filename)s:\n"
5500
5728
"%(errors)s"
5501
5729
msgstr ""
5502
5730
5503
#: bzrlib/errors.py:1772
5731
#: breezy/errors.py:1764
5504
5732
msgid ""
5505
5733
"Bad value \"%(value)s\" for option \"%(name)s\".\n"
5506
5734
"See ``bzr help %(name)s``"
5507
5735
msgstr ""
5508
5736
5509
#: bzrlib/errors.py:1782
5737
#: breezy/errors.py:1774
5510
5738
msgid "%(username)r does not seem to contain a reasonable email address"
5511
5739
msgstr ""
5512
5740
5513
#: bzrlib/errors.py:1791
5741
#: breezy/errors.py:1783
5514
5742
msgid "Failed to GPG sign data with command \"%(command_line)s\""
5515
5743
msgstr ""
5516
5744
5517
#: bzrlib/errors.py:1799
5745
#: breezy/errors.py:1791
5518
5746
msgid "Failed to verify GPG signature data with error \"%(error)s\""
5519
5747
msgstr ""
5520
5748
5521
#: bzrlib/errors.py:1807
5749
#: breezy/errors.py:1799
5522
5750
msgid "Unable to import library \"%(library)s\": %(error)s"
5523
5751
msgstr ""
5524
5752
5525
#: bzrlib/errors.py:1815
5753
#: breezy/errors.py:1807
5526
5754
msgid "python-gpgme is not installed, it is needed to verify signatures"
5527
5755
msgstr ""
5528
5756
5529
#: bzrlib/errors.py:1823
5757
#: breezy/errors.py:1815
5530
5758
msgid ""
5531
5759
"The working tree for %(basedir)s has changed since the last commit, but "
5532
5760
"weave merge requires that it be unchanged"
5533
5761
msgstr ""
5534
5762
5535
#: bzrlib/errors.py:1833
5763
#: breezy/errors.py:1825
5536
5764
msgid ""
5537
5765
"Can't reprocess and show base, because reprocessing obscures the "
5538
5766
"relationship of conflicting lines to the base"
5539
5767
msgstr ""
5540
5768
5541
#: bzrlib/errors.py:1839
5769
#: breezy/errors.py:1831
5542
5770
msgid "Cycle in graph %(graph)r"
5543
5771
msgstr ""
5544
5772
5545
#: bzrlib/errors.py:1867
5773
#: breezy/errors.py:1859
5546
5774
msgid "File %(filename)s is not conflicted."
5547
5775
msgstr ""
5548
5776
5549
#: bzrlib/errors.py:1889
5777
#: breezy/errors.py:1881
5550
5778
msgid "No bundle was found in \"%(filename)s\"."
5551
5779
msgstr ""
5552
5780
5553
#: bzrlib/errors.py:1898
5781
#: breezy/errors.py:1890
5554
5782
msgid "Unable to handle bundle version %(version)s: %(msg)s"
5555
5783
msgstr ""
5556
5784
5557
#: bzrlib/errors.py:1908
5785
#: breezy/errors.py:1900
5558
5786
msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
5559
5787
msgstr ""
5560
5788
5561
#: bzrlib/errors.py:1921
5789
#: breezy/errors.py:1913
5562
5790
msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
5563
5791
msgstr ""
5564
5792
5565
#: bzrlib/errors.py:1931
5793
#: breezy/errors.py:1923
5566
5794
msgid "Key %(key)s is already present in map"
5567
5795
msgstr ""
5568
5796
5569
#: bzrlib/errors.py:1936
5797
#: breezy/errors.py:1928
5570
5798
msgid "The prefix %(prefix)s is in the help search path twice."
5571
5799
msgstr ""
5572
5800
5573
#: bzrlib/errors.py:1946
5801
#: breezy/errors.py:1938
5574
5802
msgid ""
5575
5803
"No final name for trans_id %(trans_id)r\n"
5576
5804
"file-id: %(file_id)r\n"
5577
5805
"root trans-id: %(root_trans_id)r\n"
5578
5806
msgstr ""
5579
5807
5580
#: bzrlib/errors.py:1978
5808
#: breezy/errors.py:1970
5581
5809
msgid "Attempt to reuse a transform that has already been applied."
5582
5810
msgstr ""
5583
5811
5584
#: bzrlib/errors.py:1983
5812
#: breezy/errors.py:1975
5585
5813
msgid "Moving the root directory is not supported at this time"
5586
5814
msgstr ""
5587
5815
5588
#: bzrlib/errors.py:1988
5816
#: breezy/errors.py:1980
5589
5817
msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
5590
5818
msgstr ""
5591
5819
5592
#: bzrlib/errors.py:1999
5820
#: breezy/errors.py:1991
5593
5821
msgid ""
5594
5822
"Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5595
5823
msgstr ""
5596
5824
5597
#: bzrlib/errors.py:2035
5825
#: breezy/errors.py:2027
5598
5826
msgid ""
5599
5827
"Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
5600
5828
msgstr ""
5601
5829
5602
#: bzrlib/errors.py:2065
5830
#: breezy/errors.py:2057
5603
5831
msgid "Unable to import paramiko (required for sftp support): %(error)s"
5604
5832
msgstr ""
5605
5833
5606
#: bzrlib/errors.py:2073
5834
#: breezy/errors.py:2065
5607
5835
msgid "Nothing to merge."
5608
5836
msgstr ""
5609
5837
5610
#: bzrlib/errors.py:2078
5838
#: breezy/errors.py:2070
5611
5839
msgid "Format %(format)s cannot be initialised by this version of bzr."
5612
5840
msgstr ""
5613
5841
5614
#: bzrlib/errors.py:2087
5842
#: breezy/errors.py:2079
5615
5843
msgid ""
5616
5844
"Cannot convert from format %(from_format)s to format %(format)s. "
5617
5845
"%(problem)s"
5618
5846
msgstr ""
5619
5847
5620
#: bzrlib/errors.py:2099
5848
#: breezy/errors.py:2091
5621
5849
msgid "Could not find an appropriate Differ for file \"%(path)s\""
5622
5850
msgstr ""
5623
5851
5624
#: bzrlib/errors.py:2107
5852
#: breezy/errors.py:2099
5625
5853
msgid "%(exe_name)s could not be found on this machine"
5626
5854
msgstr ""
5627
5855
5628
#: bzrlib/errors.py:2115
5856
#: breezy/errors.py:2107
5629
5857
msgid "Diff is not installed on this machine: %(msg)s"
5630
5858
msgstr ""
5631
5859
5632
#: bzrlib/errors.py:2123
5860
#: breezy/errors.py:2115
5633
5861
msgid "Diff3 is not installed on this machine."
5634
5862
msgstr ""
5635
5863
5636
#: bzrlib/errors.py:2129
5864
#: breezy/errors.py:2121
5637
5865
msgid "The content being inserted is already present."
5638
5866
msgstr ""
5639
5867
5640
#: bzrlib/errors.py:2134
5868
#: breezy/errors.py:2126
5641
5869
msgid ""
5642
5870
"This tree contains left-over files from a failed operation.\n"
5643
5871
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5645
5873
" keep, and delete it when you are done."
5646
5874
msgstr ""
5647
5875
5648
#: bzrlib/errors.py:2145
5876
#: breezy/errors.py:2137
5649
5877
msgid ""
5650
5878
"This tree contains left-over files from a failed operation.\n"
5651
5879
" Please examine %(pending_deletion)s to see if it contains any files you\n"
5652
5880
" wish to keep, and delete it when you are done."
5653
5881
msgstr ""
5654
5882
5655
#: bzrlib/errors.py:2155
5883
#: breezy/errors.py:2147
5656
5884
msgid ""
5657
5885
"Unable to delete transform temporary directory %(limbo_dir)s.\n"
5658
5886
" Please examine %(limbo_dir)s to see if it contains any files you wish "
5660
5888
" keep, and delete it when you are done."
5661
5889
msgstr ""
5662
5890
5663
#: bzrlib/errors.py:2166
5891
#: breezy/errors.py:2158
5664
5892
msgid ""
5665
5893
"Unable to delete transform temporary directory %(pending_deletion)s. Please "
5666
5894
"examine %(pending_deletion)s to see if it contains any files you wish to "
5667
5895
"keep, and delete it when you are done."
5668
5896
msgstr ""
5669
5897
5670
#: bzrlib/errors.py:2176
5898
#: breezy/errors.py:2168
5671
5899
msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
5672
5900
msgstr ""
5673
5901
5674
#: bzrlib/errors.py:2190
5675
msgid ""
5676
"Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5902
#: breezy/errors.py:2182
5903
msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
5677
5904
msgstr ""
5678
5905
5679
#: bzrlib/errors.py:2203
5906
#: breezy/errors.py:2195
5680
5907
msgid "Error in merge modified format"
5681
5908
msgstr ""
5682
5909
5683
#: bzrlib/errors.py:2208
5910
#: breezy/errors.py:2200
5684
5911
msgid "Format error in conflict listings"
5685
5912
msgstr ""
5686
5913
5687
#: bzrlib/errors.py:2212
5914
#: breezy/errors.py:2204
5688
5915
msgid ""
5689
5916
"Inconsistency in dirstate file %(dirstate_path)s.\n"
5690
5917
"Error: %(description)s"
5691
5918
msgstr ""
5692
5919
5693
#: bzrlib/errors.py:2223
5920
#: breezy/errors.py:2215
5694
5921
msgid ""
5695
5922
"An error has been detected in the repository %(repo_path)s.\n"
5696
5923
"Please run bzr reconcile on this repository."
5697
5924
msgstr ""
5698
5925
5699
#: bzrlib/errors.py:2234
5926
#: breezy/errors.py:2226
5700
5927
msgid ""
5701
5928
"An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
5702
5929
"reason: %(reason)s"
5703
5930
msgstr ""
5704
5931
5705
#: bzrlib/errors.py:2247
5932
#: breezy/errors.py:2239
5706
5933
msgid ""
5707
5934
"An inconsistent delta was supplied: %(delta)r\n"
5708
5935
"reason: %(reason)s"
5709
5936
msgstr ""
5710
5937
5711
#: bzrlib/errors.py:2259
5938
#: breezy/errors.py:2251
5712
5939
msgid "To use this feature you must upgrade your branch at %(path)s."
5713
5940
msgstr ""
5714
5941
5715
#: bzrlib/errors.py:2268
5942
#: breezy/errors.py:2260
5716
5943
msgid "To use this feature you must upgrade your repository at %(path)s."
5717
5944
msgstr ""
5718
5945
5719
#: bzrlib/errors.py:2273
5946
#: breezy/errors.py:2265
5720
5947
msgid ""
5721
5948
"To use this feature you must upgrade your branch at %(path)s to a format "
5722
5949
"which supports rich roots."
5723
5950
msgstr ""
5724
5951
5725
#: bzrlib/errors.py:2279
5952
#: breezy/errors.py:2271
5726
5953
msgid "Cannot perform local-only commits on unbound branches."
5727
5954
msgstr ""
5728
5955
5729
#: bzrlib/errors.py:2284
5956
#: breezy/errors.py:2276
5730
5957
msgid "The method %(mname)s is not supported on objects of type %(tname)s."
5731
5958
msgstr ""
5732
5959
5733
#: bzrlib/errors.py:2305
5960
#: breezy/errors.py:2297
5734
5961
msgid "Ghost tags not supported by format %(format)r."
5735
5962
msgstr ""
5736
5963
5737
#: bzrlib/errors.py:2313
5964
#: breezy/errors.py:2305
5738
5965
msgid "File is binary but should be text."
5739
5966
msgstr ""
5740
5967
5741
#: bzrlib/errors.py:2318
5968
#: breezy/errors.py:2310
5742
5969
msgid "The path %(path)s is not permitted on this platform"
5743
5970
msgstr ""
5744
5971
5745
#: bzrlib/errors.py:2327
5972
#: breezy/errors.py:2319
5746
5973
msgid ""
5747
5974
"Testament did not match expected value.\n"
5748
5975
" For revision_id {%(revision_id)s}, expected {%(expected)s}, measured\n"
5749
5976
" {%(measured)s}"
5750
5977
msgstr ""
5751
5978
5752
#: bzrlib/errors.py:2339
5979
#: breezy/errors.py:2331
5753
5980
msgid "Not a bzr revision-bundle: %(text)r"
5754
5981
msgstr ""
5755
5982
5756
#: bzrlib/errors.py:2348
5983
#: breezy/errors.py:2340
5757
5984
msgid "Bad bzr revision-bundle: %(text)r"
5758
5985
msgstr ""
5759
5986
5760
#: bzrlib/errors.py:2357
5987
#: breezy/errors.py:2349
5761
5988
msgid "Malformed bzr revision-bundle header: %(text)r"
5762
5989
msgstr ""
5763
5990
5764
#: bzrlib/errors.py:2362
5991
#: breezy/errors.py:2354
5765
5992
msgid "Malformed patches in bzr revision-bundle: %(text)r"
5766
5993
msgstr ""
5767
5994
5768
#: bzrlib/errors.py:2367
5995
#: breezy/errors.py:2359
5769
5996
msgid "Malformed footer in bzr revision-bundle: %(text)r"
5770
5997
msgstr ""
5771
5998
5772
#: bzrlib/errors.py:2372
5999
#: breezy/errors.py:2364
5773
6000
msgid "End of line marker was not \\n in bzr revision-bundle"
5774
6001
msgstr ""
5775
6002
5776
#: bzrlib/errors.py:2382
6003
#: breezy/errors.py:2374
5777
6004
msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
5778
6005
msgstr ""
5779
6006
5780
#: bzrlib/errors.py:2392
6007
#: breezy/errors.py:2384
5781
6008
msgid "Root class for inventory serialization errors"
5782
6009
msgstr ""
5783
6010
5784
#: bzrlib/errors.py:2396
6011
#: breezy/errors.py:2388
5785
6012
msgid ""
5786
6013
"The inventory was not in the expected format:\n"
5787
6014
" %(msg)s"
5788
6015
msgstr ""
5789
6016
5790
#: bzrlib/errors.py:2405
6017
#: breezy/errors.py:2397
5791
6018
msgid "This operation requires rich root data storage"
5792
6019
msgstr ""
5793
6020
5794
#: bzrlib/errors.py:2418
5795
msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
6021
#: breezy/errors.py:2410
6022
msgid "Unrecognised value for BRZ_SSH environment variable: %(vendor)s"
5796
6023
msgstr ""
5797
6024
5798
#: bzrlib/errors.py:2427
6025
#: breezy/errors.py:2419
5799
6026
msgid ""
5800
"Don't know how to handle SSH connections. Please set BZR_SSH environment "
6027
"Don't know how to handle SSH connections. Please set BRZ_SSH environment "
5801
6028
"variable."
5802
6029
msgstr ""
5803
6030
5804
#: bzrlib/errors.py:2434
6031
#: breezy/errors.py:2426
5805
6032
msgid ""
5806
6033
"Could not determine revno for {%(revision_id)s} because its ancestry shows a "
5807
6034
"ghost at {%(ghost_revision_id)s}"
5808
6035
msgstr ""
5809
6036
5810
#: bzrlib/errors.py:2444
6037
#: breezy/errors.py:2436
5811
6038
msgid "Ghost revision {%(revision_id)s} cannot be used here."
5812
6039
msgstr ""
5813
6040
5814
#: bzrlib/errors.py:2495
6041
#: breezy/errors.py:2487
5815
6042
msgid ""
5816
6043
"A merge directive must provide either a bundle or a public branch location."
5817
6044
msgstr ""
5818
6045
5819
#: bzrlib/errors.py:2502
6046
#: breezy/errors.py:2494
5820
6047
msgid "Bad merge directive payload %(start)r"
5821
6048
msgstr ""
5822
6049
5823
#: bzrlib/errors.py:2512
6050
#: breezy/errors.py:2504
5824
6051
msgid "Preview patch does not match requested changes."
5825
6052
msgstr ""
5826
6053
5827
#: bzrlib/errors.py:2518
6054
#: breezy/errors.py:2510
5828
6055
msgid "Patch_type was %(patch_type)s, but no patch was supplied."
5829
6056
msgstr ""
5830
6057
5831
#: bzrlib/errors.py:2528
6058
#: breezy/errors.py:2520
5832
6059
msgid ""
5833
6060
"Your branch does not have all of the revisions required in order to merge "
5834
6061
"this merge directive and the target location specified in the merge "
5835
6062
"directive is not a branch: %(location)s."
5836
6063
msgstr ""
5837
6064
5838
#: bzrlib/errors.py:2540
6065
#: breezy/errors.py:2532
5839
6066
msgid "Unsupported entry kind %(kind)s"
5840
6067
msgstr ""
5841
6068
5842
#: bzrlib/errors.py:2548
6069
#: breezy/errors.py:2540
5843
6070
msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
5844
6071
msgstr ""
5845
6072
5846
#: bzrlib/errors.py:2558
6073
#: breezy/errors.py:2550
5847
6074
msgid "Subsume target %(other_tree)s needs to be upgraded."
5848
6075
msgstr ""
5849
6076
5850
#: bzrlib/errors.py:2577
6077
#: breezy/errors.py:2569
5851
6078
msgid "No such tag: %(tag_name)s"
5852
6079
msgstr ""
5853
6080
5854
#: bzrlib/errors.py:2585
6081
#: breezy/errors.py:2577
5855
6082
msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
5856
6083
msgstr ""
5857
6084
5858
#: bzrlib/errors.py:2594
6085
#: breezy/errors.py:2586
5859
6086
msgid "Tag %(tag_name)s already exists."
5860
6087
msgstr ""
5861
6088
5862
#: bzrlib/errors.py:2602
6089
#: breezy/errors.py:2594
5863
6090
msgid ""
5864
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help "
5865
"bugs\" for more information on this feature."
6091
"Did not understand bug identifier %(bug_id)s: %(reason)s. See \"bzr help bugs"
6092
"\" for more information on this feature."
5866
6093
msgstr ""
5867
6094
5868
#: bzrlib/errors.py:2612
6095
#: breezy/errors.py:2604
5869
6096
msgid ""
5870
6097
"The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
5871
6098
msgstr ""
5872
6099
5873
#: bzrlib/errors.py:2622
6100
#: breezy/errors.py:2614
5874
6101
msgid ""
5875
6102
"Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
5876
6103
msgstr ""
5877
6104
5878
#: bzrlib/errors.py:2632
6105
#: breezy/errors.py:2624
5879
6106
msgid "Invalid line in bugs property: '%(line)s'"
5880
6107
msgstr ""
5881
6108
5882
#: bzrlib/errors.py:2640
6109
#: breezy/errors.py:2632
5883
6110
msgid "Invalid bug status: '%(status)s'"
5884
6111
msgstr ""
5885
6112
5886
#: bzrlib/errors.py:2648
6113
#: breezy/errors.py:2640
5887
6114
msgid "Could not understand response from smart server: %(response_tuple)r"
5888
6115
msgstr ""
5889
6116
5890
#: bzrlib/errors.py:2687
6117
#: breezy/errors.py:2679
5891
6118
msgid "Server sent an unexpected error: %(error_tuple)r"
5892
6119
msgstr ""
5893
6120
5894
#: bzrlib/errors.py:2706
6121
#: breezy/errors.py:2698
5895
6122
msgid "Unrecognised container format: %(container_format)r"
5896
6123
msgstr ""
5897
6124
5898
#: bzrlib/errors.py:2714
6125
#: breezy/errors.py:2706
5899
6126
msgid "Unexpected end of container stream"
5900
6127
msgstr ""
5901
6128
5902
#: bzrlib/errors.py:2719
6129
#: breezy/errors.py:2711
5903
6130
msgid "Unknown record type: %(record_type)r"
5904
6131
msgstr ""
5905
6132
5906
#: bzrlib/errors.py:2727
6133
#: breezy/errors.py:2719
5907
6134
msgid "Invalid record: %(reason)s"
5908
6135
msgstr ""
5909
6136
5910
#: bzrlib/errors.py:2735
6137
#: breezy/errors.py:2727
5911
6138
msgid "Container has data after end marker: %(excess)r"
5912
6139
msgstr ""
5913
6140
5914
#: bzrlib/errors.py:2743
6141
#: breezy/errors.py:2735
5915
6142
msgid "Container has multiple records with the same name: %(name)s"
5916
6143
msgstr ""
5917
6144
5918
#: bzrlib/errors.py:2756
6145
#: breezy/errors.py:2748
5919
6146
msgid "Corrupt or incompatible data stream: %(reason)s"
5920
6147
msgstr ""
5921
6148
5922
#: bzrlib/errors.py:2764
6149
#: breezy/errors.py:2756
5923
6150
msgid "SMTP error: %(error)s"
5924
6151
msgstr ""
5925
6152
5926
#: bzrlib/errors.py:2772
6153
#: breezy/errors.py:2764
5927
6154
msgid "No message supplied."
5928
6155
msgstr ""
5929
6156
5930
#: bzrlib/errors.py:2777
6157
#: breezy/errors.py:2769
5931
6158
msgid "No mail-to address (--mail-to) or output (-o) specified."
5932
6159
msgstr ""
5933
6160
5934
#: bzrlib/errors.py:2782
6161
#: breezy/errors.py:2774
5935
6162
msgid ""
5936
6163
"Unable to find mail client with the following names: "
5937
6164
"%(mail_command_list_string)s"
5938
6165
msgstr ""
5939
6166
5940
#: bzrlib/errors.py:2792
6167
#: breezy/errors.py:2784
5941
6168
msgid "SMTP connection to %(host)s refused"
5942
6169
msgstr ""
5943
6170
5944
#: bzrlib/errors.py:2801
6171
#: breezy/errors.py:2793
5945
6172
msgid "Please specify smtp_server. No server at default %(host)s."
5946
6173
msgstr ""
5947
6174
5948
#: bzrlib/errors.py:2815
6175
#: breezy/errors.py:2807
5949
6176
msgid ""
5950
6177
"'%(display_url)s' is not in sync with %(target_url)s. See bzr help sync-for-"
5951
6178
"reconfigure."
5952
6179
msgstr ""
5953
6180
5954
#: bzrlib/errors.py:2827
6181
#: breezy/errors.py:2819
5955
6182
msgid "'%(display_url)s' is already a branch."
5956
6183
msgstr ""
5957
6184
5958
#: bzrlib/errors.py:2832
6185
#: breezy/errors.py:2824
5959
6186
msgid "'%(display_url)s' is already a tree."
5960
6187
msgstr ""
5961
6188
5962
#: bzrlib/errors.py:2837
6189
#: breezy/errors.py:2829
5963
6190
msgid "'%(display_url)s' is already a checkout."
5964
6191
msgstr ""
5965
6192
5966
#: bzrlib/errors.py:2842
6193
#: breezy/errors.py:2834
5967
6194
msgid "'%(display_url)s' is already a lightweight checkout."
5968
6195
msgstr ""
5969
6196
5970
#: bzrlib/errors.py:2847
6197
#: breezy/errors.py:2839
5971
6198
msgid "'%(display_url)s' is already using a shared repository."
5972
6199
msgstr ""
5973
6200
5974
#: bzrlib/errors.py:2852
6201
#: breezy/errors.py:2844
5975
6202
msgid "'%(display_url)s' is already standalone."
5976
6203
msgstr ""
5977
6204
5978
#: bzrlib/errors.py:2857
6205
#: breezy/errors.py:2849
5979
6206
msgid "Shared repository '%(display_url)s' already creates working trees."
5980
6207
msgstr ""
5981
6208
5982
#: bzrlib/errors.py:2863
6209
#: breezy/errors.py:2855
5983
6210
msgid ""
5984
6211
"Shared repository '%(display_url)s' already doesn't create working trees."
5985
6212
msgstr ""
5986
6213
5987
#: bzrlib/errors.py:2869
6214
#: breezy/errors.py:2861
5988
6215
msgid "Requested reconfiguration of '%(display_url)s' is not supported."
5989
6216
msgstr ""
5990
6217
5991
#: bzrlib/errors.py:2874
6218
#: breezy/errors.py:2866
5992
6219
msgid "No location could be found to bind to at %(display_url)s."
5993
6220
msgstr ""
5994
6221
5995
#: bzrlib/errors.py:2879
5996
msgid ""
5997
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr "
5998
"status).%(more)s"
5999
msgstr ""
6000
6001
#: bzrlib/errors.py:2898
6002
msgid ""
6003
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --"
6004
"list).%(more)s"
6005
msgstr ""
6006
6007
#: bzrlib/errors.py:2904
6222
#: breezy/errors.py:2871
6223
msgid ""
6224
"Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
6225
"%(more)s"
6226
msgstr ""
6227
6228
#: breezy/errors.py:2890
6229
msgid ""
6230
"Branch \"%(display_url)s\" does not support storing uncommitted changes."
6231
msgstr ""
6232
6233
#: breezy/errors.py:2905
6234
msgid ""
6235
"Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
6236
"%(more)s"
6237
msgstr ""
6238
6239
#: breezy/errors.py:2911
6008
6240
msgid "Variable {%(name)s} is not available."
6009
6241
msgstr ""
6010
6242
6011
#: bzrlib/errors.py:2912
6243
#: breezy/errors.py:2919
6012
6244
msgid "No template specified."
6013
6245
msgstr ""
6014
6246
6015
#: bzrlib/errors.py:2917
6247
#: breezy/errors.py:2924
6016
6248
msgid "Unable to create symlink %(path_str)son this platform"
6017
6249
msgstr ""
6018
6250
6019
#: bzrlib/errors.py:2932
6251
#: breezy/errors.py:2939
6020
6252
msgid ""
6021
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", "
6022
"\"original\", \"local\"."
6253
"Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
6254
"\", \"local\"."
6023
6255
msgstr ""
6024
6256
6025
#: bzrlib/errors.py:2966
6257
#: breezy/errors.py:2973
6026
6258
msgid ""
6027
6259
"Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
6028
6260
msgstr ""
6029
6261
6030
#: bzrlib/errors.py:2978
6262
#: breezy/errors.py:2985
6031
6263
msgid "The \"%(config_id)s\" configuration does not exist."
6032
6264
msgstr ""
6033
6265
6034
#: bzrlib/errors.py:2986
6266
#: breezy/errors.py:2993
6035
6267
msgid "The \"%(option_name)s\" configuration option does not exist."
6036
6268
msgstr ""
6037
6269
6038
#: bzrlib/errors.py:2994
6270
#: breezy/errors.py:3001
6039
6271
msgid "The alias \"%(alias_name)s\" does not exist."
6040
6272
msgstr ""
6041
6273
6042
#: bzrlib/errors.py:3008
6274
#: breezy/errors.py:3015
6043
6275
msgid "\"%(alias_name)s\" is not a valid location alias."
6044
6276
msgstr ""
6045
6277
6046
#: bzrlib/errors.py:3016
6278
#: breezy/errors.py:3023
6047
6279
msgid "No %(alias_name)s location assigned."
6048
6280
msgstr ""
6049
6281
6050
#: bzrlib/errors.py:3024
6282
#: breezy/errors.py:3031
6051
6283
msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
6052
6284
msgstr ""
6053
6285
6054
#: bzrlib/errors.py:3034
6286
#: breezy/errors.py:3041
6055
6287
msgid "Unknown rules detected: %(unknowns_str)s."
6056
6288
msgstr ""
6057
6289
6058
#: bzrlib/errors.py:3045
6290
#: breezy/errors.py:3052
6059
6291
msgid "Tip change rejected: %(msg)s"
6060
6292
msgstr ""
6061
6293
6062
#: bzrlib/errors.py:3053
6294
#: breezy/errors.py:3060
6063
6295
msgid "Shelf corrupt."
6064
6296
msgstr ""
6065
6297
6066
#: bzrlib/errors.py:3058
6298
#: breezy/errors.py:3065
6067
6299
msgid "Corruption while decompressing repository file%(orig_error)s"
6068
6300
msgstr ""
6069
6301
6070
#: bzrlib/errors.py:3070
6302
#: breezy/errors.py:3077
6071
6303
msgid "No changes are shelved with id \"%(shelf_id)d\"."
6072
6304
msgstr ""
6073
6305
6074
#: bzrlib/errors.py:3078
6306
#: breezy/errors.py:3085
6075
6307
msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
6076
6308
msgstr ""
6077
6309
6078
#: bzrlib/errors.py:3086
6079
msgid ""
6080
"An attempt to access a url outside the server jail was made: '%(url)s'."
6310
#: breezy/errors.py:3093
6311
msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
6081
6312
msgstr ""
6082
6313
6083
#: bzrlib/errors.py:3094
6314
#: breezy/errors.py:3101
6084
6315
msgid "The user aborted the operation."
6085
6316
msgstr ""
6086
6317
6087
#: bzrlib/errors.py:3099
6318
#: breezy/errors.py:3106
6088
6319
msgid "Branching '%(url)s'(%(format)s) must create a working tree."
6089
6320
msgstr ""
6090
6321
6091
#: bzrlib/errors.py:3109
6322
#: breezy/errors.py:3116
6092
6323
msgid "No such view: %(view_name)s."
6093
6324
msgstr ""
6094
6325
6095
#: bzrlib/errors.py:3119
6326
#: breezy/errors.py:3126
6096
6327
msgid ""
6097
6328
"Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
6098
6329
"to a later format."
6099
6330
msgstr ""
6100
6331
6101
#: bzrlib/errors.py:3128
6332
#: breezy/errors.py:3135
6102
6333
msgid ""
6103
6334
"Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
6104
6335
msgstr ""
6105
6336
6106
#: bzrlib/errors.py:3195
6337
#: breezy/errors.py:3202
6107
6338
msgid "%(bzrdir)r does not support co-located branches."
6108
6339
msgstr ""
6109
6340
6110
#: bzrlib/errors.py:3201
6341
#: breezy/errors.py:3208
6111
6342
msgid ""
6112
6343
"Unable to determine your name.\n"
6113
6344
"Please, set your name with the 'whoami' command.\n"
6114
6345
"E.g. bzr whoami \"Your Name <name@example.com>\""
6115
6346
msgstr ""
6116
6347
6117
#: bzrlib/errors.py:3210
6348
#: breezy/errors.py:3217
6118
6349
msgid "Invalid pattern(s) found. %(msg)s"
6119
6350
msgstr ""
6120
6351
6121
#: bzrlib/errors.py:3218
6352
#: breezy/errors.py:3225
6122
6353
msgid ""
6123
6354
"Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
6124
6355
"unbind` to fix."
6125
6356
msgstr ""
6126
6357
6127
#: bzrlib/errors.py:3229
6358
#: breezy/errors.py:3236
6128
6359
msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
6129
6360
msgstr ""
6130
6361
6131
#: bzrlib/errors.py:3238
6132
msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
6133
msgstr ""
6134
6135
#: bzrlib/errors.py:3247
6362
#: breezy/errors.py:3245
6363
msgid "Option \"%(name)s\" is not defined while expanding \"%(string)s\"."
6364
msgstr ""
6365
6366
#: breezy/errors.py:3254
6367
msgid "Option \"%(name)s\" is not allowed."
6368
msgstr ""
6369
6370
#: breezy/errors.py:3262
6136
6371
msgid ""
6137
6372
"No compatible object available for operations from %(source)r to %(target)r."
6138
6373
msgstr ""
6139
6374
6140
#: bzrlib/errors.py:3257
6375
#: breezy/errors.py:3272
6141
6376
msgid ""
6142
6377
"VFS requests over the smart server are not allowed. Encountered: %(method)s, "
6143
6378
"%(arguments)s."
6144
6379
msgstr ""
6145
6380
6146
#: bzrlib/errors.py:3267
6381
#: breezy/errors.py:3282
6147
6382
msgid ""
6148
6383
"Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
6149
6384
"format %(format)r"
6150
6385
msgstr ""
6151
6386
6152
#: bzrlib/errors.py:3279
6387
#: breezy/errors.py:3294
6153
6388
msgid ""
6154
6389
"Missing feature %(feature)s not provided by this version of Bazaar or any "
6155
6390
"plugin."
6156
6391
msgstr ""
6157
6392
6158
#: bzrlib/errors.py:3292
6393
#: breezy/errors.py:3307
6159
6394
msgid "Binary files section encountered."
6160
6395
msgstr ""
6161
6396
6162
#: bzrlib/errors.py:3300
6397
#: breezy/errors.py:3315
6163
6398
msgid ""
6164
6399
"Malformed patch header. %(desc)s\n"
6165
6400
"%(line)r"
6166
6401
msgstr ""
6167
6402
6168
#: bzrlib/errors.py:3309
6403
#: breezy/errors.py:3324
6169
6404
msgid ""
6170
6405
"Malformed hunk header. %(desc)s\n"
6171
6406
"%(line)r"
6172
6407
msgstr ""
6173
6408
6174
#: bzrlib/errors.py:3318
6409
#: breezy/errors.py:3333
6175
6410
msgid ""
6176
6411
"Malformed line. %(desc)s\n"
6177
6412
"%(line)r"
6178
6413
msgstr ""
6179
6414
6180
#: bzrlib/errors.py:3328
6415
#: breezy/errors.py:3343
6181
6416
msgid ""
6182
6417
"Text contents mismatch at line %(line_no)d. Original has \"%(orig_line)s\", "
6183
6418
"but patch says it should be \"%(patch_line)s\""
6184
6419
msgstr ""
6185
6420
6186
#: bzrlib/errors.py:3339
6421
#: breezy/errors.py:3354
6187
6422
msgid "The feature %(feature)s has already been registered."
6188
6423
msgstr ""
6189
6424
6190
#: bzrlib/export_pot.py:252
6425
#: breezy/errors.py:3362
6426
msgid ""
6427
"Cannot store uncommitted changes because this branch already stores "
6428
"uncommitted changes."
6429
msgstr ""
6430
6431
#: breezy/export_pot.py:252
6191
6432
#, python-format
6192
6433
msgid "Exporting messages from builtin command: %s"
6193
6434
msgstr ""
6194
6435
6195
#: bzrlib/export_pot.py:271
6436
#: breezy/export_pot.py:271
6437
#, python-brace-format
6196
6438
msgid "Exporting messages from plugin command: {0} in {1}"
6197
6439
msgstr ""
6198
6440
6199
#: bzrlib/export_pot.py:292
6441
#: breezy/export_pot.py:292
6200
6442
#, python-format
6201
6443
msgid "Exporting message from error: %s"
6202
6444
msgstr ""
6203
6445
6204
#: bzrlib/fetch.py:98
6446
#: breezy/fetch.py:98
6205
6447
msgid "Finding revisions"
6206
6448
msgstr ""
6207
6449
6208
#: bzrlib/fetch.py:103
6450
#: breezy/fetch.py:103
6209
6451
msgid "Fetching revisions"
6210
6452
msgstr ""
6211
6453
6212
#: bzrlib/foreign.py:262
6454
#: breezy/foreign.py:262
6213
6455
msgid "Push into a different VCS without any custom bzr metadata."
6214
6456
msgstr ""
6215
6457
6216
#: bzrlib/foreign.py:264
6458
#: breezy/foreign.py:264
6217
6459
msgid ""
6218
6460
"This will afterwards rebase the local branch on the remote\n"
6219
6461
"branch unless the --no-rebase option is used, in which case \n"
6220
6462
"the two branches will be out of sync after the push. "
6221
6463
msgstr ""
6222
6464
6223
#: bzrlib/foreign.py:277
6465
# help of 'no-rebase' option of 'dpush' command
6466
#: breezy/foreign.py:277
6224
6467
msgid "Do not rebase after push."
6225
6468
msgstr ""
6226
6469
6227
#: bzrlib/foreign.py:311
6470
#: breezy/foreign.py:311
6228
6471
#, python-format
6229
6472
msgid "Using saved location: %s\n"
6230
6473
msgstr ""
6231
6474
6232
#: bzrlib/foreign.py:321
6475
#: breezy/foreign.py:321
6233
6476
msgid ""
6234
6477
"{0!r} and {1!r} are in the same VCS, lossy push not necessary. Please use "
6235
6478
"regular push."
6236
6479
msgstr ""
6237
6480
6238
#: bzrlib/gpg.py:366
6481
#: breezy/gpg.py:358
6482
#, python-brace-format
6239
6483
msgid "No GnuPG key results for pattern: {0}"
6240
6484
msgstr ""
6241
6485
6242
#: bzrlib/gpg.py:439
6486
#: breezy/gpg.py:431
6487
#, python-brace-format
6243
6488
msgid "{0} commits with valid signatures"
6244
6489
msgstr ""
6245
6490
6246
#: bzrlib/gpg.py:445
6491
#: breezy/gpg.py:437
6492
#, python-brace-format
6247
6493
msgid "{0} commit with unknown key"
6248
6494
msgid_plural "{0} commits with unknown keys"
6249
6495
msgstr[0] ""
6250
6496
msgstr[1] ""
6251
6497
6252
#: bzrlib/gpg.py:453
6498
#: breezy/gpg.py:445
6499
#, python-brace-format
6253
6500
msgid "{0} commit not valid"
6254
6501
msgid_plural "{0} commits not valid"
6255
6502
msgstr[0] ""
6256
6503
msgstr[1] ""
6257
6504
6258
#: bzrlib/gpg.py:461
6505
#: breezy/gpg.py:453
6506
#, python-brace-format
6259
6507
msgid "{0} commit not signed"
6260
6508
msgid_plural "{0} commits not signed"
6261
6509
msgstr[0] ""
6262
6510
msgstr[1] ""
6263
6511
6264
#: bzrlib/gpg.py:469
6512
#: breezy/gpg.py:461
6513
#, python-brace-format
6265
6514
msgid "{0} commit with key now expired"
6266
6515
msgid_plural "{0} commits with key now expired"
6267
6516
msgstr[0] ""
6268
6517
msgstr[1] ""
6269
6518
6270
#: bzrlib/gpg.py:489
6519
#: breezy/gpg.py:481
6520
#, python-brace-format
6271
6521
msgid "{0} commit by author {1} with key {2} now expired"
6272
6522
msgid_plural "{0} commits by author {1} with key {2} now expired"
6273
6523
msgstr[0] ""
6274
6524
msgstr[1] ""
6275
6525
6276
#: bzrlib/gpg.py:505
6526
#: breezy/gpg.py:497
6527
#, python-brace-format
6277
6528
msgid "{0} signed {1} commit"
6278
6529
msgid_plural "{0} signed {1} commits"
6279
6530
msgstr[0] ""
6280
6531
msgstr[1] ""
6281
6532
6282
#: bzrlib/gpg.py:522 bzrlib/gpg.py:539
6533
#: breezy/gpg.py:514 breezy/gpg.py:531
6534
#, python-brace-format
6283
6535
msgid "{0} commit by author {1}"
6284
6536
msgid_plural "{0} commits by author {1}"
6285
6537
msgstr[0] ""
6286
6538
msgstr[1] ""
6287
6539
6288
#: bzrlib/gpg.py:554
6540
#: breezy/gpg.py:546
6541
#, python-brace-format
6289
6542
msgid "Unknown key {0} signed {1} commit"
6290
6543
msgid_plural "Unknown key {0} signed {1} commits"
6291
6544
msgstr[0] ""
6292
6545
msgstr[1] ""
6293
6546
6294
#: bzrlib/groupcompress.py:1739
6547
#: breezy/groupcompress.py:1739
6295
6548
#, python-format
6296
6549
msgid "Insert claimed random_id=True, but then inserted %r two times"
6297
6550
msgstr ""
6298
6551
6299
#: bzrlib/hooks.py:313
6552
#: breezy/hooks.py:313
6300
6553
#, python-format
6301
6554
msgid "Introduced in: %s"
6302
6555
msgstr ""
6303
6556
6304
#: bzrlib/hooks.py:316
6557
#: breezy/hooks.py:316
6305
6558
#, python-format
6306
6559
msgid "Deprecated in: %s"
6307
6560
msgstr ""
6308
6561
6309
#: bzrlib/knit.py:1766 bzrlib/knit.py:1802
6562
#: breezy/knit.py:1766 breezy/knit.py:1802
6310
6563
msgid "Walking content"
6311
6564
msgstr ""
6312
6565
6313
#: bzrlib/knit.py:3330
6566
#: breezy/knit.py:3330
6314
6567
msgid "annotating"
6315
6568
msgstr ""
6316
6569
6317
#: bzrlib/lock.py:548
6570
#: breezy/lock.py:549
6318
6571
msgid "{0!r} was {1} locked again"
6319
6572
msgstr ""
6320
6573
6321
#: bzrlib/lockdir.py:321
6574
#: breezy/lockdir.py:321
6322
6575
#, python-format
6323
6576
msgid "error removing pending lock: %s"
6324
6577
msgstr ""
6325
6578
6326
#: bzrlib/lockdir.py:616
6579
#: breezy/lockdir.py:616
6327
6580
msgid "Unable to obtain"
6328
6581
msgstr ""
6329
6582
6330
#: bzrlib/lockdir.py:618
6583
#: breezy/lockdir.py:618
6331
6584
msgid "Lock owner changed for"
6332
6585
msgstr ""
6333
6586
6334
#: bzrlib/lockdir.py:620
6587
#: breezy/lockdir.py:620
6588
#, python-brace-format
6335
6589
msgid "{0} lock {1} {2}."
6336
6590
msgstr ""
6337
6591
6338
#: bzrlib/lockdir.py:627
6592
#: breezy/lockdir.py:627
6339
6593
#, python-format
6340
6594
msgid "Will continue to try until %s, unless you press Ctrl-C."
6341
6595
msgstr ""
6342
6596
6343
#: bzrlib/lockdir.py:629
6597
#: breezy/lockdir.py:629
6344
6598
msgid "See \"bzr help break-lock\" for more."
6345
6599
msgstr ""
6346
6600
6347
#: bzrlib/lockdir.py:739
6601
#: breezy/lockdir.py:739
6348
6602
#, python-format
6349
6603
msgid ""
6350
6604
"held by %(user)s on %(hostname)s (process #%(pid)s), acquired %(time_ago)s"
6351
6605
msgstr ""
6352
6606
6353
#: bzrlib/log.py:563
6607
#: breezy/log.py:563
6354
6608
msgid "--exclude-common-ancestry requires two different revisions"
6355
6609
msgstr ""
6356
6610
6357
#: bzrlib/log.py:565
6611
#: breezy/log.py:565
6358
6612
#, python-format
6359
6613
msgid "invalid direction %r"
6360
6614
msgstr ""
6361
6615
6362
#: bzrlib/log.py:653
6616
#: breezy/log.py:653
6363
6617
msgid "Start revision not found in history of end revision."
6364
6618
msgstr ""
6365
6619
6366
#: bzrlib/log.py:1071 bzrlib/log.py:1129
6620
#: breezy/log.py:1071 breezy/log.py:1129
6367
6621
msgid "Logging revision 0 is invalid."
6368
6622
msgstr ""
6369
6623
6370
#: bzrlib/log.py:1073 bzrlib/log.py:1131
6624
#: breezy/log.py:1073 breezy/log.py:1131
6371
6625
msgid "Start revision must be older than the end revision."
6372
6626
msgstr ""
6373
6627
6374
#: bzrlib/log.py:1818
6628
#: breezy/log.py:1818
6375
6629
#, python-format
6376
6630
msgid "unknown log formatter: %r"
6377
6631
msgstr ""
6378
6632
6379
#: bzrlib/log.py:2114
6633
#: breezy/log.py:2114
6380
6634
msgid "fixes bug"
6381
6635
msgid_plural "fixes bugs"
6382
6636
msgstr[0] ""
6383
6637
msgstr[1] ""
6384
6638
6385
#: bzrlib/merge.py:689
6639
#: breezy/merge.py:689
6386
6640
msgid "All changes applied successfully."
6387
6641
msgstr ""
6388
6642
6389
#: bzrlib/merge.py:691
6643
#: breezy/merge.py:691
6390
6644
#, python-format
6391
6645
msgid "%d conflicts encountered."
6392
6646
msgstr ""
6393
6647
6394
#: bzrlib/merge.py:845 bzrlib/merge.py:1868
6648
#: breezy/merge.py:845 breezy/merge.py:1868
6395
6649
msgid "Preparing file merge"
6396
6650
msgstr ""
6397
6651
6398
#: bzrlib/multiparent.py:426
6652
#: breezy/multiparent.py:426
6399
6653
msgid "Importing revisions"
6400
6654
msgstr ""
6401
6655
6402
#: bzrlib/option.py:526
6656
# help of 'help' option
6657
#: breezy/option.py:526
6403
6658
msgid "Show help message."
6404
6659
msgstr ""
6405
6660
6406
#: bzrlib/option.py:528
6661
# help of 'quiet' option
6662
#: breezy/option.py:528
6407
6663
msgid "Only display errors and warnings."
6408
6664
msgstr ""
6409
6665
6410
#: bzrlib/option.py:531
6666
# help of 'usage' option
6667
#: breezy/option.py:531
6411
6668
msgid "Show usage message and options."
6412
6669
msgstr ""
6413
6670
6414
#: bzrlib/option.py:533
6671
# help of 'verbose' option
6672
#: breezy/option.py:533
6415
6673
msgid "Display more information."
6416
6674
msgstr ""
6417
6675
6418
#: bzrlib/option.py:541
6676
# help of 'change' option
6677
#: breezy/option.py:541
6419
6678
msgid ""
6420
6679
"Select changes introduced by the specified revision. See also \"help "
6421
6680
"revisionspec\"."
6422
6681
msgstr ""
6423
6682
6424
#: bzrlib/option.py:543
6683
# help of 'directory' option
6684
#: breezy/option.py:543
6425
6685
msgid "Branch to operate on, instead of working directory."
6426
6686
msgstr ""
6427
6687
6428
#: bzrlib/option.py:545
6688
# help of 'log-format=long' option
6689
#: breezy/option.py:545
6429
6690
msgid "Detailed log format."
6430
6691
msgstr ""
6431
6692
6432
#: bzrlib/option.py:545
6693
# help of 'log-format=gnu-changelog' option
6694
#: breezy/option.py:545
6433
6695
msgid "Format used by GNU ChangeLog files."
6434
6696
msgstr ""
6435
6697
6436
#: bzrlib/option.py:545
6698
# help of 'log-format=line' option
6699
#: breezy/option.py:545
6437
6700
msgid "Log format with one line per revision."
6438
6701
msgstr ""
6439
6702
6440
#: bzrlib/option.py:545
6703
# help of 'log-format=short' option
6704
#: breezy/option.py:545
6441
6705
msgid "Moderately short log format."
6442
6706
msgstr ""
6443
6707
6444
#: bzrlib/option.py:545
6708
# help of 'log-format' option
6709
#: breezy/option.py:545
6445
6710
msgid "Use specified log format."
6446
6711
msgstr ""
6447
6712
6448
#: bzrlib/option.py:547
6713
# title of 'log-format' option
6714
#: breezy/option.py:547
6449
6715
msgid "Log format"
6450
6716
msgstr ""
6451
6717
6452
#: bzrlib/option.py:549
6718
# help of 'merge-type=lca' option
6719
#: breezy/option.py:549
6453
6720
msgid "LCA-newness merge."
6454
6721
msgstr ""
6455
6722
6456
#: bzrlib/option.py:549
6723
# help of 'merge-type=diff3' option
6724
#: breezy/option.py:549
6457
6725
msgid "Merge using external diff3."
6458
6726
msgstr ""
6459
6727
6460
#: bzrlib/option.py:549
6728
# help of 'merge-type=merge3' option
6729
#: breezy/option.py:549
6461
6730
msgid "Native diff3-style merge."
6462
6731
msgstr ""
6463
6732
6464
#: bzrlib/option.py:549
6733
# help of 'merge-type' option
6734
#: breezy/option.py:549
6465
6735
msgid "Select a particular merge algorithm."
6466
6736
msgstr ""
6467
6737
6468
#: bzrlib/option.py:549
6738
# help of 'merge-type=weave' option
6739
#: breezy/option.py:549
6469
6740
msgid "Weave-based merge."
6470
6741
msgstr ""
6471
6742
6472
#: bzrlib/option.py:551
6743
# title of 'merge-type' option
6744
#: breezy/option.py:551
6473
6745
msgid "Merge algorithm"
6474
6746
msgstr ""
6475
6747
6476
#: bzrlib/option.py:554
6748
# help of 'message' option
6749
#: breezy/option.py:554
6477
6750
msgid "Message string."
6478
6751
msgstr ""
6479
6752
6480
#: bzrlib/option.py:556
6753
# help of 'null' option
6754
#: breezy/option.py:556
6481
6755
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
6482
6756
msgstr ""
6483
6757
6484
#: bzrlib/option.py:558
6758
# help of 'overwrite' option
6759
#: breezy/option.py:558
6485
6760
msgid "Ignore differences between branches and overwrite unconditionally."
6486
6761
msgstr ""
6487
6762
6488
#: bzrlib/option.py:560
6763
# help of 'remember' option
6764
#: breezy/option.py:560
6489
6765
msgid "Remember the specified location as a default."
6490
6766
msgstr ""
6491
6767
6492
#: bzrlib/option.py:562
6768
# help of 'reprocess' option
6769
#: breezy/option.py:562
6493
6770
msgid "Reprocess to reduce spurious conflicts."
6494
6771
msgstr ""
6495
6772
6496
#: bzrlib/option.py:566
6773
# help of 'revision' option
6774
#: breezy/option.py:566
6497
6775
msgid "See \"help revisionspec\" for details."
6498
6776
msgstr ""
6499
6777
6500
#: bzrlib/option.py:568
6778
# help of 'show-ids' option
6779
#: breezy/option.py:568
6501
6780
msgid "Show internal object ids."
6502
6781
msgstr ""
6503
6782
6504
#: bzrlib/option.py:571
6783
# help of 'timezone' option
6784
#: breezy/option.py:571
6505
6785
msgid "Display timezone as local, original, or utc."
6506
6786
msgstr ""
6507
6787
6508
#: bzrlib/osutils.py:100
6788
#: breezy/osutils.py:101
6509
6789
msgid "Parameter {0!r} encoding is unsupported by {1} application locale."
6510
6790
msgstr ""
6511
6791
6512
#: bzrlib/osutils.py:220
6792
#: breezy/osutils.py:221
6513
6793
msgid "lstat/stat of ({0!r}): {1!r}"
6514
6794
msgstr ""
6515
6795
6516
#: bzrlib/osutils.py:1030 bzrlib/osutils.py:1041
6796
#: breezy/osutils.py:1041 breezy/osutils.py:1052
6517
6797
#, python-format
6518
6798
msgid "sorry, %r not allowed in path"
6519
6799
msgstr ""
6520
6800
6521
#: bzrlib/osutils.py:1259
6801
#: breezy/osutils.py:1270
6522
6802
#, python-format
6523
6803
msgid "%r is too short to calculate a relative path"
6524
6804
msgstr ""
6525
6805
6526
#: bzrlib/plugin.py:143
6806
#: breezy/plugin.py:143
6527
6807
#, python-format
6528
6808
msgid "\"%s\" is not a valid <plugin_name>@<plugin_path> description "
6529
6809
msgstr ""
6530
6810
6531
#: bzrlib/plugins/bash_completion/bashcomp.py:411
6811
# help of 'plugin' option of 'bash-completion' command
6812
#: breezy/plugins/bash_completion/bashcomp.py:411
6532
6813
msgid "Enable completions for the selected plugin (default: all plugins)"
6533
6814
msgstr ""
6534
6815
6535
#: bzrlib/plugins/bash_completion/bashcomp.py:412
6816
#: breezy/plugins/bash_completion/bashcomp.py:412
6536
6817
msgid "Generate a shell function for bash command line completion."
6537
6818
msgstr ""
6538
6819
6539
#: bzrlib/plugins/bash_completion/bashcomp.py:414
6820
#: breezy/plugins/bash_completion/bashcomp.py:414
6540
6821
msgid ""
6541
6822
"This command generates a shell function which can be used by bash to\n"
6542
6823
"automatically complete the currently typed command when the user presses\n"
6543
6824
"the completion key (usually tab)."
6544
6825
msgstr ""
6545
6826
6546
#: bzrlib/plugins/bash_completion/bashcomp.py:418
6827
#: breezy/plugins/bash_completion/bashcomp.py:418
6547
6828
msgid ""
6548
6829
"Commonly used like this:\n"
6549
6830
" eval \"`bzr bash-completion`\""
6550
6831
msgstr ""
6551
6832
6552
#: bzrlib/plugins/bash_completion/bashcomp.py:424
6833
# help of 'function-name' option of 'bash-completion' command
6834
#: breezy/plugins/bash_completion/bashcomp.py:424
6553
6835
msgid "Name of the generated function (default: _bzr)"
6554
6836
msgstr ""
6555
6837
6556
#: bzrlib/plugins/bash_completion/bashcomp.py:426
6838
# help of 'function-only' option of 'bash-completion' command
6839
#: breezy/plugins/bash_completion/bashcomp.py:426
6557
6840
msgid "Generate only the shell function, don't enable it"
6558
6841
msgstr ""
6559
6842
6560
#: bzrlib/plugins/launchpad/account.py:66
6843
#: breezy/plugins/grep/cmds.py:77
6844
msgid "Print lines matching PATTERN for specified files and revisions."
6845
msgstr ""
6846
6847
#: breezy/plugins/grep/cmds.py:79
6848
msgid ""
6849
"This command searches the specified files and revisions for a given\n"
6850
"pattern. The pattern is specified as a Python regular expressions[1]."
6851
msgstr ""
6852
6853
#: breezy/plugins/grep/cmds.py:82
6854
msgid ""
6855
"If the file name is not specified, the revisions starting with the\n"
6856
"current directory are searched recursively. If the revision number is\n"
6857
"not specified, the working copy is searched. To search the last committed\n"
6858
"revision, use the '-r -1' or '-r last:1' option."
6859
msgstr ""
6860
6861
#: breezy/plugins/grep/cmds.py:87
6862
msgid ""
6863
"Unversioned files are not searched unless explicitly specified on the\n"
6864
"command line. Unversioned directores are not searched."
6865
msgstr ""
6866
6867
#: breezy/plugins/grep/cmds.py:90
6868
msgid ""
6869
"When searching a pattern, the output is shown in the 'filepath:string'\n"
6870
"format. If a revision is explicitly searched, the output is shown as\n"
6871
"'filepath~N:string', where N is the revision number."
6872
msgstr ""
6873
6874
#: breezy/plugins/grep/cmds.py:94
6875
msgid ""
6876
"--include and --exclude options can be used to search only (or exclude\n"
6877
"from search) files with base name matches the specified Unix style GLOB\n"
6878
"pattern. The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
6879
"to quote wildcard or backslash character literally. Note that the glob\n"
6880
"pattern is not a regular expression."
6881
msgstr ""
6882
6883
#: breezy/plugins/grep/cmds.py:100
6884
msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
6885
msgstr ""
6886
6887
# help of 'color' option of 'grep' command
6888
#: breezy/plugins/grep/cmds.py:109
6889
msgid "Show match in color. WHEN is never, always or auto."
6890
msgstr ""
6891
6892
# help of 'diff' option of 'grep' command
6893
#: breezy/plugins/grep/cmds.py:111
6894
msgid "Grep for pattern in changeset for each revision."
6895
msgstr ""
6896
6897
# help of 'exclude' option of 'grep' command
6898
#: breezy/plugins/grep/cmds.py:113
6899
msgid "Skip files whose base name matches GLOB."
6900
msgstr ""
6901
6902
# help of 'include' option of 'grep' command
6903
#: breezy/plugins/grep/cmds.py:115
6904
msgid "Search only files whose base name matches GLOB."
6905
msgstr ""
6906
6907
# help of 'files-with-matches' option of 'grep' command
6908
#: breezy/plugins/grep/cmds.py:117
6909
msgid "Print only the name of each input file in which PATTERN is found."
6910
msgstr ""
6911
6912
# help of 'files-without-match' option of 'grep' command
6913
#: breezy/plugins/grep/cmds.py:120
6914
msgid "Print only the name of each input file in which PATTERN is not found."
6915
msgstr ""
6916
6917
# help of 'fixed-string' option of 'grep' command
6918
#: breezy/plugins/grep/cmds.py:123
6919
msgid "Interpret PATTERN is a single fixed string (not regex)."
6920
msgstr ""
6921
6922
# help of 'from-root' option of 'grep' command
6923
#: breezy/plugins/grep/cmds.py:125
6924
msgid ""
6925
"Search for pattern starting from the root of the branch. (implies --"
6926
"recursive)"
6927
msgstr ""
6928
6929
# help of 'ignore-case' option of 'grep' command
6930
#: breezy/plugins/grep/cmds.py:128
6931
msgid "ignore case distinctions while matching."
6932
msgstr ""
6933
6934
# help of 'levels' option of 'grep' command
6935
#: breezy/plugins/grep/cmds.py:130
6936
msgid ""
6937
"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
6938
msgstr ""
6939
6940
# help of 'line-number' option of 'grep' command
6941
#: breezy/plugins/grep/cmds.py:135
6942
msgid "show 1-based line number."
6943
msgstr ""
6944
6945
# help of 'no-recursive' option of 'grep' command
6946
#: breezy/plugins/grep/cmds.py:137
6947
msgid "Don't recurse into subdirectories. (default is --recursive)"
6948
msgstr ""
6949
6950
# help of 'null' option of 'grep' command
6951
#: breezy/plugins/grep/cmds.py:139
6952
msgid ""
6953
"Write an ASCII NUL (\\0) separator between output lines rather than a "
6954
"newline."
6955
msgstr ""
6956
6957
#: breezy/plugins/launchpad/account.py:66
6561
6958
msgid "Setting ssh/sftp usernames for launchpad.net."
6562
6959
msgstr ""
6563
6960
6564
#: bzrlib/plugins/launchpad/cmds.py:44
6961
#: breezy/plugins/launchpad/cmds.py:43
6565
6962
msgid "Register a branch with launchpad.net."
6566
6963
msgstr ""
6567
6964
6568
#: bzrlib/plugins/launchpad/cmds.py:46
6965
#: breezy/plugins/launchpad/cmds.py:45
6569
6966
msgid ""
6570
6967
"This command lists a bzr branch in the directory of branches on\n"
6571
6968
"launchpad.net. Registration allows the branch to be associated with\n"
6572
6969
"bugs or specifications."
6573
6970
msgstr ""
6574
6971
6575
#: bzrlib/plugins/launchpad/cmds.py:50
6972
#: breezy/plugins/launchpad/cmds.py:49
6576
6973
msgid ""
6577
6974
"Before using this command you must register the project to which the\n"
6578
6975
"branch belongs, and create an account for yourself on launchpad.net."
6579
6976
msgstr ""
6580
6977
6581
#: bzrlib/plugins/launchpad/cmds.py:53
6978
#: breezy/plugins/launchpad/cmds.py:52
6582
6979
msgid ""
6583
6980
"arguments:\n"
6584
6981
" public_url: The publicly visible url for the branch to register.\n"
6590
6987
" otherwise error."
6591
6988
msgstr ""
6592
6989
6593
#: bzrlib/plugins/launchpad/cmds.py:62
6990
#: breezy/plugins/launchpad/cmds.py:61
6594
6991
msgid ""
6595
6992
"example:\n"
6596
6993
" bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
6597
6994
" --project fooproject"
6598
6995
msgstr ""
6599
6996
6600
#: bzrlib/plugins/launchpad/cmds.py:69
6997
# help of 'project' option of 'register-branch' command
6998
#: breezy/plugins/launchpad/cmds.py:68
6601
6999
msgid "Launchpad project short name to associate with the branch."
6602
7000
msgstr ""
6603
7001
6604
#: bzrlib/plugins/launchpad/cmds.py:76
7002
# help of 'branch-name' option of 'register-branch' command
7003
#: breezy/plugins/launchpad/cmds.py:75
6605
7004
msgid ""
6606
7005
"Short name for the branch; by default taken from the last component of the "
6607
7006
"url."
6608
7007
msgstr ""
6609
7008
6610
#: bzrlib/plugins/launchpad/cmds.py:80
7009
# help of 'branch-title' option of 'register-branch' command
7010
#: breezy/plugins/launchpad/cmds.py:79
6611
7011
msgid "One-sentence description of the branch."
6612
7012
msgstr ""
6613
7013
6614
#: bzrlib/plugins/launchpad/cmds.py:83
7014
# help of 'branch-description' option of 'register-branch' command
7015
#: breezy/plugins/launchpad/cmds.py:82
6615
7016
msgid "Longer description of the purpose or contents of the branch."
6616
7017
msgstr ""
6617
7018
6618
#: bzrlib/plugins/launchpad/cmds.py:86
7019
# help of 'author' option of 'register-branch' command
7020
#: breezy/plugins/launchpad/cmds.py:85
6619
7021
msgid "Branch author's email address, if not yourself."
6620
7022
msgstr ""
6621
7023
6622
#: bzrlib/plugins/launchpad/cmds.py:89
7024
# help of 'link-bug' option of 'register-branch' command
7025
#: breezy/plugins/launchpad/cmds.py:88
6623
7026
msgid "The bug this branch fixes."
6624
7027
msgstr ""
6625
7028
6626
#: bzrlib/plugins/launchpad/cmds.py:92
7029
# help of 'dry-run' option of 'register-branch' command
7030
#: breezy/plugins/launchpad/cmds.py:91
6627
7031
msgid "Prepare the request but don't actually send it."
6628
7032
msgstr ""
6629
7033
6630
#: bzrlib/plugins/launchpad/cmds.py:114
7034
#: breezy/plugins/launchpad/cmds.py:113
6631
7035
msgid ""
6632
7036
"register-branch requires a public branch url - see bzr help register-branch."
6633
7037
msgstr ""
6634
7038
6635
#: bzrlib/plugins/launchpad/cmds.py:122
7039
#: breezy/plugins/launchpad/cmds.py:121
6636
7040
msgid "--product is deprecated; please use --project."
6637
7041
msgstr ""
6638
7042
6639
#: bzrlib/plugins/launchpad/cmds.py:152
7043
#: breezy/plugins/launchpad/cmds.py:151
6640
7044
msgid "Open a Launchpad branch page in your web browser."
6641
7045
msgstr ""
6642
7046
6643
#: bzrlib/plugins/launchpad/cmds.py:157
7047
# help of 'dry-run' option of 'launchpad-open' command
7048
#: breezy/plugins/launchpad/cmds.py:156
6644
7049
msgid "Do not actually open the browser. Just say the URL we would use."
6645
7050
msgstr ""
6646
7051
6647
#: bzrlib/plugins/launchpad/cmds.py:192
7052
#: breezy/plugins/launchpad/cmds.py:191
6648
7053
#, python-format
6649
7054
msgid "Opening %s in web browser"
6650
7055
msgstr ""
6651
7056
6652
#: bzrlib/plugins/launchpad/cmds.py:200
7057
#: breezy/plugins/launchpad/cmds.py:199
6653
7058
msgid "Show or set the Launchpad user ID."
6654
7059
msgstr ""
6655
7060
6656
#: bzrlib/plugins/launchpad/cmds.py:202
7061
#: breezy/plugins/launchpad/cmds.py:201
6657
7062
msgid ""
6658
7063
"When communicating with Launchpad, some commands need to know your\n"
6659
7064
"Launchpad user ID. This command can be used to set or show the\n"
6660
7065
"user ID that Bazaar will use for such communication."
6661
7066
msgstr ""
6662
7067
6663
#: bzrlib/plugins/launchpad/cmds.py:206
7068
#: breezy/plugins/launchpad/cmds.py:205
6664
7069
msgid ""
6665
7070
":Examples:\n"
6666
7071
" Show the Launchpad ID of the current user::"
6667
7072
msgstr ""
6668
7073
6669
#: bzrlib/plugins/launchpad/cmds.py:209
7074
#: breezy/plugins/launchpad/cmds.py:208
6670
7075
msgid " bzr launchpad-login"
6671
7076
msgstr ""
6672
7077
6673
#: bzrlib/plugins/launchpad/cmds.py:211
7078
#: breezy/plugins/launchpad/cmds.py:210
6674
7079
msgid " Set the Launchpad ID of the current user to 'bob'::"
6675
7080
msgstr ""
6676
7081
6677
#: bzrlib/plugins/launchpad/cmds.py:213
7082
#: breezy/plugins/launchpad/cmds.py:212
6678
7083
msgid " bzr launchpad-login bob"
6679
7084
msgstr ""
6680
7085
6681
#: bzrlib/plugins/launchpad/cmds.py:220
7086
# help of 'no-check' option of 'launchpad-login' command
7087
#: breezy/plugins/launchpad/cmds.py:219
6682
7088
msgid "Don't check that the user name is valid."
6683
7089
msgstr ""
6684
7090
6685
#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
7091
#: breezy/plugins/launchpad/cmds.py:234 breezy/plugins/launchpad/cmds.py:245
6686
7092
msgid "Launchpad user ID exists and has SSH keys.\n"
6687
7093
msgstr ""
6688
7094
6689
#: bzrlib/plugins/launchpad/cmds.py:238
7095
#: breezy/plugins/launchpad/cmds.py:237
6690
7096
msgid "No Launchpad user ID configured.\n"
6691
7097
msgstr ""
6692
7098
6693
#: bzrlib/plugins/launchpad/cmds.py:249
7099
#: breezy/plugins/launchpad/cmds.py:248
6694
7100
#, python-format
6695
7101
msgid "Launchpad user ID set to '%s'.\n"
6696
7102
msgstr ""
6697
7103
6698
#: bzrlib/plugins/launchpad/cmds.py:255
7104
#: breezy/plugins/launchpad/cmds.py:254
6699
7105
msgid "Ask Launchpad to mirror a branch now."
6700
7106
msgstr ""
6701
7107
6702
#: bzrlib/plugins/launchpad/cmds.py:272
7108
#: breezy/plugins/launchpad/cmds.py:271
6703
7109
msgid "Propose merging a branch on Launchpad."
6704
7110
msgstr ""
6705
7111
6706
#: bzrlib/plugins/launchpad/cmds.py:274
7112
#: breezy/plugins/launchpad/cmds.py:273
6707
7113
msgid ""
6708
7114
"This will open your usual editor to provide the initial comment. When it\n"
6709
7115
"has created the proposal, it will open it in your default web browser."
6710
7116
msgstr ""
6711
7117
6712
#: bzrlib/plugins/launchpad/cmds.py:277
7118
#: breezy/plugins/launchpad/cmds.py:276
6713
7119
msgid ""
6714
7120
"The branch will be proposed to merge into SUBMIT_BRANCH. If SUBMIT_BRANCH\n"
6715
7121
"is not supplied, the remembered submit branch will be used. If no submit\n"
6716
7122
"branch is remembered, the development focus will be used."
6717
7123
msgstr ""
6718
7124
6719
#: bzrlib/plugins/launchpad/cmds.py:281
7125
#: breezy/plugins/launchpad/cmds.py:280
6720
7126
msgid ""
6721
7127
"By default, the SUBMIT_BRANCH's review team will be requested to review\n"
6722
7128
"the merge proposal. This can be overriden by specifying --review (-R).\n"
6724
7130
"may optionally be followed by '=' and the review type. For example:"
6725
7131
msgstr ""
6726
7132
6727
#: bzrlib/plugins/launchpad/cmds.py:286
7133
#: breezy/plugins/launchpad/cmds.py:285
6728
7134
msgid " bzr lp-propose-merge --review jrandom --review review-team=qa"
6729
7135
msgstr ""
6730
7136
6731
#: bzrlib/plugins/launchpad/cmds.py:288
7137
#: breezy/plugins/launchpad/cmds.py:287
6732
7138
msgid ""
6733
7139
"This will propose a merge, request \"jrandom\" to perform a review of\n"
6734
7140
"unspecified type, and request \"review-team\" to perform a \"qa\" review."
6735
7141
msgstr ""
6736
7142
6737
#: bzrlib/plugins/launchpad/cmds.py:293
7143
# help of 'staging' option of 'lp-propose-merge' command
7144
#: breezy/plugins/launchpad/cmds.py:292
6738
7145
msgid "Propose the merge on staging."
6739
7146
msgstr ""
6740
7147
6741
#: bzrlib/plugins/launchpad/cmds.py:295
7148
# help of 'message' option of 'lp-propose-merge' command
7149
#: breezy/plugins/launchpad/cmds.py:294
6742
7150
msgid "Commit message."
6743
7151
msgstr ""
6744
7152
6745
#: bzrlib/plugins/launchpad/cmds.py:297
6746
msgid "Mark the proposal as approved immediately."
7153
# help of 'approve' option of 'lp-propose-merge' command
7154
#: breezy/plugins/launchpad/cmds.py:296
7155
msgid ""
7156
"Mark the proposal as approved immediately, setting the approved revision to "
7157
"tip."
6747
7158
msgstr ""
6748
7159
6749
#: bzrlib/plugins/launchpad/cmds.py:298
7160
# help of 'fixes' option of 'lp-propose-merge' command
7161
#: breezy/plugins/launchpad/cmds.py:298
6750
7162
msgid "The bug this proposal fixes."
6751
7163
msgstr ""
6752
7164
6753
#: bzrlib/plugins/launchpad/cmds.py:300
7165
# help of 'review' option of 'lp-propose-merge' command
7166
#: breezy/plugins/launchpad/cmds.py:300
6754
7167
msgid "Requested reviewer and optional type."
6755
7168
msgstr ""
6756
7169
6757
#: bzrlib/plugins/launchpad/cmds.py:335
7170
#: breezy/plugins/launchpad/cmds.py:335
6758
7171
msgid "Find the proposal to merge this revision."
6759
7172
msgstr ""
6760
7173
6761
#: bzrlib/plugins/launchpad/cmds.py:337
7174
#: breezy/plugins/launchpad/cmds.py:337
6762
7175
msgid ""
6763
7176
"Finds the merge proposal(s) that discussed landing the specified revision.\n"
6764
"This works only if the selected branch was the merge proposal target, and\n"
6765
"if the merged_revno is recorded for the merge proposal. The proposal(s)\n"
6766
"are opened in a web browser."
7177
"This works only if the if the merged_revno was recorded for the merge\n"
7178
"proposal. The proposal(s) are opened in a web browser."
6767
7179
msgstr ""
6768
7180
6769
#: bzrlib/plugins/launchpad/cmds.py:342
7181
#: breezy/plugins/launchpad/cmds.py:341
6770
7182
msgid ""
6771
"Any revision involved in the merge may be specified-- the revision in\n"
6772
"which the merge was performed, or one of the revisions that was merged."
7183
"Only the revision specified is searched for. To find the mainline\n"
7184
"revision that merged it into mainline, use the \"mainline\" revision spec."
6773
7185
msgstr ""
6774
7186
6775
#: bzrlib/plugins/launchpad/cmds.py:345
7187
#: breezy/plugins/launchpad/cmds.py:344
6776
7188
msgid "So, to find the merge proposal that reviewed line 1 of README::"
6777
7189
msgstr ""
6778
7190
6779
#: bzrlib/plugins/launchpad/cmds.py:347
6780
msgid " bzr lp-find-proposal -r annotate:README:1"
7191
#: breezy/plugins/launchpad/cmds.py:346
7192
msgid " bzr lp-find-proposal -r mainline:annotate:README:1"
6781
7193
msgstr ""
6782
7194
6783
#: bzrlib/plugins/launchpad/cmds.py:363
7195
#: breezy/plugins/launchpad/cmds.py:365
6784
7196
msgid "No review found."
6785
7197
msgstr ""
6786
7198
6787
#: bzrlib/plugins/launchpad/cmds.py:364
7199
#: breezy/plugins/launchpad/cmds.py:366
6788
7200
#, python-format
6789
7201
msgid "%d proposals(s) found."
6790
7202
msgstr ""
6791
7203
6792
#: bzrlib/plugins/launchpad/cmds.py:374
6793
msgid "Finding revision-id"
6794
msgstr ""
6795
6796
#: bzrlib/plugins/launchpad/cmds.py:381
6797
msgid "Finding merge"
6798
msgstr ""
6799
6800
#: bzrlib/plugins/launchpad/cmds.py:386
6801
msgid "Finding revno"
6802
msgstr ""
6803
6804
#: bzrlib/plugins/launchpad/cmds.py:392
6805
msgid "Finding Launchpad branch"
6806
msgstr ""
6807
6808
#: bzrlib/plugins/launchpad/cmds.py:395
7204
#: breezy/plugins/launchpad/cmds.py:378
6809
7205
msgid "Finding proposals"
6810
7206
msgstr ""
6811
7207
6812
#: bzrlib/plugins/launchpad/lp_api.py:241
6813
#: bzrlib/plugins/launchpad/lp_api.py:246
7208
#: breezy/plugins/launchpad/lp_api.py:231
7209
#: breezy/plugins/launchpad/lp_api.py:236
6814
7210
#, python-format
6815
7211
msgid "%s is not registered on Launchpad"
6816
7212
msgstr ""
6817
7213
6818
#: bzrlib/plugins/launchpad/lp_api.py:256
7214
#: breezy/plugins/launchpad/lp_api.py:246
6819
7215
#, python-format
6820
7216
msgid "%s has no development focus."
6821
7217
msgstr ""
6822
7218
6823
#: bzrlib/plugins/launchpad/lp_api.py:261
7219
#: breezy/plugins/launchpad/lp_api.py:251
6824
7220
#, python-format
6825
7221
msgid "development focus %s has no branch."
6826
7222
msgstr ""
6827
7223
6828
#: bzrlib/plugins/launchpad/lp_api.py:266
7224
#: breezy/plugins/launchpad/lp_api.py:256
6829
7225
#, python-format
6830
7226
msgid "source package %s has no branch."
6831
7227
msgstr ""
6832
7228
6833
#: bzrlib/plugins/launchpad/lp_api.py:270
7229
#: breezy/plugins/launchpad/lp_api.py:260
6834
7230
#, python-format
6835
7231
msgid "%s has no associated product or source package."
6836
7232
msgstr ""
6837
7233
6838
#: bzrlib/plugins/launchpad/lp_api.py:282
7234
#: breezy/plugins/launchpad/lp_api.py:272
6839
7235
#, python-format
6840
7236
msgid "%s is already up-to-date."
6841
7237
msgstr ""
6842
7238
6843
#: bzrlib/plugins/launchpad/lp_api.py:289
7239
#: breezy/plugins/launchpad/lp_api.py:279
6844
7240
#, python-format
6845
7241
msgid "Pushing to %s"
6846
7242
msgstr ""
6847
7243
6848
#: bzrlib/plugins/launchpad/lp_directory.py:170
7244
#: breezy/plugins/launchpad/lp_directory.py:170
7245
#, python-brace-format
6849
7246
msgid ""
6850
7247
"resolution for {0}\n"
6851
7248
" local: {1}\n"
6852
7249
" remote: {2}"
6853
7250
msgstr ""
6854
7251
6855
#: bzrlib/plugins/launchpad/lp_propose.py:150
7252
#: breezy/plugins/launchpad/lp_propose.py:161
6856
7253
#, python-format
6857
7254
msgid "There is already a branch merge proposal: %s"
6858
7255
msgstr ""
6859
7256
6860
#: bzrlib/plugins/weave_fmt/bzrdir.py:237
7257
#: breezy/plugins/weave_fmt/bzrdir.py:237
6861
7258
msgid "pb parameter to convert() is deprecated"
6862
7259
msgstr ""
6863
7260
6864
#: bzrlib/plugins/weave_fmt/bzrdir.py:240
7261
#: breezy/plugins/weave_fmt/bzrdir.py:240
6865
7262
msgid "starting upgrade from format 4 to 5"
6866
7263
msgstr ""
6867
7264
6868
#: bzrlib/plugins/weave_fmt/bzrdir.py:250
7265
#: breezy/plugins/weave_fmt/bzrdir.py:250
6869
7266
msgid "note: upgrade may be faster if all store files are ungzipped first"
6870
7267
msgstr ""
6871
7268
6872
#: bzrlib/plugins/weave_fmt/bzrdir.py:279
7269
#: breezy/plugins/weave_fmt/bzrdir.py:279
6873
7270
msgid "converting revision"
6874
7271
msgstr ""
6875
7272
6876
#: bzrlib/plugins/weave_fmt/bzrdir.py:284
7273
#: breezy/plugins/weave_fmt/bzrdir.py:284
6877
7274
msgid "upgraded to weaves:"
6878
7275
msgstr ""
6879
7276
6880
#: bzrlib/plugins/weave_fmt/bzrdir.py:285
7277
#: breezy/plugins/weave_fmt/bzrdir.py:285
6881
7278
#, python-format
6882
7279
msgid "%6d revisions and inventories"
6883
7280
msgstr ""
6884
7281
6885
#: bzrlib/plugins/weave_fmt/bzrdir.py:287
7282
#: breezy/plugins/weave_fmt/bzrdir.py:287
6886
7283
#, python-format
6887
7284
msgid "%6d revisions not present"
6888
7285
msgstr ""
6889
7286
6890
#: bzrlib/plugins/weave_fmt/bzrdir.py:289
7287
#: breezy/plugins/weave_fmt/bzrdir.py:289
6891
7288
#, python-format
6892
7289
msgid "%6d texts"
6893
7290
msgstr ""
6894
7291
6895
#: bzrlib/plugins/weave_fmt/bzrdir.py:325
7292
#: breezy/plugins/weave_fmt/bzrdir.py:325
6896
7293
msgid "writing weave"
6897
7294
msgstr ""
6898
7295
6899
#: bzrlib/plugins/weave_fmt/bzrdir.py:329
6900
#: bzrlib/plugins/weave_fmt/bzrdir.py:331
7296
#: breezy/plugins/weave_fmt/bzrdir.py:329
7297
#: breezy/plugins/weave_fmt/bzrdir.py:331
6901
7298
msgid "inventory"
6902
7299
msgstr ""
6903
7300
6904
#: bzrlib/plugins/weave_fmt/bzrdir.py:348
7301
#: breezy/plugins/weave_fmt/bzrdir.py:348
6905
7302
msgid "write revision"
6906
7303
msgstr ""
6907
7304
6908
#: bzrlib/plugins/weave_fmt/bzrdir.py:362
7305
#: breezy/plugins/weave_fmt/bzrdir.py:362
6909
7306
msgid "loading revision"
6910
7307
msgstr ""
6911
7308
6912
#: bzrlib/plugins/weave_fmt/bzrdir.py:367
7309
#: breezy/plugins/weave_fmt/bzrdir.py:367
6913
7310
#, python-format
6914
7311
msgid "revision {%s} not present in branch; will be converted as a ghost"
6915
7312
msgstr ""
6916
7313
6917
#: bzrlib/plugins/weave_fmt/bzrdir.py:507
7314
#: breezy/plugins/weave_fmt/bzrdir.py:507
6918
7315
msgid "starting upgrade from format 5 to 6"
6919
7316
msgstr ""
6920
7317
6921
#: bzrlib/plugins/weave_fmt/bzrdir.py:517
7318
#: breezy/plugins/weave_fmt/bzrdir.py:517
6922
7319
#, python-format
6923
7320
msgid "adding prefixes to %s"
6924
7321
msgstr ""
6925
7322
6926
#: bzrlib/plugins/weave_fmt/bzrdir.py:557
7323
#: breezy/plugins/weave_fmt/bzrdir.py:557
6927
7324
msgid "starting upgrade from format 6 to metadir"
6928
7325
msgstr ""
6929
7326
6930
#: bzrlib/plugins/weave_fmt/bzrdir.py:565
7327
#: breezy/plugins/weave_fmt/bzrdir.py:565
6931
7328
msgid "Removing ancestry.weave"
6932
7329
msgstr ""
6933
7330
6934
#: bzrlib/plugins/weave_fmt/bzrdir.py:570
7331
#: breezy/plugins/weave_fmt/bzrdir.py:570
6935
7332
msgid "Finding branch files"
6936
7333
msgstr ""
6937
7334
6938
#: bzrlib/plugins/weave_fmt/bzrdir.py:580
7335
#: breezy/plugins/weave_fmt/bzrdir.py:580
6939
7336
msgid "Upgrading repository"
6940
7337
msgstr ""
6941
7338
6942
#: bzrlib/plugins/weave_fmt/bzrdir.py:590
7339
#: breezy/plugins/weave_fmt/bzrdir.py:590
6943
7340
msgid "Upgrading branch"
6944
7341
msgstr ""
6945
7342
6946
#: bzrlib/plugins/weave_fmt/bzrdir.py:613
7343
#: breezy/plugins/weave_fmt/bzrdir.py:613
6947
7344
msgid "No working tree."
6948
7345
msgstr ""
6949
7346
6950
#: bzrlib/plugins/weave_fmt/bzrdir.py:620
7347
#: breezy/plugins/weave_fmt/bzrdir.py:620
6951
7348
msgid "Upgrading working tree"
6952
7349
msgstr ""
6953
7350
6954
#: bzrlib/plugins/weave_fmt/bzrdir.py:641
7351
#: breezy/plugins/weave_fmt/bzrdir.py:641
6955
7352
#, python-format
6956
7353
msgid "Make %s lock"
6957
7354
msgstr ""
6958
7355
6959
#: bzrlib/plugins/weave_fmt/bzrdir.py:652
7356
#: breezy/plugins/weave_fmt/bzrdir.py:652
6960
7357
#, python-format
6961
7358
msgid "Moving %s"
6962
7359
msgstr ""
6963
7360
6964
#: bzrlib/push.py:56
7361
#: breezy/push.py:56
6965
7362
msgid "Created new branch."
6966
7363
msgstr ""
6967
7364
6968
#: bzrlib/push.py:97
7365
#: breezy/push.py:97
6969
7366
#, python-format
6970
7367
msgid ""
6971
7368
"Target directory %s already contains a .bzr directory, but it is not valid."
6972
7369
msgstr ""
6973
7370
6974
#: bzrlib/push.py:101
7371
#: breezy/push.py:101
6975
7372
#, python-format
6976
7373
msgid ""
6977
7374
"Target directory %s already exists, but does not have a .bzr directory. "
6978
7375
"Supply --use-existing-dir to push there anyway."
6979
7376
msgstr ""
6980
7377
6981
#: bzrlib/push.py:122
7378
#: breezy/push.py:122
6982
7379
#, python-format
6983
7380
msgid "Too many redirections trying to make %s."
6984
7381
msgstr ""
6985
7382
6986
#: bzrlib/push.py:148
7383
#: breezy/push.py:148
6987
7384
msgid ""
6988
7385
"These branches have diverged. See \"bzr help diverged-branches\" for more "
6989
7386
"information."
6990
7387
msgstr ""
6991
7388
6992
#: bzrlib/push.py:152
7389
#: breezy/push.py:152
6993
7390
#, python-format
6994
7391
msgid ""
6995
7392
"It is not possible to losslessly push to %s. You may want to use dpush "
6996
7393
"instead."
6997
7394
msgstr ""
6998
7395
6999
#: bzrlib/push.py:158
7396
#: breezy/push.py:158
7000
7397
#, python-format
7001
7398
msgid ""
7002
7399
"At %s you have a valid .bzr control directory, but not a branch or "
7004
7401
"directory out of the way and try again."
7005
7402
msgstr ""
7006
7403
7007
#: bzrlib/reconcile.py:97
7404
#: breezy/reconcile.py:97
7008
7405
#, python-format
7009
7406
msgid "Reconciling branch %s"
7010
7407
msgstr ""
7011
7408
7012
#: bzrlib/reconcile.py:103
7409
#: breezy/reconcile.py:103
7013
7410
#, python-format
7014
7411
msgid "Reconciling repository %s"
7015
7412
msgstr ""
7016
7413
7017
#: bzrlib/reconcile.py:105
7414
#: breezy/reconcile.py:105
7018
7415
msgid "Reconciling repository"
7019
7416
msgstr ""
7020
7417
7021
#: bzrlib/reconcile.py:111
7418
#: breezy/reconcile.py:111
7022
7419
#, python-format
7023
7420
msgid "%s cannot canonicalize CHKs."
7024
7421
msgstr ""
7025
7422
7026
#: bzrlib/reconcile.py:119
7423
#: breezy/reconcile.py:119
7027
7424
msgid "Reconcile aborted: revision index has inconsistent parents."
7028
7425
msgstr ""
7029
7426
7030
#: bzrlib/reconcile.py:121
7427
#: breezy/reconcile.py:121
7031
7428
msgid "Run \"bzr check\" for more details."
7032
7429
msgstr ""
7033
7430
7034
#: bzrlib/reconcile.py:123
7431
#: breezy/reconcile.py:123
7035
7432
msgid "Reconciliation complete."
7036
7433
msgstr ""
7037
7434
7038
#: bzrlib/reconcile.py:166
7435
#: breezy/reconcile.py:166
7436
#, python-brace-format
7039
7437
msgid "Fixing last revision info {0} => {1}"
7040
7438
msgstr ""
7041
7439
7042
#: bzrlib/reconcile.py:173
7440
#: breezy/reconcile.py:173
7043
7441
msgid "revision_history ok."
7044
7442
msgstr ""
7045
7443
7046
#: bzrlib/reconcile.py:234
7444
#: breezy/reconcile.py:234
7047
7445
msgid "Reading inventory data"
7048
7446
msgstr ""
7049
7447
7050
#: bzrlib/reconcile.py:254 bzrlib/reconcile.py:384
7448
#: breezy/reconcile.py:254 breezy/reconcile.py:384
7051
7449
msgid "Inventory ok."
7052
7450
msgstr ""
7053
7451
7054
#: bzrlib/reconcile.py:256 bzrlib/reconcile.py:386
7452
#: breezy/reconcile.py:256 breezy/reconcile.py:386
7055
7453
msgid "Backing up inventory"
7056
7454
msgstr ""
7057
7455
7058
#: bzrlib/reconcile.py:258
7456
#: breezy/reconcile.py:258
7059
7457
msgid "Backup inventory created."
7060
7458
msgstr ""
7061
7459
7062
#: bzrlib/reconcile.py:274 bzrlib/reconcile.py:405
7460
#: breezy/reconcile.py:274 breezy/reconcile.py:405
7063
7461
msgid "Writing weave"
7064
7462
msgstr ""
7065
7463
7066
#: bzrlib/reconcile.py:277 bzrlib/reconcile.py:408
7464
#: breezy/reconcile.py:277 breezy/reconcile.py:408
7067
7465
msgid "Inventory regenerated."
7068
7466
msgstr ""
7069
7467
7070
#: bzrlib/reconcile.py:371 bzrlib/reconcile.py:373 bzrlib/reconcile.py:376
7468
#: breezy/reconcile.py:371 breezy/reconcile.py:373 breezy/reconcile.py:376
7071
7469
msgid "Reading indexes"
7072
7470
msgstr ""
7073
7471
7074
#: bzrlib/reconcile.py:380 bzrlib/reconcile.py:382
7472
#: breezy/reconcile.py:380 breezy/reconcile.py:382
7075
7473
msgid "Checking unused inventories"
7076
7474
msgstr ""
7077
7475
7078
#: bzrlib/reconcile.py:388
7476
#: breezy/reconcile.py:388
7079
7477
msgid "Backup Inventory created"
7080
7478
msgstr ""
7081
7479
7082
#: bzrlib/reconcile.py:446
7480
#: breezy/reconcile.py:446
7083
7481
msgid "Fixing text parents"
7084
7482
msgstr ""
7085
7483
7086
#: bzrlib/reconfigure.py:54
7484
#: breezy/reconfigure.py:54
7485
#, python-brace-format
7087
7486
msgid "{0} is now stacked on {1}\n"
7088
7487
msgstr ""
7089
7488
7090
#: bzrlib/reconfigure.py:69
7489
#: breezy/reconfigure.py:69
7091
7490
#, python-format
7092
7491
msgid "%s is now not stacked\n"
7093
7492
msgstr ""
7094
7493
7095
#: bzrlib/remote.py:1228 bzrlib/repository.py:289
7494
#: breezy/remote.py:1228 breezy/repository.py:289
7096
7495
#, python-format
7097
7496
msgid "bzr: ERROR (ignored): %s"
7098
7497
msgstr ""
7099
7498
7100
#: bzrlib/remote.py:2534
7499
#: breezy/remote.py:2534
7101
7500
msgid "Copying repository content as tarball..."
7102
7501
msgstr ""
7103
7502
7104
#: bzrlib/rename_map.py:69
7503
#: breezy/rename_map.py:69
7105
7504
msgid "Calculating hashes"
7106
7505
msgstr ""
7107
7506
7108
#: bzrlib/rename_map.py:107
7507
#: breezy/rename_map.py:107
7109
7508
msgid "Determining hash hits"
7110
7509
msgstr ""
7111
7510
7112
#: bzrlib/rename_map.py:242
7511
#: breezy/rename_map.py:242
7512
#, python-brace-format
7113
7513
msgid "{0} => {1}"
7114
7514
msgstr ""
7115
7515
7116
#: bzrlib/repository.py:1738
7516
#: breezy/repository.py:1738
7117
7517
msgid "Moving repository to repository.backup"
7118
7518
msgstr ""
7119
7519
7120
#: bzrlib/repository.py:1745
7520
#: breezy/repository.py:1745
7121
7521
msgid "Creating new repository"
7122
7522
msgstr ""
7123
7523
7124
#: bzrlib/repository.py:1750
7524
#: breezy/repository.py:1750
7125
7525
msgid "Copying content"
7126
7526
msgstr ""
7127
7527
7128
#: bzrlib/repository.py:1754
7528
#: breezy/repository.py:1754
7129
7529
msgid "Deleting old repository content"
7130
7530
msgstr ""
7131
7531
7132
#: bzrlib/repository.py:1756
7532
#: breezy/repository.py:1756
7133
7533
msgid "repository converted"
7134
7534
msgstr ""
7135
7535
7136
#: bzrlib/revisionspec.py:903
7536
#: breezy/revisionspec.py:903
7537
#, python-brace-format
7137
7538
msgid "Using {0} {1}"
7138
7539
msgstr ""
7139
7540
7140
#: bzrlib/send.py:59
7541
#: breezy/send.py:59
7141
7542
#, python-format
7142
7543
msgid "Mail client \"%s\" does not support specifying body"
7143
7544
msgstr ""
7144
7545
7145
#: bzrlib/send.py:63
7546
#: breezy/send.py:63
7146
7547
msgid "--remember requires a branch to be specified."
7147
7548
msgstr ""
7148
7549
7149
#: bzrlib/send.py:78
7550
#: breezy/send.py:78
7150
7551
msgid "No submit branch known or specified"
7151
7552
msgstr ""
7152
7553
7153
#: bzrlib/send.py:81
7554
#: breezy/send.py:81
7555
#, python-brace-format
7154
7556
msgid "Using saved {0} location \"{1}\" to determine what changes to submit."
7155
7557
msgstr ""
7156
7558
7157
#: bzrlib/send.py:99
7559
#: breezy/send.py:99
7158
7560
#, python-format
7159
7561
msgid "No such send format '%s'."
7160
7562
msgstr ""
7161
7563
7162
#: bzrlib/send.py:115
7564
#: breezy/send.py:115
7163
7565
msgid "bzr send takes at most two one revision identifiers"
7164
7566
msgstr ""
7165
7567
7166
#: bzrlib/send.py:128
7568
#: breezy/send.py:128
7167
7569
msgid "No revisions to submit."
7168
7570
msgstr ""
7169
7571
7170
#: bzrlib/send.py:140
7572
#: breezy/send.py:140
7171
7573
msgid ""
7172
7574
"- not supported for merge directives that use more than one output file."
7173
7575
msgstr ""
7174
7576
7175
#: bzrlib/send.py:186
7577
#: breezy/send.py:186
7176
7578
msgid "Format 0.9 does not permit bundle with no patch"
7177
7579
msgstr ""
7178
7580
7179
#: bzrlib/shelf_ui.py:46
7581
#: breezy/shelf_ui.py:46
7180
7582
#, python-format
7181
7583
msgid "Shelve adding file \"%(path)s\"?"
7182
7584
msgstr ""
7183
7585
7184
#: bzrlib/shelf_ui.py:47
7586
#: breezy/shelf_ui.py:47
7185
7587
msgid "Shelve binary changes?"
7186
7588
msgstr ""
7187
7589
7188
#: bzrlib/shelf_ui.py:48
7590
#: breezy/shelf_ui.py:48
7189
7591
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
7190
7592
msgstr ""
7191
7593
7192
#: bzrlib/shelf_ui.py:50
7594
#: breezy/shelf_ui.py:50
7193
7595
#, python-format
7194
7596
msgid "Shelve removing file \"%(path)s\"?"
7195
7597
msgstr ""
7196
7598
7197
#: bzrlib/shelf_ui.py:51
7599
#: breezy/shelf_ui.py:51
7198
7600
#, python-format
7199
7601
msgid "Shelve %d change(s)?"
7200
7602
msgstr ""
7201
7603
7202
#: bzrlib/shelf_ui.py:52
7604
#: breezy/shelf_ui.py:52
7203
7605
msgid "Shelve?"
7204
7606
msgstr ""
7205
7607
7206
#: bzrlib/shelf_ui.py:53
7608
#: breezy/shelf_ui.py:53
7207
7609
#, python-format
7208
7610
msgid ""
7209
7611
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
7210
7612
msgstr ""
7211
7613
7212
#: bzrlib/shelf_ui.py:55
7614
#: breezy/shelf_ui.py:55
7213
7615
#, python-format
7214
7616
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
7215
7617
msgstr ""
7216
7618
7217
#: bzrlib/shelf_ui.py:70
7619
#: breezy/shelf_ui.py:70
7218
7620
#, python-format
7219
7621
msgid "Changes shelved with id \"%d\"."
7220
7622
msgstr ""
7221
7623
7222
#: bzrlib/shelf_ui.py:74
7624
#: breezy/shelf_ui.py:74
7223
7625
msgid "Selected changes destroyed."
7224
7626
msgstr ""
7225
7627
7226
#: bzrlib/shelf_ui.py:78
7628
#: breezy/shelf_ui.py:78
7227
7629
msgid "Selected changes:"
7228
7630
msgstr ""
7229
7631
7230
#: bzrlib/shelf_ui.py:98
7632
#: breezy/shelf_ui.py:98
7231
7633
#, python-format
7232
7634
msgid "Delete file \"%(path)s\"?"
7233
7635
msgstr ""
7234
7636
7235
#: bzrlib/shelf_ui.py:99
7637
#: breezy/shelf_ui.py:99
7236
7638
msgid "Apply binary changes?"
7237
7639
msgstr ""
7238
7640
7239
#: bzrlib/shelf_ui.py:100
7641
#: breezy/shelf_ui.py:100
7240
7642
#, python-format
7241
7643
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
7242
7644
msgstr ""
7243
7645
7244
#: bzrlib/shelf_ui.py:102
7646
#: breezy/shelf_ui.py:102
7245
7647
#, python-format
7246
7648
msgid "Add file \"%(path)s\"?"
7247
7649
msgstr ""
7248
7650
7249
#: bzrlib/shelf_ui.py:103
7651
#: breezy/shelf_ui.py:103
7250
7652
#, python-format
7251
7653
msgid "Apply %d change(s)?"
7252
7654
msgstr ""
7253
7655
7254
#: bzrlib/shelf_ui.py:104
7656
#: breezy/shelf_ui.py:104
7255
7657
msgid "Apply change?"
7256
7658
msgstr ""
7257
7659
7258
#: bzrlib/shelf_ui.py:105
7660
#: breezy/shelf_ui.py:105
7259
7661
#, python-format
7260
7662
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
7261
7663
msgstr ""
7262
7664
7263
#: bzrlib/shelf_ui.py:107
7665
#: breezy/shelf_ui.py:107
7264
7666
#, python-format
7265
7667
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
7266
7668
msgstr ""
7267
7669
7268
#: bzrlib/shelf_ui.py:402
7670
#: breezy/shelf_ui.py:402
7269
7671
msgid "No changes are shelved."
7270
7672
msgstr ""
7271
7673
7272
#: bzrlib/shelf_ui.py:460
7674
#: breezy/shelf_ui.py:460
7273
7675
#, python-format
7274
7676
msgid "Using changes with id \"%d\"."
7275
7677
msgstr ""
7276
7678
7277
#: bzrlib/shelf_ui.py:464
7679
#: breezy/shelf_ui.py:464
7278
7680
#, python-format
7279
7681
msgid "Message: %s"
7280
7682
msgstr ""
7281
7683
7282
#: bzrlib/shelf_ui.py:476
7684
#: breezy/shelf_ui.py:476
7283
7685
#, python-format
7284
7686
msgid "Deleted changes with id \"%d\"."
7285
7687
msgstr ""
7286
7688
7287
#: bzrlib/smart/medium.py:714
7689
#: breezy/smart/medium.py:714
7690
#, python-brace-format
7288
7691
msgid "HPSS calls: {0} ({1} vfs) {2}"
7289
7692
msgstr ""
7290
7693
7291
#: bzrlib/smart/server.py:169
7694
#: breezy/smart/ping.py:32
7695
msgid "Pings a Bazaar smart server."
7696
msgstr ""
7697
7698
#: breezy/smart/ping.py:34
7699
msgid ""
7700
"This command sends a 'hello' request to the given location using the bzr\n"
7701
"smart protocol, and reports the response."
7702
msgstr ""
7703
7704
#: breezy/smart/server.py:169
7292
7705
msgid "Requested to stop gracefully"
7293
7706
msgstr ""
7294
7707
7295
#: bzrlib/smart/server.py:179
7708
#: breezy/smart/server.py:179
7296
7709
#, python-format
7297
7710
msgid "Waiting for %d client(s) to finish"
7298
7711
msgstr ""
7299
7712
7300
#: bzrlib/smart/server.py:185
7713
#: breezy/smart/server.py:185
7301
7714
#, python-format
7302
7715
msgid "Still waiting for %d client(s) to finish"
7303
7716
msgstr ""
7304
7717
7305
#: bzrlib/smart/server.py:219
7718
#: breezy/smart/server.py:219
7306
7719
#, python-format
7307
7720
msgid "listening socket error: %s"
7308
7721
msgstr ""
7309
7722
7310
#: bzrlib/smart/server.py:452
7723
#: breezy/smart/server.py:452
7311
7724
#, python-format
7312
7725
msgid "listening on port: %s"
7313
7726
msgstr ""
7314
7727
7315
#: bzrlib/switch.py:73
7728
#: breezy/switch.py:84
7316
7729
msgid "Pending merges must be committed or reverted before using switch."
7317
7730
msgstr ""
7318
7731
7319
#: bzrlib/switch.py:100
7732
#: breezy/switch.py:111
7320
7733
msgid ""
7321
7734
"Cannot switch as local commits found in the checkout. Commit these to the "
7322
7735
"bound branch or use --force to throw them away."
7323
7736
msgstr ""
7324
7737
7325
#: bzrlib/switch.py:105
7738
#: breezy/switch.py:116
7326
7739
#, python-format
7327
7740
msgid ""
7328
7741
"Unable to connect to current master branch %(target)s: %(error)s To switch "
7329
7742
"anyway, use --force."
7330
7743
msgstr ""
7331
7744
7332
#: bzrlib/switch.py:129
7745
#: breezy/switch.py:140
7333
7746
msgid "Cannot switch a branch, only a checkout."
7334
7747
msgstr ""
7335
7748
7336
#: bzrlib/switch.py:167
7749
#: breezy/switch.py:183
7337
7750
#, python-format
7338
7751
msgid "Tree is up to date at revision %d."
7339
7752
msgstr ""
7340
7753
7341
#: bzrlib/switch.py:173
7754
#: breezy/switch.py:190
7342
7755
#, python-format
7343
7756
msgid "Updated to revision %d."
7344
7757
msgstr ""
7345
7758
7346
#: bzrlib/transform.py:1723 bzrlib/transform.py:1734 bzrlib/transform.py:1736
7759
#: breezy/transform.py:1723 breezy/transform.py:1734 breezy/transform.py:1736
7347
7760
msgid "Apply phase"
7348
7761
msgstr ""
7349
7762
7350
#: bzrlib/transform.py:1762 bzrlib/transform.py:1830
7763
#: breezy/transform.py:1762 breezy/transform.py:1830
7351
7764
msgid "removing file"
7352
7765
msgstr ""
7353
7766
7354
#: bzrlib/transform.py:1780 bzrlib/transform.py:1865
7767
#: breezy/transform.py:1780 breezy/transform.py:1865
7355
7768
msgid "adding file"
7356
7769
msgstr ""
7357
7770
7358
#: bzrlib/transform.py:2598
7771
#: breezy/transform.py:2598
7359
7772
msgid "Building tree"
7360
7773
msgstr ""
7361
7774
7362
#: bzrlib/transform.py:2688 bzrlib/transform.py:2715
7775
#: breezy/transform.py:2688 breezy/transform.py:2715
7363
7776
msgid "Adding file contents"
7364
7777
msgstr ""
7365
7778
7366
#: bzrlib/transform.py:3017
7779
#: breezy/transform.py:3017
7367
7780
msgid "Resolution pass"
7368
7781
msgstr ""
7369
7782
7370
#: bzrlib/transport/ftp/_gssapi.py:88
7783
#: breezy/transport/ftp/_gssapi.py:88
7371
7784
#, python-format
7372
7785
msgid "Authenticated as %s"
7373
7786
msgstr ""
7374
7787
7375
#: bzrlib/tree.py:647
7788
#: breezy/tree.py:647
7376
7789
msgid "*** {0} content-filter: {1} => {2!r}"
7377
7790
msgstr ""
7378
7791
7379
#: bzrlib/upgrade.py:77
7792
#: breezy/upgrade.py:77
7380
7793
#, python-format
7381
7794
msgid "This is a checkout. The branch (%s) needs to be upgraded separately."
7382
7795
msgstr ""
7383
7796
7384
#: bzrlib/upgrade.py:100
7797
#: breezy/upgrade.py:100
7385
7798
#, python-format
7386
7799
msgid "cannot upgrade from bzrdir format %s"
7387
7800
msgstr ""
7388
7801
7389
#: bzrlib/upgrade.py:103
7802
#: breezy/upgrade.py:103
7390
7803
#, python-format
7391
7804
msgid "starting upgrade of %s"
7392
7805
msgstr ""
7393
7806
7394
#: bzrlib/upgrade.py:110
7807
#: breezy/upgrade.py:110
7395
7808
msgid "finished"
7396
7809
msgstr ""
7397
7810
7398
#: bzrlib/upgrade.py:120
7811
#: breezy/upgrade.py:120
7399
7812
msgid "Deleting backup.bzr"
7400
7813
msgstr ""
7401
7814
7402
#: bzrlib/upgrade.py:151
7815
#: breezy/upgrade.py:151
7816
#, python-brace-format
7403
7817
msgid ""
7404
7818
"\n"
7405
7819
"SUMMARY: {0} upgrades attempted, {1} succeeded, {2} failed"
7406
7820
msgstr ""
7407
7821
7408
#: bzrlib/upgrade.py:208
7822
#: breezy/upgrade.py:208
7409
7823
#, python-format
7410
7824
msgid "Found %d dependent branches - upgrading ..."
7411
7825
msgstr ""
7412
7826
7413
#: bzrlib/upgrade.py:276
7827
#: breezy/upgrade.py:276
7414
7828
msgid "Upgrading bzrdirs"
7415
7829
msgstr ""
7416
7830
7417
#: bzrlib/upgrade.py:282
7831
#: breezy/upgrade.py:282
7418
7832
#, python-format
7419
7833
msgid "Upgrading %s"
7420
7834
msgstr ""
7421
7835
7422
#: bzrlib/upgrade.py:283
7836
#: breezy/upgrade.py:283
7837
#, python-brace-format
7423
7838
msgid "Upgrading {0} {1} ..."
7424
7839
msgstr ""
7425
7840
7426
#: bzrlib/upgrade.py:301
7841
#: breezy/upgrade.py:301
7427
7842
msgid "Removing backup ..."
7428
7843
msgstr ""
7429
7844
7430
#: bzrlib/upgrade.py:305
7845
#: breezy/upgrade.py:305
7846
#, python-brace-format
7431
7847
msgid "failed to clean-up {0}: {1}"
7432
7848
msgstr ""
7433
7849
7434
#: bzrlib/vf_repository.py:1091
7850
#: breezy/vf_repository.py:1091
7435
7851
msgid "inventories"
7436
7852
msgstr ""
7437
7853
7438
#: bzrlib/vf_repository.py:1117
7854
#: breezy/vf_repository.py:1117
7439
7855
msgid "texts"
7440
7856
msgstr ""
7441
7857
7442
#: bzrlib/vf_repository.py:1622 bzrlib/vf_repository.py:1631
7858
#: breezy/vf_repository.py:1622 breezy/vf_repository.py:1631
7443
7859
msgid "Calculating text parents"
7444
7860
msgstr ""
7445
7861
7446
#: bzrlib/vf_repository.py:1707
7862
#: breezy/vf_repository.py:1707
7447
7863
msgid "Fetch texts"
7448
7864
msgstr ""
7449
7865
7450
#: bzrlib/vf_repository.py:2536
7866
#: breezy/vf_repository.py:2536
7451
7867
msgid "loading text store"
7452
7868
msgstr ""
7453
7869
7454
#: bzrlib/vf_repository.py:2542
7870
#: breezy/vf_repository.py:2542
7455
7871
msgid "checking text graph"
7456
7872
msgstr ""
7457
7873
7458
#: bzrlib/vf_repository.py:2998 bzrlib/vf_repository.py:3012
7459
#: bzrlib/vf_repository.py:3127
7874
#: breezy/vf_repository.py:2998 breezy/vf_repository.py:3012
7875
#: breezy/vf_repository.py:3127
7460
7876
msgid "Transferring revisions"
7461
7877
msgstr ""
7462
7878
7463
#: bzrlib/win32utils.py:146
7879
#: breezy/win32utils.py:146
7464
7880
msgid "Failed to GetProcessMemoryInfo()"
7465
7881
msgstr ""
7466
7882
7467
#: bzrlib/win32utils.py:167
7883
#: breezy/win32utils.py:167
7468
7884
msgid "Cannot debug memory on win32 without ctypes or win32process"
7469
7885
msgstr ""
7470
7886
7471
#: bzrlib/win32utils.py:172
7887
#: breezy/win32utils.py:172
7888
#, python-brace-format
7472
7889
msgid "WorkingSize {0:>7}KiB\tPeakWorking {1:>7}KiB\t{2}"
7473
7890
msgstr ""
7474
7891
7475
#: bzrlib/win32utils.py:180
7892
#: breezy/win32utils.py:180
7476
7893
#, python-format
7477
7894
msgid "WorkingSize %8d KiB"
7478
7895
msgstr ""
7479
7896
7480
#: bzrlib/win32utils.py:181
7897
#: breezy/win32utils.py:181
7481
7898
#, python-format
7482
7899
msgid "PeakWorking %8d KiB"
7483
7900
msgstr ""
7484
7901
7485
#: bzrlib/win32utils.py:182
7902
#: breezy/win32utils.py:182
7486
7903
#, python-format
7487
7904
msgid "PagefileUsage %8d KiB"
7488
7905
msgstr ""
7489
7906
7490
#: bzrlib/win32utils.py:183
7907
#: breezy/win32utils.py:183
7491
7908
#, python-format
7492
7909
msgid "PeakPagefileUsage %8d KiB"
7493
7910
msgstr ""
7494
7911
7495
#: bzrlib/win32utils.py:185
7912
#: breezy/win32utils.py:185
7496
7913
#, python-format
7497
7914
msgid "PrivateUsage %8d KiB"
7498
7915
msgstr ""
7499
7916
7500
#: bzrlib/win32utils.py:186
7917
#: breezy/win32utils.py:186
7501
7918
#, python-format
7502
7919
msgid "PageFaultCount %8d"
7503
7920
msgstr ""
7504
7921
7505
#: bzrlib/workingtree.py:1482
7922
#: breezy/workingtree.py:1516
7506
7923
msgid "Rerun update after fixing the conflicts."
7507
7924
msgstr ""
7508
7925
7512
7929
7513
7930
#: dummy/help_topics/basic/detail.txt:1
7514
7931
msgid ""
7515
"Bazaar 2.6b2 -- a free distributed version-control tool\n"
7932
"Bazaar 2.8.0dev1 -- a free distributed version-control tool\n"
7516
7933
"http://bazaar.canonical.com/"
7517
7934
msgstr ""
7518
7935
7621
8038
7622
8039
#: dummy/help_topics/checkouts/detail.txt:11
7623
8040
msgid ""
7624
"A checkout is created with the bzr checkout command (see \"help "
7625
"checkout\").\n"
8041
"A checkout is created with the bzr checkout command (see \"help checkout"
8042
"\").\n"
7626
8043
"You pass it a reference to another branch, and it will create a local copy\n"
7627
8044
"for you that still contains a reference to the branch you created the\n"
7628
8045
"checkout from (the master branch). Then if you make any commits they will "
7845
8262
#: dummy/help_topics/files/detail.txt:3
7846
8263
msgid ""
7847
8264
":On Unix: ~/.bazaar/bazaar.conf\n"
7848
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\\\"
7849
"bazaar\\\\2.0\\\\bazaar.conf"
8265
":On Windows: C:\\\\Documents and Settings\\\\username\\\\Application Data\\"
8266
"\\bazaar\\\\2.0\\\\bazaar.conf"
7850
8267
msgstr ""
7851
8268
7852
8269
#: dummy/help_topics/files/detail.txt:6
7956
8373
"--profile Profile execution using the hotshot profiler.\n"
7957
8374
"--lsprof Profile execution using the lsprof profiler.\n"
7958
8375
"--lsprof-file Profile execution using the lsprof profiler, and write the\n"
7959
" results to a specified file. If the filename ends with "
7960
"\".txt\",\n"
8376
" results to a specified file. If the filename ends with \".txt"
8377
"\",\n"
7961
8378
" text format will be used. If the filename either starts "
7962
8379
"with\n"
7963
8380
" \"callgrind.out\" or end with \".callgrind\", the output will "
8441
8858
msgstr ""
8442
8859
8443
8860
#: en/help_topics/authentication.txt:27
8444
msgid " bzr branch ftp://joe:secret@host.com/path/to/my/branch"
8861
msgid " brz branch ftp://joe:secret@host.com/path/to/my/branch"
8445
8862
msgstr ""
8446
8863
8447
8864
#: en/help_topics/authentication.txt:29
8449
8866
msgstr ""
8450
8867
8451
8868
#: en/help_topics/authentication.txt:31
8452
msgid " bzr branch ftp://host.com/path/to/my/branch"
8869
msgid " brz branch ftp://host.com/path/to/my/branch"
8453
8870
msgstr ""
8454
8871
8455
8872
#: en/help_topics/authentication.txt:33
8456
msgid ""
8457
"provided you have created the following ``authentication.conf`` file::"
8873
msgid "provided you have created the following ``authentication.conf`` file::"
8458
8874
msgstr ""
8459
8875
8460
8876
#: en/help_topics/authentication.txt:35
8477
8893
msgid ""
8478
8894
"There are two kinds of authentication used by the various schemes supported "
8479
8895
"by\n"
8480
"bzr:"
8896
"brz:"
8481
8897
msgstr ""
8482
8898
8483
8899
#: en/help_topics/authentication.txt:48
8506
8922
"is\n"
8507
8923
"really needed is (``user``, ``password``, ``host``, ``path``). The ``realm`` "
8508
8924
"is\n"
8509
"not taken into account in the definitions, but will displayed if bzr "
8925
"not taken into account in the definitions, but will displayed if brz "
8510
8926
"prompts\n"
8511
8927
"you for a password."
8512
8928
msgstr ""
8555
8971
8556
8972
#: en/help_topics/authentication.txt:84
8557
8973
msgid ""
8558
" * ``user``: can be empty (``bzr`` will defaults to python's\n"
8974
" * ``user``: can be empty (``bzr`` will default to python's\n"
8559
8975
" ``getpass.get_user()``),"
8560
8976
msgstr ""
8561
8977
8567
8983
8568
8984
#: en/help_topics/authentication.txt:90
8569
8985
msgid ""
8570
"Multiple definitions can be provided and, for a given URL, bzr will select "
8986
"Multiple definitions can be provided and, for a given URL, brz will select "
8571
8987
"a\n"
8572
8988
"(``user`` [, ``password``]) based on the following rules :"
8573
8989
msgstr ""
8588
9004
#: en/help_topics/authentication.txt:99
8589
9005
msgid ""
8590
9006
" 4. ``host`` matches exactly or act as a domain if it starts with '.'\n"
8591
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but "
8592
"``projectbzr.sf.net``\n"
9007
" (``project.bzr.sf.net`` will match ``.bzr.sf.net`` but ``projectbzr.sf."
9008
"net``\n"
8593
9009
" will not match ``bzr.sf.net``)."
8594
9010
msgstr ""
8595
9011
8674
9090
msgid ""
8675
9091
"All connections are done with the same ``user`` (the remote one for which "
8676
9092
"the\n"
8677
"default bzr one is not appropriate) and the password is always prompted "
9093
"default brz one is not appropriate) and the password is always prompted "
8678
9094
"with\n"
8679
9095
"some exceptions::"
8680
9096
msgstr ""
8719
9135
" # The leading '.' ensures that 'shp.net' alone doesn't match\n"
8720
9136
" host=.shp.net\n"
8721
9137
" user=joe\n"
8722
" # bzr don't support supplying a password for sftp,\n"
9138
" # brz doesn't support supplying a password for sftp,\n"
8723
9139
" # consider using an ssh agent if you don't want to supply\n"
8724
9140
" # a password interactively. (pageant, ssh-agent, etc)"
8725
9141
msgstr ""
8898
9314
msgstr ""
8899
9315
8900
9316
#: en/help_topics/bugs.txt:54
8901
msgid ""
8902
"Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
9317
msgid "Use ``bzr commit --fixes lp:2`` to record that this commit fixes bug 2."
8903
9318
msgstr ""
8904
9319
8905
9320
#: en/help_topics/bugs.txt:56
8993
9408
8994
9409
#: en/help_topics/bugs.txt:103
8995
9410
msgid ""
8996
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug HUDSON-"
8997
"1234\n"
9411
"would allow ``bzr commit --fixes hudson:HUDSON-1234`` to mark bug "
9412
"HUDSON-1234\n"
8998
9413
"in Hudson's JIRA bug tracker as fixed.\n"
8999
9414
msgstr ""
9000
9415
9030
9445
"export Export current or past revision to a destination directory "
9031
9446
"or\n"
9032
9447
" archive.\n"
9448
"grep Print lines matching PATTERN for specified files and\n"
9449
" revisions. [grep]\n"
9033
9450
"help Show help on a command or other topic.\n"
9034
9451
"ignore Ignore specified files or patterns.\n"
9035
9452
"ignored List ignored files and the patterns that matched them.\n"
9053
9470
"mv Move or rename a file.\n"
9054
9471
"nick Print or set the branch nickname.\n"
9055
9472
"pack Compress the data within a repository.\n"
9473
"ping Pings a Bazaar smart server.\n"
9056
9474
"plugins List the installed plugins.\n"
9057
9475
"pull Turn this branch into a mirror of another branch.\n"
9058
9476
"push Update a mirror of this branch.\n"
9059
"reconcile Reconcile bzr metadata in a branch.\n"
9060
"reconfigure Reconfigure the type of a bzr directory.\n"
9477
"reconcile Reconcile brz metadata in a branch.\n"
9478
"reconfigure Reconfigure the type of a brz directory.\n"
9061
9479
"register-branch Register a branch with launchpad.net. [launchpad]\n"
9062
9480
"remerge Redo a merge.\n"
9063
9481
"remove Remove files or directories.\n"
9070
9488
"revno Show current revision number.\n"
9071
9489
"root Show the tree root directory.\n"
9072
9490
"send Mail or create a merge-directive for submitting changes.\n"
9073
"serve Run the bzr server.\n"
9491
"serve Run the brz server.\n"
9074
9492
"shelve Temporarily set aside some changes from the current tree.\n"
9075
9493
"sign-my-commits Sign all commits by a given committer.\n"
9076
9494
"split Split a subdirectory of a tree into a separate tree.\n"
9086
9504
"upgrade Upgrade a repository, branch or working tree to a newer\n"
9087
9505
" format.\n"
9088
9506
"verify-signatures Verify all commit signatures.\n"
9089
"version Show version of bzr.\n"
9507
"version Show version of brz.\n"
9090
9508
"version-info Show version information about this tree.\n"
9091
9509
"view Manage filtered views.\n"
9092
"whoami Show or set bzr user id.\n"
9510
"whoami Show or set brz user id.\n"
9093
9511
msgstr ""
9094
9512
9095
9513
#: en/help_topics/configuration.txt:1
9112
9530
9113
9531
#: en/help_topics/configuration.txt:10
9114
9532
msgid ""
9115
"BZR_EMAIL\n"
9533
"BRZ_EMAIL\n"
9116
9534
"~~~~~~~~~"
9117
9535
msgstr ""
9118
9536
9130
9548
9131
9549
#: en/help_topics/configuration.txt:19
9132
9550
msgid ""
9133
"BZR_PROGRESS_BAR\n"
9551
"BRZ_PROGRESS_BAR\n"
9134
9552
"~~~~~~~~~~~~~~~~"
9135
9553
msgstr ""
9136
9554
9145
9563
9146
9564
#: en/help_topics/configuration.txt:26
9147
9565
msgid ""
9148
"BZR_SIGQUIT_PDB\n"
9566
"BRZ_SIGQUIT_PDB\n"
9149
9567
"~~~~~~~~~~~~~~~"
9150
9568
msgstr ""
9151
9569
9152
9570
#: en/help_topics/configuration.txt:29
9153
msgid ""
9154
"Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9571
msgid "Control whether SIGQUIT behaves normally or invokes a breakin debugger."
9155
9572
msgstr ""
9156
9573
9157
9574
#: en/help_topics/configuration.txt:31
9162
9579
9163
9580
#: en/help_topics/configuration.txt:34
9164
9581
msgid ""
9165
"BZR_HOME\n"
9582
"BRZ_HOME\n"
9166
9583
"~~~~~~~~"
9167
9584
msgstr ""
9168
9585
9172
9589
9173
9590
#: en/help_topics/configuration.txt:39
9174
9591
msgid ""
9175
"BZR_SSH\n"
9592
"BRZ_SSH\n"
9176
9593
"~~~~~~~"
9177
9594
msgstr ""
9178
9595
9182
9599
9183
9600
#: en/help_topics/configuration.txt:44
9184
9601
msgid ""
9185
"BZR_PDB\n"
9602
"BRZ_PDB\n"
9186
9603
"~~~~~~~"
9187
9604
msgstr ""
9188
9605
9212
9629
9213
9630
#: en/help_topics/configuration.txt:59
9214
9631
msgid ""
9215
"BZR_EDITOR\n"
9632
"BRZ_EDITOR\n"
9216
9633
"~~~~~~~~~~"
9217
9634
msgstr ""
9218
9635
9222
9639
9223
9640
#: en/help_topics/configuration.txt:64
9224
9641
msgid ""
9225
"BZR_LOG\n"
9642
"BRZ_LOG\n"
9226
9643
"~~~~~~~"
9227
9644
msgstr ""
9228
9645
9247
9664
#: en/help_topics/configuration.txt:76
9248
9665
msgid ""
9249
9666
"\n"
9250
"BZR_PLUGIN_PATH\n"
9667
"BRZ_PLUGIN_PATH\n"
9251
9668
"~~~~~~~~~~~~~~~"
9252
9669
msgstr ""
9253
9670
9258
9675
msgstr ""
9259
9676
9260
9677
#: en/help_topics/configuration.txt:83
9261
msgid ""
9262
"* the user specific plugin directory (containing the ``user`` plugins),"
9678
msgid "* the user specific plugin directory (containing the ``user`` plugins),"
9263
9679
msgstr ""
9264
9680
9265
9681
#: en/help_topics/configuration.txt:85
9359
9775
9360
9776
#: en/help_topics/configuration.txt:135
9361
9777
msgid ""
9362
"BZR_DISABLE_PLUGINS\n"
9778
"BRZ_DISABLE_PLUGINS\n"
9363
9779
"~~~~~~~~~~~~~~~~~~~"
9364
9780
msgstr ""
9365
9781
9388
9804
9389
9805
#: en/help_topics/configuration.txt:151
9390
9806
msgid ""
9391
"BZR_PLUGINS_AT\n"
9807
"BRZ_PLUGINS_AT\n"
9392
9808
"~~~~~~~~~~~~~~"
9393
9809
msgstr ""
9394
9810
9433
9849
9434
9850
#: en/help_topics/configuration.txt:178
9435
9851
msgid ""
9436
"BZRPATH\n"
9852
"BRZPATH\n"
9437
9853
"~~~~~~~"
9438
9854
msgstr ""
9439
9855
9635
10051
9636
10052
#: en/help_topics/configuration.txt:287
9637
10053
msgid ""
9638
"Policies are specified by keys with names of the form "
9639
"\"<option_name>:policy\".\n"
10054
"Policies are specified by keys with names of the form \"<option_name>:policy"
10055
"\".\n"
9640
10056
"For example, to define the push location for a tree of branches, the\n"
9641
10057
"following could be used::"
9642
10058
msgstr ""
10391
10807
#: en/help_topics/configuration.txt:686
10392
10808
msgid ""
10393
10809
"Defines the maximum file size the command line \"add\" operation will allow\n"
10394
"in recursive mode, with files larger than this value being skipped. You may "
10395
"\n"
10396
"specify this value as an integer (in which case it is interpreted as bytes), "
10397
"\n"
10810
"in recursive mode, with files larger than this value being skipped. You "
10811
"may \n"
10812
"specify this value as an integer (in which case it is interpreted as "
10813
"bytes), \n"
10398
10814
"or you may specify the value using SI units, i.e. 10KB, 20MB, 1G. A value of "
10399
10815
"0 \n"
10400
10816
"will disable skipping."
10444
10860
10445
10861
#: en/help_topics/configuration.txt:716
10446
10862
msgid ""
10863
"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
10864
"interpolation markers, trying to display the mergetool line results in the\n"
10865
"following problem::"
10866
msgstr ""
10867
10868
#: en/help_topics/configuration.txt:720
10869
msgid ""
10870
"\n"
10871
" $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
10872
"{result}'\n"
10873
" $ bzr config bzr.mergetool.kdiff3\n"
10874
" bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
10875
"{this} {other} -o {result}\"."
10876
msgstr ""
10877
10878
#: en/help_topics/configuration.txt:725
10879
msgid ""
10880
"To avoid this, ``config`` can be instructed not to try expanding variables::"
10881
msgstr ""
10882
10883
#: en/help_topics/configuration.txt:727
10884
msgid ""
10885
" $ bzr config --all bzr.mergetool.kdiff3\n"
10886
" branch:\n"
10887
" bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
10888
msgstr ""
10889
10890
#: en/help_topics/configuration.txt:731
10891
msgid ""
10892
"\n"
10447
10893
"bzr.default_mergetool\n"
10448
10894
"~~~~~~~~~~~~~~~~~~~~~"
10449
10895
msgstr ""
10450
10896
10451
#: en/help_topics/configuration.txt:719
10897
#: en/help_topics/configuration.txt:735
10452
10898
msgid ""
10453
10899
"Specifies which external merge tool (as defined above) should be selected "
10454
10900
"by\n"
10455
10901
"default in tools such as ``bzr qconflicts``."
10456
10902
msgstr ""
10457
10903
10458
#: en/help_topics/configuration.txt:724
10904
#: en/help_topics/configuration.txt:740
10459
10905
msgid " bzr.default_mergetool = kdiff3\n"
10460
10906
msgstr ""
10461
10907
10475
10921
10476
10922
#: en/help_topics/conflict-types.txt:8
10477
10923
msgid ""
10478
"When conflicts are present in your working tree (as shown by ``bzr\n"
10479
"conflicts``), you should resolve them and then inform bzr that the "
10924
"When conflicts are present in your working tree (as shown by ``brz\n"
10925
"conflicts``), you should resolve them and then inform brz that the "
10480
10926
"conflicts\n"
10481
10927
"have been resolved."
10482
10928
msgstr ""
10528
10974
#: en/help_topics/conflict-types.txt:34
10529
10975
msgid ""
10530
10976
"2. Inform Bazaar that the conflict is now solved and ask to cleanup any\n"
10531
" remaining generated information (``bzr resolve <item>``)."
10977
" remaining generated information (``brz resolve <item>``)."
10532
10978
msgstr ""
10533
10979
10534
10980
#: en/help_topics/conflict-types.txt:37
10560
11006
msgstr ""
10561
11007
10562
11008
#: en/help_topics/conflict-types.txt:51
10563
msgid " ``bzr resolve FILE --action=done'"
11009
msgid " ``brz resolve FILE --action=done'"
10564
11010
msgstr ""
10565
11011
10566
11012
#: en/help_topics/conflict-types.txt:53
10571
11017
msgstr ""
10572
11018
10573
11019
#: en/help_topics/conflict-types.txt:56
10574
msgid " ``bzr resolve FILE``"
11020
msgid " ``brz resolve FILE``"
10575
11021
msgstr ""
10576
11022
10577
11023
#: en/help_topics/conflict-types.txt:58
10578
msgid "See ``bzr help resolve`` for more details."
11024
msgid "See ``brz help resolve`` for more details."
10579
11025
msgstr ""
10580
11026
10581
11027
#: en/help_topics/conflict-types.txt:60
10658
11104
10659
11105
#: en/help_topics/conflict-types.txt:100
10660
11106
msgid ""
10661
"When you have resolved text conflicts, just run ``bzr resolve --auto``, and\n"
11107
"When you have resolved text conflicts, just run ``brz resolve --auto``, and\n"
10662
11108
"Bazaar will auto-detect which conflicts you have resolved."
10663
11109
msgstr ""
10664
11110
10672
11118
#: en/help_topics/conflict-types.txt:107
10673
11119
msgid ""
10674
11120
"\n"
10675
"When you want to pick one set of changes over the other, you can use ``bzr\n"
11121
"When you want to pick one set of changes over the other, you can use ``brz\n"
10676
11122
"resolve`` with one of the following actions:"
10677
11123
msgstr ""
10678
11124
10731
11177
#: en/help_topics/conflict-types.txt:226 en/help_topics/conflict-types.txt:252
10732
11178
#: en/help_topics/conflict-types.txt:291 en/help_topics/conflict-types.txt:326
10733
11179
#: en/help_topics/conflict-types.txt:361
10734
msgid "``bzr resolve`` recognizes the following actions:"
11180
msgid "``brz resolve`` recognizes the following actions:"
10735
11181
msgstr ""
10736
11182
10737
11183
#: en/help_topics/conflict-types.txt:139
10738
11184
msgid ""
10739
"* ``--action=take-this`` will issue ``bzr mv FILE.THIS FILE``,\n"
10740
"* ``--action=take-other`` will issue ``bzr mv FILE.OTHER FILE``,\n"
11185
"* ``--action=take-this`` will issue ``brz mv FILE.THIS FILE``,\n"
11186
"* ``--action=take-other`` will issue ``brz mv FILE.OTHER FILE``,\n"
10741
11187
"* ``--action=done`` will just mark the conflict as resolved."
10742
11188
msgstr ""
10743
11189
10781
11227
msgid ""
10782
11228
"To resolve the conflict, you must apply the correct tags to either the "
10783
11229
"target\n"
10784
"branch or the source branch as appropriate. Use \"bzr tags --show-ids -d\n"
11230
"branch or the source branch as appropriate. Use \"brz tags --show-ids -d\n"
10785
11231
"SOURCE_URL\" to see the tags in the source branch. If you want to make the\n"
10786
11232
"target branch's tags match the source branch, then in the target branch do\n"
10787
"``bzr tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
11233
"``brz tag --force -r revid:REVISION_ID CONFLICTING_TAG`` for each of the\n"
10788
11234
"CONFLICTING_TAGs, where REVISION_ID comes from the list of tags in the "
10789
11235
"source\n"
10790
"branch. You need not call \"bzr resolve\" after doing this. To resolve in\n"
11236
"branch. You need not call \"brz resolve\" after doing this. To resolve in\n"
10791
11237
"favor of the target branch, you need to similarly use ``tag --force`` in "
10792
11238
"the\n"
10793
11239
"source branch. (Note that pulling or pushing using --overwrite will "
10813
11259
10814
11260
#: en/help_topics/conflict-types.txt:187
10815
11261
msgid ""
10816
"* ``--action=take-this`` will issue ``bzr rm FILE ; bzr mv FILE.moved "
11262
"* ``--action=take-this`` will issue ``brz rm FILE ; brz mv FILE.moved "
10817
11263
"FILE``,\n"
10818
"* ``--action=take-other`` will issue ``bzr rm FILE.moved``,\n"
11264
"* ``--action=take-other`` will issue ``brz rm FILE.moved``,\n"
10819
11265
"* ``--action=done`` will just mark the conflict as resolved."
10820
11266
msgstr ""
10821
11267
10831
11277
msgstr ""
10832
11278
10833
11279
#: en/help_topics/conflict-types.txt:200
10834
msgid ""
10835
" Conflict because FILE is not versioned, but has versioned children."
11280
msgid " Conflict because FILE is not versioned, but has versioned children."
10836
11281
msgstr ""
10837
11282
10838
11283
#: en/help_topics/conflict-types.txt:202
10845
11290
"will version the parent directory as well. Resolving this issue depends\n"
10846
11291
"very much on the particular scenario. You may wish to rename or delete "
10847
11292
"either\n"
10848
"the file or the directory. When you are satisfied, you can run \"bzr "
11293
"the file or the directory. When you are satisfied, you can run \"brz "
10849
11294
"resolve\n"
10850
11295
"FILE\" to mark the conflict as resolved."
10851
11296
msgstr ""
10878
11323
10879
11324
#: en/help_topics/conflict-types.txt:228
10880
11325
msgid ""
10881
"* ``--action=take-this`` will issue ``bzr rm directory`` including the\n"
11326
"* ``--action=take-this`` will issue ``brz rm directory`` including the\n"
10882
11327
" children,\n"
10883
11328
"* ``--action=take-other`` will acknowledge Bazaar choice to keep the "
10884
11329
"children\n"
10913
11358
10914
11359
#: en/help_topics/conflict-types.txt:256
10915
11360
msgid ""
10916
"* ``--action=take-other`` will issue ``bzr rm directory`` including the \n"
11361
"* ``--action=take-other`` will issue ``brz rm directory`` including the \n"
10917
11362
" children,"
10918
11363
msgstr ""
10919
11364
10931
11376
#: en/help_topics/conflict-types.txt:265
10932
11377
msgid ""
10933
11378
"Handling such orphans, *before* the conflict is created, is controlled by\n"
10934
"setting the ``bzr.transform.orphan_policy`` configuration option."
11379
"setting the ``brz.transform.orphan_policy`` configuration option."
10935
11380
msgstr ""
10936
11381
10937
11382
#: en/help_topics/conflict-types.txt:268
10946
11391
10947
11392
#: en/help_topics/conflict-types.txt:273
10948
11393
msgid ""
10949
"* ``move``: will move the orphans to a ``bzr-orphans`` directory at the "
11394
"* ``move``: will move the orphans to a ``brz-orphans`` directory at the "
10950
11395
"root\n"
10951
11396
" of the working tree with names like ``<file>.~#~``."
10952
11397
msgstr ""
10978
11423
#: en/help_topics/conflict-types.txt:293
10979
11424
msgid ""
10980
11425
"* ``--action=take-this`` will revert Bazaar choice and keep ``PATH1`` by\n"
10981
" issuing ``bzr mv PATH2 PATH1``,\n"
11426
" issuing ``brz mv PATH2 PATH1``,\n"
10982
11427
"* ``--action=take-other`` will acknowledge Bazaar choice of keeping "
10983
11428
"``PATH2``,\n"
10984
11429
"* ``--action=done`` will just mark the conflict as resolved."
11004
11449
11005
11450
#: en/help_topics/conflict-types.txt:311
11006
11451
msgid ""
11007
" $ bzr init\n"
11008
" $ bzr mkdir white\n"
11009
" $ bzr mkdir black\n"
11010
" $ bzr commit -m \"BASE\"\n"
11011
" $ bzr branch . ../other\n"
11012
" $ bzr mv white black\n"
11013
" $ bzr commit -m \"THIS\"\n"
11014
" $ bzr mv ../other/black ../other/white\n"
11015
" $ bzr commit ../other -m \"OTHER\"\n"
11016
" $ bzr merge ../other"
11452
" $ brz init\n"
11453
" $ brz mkdir white\n"
11454
" $ brz mkdir black\n"
11455
" $ brz commit -m \"BASE\"\n"
11456
" $ brz branch . ../other\n"
11457
" $ brz mv white black\n"
11458
" $ brz commit -m \"THIS\"\n"
11459
" $ brz mv ../other/black ../other/white\n"
11460
" $ brz commit ../other -m \"OTHER\"\n"
11461
" $ brz merge ../other"
11017
11462
msgstr ""
11018
11463
11019
11464
#: en/help_topics/conflict-types.txt:322
11025
11470
11026
11471
#: en/help_topics/conflict-types.txt:328
11027
11472
msgid ""
11028
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving ``white`` "
11029
"\n"
11473
"* ``--action=take-this`` will acknowledge Bazaar choice of leaving "
11474
"``white`` \n"
11030
11475
" in ``black``,\n"
11031
11476
"* ``--action=take-other`` will revert Bazaar choice and move ``black`` in\n"
11032
" ``white`` by issuing ``bzr mv black/white white ; bzr mv black white``,\n"
11477
" ``white`` by issuing ``brz mv black/white white ; brz mv black white``,\n"
11033
11478
"* ``--action=done`` will just mark the conflict as resolved."
11034
11479
msgstr ""
11035
11480
11054
11499
11055
11500
#: en/help_topics/conflict-types.txt:347
11056
11501
msgid ""
11057
" $ bzr init\n"
11058
" $ bzr mkdir foo\n"
11059
" $ bzr commit -m \"BASE\"\n"
11060
" $ bzr branch . ../other\n"
11502
" $ brz init\n"
11503
" $ brz mkdir foo\n"
11504
" $ brz commit -m \"BASE\"\n"
11505
" $ brz branch . ../other\n"
11061
11506
" $ rmdir foo\n"
11062
11507
" $ touch foo\n"
11063
" $ bzr commit -m \"THIS\"\n"
11064
" $ bzr mkdir ../other/foo/bar\n"
11065
" $ bzr commit ../other -m \"OTHER\"\n"
11066
" $ bzr merge ../other"
11508
" $ brz commit -m \"THIS\"\n"
11509
" $ brz mkdir ../other/foo/bar\n"
11510
" $ brz commit ../other -m \"OTHER\"\n"
11511
" $ brz merge ../other"
11067
11512
msgstr ""
11068
11513
11069
11514
#: en/help_topics/conflict-types.txt:358
11074
11519
11075
11520
#: en/help_topics/conflict-types.txt:363
11076
11521
msgid ""
11077
"* ``--action=take-this`` will issue ``bzr rm --force foo.new`` and \n"
11078
" ``bzr add foo``,\n"
11079
"* ``--action=take-other`` will issue ``bzr rm --force foo`` and \n"
11080
" ``bzr mv foo.new foo``,\n"
11522
"* ``--action=take-this`` will issue ``brz rm --force foo.new`` and \n"
11523
" ``brz add foo``,\n"
11524
"* ``--action=take-other`` will issue ``brz rm --force foo`` and \n"
11525
" ``brz mv foo.new foo``,\n"
11081
11526
"* ``--action=done`` will just mark the conflict as resolved."
11082
11527
msgstr ""
11083
11528
11175
11620
"they filter, e.g. only files ending in ``.java`` or ``.php``.\n"
11176
11621
"In other cases, the plugin may leave it in the user's hands to\n"
11177
11622
"define which files are to be filtered. This is typically done\n"
11178
"using rule-based preferences. See ``bzr help rules`` for general\n"
11623
"using rule-based preferences. See ``brz help rules`` for general\n"
11179
11624
"information about defining these."
11180
11625
msgstr ""
11181
11626
11189
11634
#: en/help_topics/content-filters.txt:55
11190
11635
msgid ""
11191
11636
"Read converters are only applied to commands that read content from\n"
11192
"a working tree, e.g. status, diff and commit. For example, ``bzr diff``\n"
11637
"a working tree, e.g. status, diff and commit. For example, ``brz diff``\n"
11193
11638
"will apply read converters to files in the working tree, then compare\n"
11194
11639
"the results to the content last committed."
11195
11640
msgstr ""
11198
11643
msgid ""
11199
11644
"Write converters are only applied by commands that **create files in a\n"
11200
11645
"working tree**, e.g. branch, checkout, update. If you wish to see the\n"
11201
"canonical format of a file or tree, use ``bzr cat`` or ``bzr export``\n"
11646
"canonical format of a file or tree, use ``brz cat`` or ``brz export``\n"
11202
11647
"respectively."
11203
11648
msgstr ""
11204
11649
11205
11650
#: en/help_topics/content-filters.txt:65
11206
11651
msgid ""
11207
"Note: ``bzr commit`` does not implicitly apply write converters after\n"
11652
"Note: ``brz commit`` does not implicitly apply write converters after\n"
11208
11653
"comitting files. If this makes sense for a given plugin providing\n"
11209
11654
"a content filter, the plugin can usually achieve this effect by using a\n"
11210
11655
"``start_commit`` or ``post_commit`` hook say. See :doc:`hooks-help`\n"
11235
11680
#: en/help_topics/content-filters.txt:84
11236
11681
msgid ""
11237
11682
" * To reapply read converters, ``touch`` files, i.e. update their\n"
11238
" timestamp. Operations like ``bzr status`` should then reapply the\n"
11683
" timestamp. Operations like ``brz status`` should then reapply the\n"
11239
11684
" relevant read converters and compare the end result with the\n"
11240
11685
" canonical format."
11241
11686
msgstr ""
11243
11688
#: en/help_topics/content-filters.txt:89
11244
11689
msgid ""
11245
11690
" * To reapply write converters, ensure there are no local changes,\n"
11246
" delete the relevant files and run ``bzr revert`` on those files."
11691
" delete the relevant files and run ``brz revert`` on those files."
11247
11692
msgstr ""
11248
11693
11249
11694
#: en/help_topics/content-filters.txt:92
11278
11723
11279
11724
#: en/help_topics/debug-flags.txt:4
11280
11725
msgid ""
11281
"These flags can be passed on the bzr command line or (without the ``-D``\n"
11726
"These flags can be passed on the brz command line or (without the ``-D``\n"
11282
11727
"prefix) put in the ``debug_flags`` variable in ``bazaar.conf``."
11283
11728
msgstr ""
11284
11729
11369
11814
11370
11815
#: en/help_topics/diverged-branches.txt:20
11371
11816
msgid ""
11372
"The ``bzr missing`` command is used to find out what revisions are in "
11817
"The ``brz missing`` command is used to find out what revisions are in "
11373
11818
"another\n"
11374
11819
"branch that are not present in the current branch, and vice-versa. It shows "
11375
11820
"a\n"
11376
11821
"summary of which extra revisions exist in each branch. If you want to see "
11377
11822
"the\n"
11378
"precise effects of those revisions, you can use ``bzr diff --"
11823
"precise effects of those revisions, you can use ``brz diff --"
11379
11824
"old=other_branch``\n"
11380
11825
"to show the differences between other_branch and your current branch."
11381
11826
msgstr ""
11389
11834
#: en/help_topics/diverged-branches.txt:29
11390
11835
msgid ""
11391
11836
"The solution is to merge the revisions from the mainline into your local\n"
11392
"branch. To do so, use ``bzr merge`` to get the new revisions from the\n"
11837
"branch. To do so, use ``brz merge`` to get the new revisions from the\n"
11393
11838
"mainline. This merge may result in conflicts if the other developer's "
11394
11839
"changes\n"
11395
11840
"overlap with your changes. These conflicts should be resolved before\n"
11401
11846
"resulting working tree for correctness, since the merged revisions could "
11402
11847
"have\n"
11403
11848
"made arbitrary changes. After testing, you should commit the merge using\n"
11404
"``bzr commit``. This clears up the diverged branches situation. Your "
11849
"``brz commit``. This clears up the diverged branches situation. Your "
11405
11850
"local\n"
11406
11851
"branch can now be pushed to the mainline.\n"
11407
11852
msgstr ""
11411
11856
msgstr ""
11412
11857
11413
11858
#: en/help_topics/env-variables.txt:3
11859
msgid "See bzr help configuration for more details."
11860
msgstr ""
11861
11862
#: en/help_topics/env-variables.txt:5
11414
11863
msgid ""
11415
11864
"=================== "
11416
11865
"===========================================================\n"
11417
11866
"BZRPATH Path where bzr is to look for shell plugin external\n"
11418
11867
" commands.\n"
11419
"BZR_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11868
"BRZ_EMAIL E-Mail address of the user. Overrides EMAIL.\n"
11420
11869
"EMAIL E-Mail address of the user.\n"
11421
"BZR_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11870
"BRZ_EDITOR Editor for editing commit messages. Overrides EDITOR.\n"
11422
11871
"EDITOR Editor for editing commit messages.\n"
11423
"BZR_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11424
"BZR_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11425
"BZR_PLUGINS_AT Plugins to load from a directory not in "
11426
"BZR_PLUGIN_PATH.\n"
11427
"BZR_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11428
"BZR_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11872
"BRZ_PLUGIN_PATH Paths where bzr should look for plugins.\n"
11873
"BRZ_DISABLE_PLUGINS Plugins that bzr should not load.\n"
11874
"BRZ_PLUGINS_AT Plugins to load from a directory not in "
11875
"BRZ_PLUGIN_PATH.\n"
11876
"BRZ_HOME Directory holding .bazaar config dir. Overrides HOME.\n"
11877
"BRZ_HOME (Win32) Directory holding bazaar config dir. Overrides APPDATA "
11429
11878
"and\n"
11430
11879
" HOME.\n"
11431
11880
"BZR_REMOTE_PATH Full name of remote 'bzr' command (for bzr+ssh:// "
11432
11881
"URLs).\n"
11433
"BZR_SSH Path to SSH client, or one of paramiko, openssh, "
11882
"BRZ_SSH Path to SSH client, or one of paramiko, openssh, "
11434
11883
"sshcorp,\n"
11435
11884
" plink or lsh.\n"
11436
"BZR_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11437
"BZR_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11438
"BZR_COLUMNS Override implicit terminal width.\n"
11439
"BZR_CONCURRENCY Number of processes that can be run concurrently "
11885
"BRZ_LOG Location of .bzr.log (use '/dev/null' to suppress log).\n"
11886
"BRZ_LOG (Win32) Location of .bzr.log (use 'NUL' to suppress log).\n"
11887
"BRZ_COLUMNS Override implicit terminal width.\n"
11888
"BRZ_CONCURRENCY Number of processes that can be run concurrently "
11440
11889
"(selftest)\n"
11441
"BZR_PROGRESS_BAR Override the progress display. Values are 'none' or "
11890
"BRZ_PROGRESS_BAR Override the progress display. Values are 'none' or "
11442
11891
"'text'.\n"
11443
"BZR_PDB Control whether to launch a debugger on error.\n"
11444
"BZR_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11892
"BRZ_PDB Control whether to launch a debugger on error.\n"
11893
"BRZ_SIGQUIT_PDB Control whether SIGQUIT behaves normally or invokes a\n"
11445
11894
" breakin debugger.\n"
11446
"BZR_TEXTUI_INPUT Force console input mode for prompts to line-based "
11895
"BRZ_TEXTUI_INPUT Force console input mode for prompts to line-based "
11447
11896
"(instead\n"
11448
11897
" of char-based).\n"
11449
11898
"=================== "
11460
11909
msgid ""
11461
11910
"EOL conversion is provided as a content filter where Bazaar internally\n"
11462
11911
"stores a canonical format but outputs a convenience format. See\n"
11463
"``bzr help content-filters`` for general information about using these."
11912
"``brz help content-filters`` for general information about using these."
11464
11913
msgstr ""
11465
11914
11466
11915
#: en/help_topics/eol.txt:8
11469
11918
"e.g. 1.14. Be sure that both the repository *and* the branch are\n"
11470
11919
"in a recent format. (Just setting the format on the repository\n"
11471
11920
"is not enough.) If content filtering does not appear to be working, use\n"
11472
"'bzr info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11921
"'brz info -v' to confirm that the branch is using \"Working tree format 5\"\n"
11473
11922
"or later."
11474
11923
msgstr ""
11475
11924
11476
11925
#: en/help_topics/eol.txt:15
11477
11926
msgid ""
11478
11927
"EOL conversion needs to be enabled for selected file patterns using\n"
11479
"rules. See ``bzr help rules`` for general information on defining rules.\n"
11480
"Currently, rules are only supported in $BZR_HOME/.bazaar/rules (or\n"
11481
"%BZR_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11928
"rules. See ``brz help rules`` for general information on defining rules.\n"
11929
"Currently, rules are only supported in $brz_HOME/.bazaar/rules (or\n"
11930
"%brz_HOME%/bazaar/2.0/rules on Windows). Branch specific rules will be\n"
11482
11931
"supported in a future verison of Bazaar."
11483
11932
msgstr ""
11484
11933
11606
12055
"======================\n"
11607
12056
" ``native-with-crlf-in-repo`` ``crlf`` on Windows, ``crlf``\n"
11608
12057
" ``lf`` otherwise\n"
11609
" ---------------------------- ------------------------ ----------------------"
11610
"\n"
12058
" ---------------------------- ------------------------ "
12059
"----------------------\n"
11611
12060
" ``lf-with-crlf-in-repo`` ``lf`` ``crlf``\n"
11612
" ---------------------------- ------------------------ ----------------------"
11613
"\n"
12061
" ---------------------------- ------------------------ "
12062
"----------------------\n"
11614
12063
" ``crlf-with-crlf-in-repo`` ``crlf`` ``crlf``\n"
11615
12064
" ============================ ======================== ======================"
11616
12065
msgstr ""
11679
12128
"touching-revisions Return revision-ids which affected a particular file.\n"
11680
12129
"unknowns List unknown files.\n"
11681
12130
"wait-until-signalled Test helper for\n"
11682
" test_start_and_stop_bzr_subprocess_send_signal.\n"
12131
" test_start_and_stop_brz_subprocess_send_signal.\n"
11683
12132
msgstr ""
11684
12133
11685
12134
#: en/help_topics/hooks.txt:1
11713
12162
"The class that contains each hook is given before the hooks it supplies. "
11714
12163
"For\n"
11715
12164
"instance, BranchHooks as the class is the hooks class for\n"
11716
"`bzrlib.branch.Branch.hooks`."
12165
"`breezy.branch.Branch.hooks`."
11717
12166
msgstr ""
11718
12167
11719
12168
#: en/help_topics/hooks.txt:18
11795
12244
#: en/help_topics/hooks.txt:58
11796
12245
msgid ""
11797
12246
"Called after new branch initialization completes. post_branch_init is\n"
11798
"called with a bzrlib.branch.BranchInitHookParams. Note that init,\n"
12247
"called with a breezy.branch.BranchInitHookParams. Note that init,\n"
11799
12248
"branch and checkout (both heavyweight and lightweight) will all\n"
11800
12249
"trigger this hook."
11801
12250
msgstr ""
11814
12263
msgid ""
11815
12264
"Called in bzr client and server after a change to the tip of a branch\n"
11816
12265
"is made. post_change_branch_tip is called with a\n"
11817
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12266
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11818
12267
"uncommit will all trigger this hook."
11819
12268
msgstr ""
11820
12269
11846
12295
#: en/help_topics/hooks.txt:88
11847
12296
msgid ""
11848
12297
"Called after a pull operation completes. post_pull is called with a\n"
11849
"bzrlib.branch.PullResult object and only runs in the bzr client."
12298
"breezy.branch.PullResult object and only runs in the bzr client."
11850
12299
msgstr ""
11851
12300
11852
12301
#: en/help_topics/hooks.txt:91
11858
12307
#: en/help_topics/hooks.txt:96
11859
12308
msgid ""
11860
12309
"Called after a push operation completes. post_push is called with a\n"
11861
"bzrlib.branch.BranchPushResult object and only runs in the bzr client."
12310
"breezy.branch.BranchPushResult object and only runs in the bzr client."
11862
12311
msgstr ""
11863
12312
11864
12313
#: en/help_topics/hooks.txt:99
11870
12319
#: en/help_topics/hooks.txt:104
11871
12320
msgid ""
11872
12321
"Called after a checkout switches branch. post_switch is called with a\n"
11873
"bzrlib.branch.SwitchHookParams."
12322
"breezy.branch.SwitchHookParams."
11874
12323
msgstr ""
11875
12324
11876
12325
#: en/help_topics/hooks.txt:107
11902
12351
msgid ""
11903
12352
"Called in bzr client and server before a change to the tip of a branch\n"
11904
12353
"is made. pre_change_branch_tip is called with a\n"
11905
"bzrlib.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
12354
"breezy.branch.ChangeBranchTipParams. Note that push, pull, commit,\n"
11906
12355
"uncommit will all trigger this hook."
11907
12356
msgstr ""
11908
12357
11972
12421
msgid ""
11973
12422
"Called after creating a command object to allow modifications such as\n"
11974
12423
"adding or removing options, docs etc. Called with the new\n"
11975
"bzrlib.commands.Command object."
12424
"breezy.commands.Command object."
11976
12425
msgstr ""
11977
12426
11978
12427
#: en/help_topics/hooks.txt:170
11992
12441
"command_name). get_command should either return the cmd_or_None\n"
11993
12442
"parameter, or a replacement Command object that should be used for the\n"
11994
12443
"command. Note that the Command.hooks hooks are core infrastructure.\n"
11995
"Many users will prefer to use bzrlib.commands.register_command or\n"
12444
"Many users will prefer to use breezy.commands.register_command or\n"
11996
12445
"plugin_cmds.register_lazy."
11997
12446
msgstr ""
11998
12447
12131
12580
#: en/help_topics/hooks.txt:264
12132
12581
msgid ""
12133
12582
"Invoked after a repository has been initialized. post_repo_init is\n"
12134
"called with a bzrlib.controldir.RepoInitHookParams."
12583
"called with a breezy.controldir.RepoInitHookParams."
12135
12584
msgstr ""
12136
12585
12137
12586
#: en/help_topics/hooks.txt:267
12187
12636
msgstr ""
12188
12637
12189
12638
#: en/help_topics/hooks.txt:295
12190
msgid ""
12191
"Called with a bzrlib.lock.LockResult when a physical lock is acquired."
12639
msgid "Called with a breezy.lock.LockResult when a physical lock is acquired."
12192
12640
msgstr ""
12193
12641
12194
12642
#: en/help_topics/hooks.txt:297
12198
12646
msgstr ""
12199
12647
12200
12648
#: en/help_topics/hooks.txt:302
12201
msgid "Called with a bzrlib.lock.LockResult when a physical lock is broken."
12649
msgid "Called with a breezy.lock.LockResult when a physical lock is broken."
12202
12650
msgstr ""
12203
12651
12204
12652
#: en/help_topics/hooks.txt:304
12208
12656
msgstr ""
12209
12657
12210
12658
#: en/help_topics/hooks.txt:309
12211
msgid ""
12212
"Called with a bzrlib.lock.LockResult when a physical lock is released."
12659
msgid "Called with a breezy.lock.LockResult when a physical lock is released."
12213
12660
msgstr ""
12214
12661
12215
12662
#: en/help_topics/hooks.txt:311
12230
12677
12231
12678
#: en/help_topics/hooks.txt:319
12232
12679
msgid ""
12233
"Called with a bzrlib.merge.Merger object to create a per file merge\n"
12680
"Called with a breezy.merge.Merger object to create a per file merge\n"
12234
12681
"object when starting a merge. Should return either None or a subclass\n"
12235
"of ``bzrlib.merge.AbstractPerFileMerger``. Such objects will then be\n"
12682
"of ``breezy.merge.AbstractPerFileMerger``. Such objects will then be\n"
12236
12683
"called per file that needs to be merged (including when one side has\n"
12237
12684
"deleted the file and the other has changed it). See the\n"
12238
12685
"AbstractPerFileMerger API docs for details on how it is used by merge."
12310
12757
#: en/help_topics/hooks.txt:362
12311
12758
msgid ""
12312
12759
"Called when a commit message is being generated.\n"
12313
"commit_message_template is called with the bzrlib.commit.Commit object\n"
12760
"commit_message_template is called with the breezy.commit.Commit object\n"
12314
12761
"and the message that is known so far. commit_message_template must\n"
12315
12762
"return a new message to use (which could be the same as it was given).\n"
12316
12763
"When there are multiple hooks registered for commit_message_template,\n"
12327
12774
#: en/help_topics/hooks.txt:375
12328
12775
msgid ""
12329
12776
"Set a fixed commit message. set_commit_message is called with the\n"
12330
"bzrlib.commit.Commit object (so you can also change e.g. revision\n"
12777
"breezy.commit.Commit object (so you can also change e.g. revision\n"
12331
12778
"properties by editing commit.builder._revprops) and the message so\n"
12332
12779
"far. set_commit_message must return the message to use or None if it\n"
12333
12780
"should use the message editor as normal."
12358
12805
#: en/help_topics/hooks.txt:397
12359
12806
msgid ""
12360
12807
"Called after a commit is performed on a tree. The hook is called with\n"
12361
"a bzrlib.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12808
"a breezy.mutabletree.PostCommitHookParams object. The mutable tree the\n"
12362
12809
"commit was performed on is available via the mutable_tree attribute of\n"
12363
12810
"that object."
12364
12811
msgstr ""
12397
12844
msgid ""
12398
12845
"Called before a commit is performed on a tree. The start commit hook\n"
12399
12846
"is able to change the tree before the commit takes place. start_commit\n"
12400
"is called with the bzrlib.mutabletree.MutableTree that the commit is\n"
12847
"is called with the breezy.mutabletree.MutableTree that the commit is\n"
12401
12848
"being performed on."
12402
12849
msgstr ""
12403
12850
12420
12867
#: en/help_topics/hooks.txt:436
12421
12868
msgid ""
12422
12869
"Called when the smart client is submitting a request to the smart\n"
12423
"server. Called with a bzrlib.smart.client.CallHookParams object.\n"
12870
"server. Called with a breezy.smart.client.CallHookParams object.\n"
12424
12871
"Streaming request bodies, and responses, are not accessible."
12425
12872
msgstr ""
12426
12873
12736
13183
msgstr ""
12737
13184
12738
13185
#: en/help_topics/patterns.txt:30
12739
msgid ""
12740
"For example, a case insensitive match for ``foo`` may be specified as::"
13186
msgid "For example, a case insensitive match for ``foo`` may be specified as::"
12741
13187
msgstr ""
12742
13188
12743
13189
#: en/help_topics/patterns.txt:32
12751
13197
msgstr ""
12752
13198
12753
13199
#: en/help_topics/patterns.txt:37
12754
msgid ""
12755
".. _Python regular expressions: http://docs.python.org/library/re.html"
13200
msgid ".. _Python regular expressions: http://docs.python.org/library/re.html"
12756
13201
msgstr ""
12757
13202
12758
13203
#: en/help_topics/revisionspec.txt:1
13097
13542
#: en/help_topics/rules.txt:26
13098
13543
msgid ""
13099
13544
"Default rules for all branches are defined in the optional file\n"
13100
"``BZR_HOME/rules``. "
13545
"``BRZ_HOME/rules``. "
13101
13546
msgstr ""
13102
13547
13103
13548
#: en/help_topics/rules.txt:29
13184
13629
13185
13630
#: en/help_topics/url-special-chars.txt:10
13186
13631
msgid ""
13187
"Internally bzr treats all locations as URLs. For any file system paths\n"
13632
"Internally brz treats all locations as URLs. For any file system paths\n"
13188
13633
"that are specified it will automatically determine the appropriate URL\n"
13189
13634
"representation, and escape special characters where necessary."
13190
13635
msgstr ""
13220
13665
#: en/help_topics/url-special-chars.txt:27
13221
13666
msgid ""
13222
13667
" cd /tmp\n"
13223
" bzr log /tmp/%2False\n"
13224
" bzr log %2False\n"
13225
" bzr log file:///tmp/%252False\n"
13226
" bzr log file://localhost/tmp/%252False\n"
13227
" bzr log file:%252False"
13668
" brz log /tmp/%2False\n"
13669
" brz log %2False\n"
13670
" brz log file:///tmp/%252False\n"
13671
" brz log file://localhost/tmp/%252False\n"
13672
" brz log file:%252False"
13228
13673
msgstr ""
13229
13674
13230
13675
#: en/help_topics/url-special-chars.txt:34
13233
13678
13234
13679
#: en/help_topics/url-special-chars.txt:36
13235
13680
msgid ""
13236
" bzr log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13237
" bzr log %252False (refers to a file called /tmp/%252False)"
13681
" brz log file:///tmp/%2False (refers to a file called /tmp/\\/alse)\n"
13682
" brz log %252False (refers to a file called /tmp/%252False)"
13238
13683
msgstr ""
13239
13684
13240
13685
#: en/help_topics/url-special-chars.txt:39
13257
13702
13258
13703
#: en/help_topics/url-special-chars.txt:46
13259
13704
msgid ""
13260
" bzr log foo,branch=bla # path \"foo\" with the segment parameter "
13261
"\"branch\" set to \"bla\"\n"
13262
" bzr log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13263
" bzr log file:foo,branch=bla # path \"foo\" with segment parameter "
13264
"\"branch\" set to \"bla\"\n"
13705
" brz log foo,branch=bla # path \"foo\" with the segment parameter \"branch"
13706
"\" set to \"bla\"\n"
13707
" brz log file:foo%2Cbranch=bla # path \"foo,branch=bla\"\n"
13708
" brz log file:foo,branch=bla # path \"foo\" with segment parameter \"branch"
13709
"\" set to \"bla\"\n"
13265
13710
msgstr ""
13266
13711
13267
13712
#: en/help_topics/urlspec.txt:1
Loggerhead is a web-based interface for Breezy
Version: 2.0.2.dev0