« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6138.2.3
- compare with another revision
- compare with revision 6138.3.12
- download diff
- download tarball
- view history from revision 6138.2.3
- Committer: Jonathan Riddell
- Date: 2011-09-14 11:42:04 UTC
- mto: (6138.3.3 i18n-gettext-more-strings)
- mto: This revision was merged to the branch mainline in revision 6142.
- Revision ID: jriddell@canonical.com-20110914114204-0ruc87tk1wqvtjp3
gettext() on builtin.py's error messages
- files modified:
- bzrlib/builtins.py
added
removed
po/bzr.pot
8
8
msgstr ""
9
9
"Project-Id-Version: bzr\n"
10
10
"Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
11
"POT-Creation-Date: 2011-09-07 15:32+0100\n"
11
"POT-Creation-Date: 2011-09-14 12:41+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
18
18
"Content-Transfer-Encoding: 8bit\n"
19
19
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
20
20
21
#: bzrlib/builtins.py:209
21
#: bzrlib/builtins.py:116 bzrlib/builtins.py:2756
22
#, python-format
23
msgid "Ignoring files outside view. View is %s"
24
msgstr ""
25
26
#: bzrlib/builtins.py:125
27
#, python-format
28
msgid "bzr %s --revision takes exactly one revision identifier"
29
msgstr ""
30
31
#: bzrlib/builtins.py:210
22
32
msgid "Display status summary."
23
33
msgstr ""
24
34
25
#: bzrlib/builtins.py:211
35
#: bzrlib/builtins.py:212
26
36
msgid ""
27
37
"This reports on versioned and unknown files, reporting them\n"
28
38
"grouped by state. Possible states are:"
29
39
msgstr ""
30
40
31
#: bzrlib/builtins.py:214
41
#: bzrlib/builtins.py:215
32
42
msgid ""
33
43
"added\n"
34
44
" Versioned in the working copy but not in the previous revision."
35
45
msgstr ""
36
46
37
#: bzrlib/builtins.py:217
47
#: bzrlib/builtins.py:218
38
48
msgid ""
39
49
"removed\n"
40
50
" Versioned in the previous revision but removed or deleted\n"
41
51
" in the working copy."
42
52
msgstr ""
43
53
44
#: bzrlib/builtins.py:221
54
#: bzrlib/builtins.py:222
45
55
msgid ""
46
56
"renamed\n"
47
57
" Path of this file changed from the previous revision;\n"
49
59
" parent directory was renamed."
50
60
msgstr ""
51
61
52
#: bzrlib/builtins.py:226
62
#: bzrlib/builtins.py:227
53
63
msgid ""
54
64
"modified\n"
55
65
" Text has changed since the previous revision."
56
66
msgstr ""
57
67
58
#: bzrlib/builtins.py:229
68
#: bzrlib/builtins.py:230
59
69
msgid ""
60
70
"kind changed\n"
61
71
" File kind has been changed (e.g. from file to directory)."
62
72
msgstr ""
63
73
64
#: bzrlib/builtins.py:232
74
#: bzrlib/builtins.py:233
65
75
msgid ""
66
76
"unknown\n"
67
77
" Not versioned and not matching an ignore pattern."
68
78
msgstr ""
69
79
70
#: bzrlib/builtins.py:235
80
#: bzrlib/builtins.py:236
71
81
msgid ""
72
82
"Additionally for directories, symlinks and files with a changed\n"
73
83
"executable bit, Bazaar indicates their type using a trailing\n"
75
85
"disabled using the '--no-classify' option."
76
86
msgstr ""
77
87
78
#: bzrlib/builtins.py:240
88
#: bzrlib/builtins.py:241
79
89
msgid ""
80
90
"To see ignored files use 'bzr ignored'. For details on the\n"
81
91
"changes to file texts, use 'bzr diff'."
82
92
msgstr ""
83
93
84
#: bzrlib/builtins.py:243
94
#: bzrlib/builtins.py:244
85
95
msgid ""
86
96
"Note that --short or -S gives status flags for each item, similar\n"
87
97
"to Subversion's status command. To get output similar to svn -q,\n"
88
98
"use bzr status -SV."
89
99
msgstr ""
90
100
91
#: bzrlib/builtins.py:247
101
#: bzrlib/builtins.py:248
92
102
msgid ""
93
103
"If no arguments are specified, the status of the entire working\n"
94
104
"directory is shown. Otherwise, only the status of the specified\n"
96
106
"is reported for everything inside that directory."
97
107
msgstr ""
98
108
99
#: bzrlib/builtins.py:252
109
#: bzrlib/builtins.py:253
100
110
msgid ""
101
111
"Before merges are committed, the pending merge tip revisions are\n"
102
112
"shown. To see all pending merge revisions, use the -v option.\n"
104
114
"the no-pending option or specify a file/directory."
105
115
msgstr ""
106
116
107
#: bzrlib/builtins.py:257
117
#: bzrlib/builtins.py:258
108
118
msgid ""
109
119
"To compare the working directory to a specific revision, pass a\n"
110
120
"single revision to the revision argument."
111
121
msgstr ""
112
122
113
#: bzrlib/builtins.py:260
123
#: bzrlib/builtins.py:261
114
124
msgid ""
115
125
"To see which files have changed in a specific revision, or between\n"
116
126
"two revisions, pass a revision range to the revision argument.\n"
118
128
msgstr ""
119
129
120
130
# help of 'short' option of 'status' command
121
#: bzrlib/builtins.py:269
131
#: bzrlib/builtins.py:270
122
132
msgid "Use short status indicators."
123
133
msgstr ""
124
134
125
135
# help of 'versioned' option of 'status' command
126
#: bzrlib/builtins.py:271
136
#: bzrlib/builtins.py:272
127
137
msgid "Only show versioned files."
128
138
msgstr ""
129
139
130
140
# help of 'no-pending' option of 'status' command
131
#: bzrlib/builtins.py:273
141
#: bzrlib/builtins.py:274
132
142
msgid "Don't show pending merges."
133
143
msgstr ""
134
144
135
145
# help of 'no-classify' option of 'status' command
136
#: bzrlib/builtins.py:276
146
#: bzrlib/builtins.py:277
137
147
msgid "Do not mark object type using indicator."
138
148
msgstr ""
139
149
140
#: bzrlib/builtins.py:455
150
#: bzrlib/builtins.py:292
151
msgid "bzr status --revision takes exactly one or two revision specifiers"
152
msgstr ""
153
154
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4875
155
msgid "You can only supply one of revision_id or --revision"
156
msgstr ""
157
158
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4877
159
msgid "You must supply either --revision or a revision_id"
160
msgstr ""
161
162
#: bzrlib/builtins.py:346
163
#, python-format
164
msgid "Repository %r does not support access to raw revision texts"
165
msgstr ""
166
167
#: bzrlib/builtins.py:357
168
#, python-format
169
msgid "The repository %s contains no revision %s."
170
msgstr ""
171
172
#: bzrlib/builtins.py:364
173
msgid "You cannot specify a NULL revision."
174
msgstr ""
175
176
#: bzrlib/builtins.py:456
141
177
msgid "Remove the working tree from a given branch/checkout."
142
178
msgstr ""
143
179
144
#: bzrlib/builtins.py:457
180
#: bzrlib/builtins.py:458
145
181
msgid ""
146
182
"Since a lightweight checkout is little more than a working tree\n"
147
183
"this will refuse to run against one."
148
184
msgstr ""
149
185
150
#: bzrlib/builtins.py:460
186
#: bzrlib/builtins.py:461
151
187
msgid "To re-create the working tree, use \"bzr checkout\"."
152
188
msgstr ""
153
189
154
190
# help of 'force' option of 'remove-tree' command
155
#: bzrlib/builtins.py:466
191
#: bzrlib/builtins.py:467
156
192
msgid "Remove the working tree even if it has uncommitted or shelved changes."
157
193
msgstr ""
158
194
195
#: bzrlib/builtins.py:481
196
msgid "No working tree to remove"
197
msgstr ""
198
199
#: bzrlib/builtins.py:483
200
msgid "You cannot remove the working tree of a remote path"
201
msgstr ""
202
203
#: bzrlib/builtins.py:492
204
msgid "You cannot remove the working tree from a lightweight checkout"
205
msgstr ""
206
207
#: bzrlib/builtins.py:532
208
msgid ""
209
"The tree does not appear to be corrupt. You probably want \"bzr revert\" "
210
"instead. Use \"--force\" if you are sure you want to reset the working tree."
211
msgstr ""
212
213
#: bzrlib/builtins.py:543
214
msgid ""
215
", the header appears corrupt, try passing -r -1 to set the state to the last "
216
"commit"
217
msgstr ""
218
219
#: bzrlib/builtins.py:547
220
msgid "failed to reset the tree state{0}"
221
msgstr ""
222
159
223
#: bzrlib/builtins.py:551
160
224
msgid "Show current revision number."
161
225
msgstr ""
245
309
msgid "Lookup file ids from this tree."
246
310
msgstr ""
247
311
312
#: bzrlib/builtins.py:726
313
#, python-format
314
msgid "ignored %s matching \"%s\"\n"
315
msgstr ""
316
248
317
#: bzrlib/builtins.py:731
249
318
msgid "Create a new versioned directory."
250
319
msgstr ""
253
322
msgid "This is equivalent to creating the directory and then adding it."
254
323
msgstr ""
255
324
325
#: bzrlib/builtins.py:747
326
#, python-format
327
msgid "added %s\n"
328
msgstr ""
329
330
#: bzrlib/builtins.py:791
331
#, python-format
332
msgid "invalid kind %r specified"
333
msgstr ""
334
256
335
#: bzrlib/builtins.py:828
257
336
msgid "Move or rename a file."
258
337
msgstr ""
298
377
msgid "Avoid making changes when guessing renames."
299
378
msgstr ""
300
379
380
#: bzrlib/builtins.py:861
381
msgid "--dry-run requires --auto."
382
msgstr ""
383
384
#: bzrlib/builtins.py:865
385
msgid "missing file argument"
386
msgstr ""
387
388
#: bzrlib/builtins.py:872
389
msgid "Only one path may be specified to --auto."
390
msgstr ""
391
392
#: bzrlib/builtins.py:875
393
msgid "--after cannot be specified with --auto."
394
msgstr ""
395
396
#: bzrlib/builtins.py:912
397
msgid "to mv multiple files the destination must be a versioned directory"
398
msgstr ""
399
301
400
#: bzrlib/builtins.py:964
302
401
msgid "Turn this branch into a mirror of another branch."
303
402
msgstr ""
357
456
"master branch."
358
457
msgstr ""
359
458
459
#: bzrlib/builtins.py:1026
460
msgid "Need working tree for --show-base."
461
msgstr ""
462
463
#: bzrlib/builtins.py:1042
464
msgid "No pull location known or specified."
465
msgstr ""
466
467
#: bzrlib/builtins.py:1048
468
#, python-format
469
msgid "Using saved parent location: %s\n"
470
msgstr ""
471
472
#: bzrlib/builtins.py:1055 bzrlib/builtins.py:4107
473
msgid "Cannot use -r with merge directives or bundles"
474
msgstr ""
475
360
476
#: bzrlib/builtins.py:1096
361
477
msgid "Update a mirror of this branch."
362
478
msgstr ""
441
557
msgid "Don't populate the working tree, even for protocols that support it."
442
558
msgstr ""
443
559
560
#: bzrlib/builtins.py:1190
561
msgid "Could not determine branch to refer to."
562
msgstr ""
563
564
#: bzrlib/builtins.py:1197
565
msgid "No push location known or specified."
566
msgstr ""
567
568
#: bzrlib/builtins.py:1201
569
#, python-format
570
msgid "Using saved push location: %s"
571
msgstr ""
572
444
573
#: bzrlib/builtins.py:1211
445
574
msgid "Create a new branch that is a copy of an existing branch."
446
575
msgstr ""
500
629
msgid "Bind new branch to from location."
501
630
msgstr ""
502
631
632
#: bzrlib/builtins.py:1290
633
#, python-format
634
msgid "Target directory \"%s\" already exists."
635
msgstr ""
636
637
#: bzrlib/builtins.py:1300
638
#, python-format
639
msgid "Parent of \"%s\" does not exist."
640
msgstr ""
641
642
#: bzrlib/builtins.py:1314
643
#, python-format
644
msgid "The branch %s has no revision %s."
645
msgstr ""
646
647
#: bzrlib/builtins.py:1322
648
#, python-format
649
msgid "Created new stacked branch referring to %s."
650
msgstr ""
651
652
#: bzrlib/builtins.py:1326
653
#, python-format
654
msgid "Branched %d revision(s)."
655
msgstr ""
656
657
#: bzrlib/builtins.py:1331
658
#, python-format
659
msgid "New branch bound to %s"
660
msgstr ""
661
662
#: bzrlib/builtins.py:1336 bzrlib/builtins.py:5916
663
#, python-format
664
msgid "Switched to branch: %s"
665
msgstr ""
666
503
667
#: bzrlib/builtins.py:1341
504
668
msgid "List the branches available at the current location."
505
669
msgstr ""
510
674
"location."
511
675
msgstr ""
512
676
677
#: bzrlib/builtins.py:1352
678
msgid " (default)\n"
679
msgstr ""
680
513
681
#: bzrlib/builtins.py:1358
514
682
msgid "Create a new checkout of an existing branch."
515
683
msgstr ""
600
768
"the branch from the master."
601
769
msgstr ""
602
770
771
#: bzrlib/builtins.py:1489
772
msgid "bzr update --revision takes exactly one revision"
773
msgstr ""
774
775
#: bzrlib/builtins.py:1520
776
#, python-format
777
msgid "Tree is up to date at revision %s of branch %s"
778
msgstr ""
779
780
#: bzrlib/builtins.py:1536
781
#, python-format
782
msgid ""
783
"branch has no revision %s\n"
784
"bzr update --revision only works for a revision in the branch history"
785
msgstr ""
786
787
#: bzrlib/builtins.py:1542
788
#, python-format
789
msgid "Updated to revision %s of branch %s"
790
msgstr ""
791
792
#: bzrlib/builtins.py:1546
793
msgid ""
794
"Your local commits will now show as pending merges with 'bzr status', and "
795
"can be committed with 'bzr commit'."
796
msgstr ""
797
603
798
#: bzrlib/builtins.py:1555
604
799
msgid "Show information about a working tree, branch or repository."
605
800
msgstr ""
676
871
msgid "Deletion Strategy"
677
872
msgstr ""
678
873
874
#: bzrlib/builtins.py:1625
875
msgid "(The --force option is deprecated, rather use --no-backup in future.)"
876
msgstr ""
877
878
#: bzrlib/builtins.py:1642
879
msgid "No matching files."
880
msgstr ""
881
679
882
#: bzrlib/builtins.py:1703
680
883
msgid "Reconcile bzr metadata in a branch."
681
884
msgstr ""
763
966
msgid "Create a branch without a working tree."
764
967
msgstr ""
765
968
969
#: bzrlib/builtins.py:1842
970
#, python-format
971
msgid ""
972
"Parent directory of %s does not exist.\n"
973
"You may supply --create-prefix to create all leading parent directories."
974
msgstr ""
975
976
#: bzrlib/builtins.py:1876
977
msgid ""
978
"This branch format cannot be set to append-revisions-only. Try --default."
979
msgstr ""
980
981
#: bzrlib/builtins.py:1887
982
#, python-format
983
msgid "Created a %s (format: %s)\n"
984
msgstr ""
985
986
#: bzrlib/builtins.py:1895
987
#, python-format
988
msgid "Using shared repository: %s\n"
989
msgstr ""
990
766
991
#: bzrlib/builtins.py:1899
767
992
msgid "Create a shared repository for branches to share storage space."
768
993
msgstr ""
1015
1240
msgid "Diff format"
1016
1241
msgstr ""
1017
1242
1243
#: bzrlib/builtins.py:2093
1244
msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
1245
msgstr ""
1246
1247
#: bzrlib/builtins.py:2097
1248
msgid "bzr diff --revision takes exactly one or two revision specifiers"
1249
msgstr ""
1250
1251
#: bzrlib/builtins.py:2101
1252
msgid "--using and --format are mutually exclusive."
1253
msgstr ""
1254
1018
1255
#: bzrlib/builtins.py:2121
1019
1256
msgid ""
1020
1257
"List files deleted in the working tree.\n"
1031
1268
"directory."
1032
1269
msgstr ""
1033
1270
1271
#: bzrlib/builtins.py:2216
1272
msgid "The limit argument must be an integer."
1273
msgstr ""
1274
1275
#: bzrlib/builtins.py:2224
1276
msgid "The levels argument must be an integer."
1277
msgstr ""
1278
1034
1279
#: bzrlib/builtins.py:2229
1035
1280
msgid "Show historical log for a branch or subset of a branch."
1036
1281
msgstr ""
1376
1621
msgid "Show revisions whose bugs match this expression."
1377
1622
msgstr ""
1378
1623
1624
#: bzrlib/builtins.py:2485
1625
msgid "--exclude-common-ancestry requires -r with two revisions"
1626
msgstr ""
1627
1628
#: bzrlib/builtins.py:2491
1629
msgid "--levels and --include-merges are mutually exclusive"
1630
msgstr ""
1631
1632
#: bzrlib/builtins.py:2498
1633
msgid "--revision and --change are mutually exclusive"
1634
msgstr ""
1635
1636
#: bzrlib/builtins.py:2511
1637
#, python-format
1638
msgid "Path unknown at end or start of revision range: %s"
1639
msgstr ""
1640
1641
#: bzrlib/builtins.py:2628
1642
#, python-format
1643
msgid "bzr %s doesn't accept two revisions in different branches."
1644
msgstr ""
1645
1646
#: bzrlib/builtins.py:2644
1647
#, python-format
1648
msgid "bzr %s --revision takes one or two values."
1649
msgstr ""
1650
1379
1651
#: bzrlib/builtins.py:2689
1380
1652
msgid ""
1381
1653
"List files in a tree.\n"
1412
1684
msgid "List entries of a particular kind: file, directory, symlink."
1413
1685
msgstr ""
1414
1686
1687
#: bzrlib/builtins.py:2721
1688
msgid "invalid kind specified"
1689
msgstr ""
1690
1691
#: bzrlib/builtins.py:2724
1692
msgid "Cannot set both --verbose and --null"
1693
msgstr ""
1694
1695
#: bzrlib/builtins.py:2733
1696
msgid "cannot specify both --from-root and PATH"
1697
msgstr ""
1698
1415
1699
#: bzrlib/builtins.py:2820
1416
1700
msgid "Ignore specified files or patterns."
1417
1701
msgstr ""
1540
1824
msgid "Display the default ignore rules that bzr uses."
1541
1825
msgstr ""
1542
1826
1827
#: bzrlib/builtins.py:2909
1828
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1829
msgstr ""
1830
1831
#: bzrlib/builtins.py:2925
1832
msgid "NAME_PATTERN should not be an absolute path"
1833
msgstr ""
1834
1835
#: bzrlib/builtins.py:2938
1836
#, python-format
1837
msgid ""
1838
"Warning: the following files are version controlled and match your ignore "
1839
"pattern:\n"
1840
"%s\n"
1841
"These files will continue to be version controlled unless you 'bzr remove' "
1842
"them.\n"
1843
msgstr ""
1844
1543
1845
#: bzrlib/builtins.py:2945
1544
1846
msgid "List ignored files and the patterns that matched them."
1545
1847
msgstr ""
1558
1860
msgid " bzr ls --ignored"
1559
1861
msgstr ""
1560
1862
1863
#: bzrlib/builtins.py:2986
1864
#, python-format
1865
msgid "not a valid revision-number: %r"
1866
msgstr ""
1867
1561
1868
#: bzrlib/builtins.py:2993
1562
1869
msgid "Export current or past revision to a destination directory or archive."
1563
1870
msgstr ""
1644
1951
msgid "Apply content filters to display the convenience form."
1645
1952
msgstr ""
1646
1953
1954
#: bzrlib/builtins.py:3079
1955
msgid "bzr cat --revision takes exactly one revision specifier"
1956
msgstr ""
1957
1958
#: bzrlib/builtins.py:3104 bzrlib/builtins.py:3116
1959
#, python-format
1960
msgid "%r is not present in revision %s"
1961
msgstr ""
1962
1647
1963
#: bzrlib/builtins.py:3139
1648
1964
msgid "Commit changes into a new revision."
1649
1965
msgstr ""
1800
2116
"can not be natively represented."
1801
2117
msgstr ""
1802
2118
2119
#: bzrlib/builtins.py:3250
2120
#, python-format
2121
msgid ""
2122
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2123
"default bug tracker using the `bugtracker` option.\n"
2124
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2125
msgstr ""
2126
2127
#: bzrlib/builtins.py:3259
2128
#, python-format
2129
msgid ""
2130
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2131
"for more information on this feature.\n"
2132
"Commit refused."
2133
msgstr ""
2134
2135
#: bzrlib/builtins.py:3268
2136
#, python-format
2137
msgid "Unrecognized bug %s. Commit refused."
2138
msgstr ""
2139
2140
#: bzrlib/builtins.py:3271
2141
#, python-format
2142
msgid ""
2143
"%s\n"
2144
"Commit refused."
2145
msgstr ""
2146
2147
#: bzrlib/builtins.py:3295
2148
msgid "Could not parse --commit-time: "
2149
msgstr ""
2150
2151
#: bzrlib/builtins.py:3335
2152
msgid "please specify either --message or --file"
2153
msgstr ""
2154
2155
#: bzrlib/builtins.py:3364
2156
msgid "please specify a commit message with either --message or --file"
2157
msgstr ""
2158
2159
#: bzrlib/builtins.py:3367
2160
msgid ""
2161
"Empty commit message specified. Please specify a commit message with either "
2162
"--message or --file or leave a blank message with --message \"\"."
2163
msgstr ""
2164
2165
#: bzrlib/builtins.py:3387
2166
msgid ""
2167
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2168
"--unchanged to force an empty commit."
2169
msgstr ""
2170
2171
#: bzrlib/builtins.py:3391
2172
msgid ""
2173
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2174
"resolve FILE\" to resolve."
2175
msgstr ""
2176
2177
#: bzrlib/builtins.py:3395
2178
msgid "Commit refused because there are unknown files in the working tree."
2179
msgstr ""
2180
2181
#: bzrlib/builtins.py:3398
2182
msgid ""
2183
"\n"
2184
"To commit to master branch, run update and then commit.\n"
2185
"You can also pass --local to commit to continue working disconnected."
2186
msgstr ""
2187
1803
2188
#: bzrlib/builtins.py:3406
1804
2189
msgid ""
1805
2190
"Validate working tree structure, branch consistency and repository history."
2000
2385
msgid "Set identity for the current branch instead of globally."
2001
2386
msgstr ""
2002
2387
2388
#: bzrlib/builtins.py:3574
2389
msgid "--email can only be used to display existing identity"
2390
msgstr ""
2391
2003
2392
#: bzrlib/builtins.py:3596
2004
2393
msgid "Print or set the branch nickname."
2005
2394
msgstr ""
2059
2448
msgid "Remove the alias."
2060
2449
msgstr ""
2061
2450
2451
#: bzrlib/builtins.py:3661
2452
msgid "bzr alias --remove expects an alias to remove."
2453
msgstr ""
2454
2455
#: bzrlib/builtins.py:3833
2456
msgid "subunit not available. subunit needs to be installed to use --subunit."
2457
msgstr ""
2458
2459
#: bzrlib/builtins.py:3850
2460
msgid ""
2461
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2462
msgstr ""
2463
2062
2464
#: bzrlib/builtins.py:3897
2063
2465
msgid "Show version of bzr."
2064
2466
msgstr ""
2068
2470
msgid "Print just the version number."
2069
2471
msgstr ""
2070
2472
2473
#: bzrlib/builtins.py:3920
2474
msgid "It sure does!\n"
2475
msgstr ""
2476
2477
#: bzrlib/builtins.py:3944
2478
#, python-format
2479
msgid "merge base is revision %s\n"
2480
msgstr ""
2481
2071
2482
#: bzrlib/builtins.py:3948
2072
2483
msgid "Perform a three-way merge."
2073
2484
msgstr ""
2234
2645
msgid "Select changes interactively."
2235
2646
msgstr ""
2236
2647
2648
#: bzrlib/builtins.py:4075
2649
msgid ""
2650
"Merging into empty branches not currently supported, https://bugs.launchpad."
2651
"net/bzr/+bug/308562"
2652
msgstr ""
2653
2654
#: bzrlib/builtins.py:4102
2655
msgid "Cannot use --uncommitted with bundles or merge directives."
2656
msgstr ""
2657
2658
#: bzrlib/builtins.py:4113
2659
msgid "Cannot use --uncommitted and --revision at the same time."
2660
msgstr ""
2661
2662
#: bzrlib/builtins.py:4133
2663
msgid "merger: "
2664
msgstr ""
2665
2666
#: bzrlib/builtins.py:4135
2667
msgid "Nothing to do."
2668
msgstr ""
2669
2670
#: bzrlib/builtins.py:4139
2671
msgid "Cannot pull individual files"
2672
msgstr ""
2673
2674
#: bzrlib/builtins.py:4147
2675
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2676
msgstr ""
2677
2678
#: bzrlib/builtins.py:4205
2679
#, python-format
2680
msgid "Show-base is not supported for this merge type. %s"
2681
msgstr ""
2682
2683
#: bzrlib/builtins.py:4214
2684
#, python-format
2685
msgid "Conflict reduction is not supported for merge type %s."
2686
msgstr ""
2687
2688
#: bzrlib/builtins.py:4218
2689
msgid "Cannot do conflict reduction and show base."
2690
msgstr ""
2691
2692
#: bzrlib/builtins.py:4329
2693
msgid "No location specified or remembered"
2694
msgstr ""
2695
2696
#: bzrlib/builtins.py:4331
2697
#, python-format
2698
msgid "%s remembered %s location %s"
2699
msgstr ""
2700
2237
2701
#: bzrlib/builtins.py:4337
2238
2702
msgid "Redo a merge."
2239
2703
msgstr ""
2278
2742
msgid "Show base revision text in conflicts."
2279
2743
msgstr ""
2280
2744
2745
#: bzrlib/builtins.py:4375
2746
msgid ""
2747
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2748
"merges."
2749
msgstr ""
2750
2281
2751
#: bzrlib/builtins.py:4431
2282
2752
msgid "Revert files to a previous revision."
2283
2753
msgstr ""
2469
2939
msgid "Show all revisions in addition to the mainline ones."
2470
2940
msgstr ""
2471
2941
2942
#: bzrlib/builtins.py:4639
2943
msgid "No peer location known or specified."
2944
msgstr ""
2945
2946
#: bzrlib/builtins.py:4643
2947
msgid "Using saved parent location: {0}\n"
2948
msgstr ""
2949
2950
#: bzrlib/builtins.py:4676
2951
#, python-format
2952
msgid "You have %d extra revision(s):\n"
2953
msgstr ""
2954
2955
#: bzrlib/builtins.py:4690
2956
#, python-format
2957
msgid "You are missing %d revision(s):\n"
2958
msgstr ""
2959
2960
#: bzrlib/builtins.py:4700
2961
msgid "This branch has no new revisions.\n"
2962
msgstr ""
2963
2964
#: bzrlib/builtins.py:4703
2965
msgid "Other branch has no new revisions.\n"
2966
msgstr ""
2967
2968
#: bzrlib/builtins.py:4708
2969
msgid "Branches are up to date.\n"
2970
msgstr ""
2971
2472
2972
#: bzrlib/builtins.py:4719
2473
2973
msgid "Compress the data within a repository."
2474
2974
msgstr ""
2573
3073
msgid "Show commit date in annotations."
2574
3074
msgstr ""
2575
3075
3076
#: bzrlib/builtins.py:4915
3077
msgid "Cannot sign a range of non-revision-history revisions"
3078
msgstr ""
3079
3080
#: bzrlib/builtins.py:4927
3081
msgid "Please supply either one revision, or a range."
3082
msgstr ""
3083
2576
3084
#: bzrlib/builtins.py:4931
2577
3085
msgid ""
2578
3086
"Convert the current branch into a checkout of the supplied branch.\n"
2592
3100
"that of the master."
2593
3101
msgstr ""
2594
3102
3103
#: bzrlib/builtins.py:4952
3104
msgid "No location supplied. This format does not remember old locations."
3105
msgstr ""
3106
3107
#: bzrlib/builtins.py:4957
3108
msgid "Branch is already bound"
3109
msgstr ""
3110
3111
#: bzrlib/builtins.py:4959
3112
msgid "No location supplied and no previous location known"
3113
msgstr ""
3114
3115
#: bzrlib/builtins.py:4965
3116
msgid "These branches have diverged. Try merging, and then bind again."
3117
msgstr ""
3118
2595
3119
#: bzrlib/builtins.py:4972
2596
3120
msgid "Convert the current checkout into a regular branch."
2597
3121
msgstr ""
2602
3126
"commits will be local only."
2603
3127
msgstr ""
2604
3128
3129
#: bzrlib/builtins.py:4985
3130
msgid "Local branch is not bound"
3131
msgstr ""
3132
2605
3133
#: bzrlib/builtins.py:4989
2606
3134
msgid "Remove the last committed revision."
2607
3135
msgstr ""
2647
3175
msgid "Only remove the commits from the local branch when in a checkout."
2648
3176
msgstr ""
2649
3177
3178
#: bzrlib/builtins.py:5064
3179
msgid "No revisions to uncommit.\n"
3180
msgstr ""
3181
3182
#: bzrlib/builtins.py:5079
3183
msgid "Dry-run, pretending to remove the above revisions.\n"
3184
msgstr ""
3185
3186
#: bzrlib/builtins.py:5082
3187
msgid "The above revision(s) will be removed.\n"
3188
msgstr ""
3189
3190
#: bzrlib/builtins.py:5086
3191
msgid "Uncommit these revisions"
3192
msgstr ""
3193
3194
#: bzrlib/builtins.py:5089
3195
msgid "Canceled\n"
3196
msgstr ""
3197
3198
#: bzrlib/builtins.py:5096
3199
#, python-format
3200
msgid ""
3201
"You can restore the old tip by running:\n"
3202
" bzr pull . -r revid:%s\n"
3203
msgstr ""
3204
2650
3205
#: bzrlib/builtins.py:5101
2651
3206
msgid "Break a dead lock."
2652
3207
msgstr ""
2751
3306
"and all history is preserved."
2752
3307
msgstr ""
2753
3308
3309
#: bzrlib/builtins.py:5250
3310
#, python-format
3311
msgid ""
3312
"Can't join trees because %s doesn't support rich root data.\n"
3313
"You can use bzr upgrade on the repository."
3314
msgstr ""
3315
3316
#: bzrlib/builtins.py:5259 bzrlib/builtins.py:5265
3317
#, python-format
3318
msgid "Cannot join %s. %s"
3319
msgstr ""
3320
2754
3321
#: bzrlib/builtins.py:5270
2755
3322
msgid "Split a subdirectory of a tree into a separate tree."
2756
3323
msgstr ""
2769
3336
"branch. Commits in the top-level tree will not apply to the new subtree."
2770
3337
msgstr ""
2771
3338
3339
#: bzrlib/builtins.py:5356
3340
msgid "No submit branch specified or known"
3341
msgstr ""
3342
3343
#: bzrlib/builtins.py:5364
3344
msgid "No public branch specified or known"
3345
msgstr ""
3346
3347
#: bzrlib/builtins.py:5369
3348
msgid "bzr merge-directive takes at most two one revision identifiers"
3349
msgstr ""
3350
3351
#: bzrlib/builtins.py:5378
3352
msgid "No revisions to bundle."
3353
msgstr ""
3354
2772
3355
#: bzrlib/builtins.py:5397
2773
3356
msgid "Mail or create a merge-directive for submitting changes."
2774
3357
msgstr ""
3004
3587
msgid "Replace existing tags."
3005
3588
msgstr ""
3006
3589
3590
#: bzrlib/builtins.py:5638
3591
msgid "No tag specified to delete."
3592
msgstr ""
3593
3594
#: bzrlib/builtins.py:5640
3595
#, python-format
3596
msgid "Deleted tag %s."
3597
msgstr ""
3598
3599
#: bzrlib/builtins.py:5645
3600
msgid "Tags can only be placed on a single revision, not on a range"
3601
msgstr ""
3602
3603
#: bzrlib/builtins.py:5654
3604
msgid "Please specify a tag name."
3605
msgstr ""
3606
3607
#: bzrlib/builtins.py:5662
3608
#, python-format
3609
msgid "Tag %s already exists for that revision."
3610
msgstr ""
3611
3612
#: bzrlib/builtins.py:5666
3613
#, python-format
3614
msgid "Created tag %s."
3615
msgstr ""
3616
3617
#: bzrlib/builtins.py:5668
3618
#, python-format
3619
msgid "Updated tag %s."
3620
msgstr ""
3621
3007
3622
#: bzrlib/builtins.py:5672
3008
3623
msgid "List tags."
3009
3624
msgstr ""
3047
3662
"If none of these is available, --bind-to must be specified."
3048
3663
msgstr ""
3049
3664
3050
# title of 'target_type' option of 'reconfigure' command
3665
# title of 'tree_type' option of 'reconfigure' command
3051
3666
#: bzrlib/builtins.py:5745
3052
msgid "Target type"
3667
msgid "Tree type"
3053
3668
msgstr ""
3054
3669
3055
# help of 'target_type' option of 'reconfigure' command
3670
# help of 'tree_type' option of 'reconfigure' command
3056
3671
#: bzrlib/builtins.py:5746
3057
msgid "The type to reconfigure the directory to."
3672
msgid "The relation between branch and tree."
3673
msgstr ""
3674
3675
# title of 'repository_type' option of 'reconfigure' command
3676
#: bzrlib/builtins.py:5756
3677
msgid "Repository type"
3678
msgstr ""
3679
3680
# help of 'repository_type' option of 'reconfigure' command
3681
#: bzrlib/builtins.py:5757
3682
msgid "Location fo the repository."
3683
msgstr ""
3684
3685
# title of 'repository_trees' option of 'reconfigure' command
3686
#: bzrlib/builtins.py:5765
3687
msgid "Trees in Repository"
3688
msgstr ""
3689
3690
# help of 'repository_trees' option of 'reconfigure' command
3691
#: bzrlib/builtins.py:5766
3692
msgid "Whether new branches in the repository have trees."
3058
3693
msgstr ""
3059
3694
3060
3695
# help of 'bind-to' option of 'reconfigure' command
3061
#: bzrlib/builtins.py:5761
3696
#: bzrlib/builtins.py:5773
3062
3697
msgid "Branch to bind checkout to."
3063
3698
msgstr ""
3064
3699
3065
3700
# help of 'force' option of 'reconfigure' command
3066
#: bzrlib/builtins.py:5763
3701
#: bzrlib/builtins.py:5775
3067
3702
msgid "Perform reconfiguration even if local changes will be lost."
3068
3703
msgstr ""
3069
3704
3070
3705
# help of 'stacked-on' option of 'reconfigure' command
3071
#: bzrlib/builtins.py:5766
3706
#: bzrlib/builtins.py:5778
3072
3707
msgid "Reconfigure a branch to be stacked on another branch."
3073
3708
msgstr ""
3074
3709
3075
3710
# help of 'unstacked' option of 'reconfigure' command
3076
#: bzrlib/builtins.py:5770
3711
#: bzrlib/builtins.py:5782
3077
3712
msgid ""
3078
3713
"Reconfigure a branch to be unstacked. This may require copying substantial "
3079
3714
"data into it."
3080
3715
msgstr ""
3081
3716
3082
#: bzrlib/builtins.py:5818
3717
#: bzrlib/builtins.py:5792
3718
msgid "Can't use both --stacked-on and --unstacked"
3719
msgstr ""
3720
3721
#: bzrlib/builtins.py:5806
3722
msgid "No target configuration specified"
3723
msgstr ""
3724
3725
#: bzrlib/builtins.py:5841
3083
3726
msgid "Set the branch of a checkout and update."
3084
3727
msgstr ""
3085
3728
3086
#: bzrlib/builtins.py:5820
3729
#: bzrlib/builtins.py:5843
3087
3730
msgid ""
3088
3731
"For lightweight checkouts, this changes the branch being referenced.\n"
3089
3732
"For heavyweight checkouts, this checks that there are no local commits\n"
3091
3734
"of the new location and binds to it."
3092
3735
msgstr ""
3093
3736
3094
#: bzrlib/builtins.py:5825
3737
#: bzrlib/builtins.py:5848
3095
3738
msgid ""
3096
3739
"In both cases, the working tree is updated and uncommitted changes\n"
3097
3740
"are merged. The user can commit or revert these as they desire."
3098
3741
msgstr ""
3099
3742
3100
#: bzrlib/builtins.py:5828
3743
#: bzrlib/builtins.py:5851
3101
3744
msgid "Pending merges need to be committed or reverted before using switch."
3102
3745
msgstr ""
3103
3746
3104
#: bzrlib/builtins.py:5830
3747
#: bzrlib/builtins.py:5853
3105
3748
msgid ""
3106
3749
"The path to the branch to switch to can be specified relative to the parent\n"
3107
3750
"directory of the current branch. For example, if you are currently in a\n"
3109
3752
"/path/to/newbranch."
3110
3753
msgstr ""
3111
3754
3112
#: bzrlib/builtins.py:5835
3755
#: bzrlib/builtins.py:5858
3113
3756
msgid ""
3114
3757
"Bound branches use the nickname of its master branch unless it is set\n"
3115
3758
"locally, in which case switching will update the local nickname to be\n"
3117
3760
msgstr ""
3118
3761
3119
3762
# help of 'force' option of 'switch' command
3120
#: bzrlib/builtins.py:5843
3763
#: bzrlib/builtins.py:5866
3121
3764
msgid "Switch even if local commits will be lost."
3122
3765
msgstr ""
3123
3766
3124
3767
# help of 'create-branch' option of 'switch' command
3125
#: bzrlib/builtins.py:5846
3768
#: bzrlib/builtins.py:5869
3126
3769
msgid "Create the target branch from this one before switching to it."
3127
3770
msgstr ""
3128
3771
3129
#: bzrlib/builtins.py:5915
3772
#: bzrlib/builtins.py:5881
3773
msgid "You must supply either a revision or a location"
3774
msgstr ""
3775
3776
#: bzrlib/builtins.py:5892
3777
msgid "cannot create branch without source branch"
3778
msgstr ""
3779
3780
#: bzrlib/builtins.py:5938
3130
3781
msgid "Manage filtered views."
3131
3782
msgstr ""
3132
3783
3133
#: bzrlib/builtins.py:5917
3784
#: bzrlib/builtins.py:5940
3134
3785
msgid ""
3135
3786
"Views provide a mask over the tree so that users can focus on\n"
3136
3787
"a subset of a tree when doing their work. After creating a view,\n"
3140
3791
"must be within the current view."
3141
3792
msgstr ""
3142
3793
3143
#: bzrlib/builtins.py:5924
3794
#: bzrlib/builtins.py:5947
3144
3795
msgid ""
3145
3796
"In most cases, a view has a short life-span: it is created to make\n"
3146
3797
"a selected change and is deleted once that change is committed.\n"
3148
3799
"and switch between them."
3149
3800
msgstr ""
3150
3801
3151
#: bzrlib/builtins.py:5929
3802
#: bzrlib/builtins.py:5952
3152
3803
msgid ""
3153
3804
"To disable the current view without deleting it, you can switch to\n"
3154
3805
"the pseudo view called ``off``. This can be useful when you need\n"
3156
3807
"want to switch back to your view after that."
3157
3808
msgstr ""
3158
3809
3159
#: bzrlib/builtins.py:5934
3810
#: bzrlib/builtins.py:5957
3160
3811
msgid ""
3161
3812
":Examples:\n"
3162
3813
" To define the current view::"
3163
3814
msgstr ""
3164
3815
3165
#: bzrlib/builtins.py:5937
3816
#: bzrlib/builtins.py:5960
3166
3817
msgid " bzr view file1 dir1 ..."
3167
3818
msgstr ""
3168
3819
3169
#: bzrlib/builtins.py:5939
3820
#: bzrlib/builtins.py:5962
3170
3821
msgid " To list the current view::"
3171
3822
msgstr ""
3172
3823
3173
#: bzrlib/builtins.py:5941
3824
#: bzrlib/builtins.py:5964
3174
3825
msgid " bzr view"
3175
3826
msgstr ""
3176
3827
3177
#: bzrlib/builtins.py:5943
3828
#: bzrlib/builtins.py:5966
3178
3829
msgid " To delete the current view::"
3179
3830
msgstr ""
3180
3831
3181
#: bzrlib/builtins.py:5945
3832
#: bzrlib/builtins.py:5968
3182
3833
msgid " bzr view --delete"
3183
3834
msgstr ""
3184
3835
3185
#: bzrlib/builtins.py:5947
3836
#: bzrlib/builtins.py:5970
3186
3837
msgid " To disable the current view without deleting it::"
3187
3838
msgstr ""
3188
3839
3189
#: bzrlib/builtins.py:5949
3840
#: bzrlib/builtins.py:5972
3190
3841
msgid " bzr view --switch off"
3191
3842
msgstr ""
3192
3843
3193
#: bzrlib/builtins.py:5951
3844
#: bzrlib/builtins.py:5974
3194
3845
msgid " To define a named view and switch to it::"
3195
3846
msgstr ""
3196
3847
3197
#: bzrlib/builtins.py:5953
3848
#: bzrlib/builtins.py:5976
3198
3849
msgid " bzr view --name view-name file1 dir1 ..."
3199
3850
msgstr ""
3200
3851
3201
#: bzrlib/builtins.py:5955
3852
#: bzrlib/builtins.py:5978
3202
3853
msgid " To list a named view::"
3203
3854
msgstr ""
3204
3855
3205
#: bzrlib/builtins.py:5957
3856
#: bzrlib/builtins.py:5980
3206
3857
msgid " bzr view --name view-name"
3207
3858
msgstr ""
3208
3859
3209
#: bzrlib/builtins.py:5959
3860
#: bzrlib/builtins.py:5982
3210
3861
msgid " To delete a named view::"
3211
3862
msgstr ""
3212
3863
3213
#: bzrlib/builtins.py:5961
3864
#: bzrlib/builtins.py:5984
3214
3865
msgid " bzr view --name view-name --delete"
3215
3866
msgstr ""
3216
3867
3217
#: bzrlib/builtins.py:5963
3868
#: bzrlib/builtins.py:5986
3218
3869
msgid " To switch to a named view::"
3219
3870
msgstr ""
3220
3871
3221
#: bzrlib/builtins.py:5965
3872
#: bzrlib/builtins.py:5988
3222
3873
msgid " bzr view --switch view-name"
3223
3874
msgstr ""
3224
3875
3225
#: bzrlib/builtins.py:5967
3876
#: bzrlib/builtins.py:5990
3226
3877
msgid " To list all views defined::"
3227
3878
msgstr ""
3228
3879
3229
#: bzrlib/builtins.py:5969
3880
#: bzrlib/builtins.py:5992
3230
3881
msgid " bzr view --all"
3231
3882
msgstr ""
3232
3883
3233
#: bzrlib/builtins.py:5971
3884
#: bzrlib/builtins.py:5994
3234
3885
msgid " To delete all views::"
3235
3886
msgstr ""
3236
3887
3237
#: bzrlib/builtins.py:5973
3888
#: bzrlib/builtins.py:5996
3238
3889
msgid " bzr view --delete --all"
3239
3890
msgstr ""
3240
3891
3241
3892
# help of 'all' option of 'view' command
3242
#: bzrlib/builtins.py:5980
3893
#: bzrlib/builtins.py:6003
3243
3894
msgid "Apply list or delete action to all views."
3244
3895
msgstr ""
3245
3896
3246
3897
# help of 'delete' option of 'view' command
3247
#: bzrlib/builtins.py:5983
3898
#: bzrlib/builtins.py:6006
3248
3899
msgid "Delete the view."
3249
3900
msgstr ""
3250
3901
3251
3902
# help of 'name' option of 'view' command
3252
#: bzrlib/builtins.py:5986
3903
#: bzrlib/builtins.py:6009
3253
3904
msgid "Name of the view to define, list or delete."
3254
3905
msgstr ""
3255
3906
3256
3907
# help of 'switch' option of 'view' command
3257
#: bzrlib/builtins.py:5990
3908
#: bzrlib/builtins.py:6013
3258
3909
msgid "Name of the view to switch to."
3259
3910
msgstr ""
3260
3911
3261
#: bzrlib/builtins.py:6090
3912
#: bzrlib/builtins.py:6032
3913
msgid "Both --delete and a file list specified"
3914
msgstr ""
3915
3916
#: bzrlib/builtins.py:6035
3917
msgid "Both --delete and --switch specified"
3918
msgstr ""
3919
3920
#: bzrlib/builtins.py:6038
3921
msgid "Deleted all views.\n"
3922
msgstr ""
3923
3924
#: bzrlib/builtins.py:6040
3925
msgid "No current view to delete"
3926
msgstr ""
3927
3928
#: bzrlib/builtins.py:6043
3929
#, python-format
3930
msgid "Deleted '%s' view.\n"
3931
msgstr ""
3932
3933
#: bzrlib/builtins.py:6047
3934
msgid "Both --switch and a file list specified"
3935
msgstr ""
3936
3937
#: bzrlib/builtins.py:6050
3938
msgid "Both --switch and --all specified"
3939
msgstr ""
3940
3941
#: bzrlib/builtins.py:6053
3942
msgid "No current view to disable"
3943
msgstr ""
3944
3945
#: bzrlib/builtins.py:6055
3946
#, python-format
3947
msgid "Disabled '%s' view.\n"
3948
msgstr ""
3949
3950
#: bzrlib/builtins.py:6059 bzrlib/builtins.py:6081
3951
#, python-format
3952
msgid "Using '%s' view: %s\n"
3953
msgstr ""
3954
3955
#: bzrlib/builtins.py:6062
3956
msgid "Views defined:\n"
3957
msgstr ""
3958
3959
#: bzrlib/builtins.py:6071
3960
msgid "No views defined.\n"
3961
msgstr ""
3962
3963
#: bzrlib/builtins.py:6078
3964
msgid "Cannot change the 'off' pseudo view"
3965
msgstr ""
3966
3967
#: bzrlib/builtins.py:6086
3968
msgid "No current view.\n"
3969
msgstr ""
3970
3971
#: bzrlib/builtins.py:6089
3972
#, python-format
3973
msgid "'%s' view is: %s\n"
3974
msgstr ""
3975
3976
#: bzrlib/builtins.py:6109
3977
msgid " <no hooks installed>\n"
3978
msgstr ""
3979
3980
#: bzrlib/builtins.py:6113
3262
3981
msgid "Remove a branch."
3263
3982
msgstr ""
3264
3983
3265
#: bzrlib/builtins.py:6092
3984
#: bzrlib/builtins.py:6115
3266
3985
msgid ""
3267
3986
"This will remove the branch from the specified location but \n"
3268
3987
"will keep any working tree or repository in place."
3269
3988
msgstr ""
3270
3989
3271
#: bzrlib/builtins.py:6097
3990
#: bzrlib/builtins.py:6120
3272
3991
msgid " Remove the branch at repo/trunk::"
3273
3992
msgstr ""
3274
3993
3275
#: bzrlib/builtins.py:6099
3994
#: bzrlib/builtins.py:6122
3276
3995
msgid " bzr remove-branch repo/trunk"
3277
3996
msgstr ""
3278
3997
3279
#: bzrlib/builtins.py:6115
3998
#: bzrlib/builtins.py:6138
3280
3999
msgid "Temporarily set aside some changes from the current tree."
3281
4000
msgstr ""
3282
4001
3283
#: bzrlib/builtins.py:6117
4002
#: bzrlib/builtins.py:6140
3284
4003
msgid ""
3285
4004
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
3286
4005
"ie. out of the way, until a later time when you can bring them back from\n"
3289
4008
"will they survive its deletion."
3290
4009
msgstr ""
3291
4010
3292
#: bzrlib/builtins.py:6123
4011
#: bzrlib/builtins.py:6146
3293
4012
msgid "If shelve --list is specified, previously-shelved changes are listed."
3294
4013
msgstr ""
3295
4014
3296
#: bzrlib/builtins.py:6125
4015
#: bzrlib/builtins.py:6148
3297
4016
msgid ""
3298
4017
"Shelve is intended to help separate several sets of changes that have\n"
3299
4018
"been inappropriately mingled. If you just want to get rid of all changes\n"
3301
4020
"shelve all text changes at once, use shelve --all."
3302
4021
msgstr ""
3303
4022
3304
#: bzrlib/builtins.py:6130
4023
#: bzrlib/builtins.py:6153
3305
4024
msgid ""
3306
4025
"If filenames are specified, only the changes to those files will be\n"
3307
4026
"shelved. Other files will be left untouched."
3308
4027
msgstr ""
3309
4028
3310
#: bzrlib/builtins.py:6133
4029
#: bzrlib/builtins.py:6156
3311
4030
msgid ""
3312
4031
"If a revision is specified, changes since that revision will be shelved."
3313
4032
msgstr ""
3314
4033
3315
#: bzrlib/builtins.py:6135
4034
#: bzrlib/builtins.py:6158
3316
4035
msgid ""
3317
4036
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
3318
4037
"restore the most recently shelved changes."
3319
4038
msgstr ""
3320
4039
3321
#: bzrlib/builtins.py:6138
4040
#: bzrlib/builtins.py:6161
3322
4041
msgid ""
3323
4042
"For complicated changes, it is possible to edit the changes in a separate\n"
3324
4043
"editor program to decide what the file remaining in the working copy\n"
3325
4044
"should look like. To do this, add the configuration option"
3326
4045
msgstr ""
3327
4046
3328
#: bzrlib/builtins.py:6142
4047
#: bzrlib/builtins.py:6165
3329
4048
msgid " change_editor = PROGRAM @new_path @old_path"
3330
4049
msgstr ""
3331
4050
3332
#: bzrlib/builtins.py:6144
4051
#: bzrlib/builtins.py:6167
3333
4052
msgid ""
3334
4053
"where @new_path is replaced with the path of the new version of the \n"
3335
4054
"file and @old_path is replaced with the path of the old version of \n"
3339
4058
msgstr ""
3340
4059
3341
4060
# help of 'all' option of 'shelve' command
3342
#: bzrlib/builtins.py:6156
4061
#: bzrlib/builtins.py:6179
3343
4062
msgid "Shelve all changes."
3344
4063
msgstr ""
3345
4064
3346
4065
# help of 'writer' option of 'shelve' command
3347
#: bzrlib/builtins.py:6158
4066
#: bzrlib/builtins.py:6181
3348
4067
msgid "Method to use for writing diffs."
3349
4068
msgstr ""
3350
4069
3351
4070
# title of 'writer' option of 'shelve' command
3352
#: bzrlib/builtins.py:6158
4071
#: bzrlib/builtins.py:6181
3353
4072
msgid "writer"
3354
4073
msgstr ""
3355
4074
3356
4075
# help of 'list' option of 'shelve' command
3357
#: bzrlib/builtins.py:6162
4076
#: bzrlib/builtins.py:6185
3358
4077
msgid "List shelved changes."
3359
4078
msgstr ""
3360
4079
3361
4080
# help of 'destroy' option of 'shelve' command
3362
#: bzrlib/builtins.py:6164
4081
#: bzrlib/builtins.py:6187
3363
4082
msgid "Destroy removed changes instead of shelving them."
3364
4083
msgstr ""
3365
4084
3366
#: bzrlib/builtins.py:6204
4085
#: bzrlib/builtins.py:6216
4086
msgid "No shelved changes."
4087
msgstr ""
4088
4089
#: bzrlib/builtins.py:6227
3367
4090
msgid "Restore shelved changes."
3368
4091
msgstr ""
3369
4092
3370
#: bzrlib/builtins.py:6206
4093
#: bzrlib/builtins.py:6229
3371
4094
msgid ""
3372
4095
"By default, the most recently shelved changes are restored. However if you\n"
3373
4096
"specify a shelf by id those changes will be restored instead. This works\n"
3375
4098
msgstr ""
3376
4099
3377
4100
# help of 'action' option of 'unshelve' command
3378
#: bzrlib/builtins.py:6215
4101
#: bzrlib/builtins.py:6238
3379
4102
msgid "The action to perform."
3380
4103
msgstr ""
3381
4104
3382
#: bzrlib/builtins.py:6237
4105
#: bzrlib/builtins.py:6260
3383
4106
msgid "Remove unwanted files from working tree."
3384
4107
msgstr ""
3385
4108
3386
#: bzrlib/builtins.py:6239
4109
#: bzrlib/builtins.py:6262
3387
4110
msgid ""
3388
4111
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
3389
4112
"files are never deleted."
3390
4113
msgstr ""
3391
4114
3392
#: bzrlib/builtins.py:6242
4115
#: bzrlib/builtins.py:6265
3393
4116
msgid ""
3394
4117
"Another class is 'detritus', which includes files emitted by bzr during\n"
3395
4118
"normal operations and selftests. (The value of these files decreases with\n"
3396
4119
"time.)"
3397
4120
msgstr ""
3398
4121
3399
#: bzrlib/builtins.py:6246
4122
#: bzrlib/builtins.py:6269
3400
4123
msgid ""
3401
4124
"If no options are specified, unknown files are deleted. Otherwise, option\n"
3402
4125
"flags are respected, and may be combined."
3403
4126
msgstr ""
3404
4127
3405
#: bzrlib/builtins.py:6249
4128
#: bzrlib/builtins.py:6272
3406
4129
msgid "To check what clean-tree will do, use --dry-run."
3407
4130
msgstr ""
3408
4131
3409
4132
# help of 'ignored' option of 'clean-tree' command
3410
#: bzrlib/builtins.py:6252
4133
#: bzrlib/builtins.py:6275
3411
4134
msgid "Delete all ignored files."
3412
4135
msgstr ""
3413
4136
3414
4137
# help of 'detritus' option of 'clean-tree' command
3415
#: bzrlib/builtins.py:6253
4138
#: bzrlib/builtins.py:6276
3416
4139
msgid ""
3417
4140
"Delete conflict files, merge and revert backups, and failed selftest dirs."
3418
4141
msgstr ""
3419
4142
3420
4143
# help of 'unknown' option of 'clean-tree' command
3421
#: bzrlib/builtins.py:6256
4144
#: bzrlib/builtins.py:6279
3422
4145
msgid "Delete files unknown to bzr (default)."
3423
4146
msgstr ""
3424
4147
3425
4148
# help of 'dry-run' option of 'clean-tree' command
3426
#: bzrlib/builtins.py:6257
4149
#: bzrlib/builtins.py:6280
3427
4150
msgid "Show files to delete instead of deleting them."
3428
4151
msgstr ""
3429
4152
3430
4153
# help of 'force' option of 'clean-tree' command
3431
#: bzrlib/builtins.py:6259
4154
#: bzrlib/builtins.py:6282
3432
4155
msgid "Do not prompt before deleting."
3433
4156
msgstr ""
3434
4157
3599
4322
msgid "All commits signed with verifiable keys"
3600
4323
msgstr ""
3601
4324
3602
#: bzrlib/config.py:3277
4325
#: bzrlib/config.py:3293
3603
4326
msgid "Display, set or remove a configuration option."
3604
4327
msgstr ""
3605
4328
3606
#: bzrlib/config.py:3279
4329
#: bzrlib/config.py:3295
3607
4330
msgid "Display the active value for a given option."
3608
4331
msgstr ""
3609
4332
3610
#: bzrlib/config.py:3281
4333
#: bzrlib/config.py:3297
3611
4334
msgid ""
3612
4335
"If --all is specified, NAME is interpreted as a regular expression and all\n"
3613
4336
"matching options are displayed mentioning their scope. The active value\n"
3614
4337
"that bzr will take into account is the first one displayed for each option."
3615
4338
msgstr ""
3616
4339
3617
#: bzrlib/config.py:3285
4340
#: bzrlib/config.py:3301
3618
4341
msgid "If no NAME is given, --all .* is implied."
3619
4342
msgstr ""
3620
4343
3621
#: bzrlib/config.py:3287
4344
#: bzrlib/config.py:3303
3622
4345
msgid ""
3623
4346
"Setting a value is achieved by using name=value without spaces. The value\n"
3624
4347
"is set in the most relevant scope and can be checked by displaying the\n"
3626
4349
msgstr ""
3627
4350
3628
4351
# help of 'scope' option of 'config' command
3629
#: bzrlib/config.py:3298
4352
#: bzrlib/config.py:3314
3630
4353
msgid "Reduce the scope to the specified configuration file"
3631
4354
msgstr ""
3632
4355
3633
4356
# help of 'all' option of 'config' command
3634
#: bzrlib/config.py:3302
4357
#: bzrlib/config.py:3318
3635
4358
msgid "Display all the defined values for the matching options."
3636
4359
msgstr ""
3637
4360
3638
4361
# help of 'remove' option of 'config' command
3639
#: bzrlib/config.py:3304
4362
#: bzrlib/config.py:3320
3640
4363
msgid "Remove the option from the configuration file"
3641
4364
msgstr ""
3642
4365
4899
5622
"%(arguments)s."
4900
5623
msgstr ""
4901
5624
4902
#: bzrlib/gpg.py:126 bzrlib/gpg.py:464
5625
#: bzrlib/gpg.py:116 bzrlib/gpg.py:454
4903
5626
msgid "{0} commits with valid signatures"
4904
5627
msgstr ""
4905
5628
4906
#: bzrlib/gpg.py:130 bzrlib/gpg.py:469
5629
#: bzrlib/gpg.py:120 bzrlib/gpg.py:459
4907
5630
msgid "{0} commit with unknown key"
4908
5631
msgid_plural "{0} commits with unknown keys"
4909
5632
msgstr[0] ""
4910
5633
msgstr[1] ""
4911
5634
4912
#: bzrlib/gpg.py:136 bzrlib/gpg.py:476
5635
#: bzrlib/gpg.py:126 bzrlib/gpg.py:466
4913
5636
msgid "{0} commit not valid"
4914
5637
msgid_plural "{0} commits not valid"
4915
5638
msgstr[0] ""
4916
5639
msgstr[1] ""
4917
5640
4918
#: bzrlib/gpg.py:142 bzrlib/gpg.py:483
5641
#: bzrlib/gpg.py:132 bzrlib/gpg.py:473
4919
5642
msgid "{0} commit not signed"
4920
5643
msgid_plural "{0} commits not signed"
4921
5644
msgstr[0] ""
4922
5645
msgstr[1] ""
4923
5646
4924
#: bzrlib/gpg.py:148 bzrlib/gpg.py:490
5647
#: bzrlib/gpg.py:138 bzrlib/gpg.py:480
4925
5648
msgid "{0} commit with key now expired"
4926
5649
msgid_plural "{0} commits with key now expired"
4927
5650
msgstr[0] ""
4928
5651
msgstr[1] ""
4929
5652
4930
#: bzrlib/gpg.py:346
4931
msgid "No GnuPG key results for pattern: {}"
5653
#: bzrlib/gpg.py:336
5654
msgid "No GnuPG key results for pattern: {0}"
4932
5655
msgstr ""
4933
5656
4934
#: bzrlib/gpg.py:389
5657
#: bzrlib/gpg.py:379
4935
5658
msgid "{0} signed {1} commit"
4936
5659
msgid_plural "{0} signed {1} commits"
4937
5660
msgstr[0] ""
4938
5661
msgstr[1] ""
4939
5662
4940
#: bzrlib/gpg.py:406 bzrlib/gpg.py:422
5663
#: bzrlib/gpg.py:396 bzrlib/gpg.py:412
4941
5664
msgid "{0} commit by author {1}"
4942
5665
msgid_plural "{0} commits by author {1}"
4943
5666
msgstr[0] ""
4944
5667
msgstr[1] ""
4945
5668
4946
#: bzrlib/gpg.py:436
5669
#: bzrlib/gpg.py:426
4947
5670
msgid "Unknown key {0} signed {1} commit"
4948
5671
msgid_plural "Unknown key {0} signed {1} commits"
4949
5672
msgstr[0] ""
4950
5673
msgstr[1] ""
4951
5674
4952
#: bzrlib/gpg.py:454
5675
#: bzrlib/gpg.py:444
4953
5676
msgid "{0} commit by author {1} with key {2} now expired"
4954
5677
msgid_plural "{0} commits by author {1} with key {2} now expired"
4955
5678
msgstr[0] ""
4956
5679
msgstr[1] ""
4957
5680
4958
5681
# help of 'help' option
4959
#: bzrlib/option.py:515
5682
#: bzrlib/option.py:530
4960
5683
msgid "Show help message."
4961
5684
msgstr ""
4962
5685
4963
5686
# help of 'usage' option
4964
#: bzrlib/option.py:517
5687
#: bzrlib/option.py:532
4965
5688
msgid "Show usage message and options."
4966
5689
msgstr ""
4967
5690
4968
5691
# help of 'verbose' option
4969
#: bzrlib/option.py:519
5692
#: bzrlib/option.py:534
4970
5693
msgid "Display more information."
4971
5694
msgstr ""
4972
5695
4973
5696
# help of 'quiet' option
4974
#: bzrlib/option.py:522
5697
#: bzrlib/option.py:537
4975
5698
msgid "Only display errors and warnings."
4976
5699
msgstr ""
4977
5700
4978
5701
# help of 'overwrite' option
4979
#: bzrlib/option.py:527
5702
#: bzrlib/option.py:542
4980
5703
msgid "Ignore differences between branches and overwrite unconditionally."
4981
5704
msgstr ""
4982
5705
4983
5706
# help of 'message' option
4984
#: bzrlib/option.py:538
5707
#: bzrlib/option.py:553
4985
5708
msgid "Message string."
4986
5709
msgstr ""
4987
5710
4988
5711
# help of 'null' option
4989
#: bzrlib/option.py:541
5712
#: bzrlib/option.py:556
4990
5713
msgid "Use an ASCII NUL (\\0) separator rather than a newline."
4991
5714
msgstr ""
4992
5715
4993
5716
# help of 'profile' option
4994
#: bzrlib/option.py:544
5717
#: bzrlib/option.py:559
4995
5718
msgid "Show performance profiling information."
4996
5719
msgstr ""
4997
5720
4998
5721
# help of 'revision' option
4999
#: bzrlib/option.py:548
5722
#: bzrlib/option.py:563
5000
5723
msgid "See \"help revisionspec\" for details."
5001
5724
msgstr ""
5002
5725
5003
5726
# help of 'change' option
5004
#: bzrlib/option.py:553
5727
#: bzrlib/option.py:568
5005
5728
msgid ""
5006
5729
"Select changes introduced by the specified revision. See also \"help "
5007
5730
"revisionspec\"."
5008
5731
msgstr ""
5009
5732
5010
5733
# help of 'show-ids' option
5011
#: bzrlib/option.py:555
5734
#: bzrlib/option.py:570
5012
5735
msgid "Show internal object ids."
5013
5736
msgstr ""
5014
5737
5015
5738
# help of 'timezone' option
5016
#: bzrlib/option.py:558
5739
#: bzrlib/option.py:573
5017
5740
msgid "Display timezone as local, original, or utc."
5018
5741
msgstr ""
5019
5742
5020
5743
# help of 'log-format' option
5021
#: bzrlib/option.py:563
5744
#: bzrlib/option.py:578
5022
5745
msgid "Use specified log format."
5023
5746
msgstr ""
5024
5747
5025
5748
# title of 'log-format' option
5026
#: bzrlib/option.py:565
5749
#: bzrlib/option.py:580
5027
5750
msgid "Log format"
5028
5751
msgstr ""
5029
5752
5030
5753
# help of 'long' option
5031
#: bzrlib/option.py:567
5754
#: bzrlib/option.py:582
5032
5755
msgid "Use detailed log format. Same as --log-format long"
5033
5756
msgstr ""
5034
5757
5035
5758
# help of 'short' option
5036
#: bzrlib/option.py:569
5759
#: bzrlib/option.py:584
5037
5760
msgid "Use moderately short log format. Same as --log-format short"
5038
5761
msgstr ""
5039
5762
5040
5763
# help of 'line' option
5041
#: bzrlib/option.py:570
5764
#: bzrlib/option.py:585
5042
5765
msgid "Use log format with one line per revision. Same as --log-format line"
5043
5766
msgstr ""
5044
5767
5045
5768
# help of 'merge-type' option
5046
#: bzrlib/option.py:573
5769
#: bzrlib/option.py:588
5047
5770
msgid "Select a particular merge algorithm."
5048
5771
msgstr ""
5049
5772
5050
5773
# title of 'merge-type' option
5051
#: bzrlib/option.py:575
5774
#: bzrlib/option.py:590
5052
5775
msgid "Merge algorithm"
5053
5776
msgstr ""
5054
5777
5055
5778
# help of 'remember' option
5056
#: bzrlib/option.py:577
5779
#: bzrlib/option.py:592
5057
5780
msgid "Remember the specified location as a default."
5058
5781
msgstr ""
5059
5782
5060
5783
# help of 'reprocess' option
5061
#: bzrlib/option.py:579
5784
#: bzrlib/option.py:594
5062
5785
msgid "Reprocess to reduce spurious conflicts."
5063
5786
msgstr ""
5064
5787
5065
5788
# help of 'dry-run' option
5066
#: bzrlib/option.py:582
5789
#: bzrlib/option.py:597
5067
5790
msgid "Show what would be done, but don't actually do anything."
5068
5791
msgstr ""
5069
5792
5070
5793
# help of 'name-from-revision' option
5071
#: bzrlib/option.py:583
5794
#: bzrlib/option.py:598
5072
5795
msgid "The path name in the old tree."
5073
5796
msgstr ""
5074
5797
5075
5798
# help of 'directory' option
5076
#: bzrlib/option.py:585
5799
#: bzrlib/option.py:600
5077
5800
msgid "Branch to operate on, instead of working directory"
5078
5801
msgstr ""
5079
5802
Loggerhead is a web-based interface for Breezy
Version: 2.0.1