« back to all changes in this revision
Viewing changes to po/bzr.pot
- browse files at revision 6146
- compare with another revision
- compare with revision 6620
- download diff
- download tarball
- view history from revision 6146
- Committer: Patch Queue Manager
- Date: 2011-09-19 12:22:23 UTC
- mfrom: (6143.1.8 i18n-plurals)
- Revision ID: pqm@pqm.ubuntu.com-20110919122223-243tgzmfebanxxbi
(jr) Use ngettext instead of "words(s) with brackets" for plurals (Jonathan
Riddell)
Riddell)
- files modified:
- bzrlib/branch.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-16 16:33+0100\n"
11
"POT-Creation-Date: 2011-09-19 12:02+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"
33
33
34
34
#: bzrlib/branch.py:3140
35
35
#, python-format
36
msgid "%d tag(s) updated."
37
msgstr ""
36
msgid "%d tag updated."
37
msgid_plural "%d tags updated."
38
msgstr[0] ""
39
msgstr[1] ""
38
40
39
41
#: bzrlib/branch.py:3143
40
42
msgid "No new revisions or tags to push."
187
189
msgid "bzr status --revision takes exactly one or two revision specifiers"
188
190
msgstr ""
189
191
190
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4877
192
#: bzrlib/builtins.py:336 bzrlib/builtins.py:4885
191
193
msgid "You can only supply one of revision_id or --revision"
192
194
msgstr ""
193
195
194
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4879
196
#: bzrlib/builtins.py:339 bzrlib/builtins.py:4887
195
197
msgid "You must supply either --revision or a revision_id"
196
198
msgstr ""
197
199
503
505
msgid "Using saved parent location: %s\n"
504
506
msgstr ""
505
507
506
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4109
508
#: bzrlib/builtins.py:1056 bzrlib/builtins.py:4113
507
509
msgid "Cannot use -r with merge directives or bundles"
508
510
msgstr ""
509
511
684
686
685
687
#: bzrlib/builtins.py:1327
686
688
#, python-format
687
msgid "Branched %d revision(s)."
688
msgstr ""
689
msgid "Branched %d revision."
690
msgid_plural "Branched %d revisions."
691
msgstr[0] ""
692
msgstr[1] ""
689
693
690
694
#: bzrlib/builtins.py:1332
691
695
#, python-format
692
696
msgid "New branch bound to %s"
693
697
msgstr ""
694
698
695
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5918
699
#: bzrlib/builtins.py:1337 bzrlib/builtins.py:5926
696
700
#, python-format
697
701
msgid "Switched to branch: %s"
698
702
msgstr ""
1858
1862
msgid "ignore requires at least one NAME_PATTERN or --default-rules."
1859
1863
msgstr ""
1860
1864
1861
#: bzrlib/builtins.py:2927
1865
#: bzrlib/builtins.py:2922
1866
#, python-format
1867
msgid "Invalid ignore pattern found. %s"
1868
msgid_plural "Invalid ignore patterns found. %s"
1869
msgstr[0] ""
1870
msgstr[1] ""
1871
1872
#: bzrlib/builtins.py:2931
1862
1873
msgid "NAME_PATTERN should not be an absolute path"
1863
1874
msgstr ""
1864
1875
1865
#: bzrlib/builtins.py:2940
1876
#: bzrlib/builtins.py:2944
1866
1877
#, python-format
1867
1878
msgid ""
1868
1879
"Warning: the following files are version controlled and match your ignore "
1872
1883
"them.\n"
1873
1884
msgstr ""
1874
1885
1875
#: bzrlib/builtins.py:2947
1886
#: bzrlib/builtins.py:2951
1876
1887
msgid "List ignored files and the patterns that matched them."
1877
1888
msgstr ""
1878
1889
1879
#: bzrlib/builtins.py:2949
1890
#: bzrlib/builtins.py:2953
1880
1891
msgid ""
1881
1892
"List all the ignored files and the ignore pattern that caused the file to\n"
1882
1893
"be ignored."
1883
1894
msgstr ""
1884
1895
1885
#: bzrlib/builtins.py:2952
1896
#: bzrlib/builtins.py:2956
1886
1897
msgid "Alternatively, to list just the files::"
1887
1898
msgstr ""
1888
1899
1889
#: bzrlib/builtins.py:2954
1900
#: bzrlib/builtins.py:2958
1890
1901
msgid " bzr ls --ignored"
1891
1902
msgstr ""
1892
1903
1893
#: bzrlib/builtins.py:2988
1904
#: bzrlib/builtins.py:2992
1894
1905
#, python-format
1895
1906
msgid "not a valid revision-number: %r"
1896
1907
msgstr ""
1897
1908
1898
#: bzrlib/builtins.py:2995
1909
#: bzrlib/builtins.py:2999
1899
1910
msgid "Export current or past revision to a destination directory or archive."
1900
1911
msgstr ""
1901
1912
1902
#: bzrlib/builtins.py:2997
1913
#: bzrlib/builtins.py:3001
1903
1914
msgid "If no revision is specified this exports the last committed revision."
1904
1915
msgstr ""
1905
1916
1906
#: bzrlib/builtins.py:2999
1917
#: bzrlib/builtins.py:3003
1907
1918
msgid ""
1908
1919
"Format may be an \"exporter\" name, such as tar, tgz, tbz2. If none is\n"
1909
1920
"given, try to find the format with the extension. If no extension\n"
1910
1921
"is found exports to a directory (equivalent to --format=dir)."
1911
1922
msgstr ""
1912
1923
1913
#: bzrlib/builtins.py:3003
1924
#: bzrlib/builtins.py:3007
1914
1925
msgid ""
1915
1926
"If root is supplied, it will be used as the root directory inside\n"
1916
1927
"container formats (tar, zip, etc). If it is not supplied it will default\n"
1917
1928
"to the exported filename. The root option has no effect for 'dir' format."
1918
1929
msgstr ""
1919
1930
1920
#: bzrlib/builtins.py:3007
1931
#: bzrlib/builtins.py:3011
1921
1932
msgid ""
1922
1933
"If branch is omitted then the branch containing the current working\n"
1923
1934
"directory will be used."
1924
1935
msgstr ""
1925
1936
1926
#: bzrlib/builtins.py:3010
1937
#: bzrlib/builtins.py:3014
1927
1938
msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
1928
1939
msgstr ""
1929
1940
1930
#: bzrlib/builtins.py:3012
1941
#: bzrlib/builtins.py:3016
1931
1942
msgid ""
1932
1943
" ================= =========================\n"
1933
1944
" Supported formats Autodetected by extension\n"
1941
1952
msgstr ""
1942
1953
1943
1954
# help of 'format' option of 'export' command
1944
#: bzrlib/builtins.py:3026
1955
#: bzrlib/builtins.py:3030
1945
1956
msgid "Type of file to export to."
1946
1957
msgstr ""
1947
1958
1948
1959
# help of 'filters' option of 'export' command
1949
#: bzrlib/builtins.py:3029
1960
#: bzrlib/builtins.py:3033
1950
1961
msgid "Apply content filters to export the convenient form."
1951
1962
msgstr ""
1952
1963
1953
1964
# help of 'root' option of 'export' command
1954
#: bzrlib/builtins.py:3033
1965
#: bzrlib/builtins.py:3037
1955
1966
msgid "Name of the root directory inside the exported file."
1956
1967
msgstr ""
1957
1968
1958
1969
# help of 'per-file-timestamps' option of 'export' command
1959
#: bzrlib/builtins.py:3035
1970
#: bzrlib/builtins.py:3039
1960
1971
msgid ""
1961
1972
"Set modification time of files to that of the last revision in which it was "
1962
1973
"changed."
1963
1974
msgstr ""
1964
1975
1965
#: bzrlib/builtins.py:3055
1976
#: bzrlib/builtins.py:3059
1966
1977
#, python-format
1967
1978
msgid "Unsupported export format: %s"
1968
1979
msgstr ""
1969
1980
1970
#: bzrlib/builtins.py:3059
1981
#: bzrlib/builtins.py:3063
1971
1982
msgid "Write the contents of a file as of a given revision to standard output."
1972
1983
msgstr ""
1973
1984
1974
#: bzrlib/builtins.py:3061
1985
#: bzrlib/builtins.py:3065
1975
1986
msgid "If no revision is nominated, the last revision is used."
1976
1987
msgstr ""
1977
1988
1978
#: bzrlib/builtins.py:3063
1989
#: bzrlib/builtins.py:3067
1979
1990
msgid ""
1980
1991
"Note: Take care to redirect standard output when using this command on a\n"
1981
1992
"binary file."
1982
1993
msgstr ""
1983
1994
1984
1995
# help of 'filters' option of 'cat' command
1985
#: bzrlib/builtins.py:3070
1996
#: bzrlib/builtins.py:3074
1986
1997
msgid "Apply content filters to display the convenience form."
1987
1998
msgstr ""
1988
1999
1989
#: bzrlib/builtins.py:3081
2000
#: bzrlib/builtins.py:3085
1990
2001
msgid "bzr cat --revision takes exactly one revision specifier"
1991
2002
msgstr ""
1992
2003
1993
#: bzrlib/builtins.py:3106 bzrlib/builtins.py:3118
2004
#: bzrlib/builtins.py:3110 bzrlib/builtins.py:3122
1994
2005
msgid "{0!r} is not present in revision {1}"
1995
2006
msgstr ""
1996
2007
1997
#: bzrlib/builtins.py:3141
2008
#: bzrlib/builtins.py:3145
1998
2009
msgid "Commit changes into a new revision."
1999
2010
msgstr ""
2000
2011
2001
#: bzrlib/builtins.py:3143
2012
#: bzrlib/builtins.py:3147
2002
2013
msgid ""
2003
2014
"An explanatory message needs to be given for each commit. This is\n"
2004
2015
"often done by using the --message option (getting the message from the\n"
2008
2019
"boilerplate text loaded into the editor, use the --show-diff option."
2009
2020
msgstr ""
2010
2021
2011
#: bzrlib/builtins.py:3150
2022
#: bzrlib/builtins.py:3154
2012
2023
msgid ""
2013
2024
"By default, the entire tree is committed and the person doing the\n"
2014
2025
"commit is assumed to be the author. These defaults can be overridden\n"
2015
2026
"as explained below."
2016
2027
msgstr ""
2017
2028
2018
#: bzrlib/builtins.py:3154
2029
#: bzrlib/builtins.py:3158
2019
2030
msgid ":Selective commits:"
2020
2031
msgstr ""
2021
2032
2022
#: bzrlib/builtins.py:3156
2033
#: bzrlib/builtins.py:3160
2023
2034
msgid ""
2024
2035
" If selected files are specified, only changes to those files are\n"
2025
2036
" committed. If a directory is specified then the directory and\n"
2026
2037
" everything within it is committed."
2027
2038
msgstr ""
2028
2039
2029
#: bzrlib/builtins.py:3160
2040
#: bzrlib/builtins.py:3164
2030
2041
msgid ""
2031
2042
" When excludes are given, they take precedence over selected files.\n"
2032
2043
" For example, to commit only changes within foo, but not changes\n"
2033
2044
" within foo/bar::"
2034
2045
msgstr ""
2035
2046
2036
#: bzrlib/builtins.py:3164
2047
#: bzrlib/builtins.py:3168
2037
2048
msgid " bzr commit foo -x foo/bar"
2038
2049
msgstr ""
2039
2050
2040
#: bzrlib/builtins.py:3166
2051
#: bzrlib/builtins.py:3170
2041
2052
msgid " A selective commit after a merge is not yet supported."
2042
2053
msgstr ""
2043
2054
2044
#: bzrlib/builtins.py:3168
2055
#: bzrlib/builtins.py:3172
2045
2056
msgid ":Custom authors:"
2046
2057
msgstr ""
2047
2058
2048
#: bzrlib/builtins.py:3170
2059
#: bzrlib/builtins.py:3174
2049
2060
msgid ""
2050
2061
" If the author of the change is not the same person as the committer,\n"
2051
2062
" you can specify the author's name using the --author option. The\n"
2055
2066
" author."
2056
2067
msgstr ""
2057
2068
2058
#: bzrlib/builtins.py:3177
2069
#: bzrlib/builtins.py:3181
2059
2070
msgid ":Checks:"
2060
2071
msgstr ""
2061
2072
2062
#: bzrlib/builtins.py:3179
2073
#: bzrlib/builtins.py:3183
2063
2074
msgid ""
2064
2075
" A common mistake is to forget to add a new file or directory before\n"
2065
2076
" running the commit command. The --strict option checks for unknown\n"
2068
2079
" for details."
2069
2080
msgstr ""
2070
2081
2071
#: bzrlib/builtins.py:3185
2082
#: bzrlib/builtins.py:3189
2072
2083
msgid ":Things to note:"
2073
2084
msgstr ""
2074
2085
2075
#: bzrlib/builtins.py:3187
2086
#: bzrlib/builtins.py:3191
2076
2087
msgid ""
2077
2088
" If you accidentially commit the wrong changes or make a spelling\n"
2078
2089
" mistake in the commit message say, you can use the uncommit command\n"
2079
2090
" to undo it. See ``bzr help uncommit`` for details."
2080
2091
msgstr ""
2081
2092
2082
#: bzrlib/builtins.py:3191
2093
#: bzrlib/builtins.py:3195
2083
2094
msgid ""
2084
2095
" Hooks can also be configured to run after a commit. This allows you\n"
2085
2096
" to trigger updates to external systems like bug trackers. The --fixes\n"
2088
2099
msgstr ""
2089
2100
2090
2101
# help of 'exclude' option of 'commit' command
2091
#: bzrlib/builtins.py:3201
2102
#: bzrlib/builtins.py:3205
2092
2103
msgid "Do not consider changes made to a given path."
2093
2104
msgstr ""
2094
2105
2095
2106
# help of 'message' option of 'commit' command
2096
#: bzrlib/builtins.py:3204
2107
#: bzrlib/builtins.py:3208
2097
2108
msgid "Description of the new revision."
2098
2109
msgstr ""
2099
2110
2100
2111
# help of 'unchanged' option of 'commit' command
2101
#: bzrlib/builtins.py:3207
2112
#: bzrlib/builtins.py:3211
2102
2113
msgid "Commit even if nothing has changed."
2103
2114
msgstr ""
2104
2115
2105
2116
# help of 'file' option of 'commit' command
2106
#: bzrlib/builtins.py:3211
2117
#: bzrlib/builtins.py:3215
2107
2118
msgid "Take commit message from this file."
2108
2119
msgstr ""
2109
2120
2110
2121
# help of 'strict' option of 'commit' command
2111
#: bzrlib/builtins.py:3213
2122
#: bzrlib/builtins.py:3217
2112
2123
msgid "Refuse to commit if there are unknown files in the working tree."
2113
2124
msgstr ""
2114
2125
2115
2126
# help of 'commit-time' option of 'commit' command
2116
#: bzrlib/builtins.py:3216
2127
#: bzrlib/builtins.py:3220
2117
2128
msgid ""
2118
2129
"Manually set a commit time using commit date format, e.g. '2009-10-10 "
2119
2130
"08:00:00 +0100'."
2120
2131
msgstr ""
2121
2132
2122
2133
# help of 'fixes' option of 'commit' command
2123
#: bzrlib/builtins.py:3219
2134
#: bzrlib/builtins.py:3223
2124
2135
msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
2125
2136
msgstr ""
2126
2137
2127
2138
# help of 'author' option of 'commit' command
2128
#: bzrlib/builtins.py:3222
2139
#: bzrlib/builtins.py:3226
2129
2140
msgid "Set the author's name, if it's different from the committer."
2130
2141
msgstr ""
2131
2142
2132
2143
# help of 'local' option of 'commit' command
2133
#: bzrlib/builtins.py:3225
2144
#: bzrlib/builtins.py:3229
2134
2145
msgid ""
2135
2146
"Perform a local commit in a bound branch. Local commits are not pushed to "
2136
2147
"the master branch until a normal commit is performed."
2137
2148
msgstr ""
2138
2149
2139
2150
# help of 'show-diff' option of 'commit' command
2140
#: bzrlib/builtins.py:3231
2151
#: bzrlib/builtins.py:3235
2141
2152
msgid ""
2142
2153
"When no message is supplied, show the diff along with the status summary in "
2143
2154
"the message editor."
2144
2155
msgstr ""
2145
2156
2146
2157
# help of 'lossy' option of 'commit' command
2147
#: bzrlib/builtins.py:3234
2158
#: bzrlib/builtins.py:3238
2148
2159
msgid ""
2149
2160
"When committing to a foreign version control system do not push data that "
2150
2161
"can not be natively represented."
2151
2162
msgstr ""
2152
2163
2153
#: bzrlib/builtins.py:3252
2164
#: bzrlib/builtins.py:3256
2154
2165
#, python-format
2155
2166
msgid ""
2156
2167
"No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
2158
2169
"See \"bzr help bugs\" for more information on this feature. Commit refused."
2159
2170
msgstr ""
2160
2171
2161
#: bzrlib/builtins.py:3261
2172
#: bzrlib/builtins.py:3265
2162
2173
#, python-format
2163
2174
msgid ""
2164
2175
"Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
2166
2177
"Commit refused."
2167
2178
msgstr ""
2168
2179
2169
#: bzrlib/builtins.py:3270
2180
#: bzrlib/builtins.py:3274
2170
2181
#, python-format
2171
2182
msgid "Unrecognized bug %s. Commit refused."
2172
2183
msgstr ""
2173
2184
2174
#: bzrlib/builtins.py:3273
2185
#: bzrlib/builtins.py:3277
2175
2186
#, python-format
2176
2187
msgid ""
2177
2188
"%s\n"
2178
2189
"Commit refused."
2179
2190
msgstr ""
2180
2191
2181
#: bzrlib/builtins.py:3297
2192
#: bzrlib/builtins.py:3301
2182
2193
msgid "Could not parse --commit-time: "
2183
2194
msgstr ""
2184
2195
2185
#: bzrlib/builtins.py:3337
2196
#: bzrlib/builtins.py:3341
2186
2197
msgid "please specify either --message or --file"
2187
2198
msgstr ""
2188
2199
2189
#: bzrlib/builtins.py:3366
2200
#: bzrlib/builtins.py:3370
2190
2201
msgid "please specify a commit message with either --message or --file"
2191
2202
msgstr ""
2192
2203
2193
#: bzrlib/builtins.py:3369
2204
#: bzrlib/builtins.py:3373
2194
2205
msgid ""
2195
2206
"Empty commit message specified. Please specify a commit message with either "
2196
2207
"--message or --file or leave a blank message with --message \"\"."
2197
2208
msgstr ""
2198
2209
2199
#: bzrlib/builtins.py:3389
2210
#: bzrlib/builtins.py:3393
2200
2211
msgid ""
2201
2212
"No changes to commit. Please 'bzr add' the files you want to commit, or use "
2202
2213
"--unchanged to force an empty commit."
2203
2214
msgstr ""
2204
2215
2205
#: bzrlib/builtins.py:3393
2216
#: bzrlib/builtins.py:3397
2206
2217
msgid ""
2207
2218
"Conflicts detected in working tree. Use \"bzr conflicts\" to list, \"bzr "
2208
2219
"resolve FILE\" to resolve."
2209
2220
msgstr ""
2210
2221
2211
#: bzrlib/builtins.py:3397
2222
#: bzrlib/builtins.py:3401
2212
2223
msgid "Commit refused because there are unknown files in the working tree."
2213
2224
msgstr ""
2214
2225
2215
#: bzrlib/builtins.py:3400
2226
#: bzrlib/builtins.py:3404
2216
2227
msgid ""
2217
2228
"\n"
2218
2229
"To commit to master branch, run update and then commit.\n"
2219
2230
"You can also pass --local to commit to continue working disconnected."
2220
2231
msgstr ""
2221
2232
2222
#: bzrlib/builtins.py:3408
2233
#: bzrlib/builtins.py:3412
2223
2234
msgid ""
2224
2235
"Validate working tree structure, branch consistency and repository history."
2225
2236
msgstr ""
2226
2237
2227
#: bzrlib/builtins.py:3410
2238
#: bzrlib/builtins.py:3414
2228
2239
msgid ""
2229
2240
"This command checks various invariants about branch and repository storage\n"
2230
2241
"to detect data corruption or bzr bugs."
2231
2242
msgstr ""
2232
2243
2233
#: bzrlib/builtins.py:3413
2244
#: bzrlib/builtins.py:3417
2234
2245
msgid ""
2235
2246
"The working tree and branch checks will only give output if a problem is\n"
2236
2247
"detected. The output fields of the repository check are:"
2237
2248
msgstr ""
2238
2249
2239
#: bzrlib/builtins.py:3416
2250
#: bzrlib/builtins.py:3420
2240
2251
msgid ""
2241
2252
"revisions\n"
2242
2253
" This is just the number of revisions checked. It doesn't\n"
2243
2254
" indicate a problem."
2244
2255
msgstr ""
2245
2256
2246
#: bzrlib/builtins.py:3420
2257
#: bzrlib/builtins.py:3424
2247
2258
msgid ""
2248
2259
"versionedfiles\n"
2249
2260
" This is just the number of versionedfiles checked. It\n"
2250
2261
" doesn't indicate a problem."
2251
2262
msgstr ""
2252
2263
2253
#: bzrlib/builtins.py:3424
2264
#: bzrlib/builtins.py:3428
2254
2265
msgid ""
2255
2266
"unreferenced ancestors\n"
2256
2267
" Texts that are ancestors of other texts, but\n"
2258
2269
" subtle problem that Bazaar can work around."
2259
2270
msgstr ""
2260
2271
2261
#: bzrlib/builtins.py:3429
2272
#: bzrlib/builtins.py:3433
2262
2273
msgid ""
2263
2274
"unique file texts\n"
2264
2275
" This is the total number of unique file contents\n"
2265
2276
" seen in the checked revisions. It does not indicate a problem."
2266
2277
msgstr ""
2267
2278
2268
#: bzrlib/builtins.py:3433
2279
#: bzrlib/builtins.py:3437
2269
2280
msgid ""
2270
2281
"repeated file texts\n"
2271
2282
" This is the total number of repeated texts seen\n"
2274
2285
" indicate a problem."
2275
2286
msgstr ""
2276
2287
2277
#: bzrlib/builtins.py:3439
2288
#: bzrlib/builtins.py:3443
2278
2289
msgid ""
2279
2290
"If no restrictions are specified, all Bazaar data that is found at the "
2280
2291
"given\n"
2281
2292
"location will be checked."
2282
2293
msgstr ""
2283
2294
2284
#: bzrlib/builtins.py:3442
2295
#: bzrlib/builtins.py:3446
2285
2296
msgid ":Examples:"
2286
2297
msgstr ""
2287
2298
2288
#: bzrlib/builtins.py:3444
2299
#: bzrlib/builtins.py:3448
2289
2300
msgid " Check the tree and branch at 'foo'::"
2290
2301
msgstr ""
2291
2302
2292
#: bzrlib/builtins.py:3446
2303
#: bzrlib/builtins.py:3450
2293
2304
msgid " bzr check --tree --branch foo"
2294
2305
msgstr ""
2295
2306
2296
#: bzrlib/builtins.py:3448
2307
#: bzrlib/builtins.py:3452
2297
2308
msgid " Check only the repository at 'bar'::"
2298
2309
msgstr ""
2299
2310
2300
#: bzrlib/builtins.py:3450
2311
#: bzrlib/builtins.py:3454
2301
2312
msgid " bzr check --repo bar"
2302
2313
msgstr ""
2303
2314
2304
#: bzrlib/builtins.py:3452
2315
#: bzrlib/builtins.py:3456
2305
2316
msgid " Check everything at 'baz'::"
2306
2317
msgstr ""
2307
2318
2308
#: bzrlib/builtins.py:3454
2319
#: bzrlib/builtins.py:3458
2309
2320
msgid " bzr check baz"
2310
2321
msgstr ""
2311
2322
2312
2323
# help of 'branch' option of 'check' command
2313
#: bzrlib/builtins.py:3460
2324
#: bzrlib/builtins.py:3464
2314
2325
msgid "Check the branch related to the current directory."
2315
2326
msgstr ""
2316
2327
2317
2328
# help of 'repo' option of 'check' command
2318
#: bzrlib/builtins.py:3462
2329
#: bzrlib/builtins.py:3466
2319
2330
msgid "Check the repository related to the current directory."
2320
2331
msgstr ""
2321
2332
2322
2333
# help of 'tree' option of 'check' command
2323
#: bzrlib/builtins.py:3464
2334
#: bzrlib/builtins.py:3468
2324
2335
msgid "Check the working tree related to the current directory."
2325
2336
msgstr ""
2326
2337
2327
#: bzrlib/builtins.py:3478
2338
#: bzrlib/builtins.py:3482
2328
2339
msgid "Upgrade a repository, branch or working tree to a newer format."
2329
2340
msgstr ""
2330
2341
2331
#: bzrlib/builtins.py:3480
2342
#: bzrlib/builtins.py:3484
2332
2343
msgid ""
2333
2344
"When the default format has changed after a major new release of\n"
2334
2345
"Bazaar, you may be informed during certain operations that you\n"
2337
2348
"with older repositories or with older versions of Bazaar."
2338
2349
msgstr ""
2339
2350
2340
#: bzrlib/builtins.py:3486
2351
#: bzrlib/builtins.py:3490
2341
2352
msgid ""
2342
2353
"If you wish to upgrade to a particular format rather than the\n"
2343
2354
"current default, that can be specified using the --format option.\n"
2347
2358
"2.x default) so downgrading is not always possible."
2348
2359
msgstr ""
2349
2360
2350
#: bzrlib/builtins.py:3493
2361
#: bzrlib/builtins.py:3497
2351
2362
msgid ""
2352
2363
"A backup.bzr.~#~ directory is created at the start of the conversion\n"
2353
2364
"process (where # is a number). By default, this is left there on\n"
2358
2369
"afterwards."
2359
2370
msgstr ""
2360
2371
2361
#: bzrlib/builtins.py:3501
2372
#: bzrlib/builtins.py:3505
2362
2373
msgid ""
2363
2374
"If the location given is a shared repository, dependent branches\n"
2364
2375
"are also converted provided the repository converts successfully.\n"
2366
2377
"tried."
2367
2378
msgstr ""
2368
2379
2369
#: bzrlib/builtins.py:3506
2380
#: bzrlib/builtins.py:3510
2370
2381
msgid ""
2371
2382
"For more information on upgrades, see the Bazaar Upgrade Guide,\n"
2372
2383
"http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
2373
2384
msgstr ""
2374
2385
2375
2386
# help of 'format' option of 'upgrade' command
2376
#: bzrlib/builtins.py:3514
2387
#: bzrlib/builtins.py:3518
2377
2388
msgid "Upgrade to a specific format. See \"bzr help formats\" for details."
2378
2389
msgstr ""
2379
2390
2380
2391
# title of 'format' option of 'init' command
2381
#: bzrlib/builtins.py:3518
2392
#: bzrlib/builtins.py:3522
2382
2393
msgid "Branch format"
2383
2394
msgstr ""
2384
2395
2385
2396
# help of 'clean' option of 'upgrade' command
2386
#: bzrlib/builtins.py:3520
2397
#: bzrlib/builtins.py:3524
2387
2398
msgid "Remove the backup.bzr directory if successful."
2388
2399
msgstr ""
2389
2400
2390
#: bzrlib/builtins.py:3537
2401
#: bzrlib/builtins.py:3541
2391
2402
msgid "Show or set bzr user id."
2392
2403
msgstr ""
2393
2404
2394
#: bzrlib/builtins.py:3539
2405
#: bzrlib/builtins.py:3543
2395
2406
msgid ""
2396
2407
":Examples:\n"
2397
2408
" Show the email of the current user::"
2398
2409
msgstr ""
2399
2410
2400
#: bzrlib/builtins.py:3542
2411
#: bzrlib/builtins.py:3546
2401
2412
msgid " bzr whoami --email"
2402
2413
msgstr ""
2403
2414
2404
#: bzrlib/builtins.py:3544
2415
#: bzrlib/builtins.py:3548
2405
2416
msgid " Set the current user::"
2406
2417
msgstr ""
2407
2418
2408
#: bzrlib/builtins.py:3546
2419
#: bzrlib/builtins.py:3550
2409
2420
msgid " bzr whoami \"Frank Chu <fchu@example.com>\""
2410
2421
msgstr ""
2411
2422
2412
2423
# help of 'email' option of 'whoami' command
2413
#: bzrlib/builtins.py:3550
2424
#: bzrlib/builtins.py:3554
2414
2425
msgid "Display email address only."
2415
2426
msgstr ""
2416
2427
2417
2428
# help of 'branch' option of 'whoami' command
2418
#: bzrlib/builtins.py:3552
2429
#: bzrlib/builtins.py:3556
2419
2430
msgid "Set identity for the current branch instead of globally."
2420
2431
msgstr ""
2421
2432
2422
#: bzrlib/builtins.py:3576
2433
#: bzrlib/builtins.py:3580
2423
2434
msgid "--email can only be used to display existing identity"
2424
2435
msgstr ""
2425
2436
2426
#: bzrlib/builtins.py:3598
2437
#: bzrlib/builtins.py:3602
2427
2438
msgid "Print or set the branch nickname."
2428
2439
msgstr ""
2429
2440
2430
#: bzrlib/builtins.py:3600
2441
#: bzrlib/builtins.py:3604
2431
2442
msgid ""
2432
2443
"If unset, the tree root directory name is used as the nickname.\n"
2433
2444
"To print the current nickname, execute with no argument."
2434
2445
msgstr ""
2435
2446
2436
#: bzrlib/builtins.py:3603
2447
#: bzrlib/builtins.py:3607
2437
2448
msgid ""
2438
2449
"Bound branches use the nickname of its master branch unless it is set\n"
2439
2450
"locally."
2440
2451
msgstr ""
2441
2452
2442
#: bzrlib/builtins.py:3623
2453
#: bzrlib/builtins.py:3627
2443
2454
msgid "Set/unset and display aliases."
2444
2455
msgstr ""
2445
2456
2446
#: bzrlib/builtins.py:3625
2457
#: bzrlib/builtins.py:3629
2447
2458
msgid ""
2448
2459
":Examples:\n"
2449
2460
" Show the current aliases::"
2450
2461
msgstr ""
2451
2462
2452
#: bzrlib/builtins.py:3628
2463
#: bzrlib/builtins.py:3632
2453
2464
msgid " bzr alias"
2454
2465
msgstr ""
2455
2466
2456
#: bzrlib/builtins.py:3630
2467
#: bzrlib/builtins.py:3634
2457
2468
msgid " Show the alias specified for 'll'::"
2458
2469
msgstr ""
2459
2470
2460
#: bzrlib/builtins.py:3632
2471
#: bzrlib/builtins.py:3636
2461
2472
msgid " bzr alias ll"
2462
2473
msgstr ""
2463
2474
2464
#: bzrlib/builtins.py:3634
2475
#: bzrlib/builtins.py:3638
2465
2476
msgid " Set an alias for 'll'::"
2466
2477
msgstr ""
2467
2478
2468
#: bzrlib/builtins.py:3636
2479
#: bzrlib/builtins.py:3640
2469
2480
msgid " bzr alias ll=\"log --line -r-10..-1\""
2470
2481
msgstr ""
2471
2482
2472
#: bzrlib/builtins.py:3638
2483
#: bzrlib/builtins.py:3642
2473
2484
msgid " To remove an alias for 'll'::"
2474
2485
msgstr ""
2475
2486
2476
#: bzrlib/builtins.py:3640
2487
#: bzrlib/builtins.py:3644
2477
2488
msgid " bzr alias --remove ll"
2478
2489
msgstr ""
2479
2490
2480
2491
# help of 'remove' option of 'alias' command
2481
#: bzrlib/builtins.py:3645
2492
#: bzrlib/builtins.py:3649
2482
2493
msgid "Remove the alias."
2483
2494
msgstr ""
2484
2495
2485
#: bzrlib/builtins.py:3663
2496
#: bzrlib/builtins.py:3667
2486
2497
msgid "bzr alias --remove expects an alias to remove."
2487
2498
msgstr ""
2488
2499
2489
#: bzrlib/builtins.py:3835
2500
#: bzrlib/builtins.py:3839
2490
2501
msgid "subunit not available. subunit needs to be installed to use --subunit."
2491
2502
msgstr ""
2492
2503
2493
#: bzrlib/builtins.py:3852
2504
#: bzrlib/builtins.py:3856
2494
2505
msgid ""
2495
2506
"--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
2496
2507
msgstr ""
2497
2508
2498
#: bzrlib/builtins.py:3899
2509
#: bzrlib/builtins.py:3903
2499
2510
msgid "Show version of bzr."
2500
2511
msgstr ""
2501
2512
2502
2513
# help of 'short' option of 'version' command
2503
#: bzrlib/builtins.py:3903
2514
#: bzrlib/builtins.py:3907
2504
2515
msgid "Print just the version number."
2505
2516
msgstr ""
2506
2517
2507
#: bzrlib/builtins.py:3922
2518
#: bzrlib/builtins.py:3926
2508
2519
msgid "It sure does!\n"
2509
2520
msgstr ""
2510
2521
2511
#: bzrlib/builtins.py:3946
2522
#: bzrlib/builtins.py:3950
2512
2523
#, python-format
2513
2524
msgid "merge base is revision %s\n"
2514
2525
msgstr ""
2515
2526
2516
#: bzrlib/builtins.py:3950
2527
#: bzrlib/builtins.py:3954
2517
2528
msgid "Perform a three-way merge."
2518
2529
msgstr ""
2519
2530
2520
#: bzrlib/builtins.py:3952
2531
#: bzrlib/builtins.py:3956
2521
2532
msgid ""
2522
2533
"The source of the merge can be specified either in the form of a branch,\n"
2523
2534
"or in the form of a path to a file containing a merge directive generated\n"
2528
2539
"the current working tree."
2529
2540
msgstr ""
2530
2541
2531
#: bzrlib/builtins.py:3960
2542
#: bzrlib/builtins.py:3964
2532
2543
msgid ""
2533
2544
"When merging from a branch, by default bzr will try to merge in all new\n"
2534
2545
"work from the other branch, automatically determining an appropriate base\n"
2535
2546
"revision. If this fails, you may need to give an explicit base."
2536
2547
msgstr ""
2537
2548
2538
#: bzrlib/builtins.py:3964
2549
#: bzrlib/builtins.py:3968
2539
2550
msgid ""
2540
2551
"To pick a different ending revision, pass \"--revision OTHER\". bzr will\n"
2541
2552
"try to merge in all new work up to and including revision OTHER."
2542
2553
msgstr ""
2543
2554
2544
#: bzrlib/builtins.py:3967
2555
#: bzrlib/builtins.py:3971
2545
2556
msgid ""
2546
2557
"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
2547
2558
"through OTHER, excluding BASE but including OTHER, will be merged. If this\n"
2552
2563
"changes from the other branch is not stored in the commit."
2553
2564
msgstr ""
2554
2565
2555
#: bzrlib/builtins.py:3975
2566
#: bzrlib/builtins.py:3979
2556
2567
msgid "Revision numbers are always relative to the source branch."
2557
2568
msgstr ""
2558
2569
2559
#: bzrlib/builtins.py:3982
2570
#: bzrlib/builtins.py:3986
2560
2571
msgid "Use bzr resolve when you have fixed a problem. See also bzr conflicts."
2561
2572
msgstr ""
2562
2573
2563
#: bzrlib/builtins.py:3984
2574
#: bzrlib/builtins.py:3988
2564
2575
msgid ""
2565
2576
"If there is no default branch set, the first merge will set it (use\n"
2566
2577
"--no-remember to avoid setting it). After that, you can omit the branch\n"
2568
2579
"only be saved if the remote location can be accessed."
2569
2580
msgstr ""
2570
2581
2571
#: bzrlib/builtins.py:3989
2582
#: bzrlib/builtins.py:3993
2572
2583
msgid ""
2573
2584
"The results of the merge are placed into the destination working\n"
2574
2585
"directory, where they can be reviewed (with bzr diff), tested, and then\n"
2575
2586
"committed to record the result of the merge."
2576
2587
msgstr ""
2577
2588
2578
#: bzrlib/builtins.py:3993
2589
#: bzrlib/builtins.py:3997
2579
2590
msgid ""
2580
2591
"merge refuses to run if there are any uncommitted changes, unless\n"
2581
2592
"--force is given. If --force is given, then the changes from the source \n"
2584
2595
"merge revision which has more than two parents."
2585
2596
msgstr ""
2586
2597
2587
#: bzrlib/builtins.py:3999
2598
#: bzrlib/builtins.py:4003
2588
2599
msgid ""
2589
2600
"If one would like to merge changes from the working tree of the other\n"
2590
2601
"branch without merging any committed revisions, the --uncommitted option\n"
2591
2602
"can be given."
2592
2603
msgstr ""
2593
2604
2594
#: bzrlib/builtins.py:4003
2605
#: bzrlib/builtins.py:4007
2595
2606
msgid ""
2596
2607
"To select only some changes to merge, use \"merge -i\", which will prompt\n"
2597
2608
"you to apply each diff hunk and file change, similar to \"shelve\"."
2598
2609
msgstr ""
2599
2610
2600
#: bzrlib/builtins.py:4006
2611
#: bzrlib/builtins.py:4010
2601
2612
msgid ""
2602
2613
":Examples:\n"
2603
2614
" To merge all new revisions from bzr.dev::"
2604
2615
msgstr ""
2605
2616
2606
#: bzrlib/builtins.py:4009
2617
#: bzrlib/builtins.py:4013
2607
2618
msgid " bzr merge ../bzr.dev"
2608
2619
msgstr ""
2609
2620
2610
#: bzrlib/builtins.py:4011
2621
#: bzrlib/builtins.py:4015
2611
2622
msgid " To merge changes up to and including revision 82 from bzr.dev::"
2612
2623
msgstr ""
2613
2624
2614
#: bzrlib/builtins.py:4013
2625
#: bzrlib/builtins.py:4017
2615
2626
msgid " bzr merge -r 82 ../bzr.dev"
2616
2627
msgstr ""
2617
2628
2618
#: bzrlib/builtins.py:4015
2629
#: bzrlib/builtins.py:4019
2619
2630
msgid " To merge the changes introduced by 82, without previous changes::"
2620
2631
msgstr ""
2621
2632
2622
#: bzrlib/builtins.py:4017
2633
#: bzrlib/builtins.py:4021
2623
2634
msgid " bzr merge -r 81..82 ../bzr.dev"
2624
2635
msgstr ""
2625
2636
2626
#: bzrlib/builtins.py:4019
2637
#: bzrlib/builtins.py:4023
2627
2638
msgid " To apply a merge directive contained in /tmp/merge::"
2628
2639
msgstr ""
2629
2640
2630
#: bzrlib/builtins.py:4021
2641
#: bzrlib/builtins.py:4025
2631
2642
msgid " bzr merge /tmp/merge"
2632
2643
msgstr ""
2633
2644
2634
#: bzrlib/builtins.py:4023
2645
#: bzrlib/builtins.py:4027
2635
2646
msgid ""
2636
2647
" To create a merge revision with three parents from two branches\n"
2637
2648
" feature1a and feature1b:"
2638
2649
msgstr ""
2639
2650
2640
#: bzrlib/builtins.py:4026
2651
#: bzrlib/builtins.py:4030
2641
2652
msgid ""
2642
2653
" bzr merge ../feature1a\n"
2643
2654
" bzr merge ../feature1b --force\n"
2645
2656
msgstr ""
2646
2657
2647
2658
# help of 'force' option of 'merge' command
2648
#: bzrlib/builtins.py:4038
2659
#: bzrlib/builtins.py:4042
2649
2660
msgid "Merge even if the destination tree has uncommitted changes."
2650
2661
msgstr ""
2651
2662
2652
2663
# help of 'uncommitted' option of 'merge' command
2653
#: bzrlib/builtins.py:4044
2664
#: bzrlib/builtins.py:4048
2654
2665
msgid ""
2655
2666
"Apply uncommitted changes from a working copy, instead of branch changes."
2656
2667
msgstr ""
2657
2668
2658
2669
# help of 'pull' option of 'merge' command
2659
#: bzrlib/builtins.py:4046
2670
#: bzrlib/builtins.py:4050
2660
2671
msgid ""
2661
2672
"If the destination is already completely merged into the source, pull from "
2662
2673
"the source rather than merging. When this happens, you do not need to "
2664
2675
msgstr ""
2665
2676
2666
2677
# help of 'directory' option of 'merge' command
2667
#: bzrlib/builtins.py:4051
2678
#: bzrlib/builtins.py:4055
2668
2679
msgid ""
2669
2680
"Branch to merge into, rather than the one containing the working directory."
2670
2681
msgstr ""
2671
2682
2672
2683
# help of 'preview' option of 'merge' command
2673
#: bzrlib/builtins.py:4053
2684
#: bzrlib/builtins.py:4057
2674
2685
msgid "Instead of merging, show a diff of the merge."
2675
2686
msgstr ""
2676
2687
2677
2688
# help of 'interactive' option of 'merge' command
2678
#: bzrlib/builtins.py:4055
2689
#: bzrlib/builtins.py:4059
2679
2690
msgid "Select changes interactively."
2680
2691
msgstr ""
2681
2692
2682
#: bzrlib/builtins.py:4077
2693
#: bzrlib/builtins.py:4081
2683
2694
msgid ""
2684
2695
"Merging into empty branches not currently supported, https://bugs.launchpad."
2685
2696
"net/bzr/+bug/308562"
2686
2697
msgstr ""
2687
2698
2688
#: bzrlib/builtins.py:4104
2699
#: bzrlib/builtins.py:4108
2689
2700
msgid "Cannot use --uncommitted with bundles or merge directives."
2690
2701
msgstr ""
2691
2702
2692
#: bzrlib/builtins.py:4115
2703
#: bzrlib/builtins.py:4119
2693
2704
msgid "Cannot use --uncommitted and --revision at the same time."
2694
2705
msgstr ""
2695
2706
2696
#: bzrlib/builtins.py:4135
2707
#: bzrlib/builtins.py:4139
2697
2708
msgid "merger: "
2698
2709
msgstr ""
2699
2710
2700
#: bzrlib/builtins.py:4137 bzrlib/bundle/apply_bundle.py:67
2711
#: bzrlib/builtins.py:4141 bzrlib/bundle/apply_bundle.py:67
2701
2712
msgid "Nothing to do."
2702
2713
msgstr ""
2703
2714
2704
#: bzrlib/builtins.py:4141
2715
#: bzrlib/builtins.py:4145
2705
2716
msgid "Cannot pull individual files"
2706
2717
msgstr ""
2707
2718
2708
#: bzrlib/builtins.py:4149
2719
#: bzrlib/builtins.py:4153
2709
2720
msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
2710
2721
msgstr ""
2711
2722
2712
#: bzrlib/builtins.py:4207
2723
#: bzrlib/builtins.py:4211
2713
2724
#, python-format
2714
2725
msgid "Show-base is not supported for this merge type. %s"
2715
2726
msgstr ""
2716
2727
2717
#: bzrlib/builtins.py:4216
2728
#: bzrlib/builtins.py:4220
2718
2729
#, python-format
2719
2730
msgid "Conflict reduction is not supported for merge type %s."
2720
2731
msgstr ""
2721
2732
2722
#: bzrlib/builtins.py:4220
2733
#: bzrlib/builtins.py:4224
2723
2734
msgid "Cannot do conflict reduction and show base."
2724
2735
msgstr ""
2725
2736
2726
#: bzrlib/builtins.py:4331
2737
#: bzrlib/builtins.py:4335
2727
2738
msgid "No location specified or remembered"
2728
2739
msgstr ""
2729
2740
2730
#: bzrlib/builtins.py:4333
2741
#: bzrlib/builtins.py:4337
2731
2742
msgid "{0} remembered {1} location {2}"
2732
2743
msgstr ""
2733
2744
2734
#: bzrlib/builtins.py:4339
2745
#: bzrlib/builtins.py:4343
2735
2746
msgid "Redo a merge."
2736
2747
msgstr ""
2737
2748
2738
#: bzrlib/builtins.py:4341
2749
#: bzrlib/builtins.py:4345
2739
2750
msgid ""
2740
2751
"Use this if you want to try a different merge technique while resolving\n"
2741
2752
"conflicts. Some merge techniques are better than others, and remerge\n"
2742
2753
"lets you try different ones on different files."
2743
2754
msgstr ""
2744
2755
2745
#: bzrlib/builtins.py:4345
2756
#: bzrlib/builtins.py:4349
2746
2757
msgid ""
2747
2758
"The options for remerge have the same meaning and defaults as the ones for\n"
2748
2759
"merge. The difference is that remerge can (only) be run when there is a\n"
2749
2760
"pending merge, and it lets you specify particular files."
2750
2761
msgstr ""
2751
2762
2752
#: bzrlib/builtins.py:4349
2763
#: bzrlib/builtins.py:4353
2753
2764
msgid ""
2754
2765
":Examples:\n"
2755
2766
" Re-do the merge of all conflicted files, and show the base text in\n"
2756
2767
" conflict regions, in addition to the usual THIS and OTHER texts::"
2757
2768
msgstr ""
2758
2769
2759
#: bzrlib/builtins.py:4353
2770
#: bzrlib/builtins.py:4357
2760
2771
msgid " bzr remerge --show-base"
2761
2772
msgstr ""
2762
2773
2763
#: bzrlib/builtins.py:4355
2774
#: bzrlib/builtins.py:4359
2764
2775
msgid ""
2765
2776
" Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
2766
2777
" additional processing to reduce the size of conflict regions::"
2767
2778
msgstr ""
2768
2779
2769
#: bzrlib/builtins.py:4358
2780
#: bzrlib/builtins.py:4362
2770
2781
msgid " bzr remerge --merge-type weave --reprocess foobar"
2771
2782
msgstr ""
2772
2783
2773
2784
# help of 'show-base' option of 'merge' command
2774
#: bzrlib/builtins.py:4365
2785
#: bzrlib/builtins.py:4369
2775
2786
msgid "Show base revision text in conflicts."
2776
2787
msgstr ""
2777
2788
2778
#: bzrlib/builtins.py:4377
2789
#: bzrlib/builtins.py:4381
2779
2790
msgid ""
2780
2791
"Sorry, remerge only works after normal merges. Not cherrypicking or multi-"
2781
2792
"merges."
2782
2793
msgstr ""
2783
2794
2784
#: bzrlib/builtins.py:4433
2795
#: bzrlib/builtins.py:4437
2785
2796
msgid "Revert files to a previous revision."
2786
2797
msgstr ""
2787
2798
2788
#: bzrlib/builtins.py:4435
2799
#: bzrlib/builtins.py:4439
2789
2800
msgid ""
2790
2801
"Giving a list of files will revert only those files. Otherwise, all files\n"
2791
2802
"will be reverted. If the revision is not specified with '--revision', the\n"
2792
2803
"last committed revision is used."
2793
2804
msgstr ""
2794
2805
2795
#: bzrlib/builtins.py:4439
2806
#: bzrlib/builtins.py:4443
2796
2807
msgid ""
2797
2808
"To remove only some changes, without reverting to a prior version, use\n"
2798
2809
"merge instead. For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
2801
2812
"certain changes on a hunk-by-hunk basis, see the shelve command."
2802
2813
msgstr ""
2803
2814
2804
#: bzrlib/builtins.py:4445
2815
#: bzrlib/builtins.py:4449
2805
2816
msgid ""
2806
2817
"By default, any files that have been manually changed will be backed up\n"
2807
2818
"first. (Files changed only by merge are not backed up.) Backup files have\n"
2808
2819
"'.~#~' appended to their name, where # is a number."
2809
2820
msgstr ""
2810
2821
2811
#: bzrlib/builtins.py:4449
2822
#: bzrlib/builtins.py:4453
2812
2823
msgid ""
2813
2824
"When you provide files, you can use their current pathname or the pathname\n"
2814
2825
"from the target revision. So you can use revert to \"undelete\" a file by\n"
2816
2827
"reverted."
2817
2828
msgstr ""
2818
2829
2819
#: bzrlib/builtins.py:4454
2830
#: bzrlib/builtins.py:4458
2820
2831
msgid ""
2821
2832
"If you have newly added files since the target revision, they will be\n"
2822
2833
"removed. If the files to be removed have been changed, backups will be\n"
2824
2835
"deleted."
2825
2836
msgstr ""
2826
2837
2827
#: bzrlib/builtins.py:4459
2838
#: bzrlib/builtins.py:4463
2828
2839
msgid ""
2829
2840
"The working tree contains a list of revisions that have been merged but\n"
2830
2841
"not yet committed. These revisions will be included as additional parents\n"
2836
2847
"reverting any files."
2837
2848
msgstr ""
2838
2849
2839
#: bzrlib/builtins.py:4468
2850
#: bzrlib/builtins.py:4472
2840
2851
msgid ""
2841
2852
"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
2842
2853
"changes from a branch in a single revision. To do this, perform the merge\n"
2851
2862
msgstr ""
2852
2863
2853
2864
# help of 'no-backup' option of 'revert' command
2854
#: bzrlib/builtins.py:4482
2865
#: bzrlib/builtins.py:4486
2855
2866
msgid "Do not save backups of reverted files."
2856
2867
msgstr ""
2857
2868
2858
2869
# help of 'forget-merges' option of 'revert' command
2859
#: bzrlib/builtins.py:4484
2870
#: bzrlib/builtins.py:4488
2860
2871
msgid "Remove pending merge marker, without changing any files."
2861
2872
msgstr ""
2862
2873
2863
#: bzrlib/builtins.py:4515
2874
#: bzrlib/builtins.py:4519
2864
2875
msgid ""
2865
2876
"Show help on a command or other topic.\n"
2866
2877
" "
2867
2878
msgstr ""
2868
2879
2869
2880
# help of 'long' option of 'help' command
2870
#: bzrlib/builtins.py:4520
2881
#: bzrlib/builtins.py:4524
2871
2882
msgid "Show help on all commands."
2872
2883
msgstr ""
2873
2884
2874
#: bzrlib/builtins.py:4549
2885
#: bzrlib/builtins.py:4553
2875
2886
msgid "Show unmerged/unpulled revisions between two branches."
2876
2887
msgstr ""
2877
2888
2878
#: bzrlib/builtins.py:4551
2889
#: bzrlib/builtins.py:4555
2879
2890
msgid "OTHER_BRANCH may be local or remote."
2880
2891
msgstr ""
2881
2892
2882
#: bzrlib/builtins.py:4553
2893
#: bzrlib/builtins.py:4557
2883
2894
msgid ""
2884
2895
"To filter on a range of revisions, you can use the command -r begin..end\n"
2885
2896
"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
2890
2901
" 0 - no missing revisions"
2891
2902
msgstr ""
2892
2903
2893
#: bzrlib/builtins.py:4563
2904
#: bzrlib/builtins.py:4567
2894
2905
msgid ""
2895
2906
" Determine the missing revisions between this and the branch at the\n"
2896
2907
" remembered pull location::"
2897
2908
msgstr ""
2898
2909
2899
#: bzrlib/builtins.py:4566
2910
#: bzrlib/builtins.py:4570
2900
2911
msgid " bzr missing"
2901
2912
msgstr ""
2902
2913
2903
#: bzrlib/builtins.py:4568
2914
#: bzrlib/builtins.py:4572
2904
2915
msgid " Determine the missing revisions between this and another branch::"
2905
2916
msgstr ""
2906
2917
2907
#: bzrlib/builtins.py:4570
2918
#: bzrlib/builtins.py:4574
2908
2919
msgid " bzr missing http://server/branch"
2909
2920
msgstr ""
2910
2921
2911
#: bzrlib/builtins.py:4572
2922
#: bzrlib/builtins.py:4576
2912
2923
msgid ""
2913
2924
" Determine the missing revisions up to a specific revision on the other\n"
2914
2925
" branch::"
2915
2926
msgstr ""
2916
2927
2917
#: bzrlib/builtins.py:4575
2928
#: bzrlib/builtins.py:4579
2918
2929
msgid " bzr missing -r ..-10"
2919
2930
msgstr ""
2920
2931
2921
#: bzrlib/builtins.py:4577
2932
#: bzrlib/builtins.py:4581
2922
2933
msgid ""
2923
2934
" Determine the missing revisions up to a specific revision on this\n"
2924
2935
" branch::"
2925
2936
msgstr ""
2926
2937
2927
#: bzrlib/builtins.py:4580
2938
#: bzrlib/builtins.py:4584
2928
2939
msgid " bzr missing --my-revision ..-10"
2929
2940
msgstr ""
2930
2941
2931
2942
# help of 'reverse' option of 'missing' command
2932
#: bzrlib/builtins.py:4587
2943
#: bzrlib/builtins.py:4591
2933
2944
msgid "Reverse the order of revisions."
2934
2945
msgstr ""
2935
2946
2936
2947
# help of 'mine-only' option of 'missing' command
2937
#: bzrlib/builtins.py:4589
2948
#: bzrlib/builtins.py:4593
2938
2949
msgid "Display changes in the local branch only."
2939
2950
msgstr ""
2940
2951
2941
2952
# help of 'this' option of 'missing' command
2942
#: bzrlib/builtins.py:4590
2953
#: bzrlib/builtins.py:4594
2943
2954
msgid "Same as --mine-only."
2944
2955
msgstr ""
2945
2956
2946
2957
# help of 'theirs-only' option of 'missing' command
2947
#: bzrlib/builtins.py:4592
2958
#: bzrlib/builtins.py:4596
2948
2959
msgid "Display changes in the remote branch only."
2949
2960
msgstr ""
2950
2961
2951
2962
# help of 'other' option of 'missing' command
2952
#: bzrlib/builtins.py:4593
2963
#: bzrlib/builtins.py:4597
2953
2964
msgid "Same as --theirs-only."
2954
2965
msgstr ""
2955
2966
2956
2967
# help of 'revision' option of 'missing' command
2957
#: bzrlib/builtins.py:4598
2968
#: bzrlib/builtins.py:4602
2958
2969
msgid ""
2959
2970
"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
2960
2971
"details."
2961
2972
msgstr ""
2962
2973
2963
2974
# help of 'my-revision' option of 'missing' command
2964
#: bzrlib/builtins.py:4602
2975
#: bzrlib/builtins.py:4606
2965
2976
msgid ""
2966
2977
"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
2967
2978
"details."
2968
2979
msgstr ""
2969
2980
2970
2981
# help of 'include-merges' option of 'missing' command
2971
#: bzrlib/builtins.py:4605
2982
#: bzrlib/builtins.py:4609
2972
2983
msgid "Show all revisions in addition to the mainline ones."
2973
2984
msgstr ""
2974
2985
2975
#: bzrlib/builtins.py:4641
2986
#: bzrlib/builtins.py:4645
2976
2987
msgid "No peer location known or specified."
2977
2988
msgstr ""
2978
2989
2979
#: bzrlib/builtins.py:4645
2990
#: bzrlib/builtins.py:4649
2980
2991
msgid "Using saved parent location: {0}\n"
2981
2992
msgstr ""
2982
2993
2983
#: bzrlib/builtins.py:4678
2984
#, python-format
2985
msgid "You have %d extra revision(s):\n"
2986
msgstr ""
2987
2988
#: bzrlib/builtins.py:4692
2989
#, python-format
2990
msgid "You are missing %d revision(s):\n"
2991
msgstr ""
2992
2993
#: bzrlib/builtins.py:4702
2994
#: bzrlib/builtins.py:4682
2995
#, python-format
2996
msgid "You have %d extra revision:\n"
2997
msgid_plural "You have %d extra revisions:\n"
2998
msgstr[0] ""
2999
msgstr[1] ""
3000
3001
#: bzrlib/builtins.py:4698
3002
#, python-format
3003
msgid "You are missing %d revision:\n"
3004
msgid_plural "You are missing %d revisions:\n"
3005
msgstr[0] ""
3006
msgstr[1] ""
3007
3008
#: bzrlib/builtins.py:4710
2994
3009
msgid "This branch has no new revisions.\n"
2995
3010
msgstr ""
2996
3011
2997
#: bzrlib/builtins.py:4705
3012
#: bzrlib/builtins.py:4713
2998
3013
msgid "Other branch has no new revisions.\n"
2999
3014
msgstr ""
3000
3015
3001
#: bzrlib/builtins.py:4710
3016
#: bzrlib/builtins.py:4718
3002
3017
msgid "Branches are up to date.\n"
3003
3018
msgstr ""
3004
3019
3005
#: bzrlib/builtins.py:4721
3020
#: bzrlib/builtins.py:4729
3006
3021
msgid "Compress the data within a repository."
3007
3022
msgstr ""
3008
3023
3009
#: bzrlib/builtins.py:4723
3024
#: bzrlib/builtins.py:4731
3010
3025
msgid ""
3011
3026
"This operation compresses the data within a bazaar repository. As\n"
3012
3027
"bazaar supports automatic packing of repository, this operation is\n"
3013
3028
"normally not required to be done manually."
3014
3029
msgstr ""
3015
3030
3016
#: bzrlib/builtins.py:4727
3031
#: bzrlib/builtins.py:4735
3017
3032
msgid ""
3018
3033
"During the pack operation, bazaar takes a backup of existing repository\n"
3019
3034
"data, i.e. pack files. This backup is eventually removed by bazaar\n"
3022
3037
"used."
3023
3038
msgstr ""
3024
3039
3025
#: bzrlib/builtins.py:4733
3040
#: bzrlib/builtins.py:4741
3026
3041
msgid ""
3027
3042
"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
3028
3043
"during or immediately after repacking, you may be left with a state\n"
3031
3046
msgstr ""
3032
3047
3033
3048
# help of 'clean-obsolete-packs' option of 'pack' command
3034
#: bzrlib/builtins.py:4742
3049
#: bzrlib/builtins.py:4750
3035
3050
msgid "Delete obsolete packs to save disk space."
3036
3051
msgstr ""
3037
3052
3038
#: bzrlib/builtins.py:4756
3053
#: bzrlib/builtins.py:4764
3039
3054
msgid "List the installed plugins."
3040
3055
msgstr ""
3041
3056
3042
#: bzrlib/builtins.py:4758
3057
#: bzrlib/builtins.py:4766
3043
3058
msgid ""
3044
3059
"This command displays the list of installed plugins including\n"
3045
3060
"version of plugin and a short description of each."
3046
3061
msgstr ""
3047
3062
3048
#: bzrlib/builtins.py:4761
3063
#: bzrlib/builtins.py:4769
3049
3064
msgid "--verbose shows the path where each plugin is located."
3050
3065
msgstr ""
3051
3066
3052
#: bzrlib/builtins.py:4763
3067
#: bzrlib/builtins.py:4771
3053
3068
msgid ""
3054
3069
"A plugin is an external component for Bazaar that extends the\n"
3055
3070
"revision control system, by adding or replacing code in Bazaar.\n"
3058
3073
"customizing log output."
3059
3074
msgstr ""
3060
3075
3061
#: bzrlib/builtins.py:4769
3076
#: bzrlib/builtins.py:4777
3062
3077
msgid ""
3063
3078
"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
3064
3079
"for further information on plugins including where to find them and how to\n"
3066
3081
"plugins using the Python programming language."
3067
3082
msgstr ""
3068
3083
3069
#: bzrlib/builtins.py:4785
3084
#: bzrlib/builtins.py:4793
3070
3085
msgid "Show testament (signing-form) of a revision."
3071
3086
msgstr ""
3072
3087
3073
3088
# help of 'long' option of 'testament' command
3074
#: bzrlib/builtins.py:4788
3089
#: bzrlib/builtins.py:4796
3075
3090
msgid "Produce long-format testament."
3076
3091
msgstr ""
3077
3092
3078
3093
# help of 'strict' option of 'testament' command
3079
#: bzrlib/builtins.py:4790
3094
#: bzrlib/builtins.py:4798
3080
3095
msgid "Produce a strict-format testament."
3081
3096
msgstr ""
3082
3097
3083
#: bzrlib/builtins.py:4816
3098
#: bzrlib/builtins.py:4824
3084
3099
msgid "Show the origin of each line in a file."
3085
3100
msgstr ""
3086
3101
3087
#: bzrlib/builtins.py:4818
3102
#: bzrlib/builtins.py:4826
3088
3103
msgid ""
3089
3104
"This prints out the given file with an annotation on the left side\n"
3090
3105
"indicating which revision, author and date introduced the change."
3091
3106
msgstr ""
3092
3107
3093
#: bzrlib/builtins.py:4821
3108
#: bzrlib/builtins.py:4829
3094
3109
msgid ""
3095
3110
"If the origin is the same for a run of consecutive lines, it is\n"
3096
3111
"shown only at the top, unless the --all option is given."
3097
3112
msgstr ""
3098
3113
3099
3114
# help of 'all' option of 'annotate' command
3100
#: bzrlib/builtins.py:4829
3115
#: bzrlib/builtins.py:4837
3101
3116
msgid "Show annotations on all lines."
3102
3117
msgstr ""
3103
3118
3104
3119
# help of 'long' option of 'annotate' command
3105
#: bzrlib/builtins.py:4830
3120
#: bzrlib/builtins.py:4838
3106
3121
msgid "Show commit date in annotations."
3107
3122
msgstr ""
3108
3123
3109
#: bzrlib/builtins.py:4917
3124
#: bzrlib/builtins.py:4925
3110
3125
msgid "Cannot sign a range of non-revision-history revisions"
3111
3126
msgstr ""
3112
3127
3113
#: bzrlib/builtins.py:4929
3128
#: bzrlib/builtins.py:4937
3114
3129
msgid "Please supply either one revision, or a range."
3115
3130
msgstr ""
3116
3131
3117
#: bzrlib/builtins.py:4933
3132
#: bzrlib/builtins.py:4941
3118
3133
msgid ""
3119
3134
"Convert the current branch into a checkout of the supplied branch.\n"
3120
3135
"If no branch is supplied, rebind to the last bound location."
3121
3136
msgstr ""
3122
3137
3123
#: bzrlib/builtins.py:4936
3138
#: bzrlib/builtins.py:4944
3124
3139
msgid ""
3125
3140
"Once converted into a checkout, commits must succeed on the master branch\n"
3126
3141
"before they will be applied to the local branch."
3127
3142
msgstr ""
3128
3143
3129
#: bzrlib/builtins.py:4939
3144
#: bzrlib/builtins.py:4947
3130
3145
msgid ""
3131
3146
"Bound branches use the nickname of its master branch unless it is set\n"
3132
3147
"locally, in which case binding will update the local nickname to be\n"
3133
3148
"that of the master."
3134
3149
msgstr ""
3135
3150
3136
#: bzrlib/builtins.py:4954
3151
#: bzrlib/builtins.py:4962
3137
3152
msgid "No location supplied. This format does not remember old locations."
3138
3153
msgstr ""
3139
3154
3140
#: bzrlib/builtins.py:4959
3155
#: bzrlib/builtins.py:4967
3141
3156
msgid "Branch is already bound"
3142
3157
msgstr ""
3143
3158
3144
#: bzrlib/builtins.py:4961
3159
#: bzrlib/builtins.py:4969
3145
3160
msgid "No location supplied and no previous location known"
3146
3161
msgstr ""
3147
3162
3148
#: bzrlib/builtins.py:4967
3163
#: bzrlib/builtins.py:4975
3149
3164
msgid "These branches have diverged. Try merging, and then bind again."
3150
3165
msgstr ""
3151
3166
3152
#: bzrlib/builtins.py:4974
3167
#: bzrlib/builtins.py:4982
3153
3168
msgid "Convert the current checkout into a regular branch."
3154
3169
msgstr ""
3155
3170
3156
#: bzrlib/builtins.py:4976
3171
#: bzrlib/builtins.py:4984
3157
3172
msgid ""
3158
3173
"After unbinding, the local branch is considered independent and subsequent\n"
3159
3174
"commits will be local only."
3160
3175
msgstr ""
3161
3176
3162
#: bzrlib/builtins.py:4987
3177
#: bzrlib/builtins.py:4995
3163
3178
msgid "Local branch is not bound"
3164
3179
msgstr ""
3165
3180
3166
#: bzrlib/builtins.py:4991
3181
#: bzrlib/builtins.py:4999
3167
3182
msgid "Remove the last committed revision."
3168
3183
msgstr ""
3169
3184
3170
#: bzrlib/builtins.py:4993
3185
#: bzrlib/builtins.py:5001
3171
3186
msgid ""
3172
3187
"--verbose will print out what is being removed.\n"
3173
3188
"--dry-run will go through all the motions, but not actually\n"
3174
3189
"remove anything."
3175
3190
msgstr ""
3176
3191
3177
#: bzrlib/builtins.py:4997
3192
#: bzrlib/builtins.py:5005
3178
3193
msgid ""
3179
3194
"If --revision is specified, uncommit revisions to leave the branch at the\n"
3180
3195
"specified revision. For example, \"bzr uncommit -r 15\" will leave the\n"
3181
3196
"branch at revision 15."
3182
3197
msgstr ""
3183
3198
3184
#: bzrlib/builtins.py:5001
3199
#: bzrlib/builtins.py:5009
3185
3200
msgid ""
3186
3201
"Uncommit leaves the working tree ready for a new commit. The only change\n"
3187
3202
"it may make is to restore any pending merges that were present before\n"
3189
3204
msgstr ""
3190
3205
3191
3206
# help of 'dry-run' option of 'uncommit' command
3192
#: bzrlib/builtins.py:5012
3207
#: bzrlib/builtins.py:5020
3193
3208
msgid "Don't actually make changes."
3194
3209
msgstr ""
3195
3210
3196
3211
# help of 'force' option of 'uncommit' command
3197
#: bzrlib/builtins.py:5013
3212
#: bzrlib/builtins.py:5021
3198
3213
msgid "Say yes to all questions."
3199
3214
msgstr ""
3200
3215
3201
3216
# help of 'keep-tags' option of 'uncommit' command
3202
#: bzrlib/builtins.py:5015
3217
#: bzrlib/builtins.py:5023
3203
3218
msgid "Keep tags that point to removed revisions."
3204
3219
msgstr ""
3205
3220
3206
3221
# help of 'local' option of 'uncommit' command
3207
#: bzrlib/builtins.py:5017
3222
#: bzrlib/builtins.py:5025
3208
3223
msgid "Only remove the commits from the local branch when in a checkout."
3209
3224
msgstr ""
3210
3225
3211
#: bzrlib/builtins.py:5066
3226
#: bzrlib/builtins.py:5074
3212
3227
msgid "No revisions to uncommit.\n"
3213
3228
msgstr ""
3214
3229
3215
#: bzrlib/builtins.py:5081
3230
#: bzrlib/builtins.py:5089
3216
3231
msgid "Dry-run, pretending to remove the above revisions.\n"
3217
3232
msgstr ""
3218
3233
3219
#: bzrlib/builtins.py:5084
3234
#: bzrlib/builtins.py:5092
3220
3235
msgid "The above revision(s) will be removed.\n"
3221
3236
msgstr ""
3222
3237
3223
#: bzrlib/builtins.py:5088
3238
#: bzrlib/builtins.py:5096
3224
3239
msgid "Uncommit these revisions"
3225
3240
msgstr ""
3226
3241
3227
#: bzrlib/builtins.py:5091
3242
#: bzrlib/builtins.py:5099
3228
3243
msgid "Canceled\n"
3229
3244
msgstr ""
3230
3245
3231
#: bzrlib/builtins.py:5098
3246
#: bzrlib/builtins.py:5106
3232
3247
#, python-format
3233
3248
msgid ""
3234
3249
"You can restore the old tip by running:\n"
3235
3250
" bzr pull . -r revid:%s\n"
3236
3251
msgstr ""
3237
3252
3238
#: bzrlib/builtins.py:5103
3253
#: bzrlib/builtins.py:5111
3239
3254
msgid "Break a dead lock."
3240
3255
msgstr ""
3241
3256
3242
#: bzrlib/builtins.py:5105
3257
#: bzrlib/builtins.py:5113
3243
3258
msgid ""
3244
3259
"This command breaks a lock on a repository, branch, working directory or\n"
3245
3260
"config file."
3246
3261
msgstr ""
3247
3262
3248
#: bzrlib/builtins.py:5108
3263
#: bzrlib/builtins.py:5116
3249
3264
msgid ""
3250
3265
"CAUTION: Locks should only be broken when you are sure that the process\n"
3251
3266
"holding the lock has been stopped."
3252
3267
msgstr ""
3253
3268
3254
#: bzrlib/builtins.py:5111
3269
#: bzrlib/builtins.py:5119
3255
3270
msgid ""
3256
3271
"You can get information on what locks are open via the 'bzr info\n"
3257
3272
"[location]' command."
3258
3273
msgstr ""
3259
3274
3260
#: bzrlib/builtins.py:5114
3275
#: bzrlib/builtins.py:5122
3261
3276
msgid ""
3262
3277
":Examples:\n"
3263
3278
" bzr break-lock\n"
3266
3281
msgstr ""
3267
3282
3268
3283
# help of 'config' option of 'break-lock' command
3269
#: bzrlib/builtins.py:5123
3284
#: bzrlib/builtins.py:5131
3270
3285
msgid "LOCATION is the directory where the config lock is."
3271
3286
msgstr ""
3272
3287
3273
3288
# help of 'force' option of 'break-lock' command
3274
#: bzrlib/builtins.py:5125
3289
#: bzrlib/builtins.py:5133
3275
3290
msgid "Do not ask for confirmation before breaking the lock."
3276
3291
msgstr ""
3277
3292
3278
#: bzrlib/builtins.py:5161
3293
#: bzrlib/builtins.py:5169
3279
3294
msgid "Run the bzr server."
3280
3295
msgstr ""
3281
3296
3282
3297
# help of 'inet' option of 'serve' command
3283
#: bzrlib/builtins.py:5167
3298
#: bzrlib/builtins.py:5175
3284
3299
msgid "Serve on stdin/out for use from inetd or sshd."
3285
3300
msgstr ""
3286
3301
3287
3302
# title of 'protocol' option of 'serve' command
3288
#: bzrlib/builtins.py:5168
3303
#: bzrlib/builtins.py:5176
3289
3304
msgid "protocol"
3290
3305
msgstr ""
3291
3306
3292
3307
# help of 'protocol' option of 'serve' command
3293
#: bzrlib/builtins.py:5169
3308
#: bzrlib/builtins.py:5177
3294
3309
msgid "Protocol to serve."
3295
3310
msgstr ""
3296
3311
3297
3312
# help of 'port' option of 'serve' command
3298
#: bzrlib/builtins.py:5173
3313
#: bzrlib/builtins.py:5181
3299
3314
msgid ""
3300
3315
"Listen for connections on nominated port of the form [hostname:]portnumber. "
3301
3316
"Passing 0 as the port number will result in a dynamically allocated port. "
3303
3318
msgstr ""
3304
3319
3305
3320
# help of 'directory' option of 'serve' command
3306
#: bzrlib/builtins.py:5179
3321
#: bzrlib/builtins.py:5187
3307
3322
msgid "Serve contents of this directory."
3308
3323
msgstr ""
3309
3324
3310
3325
# help of 'allow-writes' option of 'serve' command
3311
#: bzrlib/builtins.py:5181
3326
#: bzrlib/builtins.py:5189
3312
3327
msgid ""
3313
3328
"By default the server is a readonly server. Supplying --allow-writes "
3314
3329
"enables write access to the contents of the served directory and below. "
3317
3332
"uncontrolled write access to your file system."
3318
3333
msgstr ""
3319
3334
3320
#: bzrlib/builtins.py:5226
3335
#: bzrlib/builtins.py:5234
3321
3336
msgid "Combine a tree into its containing tree."
3322
3337
msgstr ""
3323
3338
3324
#: bzrlib/builtins.py:5228
3339
#: bzrlib/builtins.py:5236
3325
3340
msgid "This command requires the target tree to be in a rich-root format."
3326
3341
msgstr ""
3327
3342
3328
#: bzrlib/builtins.py:5230
3343
#: bzrlib/builtins.py:5238
3329
3344
msgid ""
3330
3345
"The TREE argument should be an independent tree, inside another tree, but\n"
3331
3346
"not part of it. (Such trees can be produced by \"bzr split\", but also by\n"
3332
3347
"running \"bzr branch\" with the target inside a tree.)"
3333
3348
msgstr ""
3334
3349
3335
#: bzrlib/builtins.py:5234
3350
#: bzrlib/builtins.py:5242
3336
3351
msgid ""
3337
3352
"The result is a combined tree, with the subtree no longer an independent\n"
3338
3353
"part. This is marked as a merge of the subtree into the containing tree,\n"
3339
3354
"and all history is preserved."
3340
3355
msgstr ""
3341
3356
3342
#: bzrlib/builtins.py:5252
3357
#: bzrlib/builtins.py:5260
3343
3358
#, python-format
3344
3359
msgid ""
3345
3360
"Can't join trees because %s doesn't support rich root data.\n"
3346
3361
"You can use bzr upgrade on the repository."
3347
3362
msgstr ""
3348
3363
3349
#: bzrlib/builtins.py:5262 bzrlib/builtins.py:5268
3364
#: bzrlib/builtins.py:5270 bzrlib/builtins.py:5276
3350
3365
msgid "Cannot join {0}. {1}"
3351
3366
msgstr ""
3352
3367
3353
#: bzrlib/builtins.py:5272
3368
#: bzrlib/builtins.py:5280
3354
3369
msgid "Split a subdirectory of a tree into a separate tree."
3355
3370
msgstr ""
3356
3371
3357
#: bzrlib/builtins.py:5274
3372
#: bzrlib/builtins.py:5282
3358
3373
msgid ""
3359
3374
"This command will produce a target tree in a format that supports\n"
3360
3375
"rich roots, like 'rich-root' or 'rich-root-pack'. These formats cannot be\n"
3361
3376
"converted into earlier formats like 'dirstate-tags'."
3362
3377
msgstr ""
3363
3378
3364
#: bzrlib/builtins.py:5278
3379
#: bzrlib/builtins.py:5286
3365
3380
msgid ""
3366
3381
"The TREE argument should be a subdirectory of a working tree. That\n"
3367
3382
"subdirectory will be converted into an independent tree, with its own\n"
3368
3383
"branch. Commits in the top-level tree will not apply to the new subtree."
3369
3384
msgstr ""
3370
3385
3371
#: bzrlib/builtins.py:5358
3386
#: bzrlib/builtins.py:5366
3372
3387
msgid "No submit branch specified or known"
3373
3388
msgstr ""
3374
3389
3375
#: bzrlib/builtins.py:5366 bzrlib/send.py:105
3390
#: bzrlib/builtins.py:5374 bzrlib/send.py:105
3376
3391
msgid "No public branch specified or known"
3377
3392
msgstr ""
3378
3393
3379
#: bzrlib/builtins.py:5371
3394
#: bzrlib/builtins.py:5379
3380
3395
msgid "bzr merge-directive takes at most two one revision identifiers"
3381
3396
msgstr ""
3382
3397
3383
#: bzrlib/builtins.py:5380
3398
#: bzrlib/builtins.py:5388
3384
3399
msgid "No revisions to bundle."
3385
3400
msgstr ""
3386
3401
3387
#: bzrlib/builtins.py:5399
3402
#: bzrlib/builtins.py:5407
3388
3403
msgid "Mail or create a merge-directive for submitting changes."
3389
3404
msgstr ""
3390
3405
3391
#: bzrlib/builtins.py:5401
3406
#: bzrlib/builtins.py:5409
3392
3407
msgid "A merge directive provides many things needed for requesting merges:"
3393
3408
msgstr ""
3394
3409
3395
#: bzrlib/builtins.py:5403
3410
#: bzrlib/builtins.py:5411
3396
3411
msgid "* A machine-readable description of the merge to perform"
3397
3412
msgstr ""
3398
3413
3399
#: bzrlib/builtins.py:5405
3414
#: bzrlib/builtins.py:5413
3400
3415
msgid "* An optional patch that is a preview of the changes requested"
3401
3416
msgstr ""
3402
3417
3403
#: bzrlib/builtins.py:5407
3418
#: bzrlib/builtins.py:5415
3404
3419
msgid ""
3405
3420
"* An optional bundle of revision data, so that the changes can be applied\n"
3406
3421
" directly from the merge directive, without retrieving data from a\n"
3407
3422
" branch."
3408
3423
msgstr ""
3409
3424
3410
#: bzrlib/builtins.py:5411
3425
#: bzrlib/builtins.py:5419
3411
3426
msgid ""
3412
3427
"`bzr send` creates a compact data set that, when applied using bzr\n"
3413
3428
"merge, has the same effect as merging from the source branch. "
3414
3429
msgstr ""
3415
3430
3416
#: bzrlib/builtins.py:5414
3431
#: bzrlib/builtins.py:5422
3417
3432
msgid ""
3418
3433
"By default the merge directive is self-contained and can be applied to any\n"
3419
3434
"branch containing submit_branch in its ancestory without needing access to\n"
3420
3435
"the source branch."
3421
3436
msgstr ""
3422
3437
3423
#: bzrlib/builtins.py:5418
3438
#: bzrlib/builtins.py:5426
3424
3439
msgid ""
3425
3440
"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
3426
3441
"revisions, but only a structured request to merge from the\n"
3429
3444
"included if known, so that people can check it later."
3430
3445
msgstr ""
3431
3446
3432
#: bzrlib/builtins.py:5424
3447
#: bzrlib/builtins.py:5432
3433
3448
msgid ""
3434
3449
"The submit branch defaults to the parent of the source branch, but can be\n"
3435
3450
"overridden. Both submit branch and public branch will be remembered in\n"
3438
3453
"be changed using --from."
3439
3454
msgstr ""
3440
3455
3441
#: bzrlib/builtins.py:5430
3456
#: bzrlib/builtins.py:5438
3442
3457
msgid ""
3443
3458
"Both the submit branch and the public branch follow the usual behavior with\n"
3444
3459
"respect to --remember: If there is no default location set, the first send\n"
3447
3462
"--remember. The value will only be saved if the location can be accessed."
3448
3463
msgstr ""
3449
3464
3450
#: bzrlib/builtins.py:5436
3465
#: bzrlib/builtins.py:5444
3451
3466
msgid ""
3452
3467
"In order to calculate those changes, bzr must analyse the submit branch.\n"
3453
3468
"Therefore it is most efficient for the submit branch to be a local mirror.\n"
3455
3470
"in the merge directive."
3456
3471
msgstr ""
3457
3472
3458
#: bzrlib/builtins.py:5441
3473
#: bzrlib/builtins.py:5449
3459
3474
msgid ""
3460
3475
"The default behaviour is to send the merge directive by mail, unless -o is\n"
3461
3476
"given, in which case it is sent to a file."
3462
3477
msgstr ""
3463
3478
3464
#: bzrlib/builtins.py:5444
3479
#: bzrlib/builtins.py:5452
3465
3480
msgid ""
3466
3481
"Mail is sent using your preferred mail program. This should be transparent\n"
3467
3482
"on Windows (it uses MAPI). On Unix, it requires the xdg-email utility.\n"
3468
3483
"If the preferred client can't be found (or used), your editor will be used."
3469
3484
msgstr ""
3470
3485
3471
#: bzrlib/builtins.py:5448
3486
#: bzrlib/builtins.py:5456
3472
3487
msgid ""
3473
3488
"To use a specific mail program, set the mail_client configuration option.\n"
3474
3489
"(For Thunderbird 1.5, this works around some bugs.) Supported values for\n"
3480
3495
"supported clients."
3481
3496
msgstr ""
3482
3497
3483
#: bzrlib/builtins.py:5455
3498
#: bzrlib/builtins.py:5463
3484
3499
msgid ""
3485
3500
"If mail is being sent, a to address is required. This can be supplied\n"
3486
3501
"either on the commandline, by setting the submit_to configuration\n"
3488
3503
"in the submit branch."
3489
3504
msgstr ""
3490
3505
3491
#: bzrlib/builtins.py:5460
3506
#: bzrlib/builtins.py:5468
3492
3507
msgid ""
3493
3508
"Two formats are currently supported: \"4\" uses revision bundle format 4 "
3494
3509
"and\n"
3498
3513
"format 1. It is compatible with Bazaar 0.12 - 0.18."
3499
3514
msgstr ""
3500
3515
3501
#: bzrlib/builtins.py:5466
3516
#: bzrlib/builtins.py:5474
3502
3517
msgid ""
3503
3518
"The merge directives created by bzr send may be applied using bzr merge or\n"
3504
3519
"bzr pull by specifying a file containing a merge directive as the location."
3505
3520
msgstr ""
3506
3521
3507
#: bzrlib/builtins.py:5469
3522
#: bzrlib/builtins.py:5477
3508
3523
msgid ""
3509
3524
"bzr send makes extensive use of public locations to map local locations "
3510
3525
"into\n"
3513
3528
msgstr ""
3514
3529
3515
3530
# help of 'output' option of 'send' command
3516
#: bzrlib/builtins.py:5493
3531
#: bzrlib/builtins.py:5501
3517
3532
msgid "Write merge directive to this file or directory; use - for stdout."
3518
3533
msgstr ""
3519
3534
3520
3535
# help of 'strict' option of 'send' command
3521
#: bzrlib/builtins.py:5497
3536
#: bzrlib/builtins.py:5505
3522
3537
msgid ""
3523
3538
"Refuse to send if there are uncommitted changes in the working tree, --no-"
3524
3539
"strict disables the check."
3525
3540
msgstr ""
3526
3541
3527
3542
# help of 'mail-to' option of 'send' command
3528
#: bzrlib/builtins.py:5499
3543
#: bzrlib/builtins.py:5507
3529
3544
msgid "Mail the request to this address."
3530
3545
msgstr ""
3531
3546
3532
3547
# help of 'body' option of 'send' command
3533
#: bzrlib/builtins.py:5503
3548
#: bzrlib/builtins.py:5511
3534
3549
msgid "Body for the email."
3535
3550
msgstr ""
3536
3551
3537
3552
# help of 'no-bundle' option of 'send' command
3538
#: bzrlib/builtins.py:5556
3553
#: bzrlib/builtins.py:5564
3539
3554
msgid "Do not include a bundle in the merge directive."
3540
3555
msgstr ""
3541
3556
3542
3557
# help of 'no-patch' option of 'send' command
3543
#: bzrlib/builtins.py:5557
3558
#: bzrlib/builtins.py:5565
3544
3559
msgid "Do not include a preview patch in the merge directive."
3545
3560
msgstr ""
3546
3561
3547
3562
# help of 'remember' option of 'send' command
3548
#: bzrlib/builtins.py:5560
3563
#: bzrlib/builtins.py:5568
3549
3564
msgid "Remember submit and public branch."
3550
3565
msgstr ""
3551
3566
3552
3567
# help of 'from' option of 'send' command
3553
#: bzrlib/builtins.py:5562
3568
#: bzrlib/builtins.py:5570
3554
3569
msgid ""
3555
3570
"Branch to generate the submission from, rather than the one containing the "
3556
3571
"working directory."
3557
3572
msgstr ""
3558
3573
3559
3574
# title of 'format' option of 'send' command
3560
#: bzrlib/builtins.py:5572
3575
#: bzrlib/builtins.py:5580
3561
3576
msgid "format"
3562
3577
msgstr ""
3563
3578
3564
3579
# help of 'format' option of 'send' command
3565
#: bzrlib/builtins.py:5573
3580
#: bzrlib/builtins.py:5581
3566
3581
msgid "Use the specified output format."
3567
3582
msgstr ""
3568
3583
3569
#: bzrlib/builtins.py:5595
3584
#: bzrlib/builtins.py:5603
3570
3585
msgid "Create, remove or modify a tag naming a revision."
3571
3586
msgstr ""
3572
3587
3573
#: bzrlib/builtins.py:5597
3588
#: bzrlib/builtins.py:5605
3574
3589
msgid ""
3575
3590
"Tags give human-meaningful names to revisions. Commands that take a -r\n"
3576
3591
"(--revision) option can be given -rtag:X, where X is any previously\n"
3577
3592
"created tag."
3578
3593
msgstr ""
3579
3594
3580
#: bzrlib/builtins.py:5601
3595
#: bzrlib/builtins.py:5609
3581
3596
msgid ""
3582
3597
"Tags are stored in the branch. Tags are copied from one branch to another\n"
3583
3598
"along when you branch, push, pull or merge."
3584
3599
msgstr ""
3585
3600
3586
#: bzrlib/builtins.py:5604
3601
#: bzrlib/builtins.py:5612
3587
3602
msgid ""
3588
3603
"It is an error to give a tag name that already exists unless you pass\n"
3589
3604
"--force, in which case the tag is moved to point to the new revision."
3590
3605
msgstr ""
3591
3606
3592
#: bzrlib/builtins.py:5607
3607
#: bzrlib/builtins.py:5615
3593
3608
msgid ""
3594
3609
"To rename a tag (change the name but keep it on the same revsion), run "
3595
3610
"``bzr\n"
3596
3611
"tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
3597
3612
msgstr ""
3598
3613
3599
#: bzrlib/builtins.py:5610
3614
#: bzrlib/builtins.py:5618
3600
3615
msgid ""
3601
3616
"If no tag name is specified it will be determined through the \n"
3602
3617
"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
3605
3620
msgstr ""
3606
3621
3607
3622
# help of 'delete' option of 'tag' command
3608
#: bzrlib/builtins.py:5620
3623
#: bzrlib/builtins.py:5628
3609
3624
msgid "Delete this tag rather than placing it."
3610
3625
msgstr ""
3611
3626
3612
3627
# help of 'directory' option of 'tag' command
3613
#: bzrlib/builtins.py:5623
3628
#: bzrlib/builtins.py:5631
3614
3629
msgid "Branch in which to place the tag."
3615
3630
msgstr ""
3616
3631
3617
3632
# help of 'force' option of 'tag' command
3618
#: bzrlib/builtins.py:5625
3633
#: bzrlib/builtins.py:5633
3619
3634
msgid "Replace existing tags."
3620
3635
msgstr ""
3621
3636
3622
#: bzrlib/builtins.py:5640
3637
#: bzrlib/builtins.py:5648
3623
3638
msgid "No tag specified to delete."
3624
3639
msgstr ""
3625
3640
3626
#: bzrlib/builtins.py:5642
3641
#: bzrlib/builtins.py:5650
3627
3642
#, python-format
3628
3643
msgid "Deleted tag %s."
3629
3644
msgstr ""
3630
3645
3631
#: bzrlib/builtins.py:5647
3646
#: bzrlib/builtins.py:5655
3632
3647
msgid "Tags can only be placed on a single revision, not on a range"
3633
3648
msgstr ""
3634
3649
3635
#: bzrlib/builtins.py:5656
3650
#: bzrlib/builtins.py:5664
3636
3651
msgid "Please specify a tag name."
3637
3652
msgstr ""
3638
3653
3639
#: bzrlib/builtins.py:5664
3654
#: bzrlib/builtins.py:5672
3640
3655
#, python-format
3641
3656
msgid "Tag %s already exists for that revision."
3642
3657
msgstr ""
3643
3658
3644
#: bzrlib/builtins.py:5668
3659
#: bzrlib/builtins.py:5676
3645
3660
#, python-format
3646
3661
msgid "Created tag %s."
3647
3662
msgstr ""
3648
3663
3649
#: bzrlib/builtins.py:5670
3664
#: bzrlib/builtins.py:5678
3650
3665
#, python-format
3651
3666
msgid "Updated tag %s."
3652
3667
msgstr ""
3653
3668
3654
#: bzrlib/builtins.py:5674
3669
#: bzrlib/builtins.py:5682
3655
3670
msgid "List tags."
3656
3671
msgstr ""
3657
3672
3658
#: bzrlib/builtins.py:5676
3673
#: bzrlib/builtins.py:5684
3659
3674
msgid ""
3660
3675
"This command shows a table of tag names and the revisions they reference."
3661
3676
msgstr ""
3662
3677
3663
3678
# help of 'directory' option of 'tags' command
3664
#: bzrlib/builtins.py:5682
3679
#: bzrlib/builtins.py:5690
3665
3680
msgid "Branch whose tags should be displayed."
3666
3681
msgstr ""
3667
3682
3668
3683
# help of 'sort' option of 'tags' command
3669
#: bzrlib/builtins.py:5684
3684
#: bzrlib/builtins.py:5692
3670
3685
msgid "Sort tags by different criteria."
3671
3686
msgstr ""
3672
3687
3673
3688
# title of 'sort' option of 'tags' command
3674
#: bzrlib/builtins.py:5684
3689
#: bzrlib/builtins.py:5692
3675
3690
msgid "Sorting"
3676
3691
msgstr ""
3677
3692
3678
#: bzrlib/builtins.py:5729
3693
#: bzrlib/builtins.py:5737
3679
3694
msgid "Reconfigure the type of a bzr directory."
3680
3695
msgstr ""
3681
3696
3682
#: bzrlib/builtins.py:5731
3697
#: bzrlib/builtins.py:5739
3683
3698
msgid "A target configuration must be specified."
3684
3699
msgstr ""
3685
3700
3686
#: bzrlib/builtins.py:5733
3701
#: bzrlib/builtins.py:5741
3687
3702
msgid ""
3688
3703
"For checkouts, the bind-to location will be auto-detected if not specified.\n"
3689
3704
"The order of preference is\n"
3695
3710
msgstr ""
3696
3711
3697
3712
# title of 'tree_type' option of 'reconfigure' command
3698
#: bzrlib/builtins.py:5747
3713
#: bzrlib/builtins.py:5755
3699
3714
msgid "Tree type"
3700
3715
msgstr ""
3701
3716
3702
3717
# help of 'tree_type' option of 'reconfigure' command
3703
#: bzrlib/builtins.py:5748
3718
#: bzrlib/builtins.py:5756
3704
3719
msgid "The relation between branch and tree."
3705
3720
msgstr ""
3706
3721
3707
3722
# title of 'repository_type' option of 'reconfigure' command
3708
#: bzrlib/builtins.py:5758
3723
#: bzrlib/builtins.py:5766
3709
3724
msgid "Repository type"
3710
3725
msgstr ""
3711
3726
3712
3727
# help of 'repository_type' option of 'reconfigure' command
3713
#: bzrlib/builtins.py:5759
3728
#: bzrlib/builtins.py:5767
3714
3729
msgid "Location fo the repository."
3715
3730
msgstr ""
3716
3731
3717
3732
# title of 'repository_trees' option of 'reconfigure' command
3718
#: bzrlib/builtins.py:5767
3733
#: bzrlib/builtins.py:5775
3719
3734
msgid "Trees in Repository"
3720
3735
msgstr ""
3721
3736
3722
3737
# help of 'repository_trees' option of 'reconfigure' command
3723
#: bzrlib/builtins.py:5768
3738
#: bzrlib/builtins.py:5776
3724
3739
msgid "Whether new branches in the repository have trees."
3725
3740
msgstr ""
3726
3741
3727
3742
# help of 'bind-to' option of 'reconfigure' command
3728
#: bzrlib/builtins.py:5775
3743
#: bzrlib/builtins.py:5783
3729
3744
msgid "Branch to bind checkout to."
3730
3745
msgstr ""
3731
3746
3732
3747
# help of 'force' option of 'reconfigure' command
3733
#: bzrlib/builtins.py:5777
3748
#: bzrlib/builtins.py:5785
3734
3749
msgid "Perform reconfiguration even if local changes will be lost."
3735
3750
msgstr ""
3736
3751
3737
3752
# help of 'stacked-on' option of 'reconfigure' command
3738
#: bzrlib/builtins.py:5780
3753
#: bzrlib/builtins.py:5788
3739
3754
msgid "Reconfigure a branch to be stacked on another branch."
3740
3755
msgstr ""
3741
3756
3742
3757
# help of 'unstacked' option of 'reconfigure' command
3743
#: bzrlib/builtins.py:5784
3758
#: bzrlib/builtins.py:5792
3744
3759
msgid ""
3745
3760
"Reconfigure a branch to be unstacked. This may require copying substantial "
3746
3761
"data into it."
3747
3762
msgstr ""
3748
3763
3749
#: bzrlib/builtins.py:5794
3764
#: bzrlib/builtins.py:5802
3750
3765
msgid "Can't use both --stacked-on and --unstacked"
3751
3766
msgstr ""
3752
3767
3753
#: bzrlib/builtins.py:5808
3768
#: bzrlib/builtins.py:5816
3754
3769
msgid "No target configuration specified"
3755
3770
msgstr ""
3756
3771
3757
#: bzrlib/builtins.py:5843
3772
#: bzrlib/builtins.py:5851
3758
3773
msgid "Set the branch of a checkout and update."
3759
3774
msgstr ""
3760
3775
3761
#: bzrlib/builtins.py:5845
3776
#: bzrlib/builtins.py:5853
3762
3777
msgid ""
3763
3778
"For lightweight checkouts, this changes the branch being referenced.\n"
3764
3779
"For heavyweight checkouts, this checks that there are no local commits\n"
3766
3781
"of the new location and binds to it."
3767
3782
msgstr ""
3768
3783
3769
#: bzrlib/builtins.py:5850
3784
#: bzrlib/builtins.py:5858
3770
3785
msgid ""
3771
3786
"In both cases, the working tree is updated and uncommitted changes\n"
3772
3787
"are merged. The user can commit or revert these as they desire."
3773
3788
msgstr ""
3774
3789
3775
#: bzrlib/builtins.py:5853
3790
#: bzrlib/builtins.py:5861
3776
3791
msgid "Pending merges need to be committed or reverted before using switch."
3777
3792
msgstr ""
3778
3793
3779
#: bzrlib/builtins.py:5855
3794
#: bzrlib/builtins.py:5863
3780
3795
msgid ""
3781
3796
"The path to the branch to switch to can be specified relative to the parent\n"
3782
3797
"directory of the current branch. For example, if you are currently in a\n"
3784
3799
"/path/to/newbranch."
3785
3800
msgstr ""
3786
3801
3787
#: bzrlib/builtins.py:5860
3802
#: bzrlib/builtins.py:5868
3788
3803
msgid ""
3789
3804
"Bound branches use the nickname of its master branch unless it is set\n"
3790
3805
"locally, in which case switching will update the local nickname to be\n"
3792
3807
msgstr ""
3793
3808
3794
3809
# help of 'force' option of 'switch' command
3795
#: bzrlib/builtins.py:5868
3810
#: bzrlib/builtins.py:5876
3796
3811
msgid "Switch even if local commits will be lost."
3797
3812
msgstr ""
3798
3813
3799
3814
# help of 'create-branch' option of 'switch' command
3800
#: bzrlib/builtins.py:5871
3815
#: bzrlib/builtins.py:5879
3801
3816
msgid "Create the target branch from this one before switching to it."
3802
3817
msgstr ""
3803
3818
3804
#: bzrlib/builtins.py:5883
3819
#: bzrlib/builtins.py:5891
3805
3820
msgid "You must supply either a revision or a location"
3806
3821
msgstr ""
3807
3822
3808
#: bzrlib/builtins.py:5894
3823
#: bzrlib/builtins.py:5902
3809
3824
msgid "cannot create branch without source branch"
3810
3825
msgstr ""
3811
3826
3812
#: bzrlib/builtins.py:5940
3827
#: bzrlib/builtins.py:5948
3813
3828
msgid "Manage filtered views."
3814
3829
msgstr ""
3815
3830
3816
#: bzrlib/builtins.py:5942
3831
#: bzrlib/builtins.py:5950
3817
3832
msgid ""
3818
3833
"Views provide a mask over the tree so that users can focus on\n"
3819
3834
"a subset of a tree when doing their work. After creating a view,\n"
3823
3838
"must be within the current view."
3824
3839
msgstr ""
3825
3840
3826
#: bzrlib/builtins.py:5949
3841
#: bzrlib/builtins.py:5957
3827
3842
msgid ""
3828
3843
"In most cases, a view has a short life-span: it is created to make\n"
3829
3844
"a selected change and is deleted once that change is committed.\n"
3831
3846
"and switch between them."
3832
3847
msgstr ""
3833
3848
3834
#: bzrlib/builtins.py:5954
3849
#: bzrlib/builtins.py:5962
3835
3850
msgid ""
3836
3851
"To disable the current view without deleting it, you can switch to\n"
3837
3852
"the pseudo view called ``off``. This can be useful when you need\n"
3839
3854
"want to switch back to your view after that."
3840
3855
msgstr ""
3841
3856
3842
#: bzrlib/builtins.py:5959
3857
#: bzrlib/builtins.py:5967
3843
3858
msgid ""
3844
3859
":Examples:\n"
3845
3860
" To define the current view::"
3846
3861
msgstr ""
3847
3862
3848
#: bzrlib/builtins.py:5962
3863
#: bzrlib/builtins.py:5970
3849
3864
msgid " bzr view file1 dir1 ..."
3850
3865
msgstr ""
3851
3866
3852
#: bzrlib/builtins.py:5964
3867
#: bzrlib/builtins.py:5972
3853
3868
msgid " To list the current view::"
3854
3869
msgstr ""
3855
3870
3856
#: bzrlib/builtins.py:5966
3871
#: bzrlib/builtins.py:5974
3857
3872
msgid " bzr view"
3858
3873
msgstr ""
3859
3874
3860
#: bzrlib/builtins.py:5968
3875
#: bzrlib/builtins.py:5976
3861
3876
msgid " To delete the current view::"
3862
3877
msgstr ""
3863
3878
3864
#: bzrlib/builtins.py:5970
3879
#: bzrlib/builtins.py:5978
3865
3880
msgid " bzr view --delete"
3866
3881
msgstr ""
3867
3882
3868
#: bzrlib/builtins.py:5972
3883
#: bzrlib/builtins.py:5980
3869
3884
msgid " To disable the current view without deleting it::"
3870
3885
msgstr ""
3871
3886
3872
#: bzrlib/builtins.py:5974
3887
#: bzrlib/builtins.py:5982
3873
3888
msgid " bzr view --switch off"
3874
3889
msgstr ""
3875
3890
3876
#: bzrlib/builtins.py:5976
3891
#: bzrlib/builtins.py:5984
3877
3892
msgid " To define a named view and switch to it::"
3878
3893
msgstr ""
3879
3894
3880
#: bzrlib/builtins.py:5978
3895
#: bzrlib/builtins.py:5986
3881
3896
msgid " bzr view --name view-name file1 dir1 ..."
3882
3897
msgstr ""
3883
3898
3884
#: bzrlib/builtins.py:5980
3899
#: bzrlib/builtins.py:5988
3885
3900
msgid " To list a named view::"
3886
3901
msgstr ""
3887
3902
3888
#: bzrlib/builtins.py:5982
3903
#: bzrlib/builtins.py:5990
3889
3904
msgid " bzr view --name view-name"
3890
3905
msgstr ""
3891
3906
3892
#: bzrlib/builtins.py:5984
3907
#: bzrlib/builtins.py:5992
3893
3908
msgid " To delete a named view::"
3894
3909
msgstr ""
3895
3910
3896
#: bzrlib/builtins.py:5986
3911
#: bzrlib/builtins.py:5994
3897
3912
msgid " bzr view --name view-name --delete"
3898
3913
msgstr ""
3899
3914
3900
#: bzrlib/builtins.py:5988
3915
#: bzrlib/builtins.py:5996
3901
3916
msgid " To switch to a named view::"
3902
3917
msgstr ""
3903
3918
3904
#: bzrlib/builtins.py:5990
3919
#: bzrlib/builtins.py:5998
3905
3920
msgid " bzr view --switch view-name"
3906
3921
msgstr ""
3907
3922
3908
#: bzrlib/builtins.py:5992
3923
#: bzrlib/builtins.py:6000
3909
3924
msgid " To list all views defined::"
3910
3925
msgstr ""
3911
3926
3912
#: bzrlib/builtins.py:5994
3927
#: bzrlib/builtins.py:6002
3913
3928
msgid " bzr view --all"
3914
3929
msgstr ""
3915
3930
3916
#: bzrlib/builtins.py:5996
3931
#: bzrlib/builtins.py:6004
3917
3932
msgid " To delete all views::"
3918
3933
msgstr ""
3919
3934
3920
#: bzrlib/builtins.py:5998
3935
#: bzrlib/builtins.py:6006
3921
3936
msgid " bzr view --delete --all"
3922
3937
msgstr ""
3923
3938
3924
3939
# help of 'all' option of 'view' command
3925
#: bzrlib/builtins.py:6005
3940
#: bzrlib/builtins.py:6013
3926
3941
msgid "Apply list or delete action to all views."
3927
3942
msgstr ""
3928
3943
3929
3944
# help of 'delete' option of 'view' command
3930
#: bzrlib/builtins.py:6008
3945
#: bzrlib/builtins.py:6016
3931
3946
msgid "Delete the view."
3932
3947
msgstr ""
3933
3948
3934
3949
# help of 'name' option of 'view' command
3935
#: bzrlib/builtins.py:6011
3950
#: bzrlib/builtins.py:6019
3936
3951
msgid "Name of the view to define, list or delete."
3937
3952
msgstr ""
3938
3953
3939
3954
# help of 'switch' option of 'view' command
3940
#: bzrlib/builtins.py:6015
3955
#: bzrlib/builtins.py:6023
3941
3956
msgid "Name of the view to switch to."
3942
3957
msgstr ""
3943
3958
3944
#: bzrlib/builtins.py:6034
3959
#: bzrlib/builtins.py:6042
3945
3960
msgid "Both --delete and a file list specified"
3946
3961
msgstr ""
3947
3962
3948
#: bzrlib/builtins.py:6037
3963
#: bzrlib/builtins.py:6045
3949
3964
msgid "Both --delete and --switch specified"
3950
3965
msgstr ""
3951
3966
3952
#: bzrlib/builtins.py:6040
3967
#: bzrlib/builtins.py:6048
3953
3968
msgid "Deleted all views.\n"
3954
3969
msgstr ""
3955
3970
3956
#: bzrlib/builtins.py:6042
3971
#: bzrlib/builtins.py:6050
3957
3972
msgid "No current view to delete"
3958
3973
msgstr ""
3959
3974
3960
#: bzrlib/builtins.py:6045
3975
#: bzrlib/builtins.py:6053
3961
3976
#, python-format
3962
3977
msgid "Deleted '%s' view.\n"
3963
3978
msgstr ""
3964
3979
3965
#: bzrlib/builtins.py:6049
3980
#: bzrlib/builtins.py:6057
3966
3981
msgid "Both --switch and a file list specified"
3967
3982
msgstr ""
3968
3983
3969
#: bzrlib/builtins.py:6052
3984
#: bzrlib/builtins.py:6060
3970
3985
msgid "Both --switch and --all specified"
3971
3986
msgstr ""
3972
3987
3973
#: bzrlib/builtins.py:6055
3988
#: bzrlib/builtins.py:6063
3974
3989
msgid "No current view to disable"
3975
3990
msgstr ""
3976
3991
3977
#: bzrlib/builtins.py:6057
3992
#: bzrlib/builtins.py:6065
3978
3993
#, python-format
3979
3994
msgid "Disabled '%s' view.\n"
3980
3995
msgstr ""
3981
3996
3982
#: bzrlib/builtins.py:6061 bzrlib/builtins.py:6083
3997
#: bzrlib/builtins.py:6069 bzrlib/builtins.py:6091
3983
3998
msgid "Using '{0}' view: {1}\n"
3984
3999
msgstr ""
3985
4000
3986
#: bzrlib/builtins.py:6064
4001
#: bzrlib/builtins.py:6072
3987
4002
msgid "Views defined:\n"
3988
4003
msgstr ""
3989
4004
3990
#: bzrlib/builtins.py:6073
4005
#: bzrlib/builtins.py:6081
3991
4006
msgid "No views defined.\n"
3992
4007
msgstr ""
3993
4008
3994
#: bzrlib/builtins.py:6080
4009
#: bzrlib/builtins.py:6088
3995
4010
msgid "Cannot change the 'off' pseudo view"
3996
4011
msgstr ""
3997
4012
3998
#: bzrlib/builtins.py:6088
4013
#: bzrlib/builtins.py:6096
3999
4014
msgid "No current view.\n"
4000
4015
msgstr ""
4001
4016
4002
#: bzrlib/builtins.py:6091
4017
#: bzrlib/builtins.py:6099
4003
4018
msgid "'{0}' view is: {1}\n"
4004
4019
msgstr ""
4005
4020
4006
#: bzrlib/builtins.py:6111
4021
#: bzrlib/builtins.py:6119
4007
4022
msgid " <no hooks installed>\n"
4008
4023
msgstr ""
4009
4024
4010
#: bzrlib/builtins.py:6115
4025
#: bzrlib/builtins.py:6123
4011
4026
msgid "Remove a branch."
4012
4027
msgstr ""
4013
4028
4014
#: bzrlib/builtins.py:6117
4029
#: bzrlib/builtins.py:6125
4015
4030
msgid ""
4016
4031
"This will remove the branch from the specified location but \n"
4017
4032
"will keep any working tree or repository in place."
4018
4033
msgstr ""
4019
4034
4020
#: bzrlib/builtins.py:6122
4035
#: bzrlib/builtins.py:6130
4021
4036
msgid " Remove the branch at repo/trunk::"
4022
4037
msgstr ""
4023
4038
4024
#: bzrlib/builtins.py:6124
4039
#: bzrlib/builtins.py:6132
4025
4040
msgid " bzr remove-branch repo/trunk"
4026
4041
msgstr ""
4027
4042
4028
#: bzrlib/builtins.py:6140
4043
#: bzrlib/builtins.py:6148
4029
4044
msgid "Temporarily set aside some changes from the current tree."
4030
4045
msgstr ""
4031
4046
4032
#: bzrlib/builtins.py:6142
4047
#: bzrlib/builtins.py:6150
4033
4048
msgid ""
4034
4049
"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
4035
4050
"ie. out of the way, until a later time when you can bring them back from\n"
4038
4053
"will they survive its deletion."
4039
4054
msgstr ""
4040
4055
4041
#: bzrlib/builtins.py:6148
4056
#: bzrlib/builtins.py:6156
4042
4057
msgid "If shelve --list is specified, previously-shelved changes are listed."
4043
4058
msgstr ""
4044
4059
4045
#: bzrlib/builtins.py:6150
4060
#: bzrlib/builtins.py:6158
4046
4061
msgid ""
4047
4062
"Shelve is intended to help separate several sets of changes that have\n"
4048
4063
"been inappropriately mingled. If you just want to get rid of all changes\n"
4050
4065
"shelve all text changes at once, use shelve --all."
4051
4066
msgstr ""
4052
4067
4053
#: bzrlib/builtins.py:6155
4068
#: bzrlib/builtins.py:6163
4054
4069
msgid ""
4055
4070
"If filenames are specified, only the changes to those files will be\n"
4056
4071
"shelved. Other files will be left untouched."
4057
4072
msgstr ""
4058
4073
4059
#: bzrlib/builtins.py:6158
4074
#: bzrlib/builtins.py:6166
4060
4075
msgid ""
4061
4076
"If a revision is specified, changes since that revision will be shelved."
4062
4077
msgstr ""
4063
4078
4064
#: bzrlib/builtins.py:6160
4079
#: bzrlib/builtins.py:6168
4065
4080
msgid ""
4066
4081
"You can put multiple items on the shelf, and by default, 'unshelve' will\n"
4067
4082
"restore the most recently shelved changes."
4068
4083
msgstr ""
4069
4084
4070
#: bzrlib/builtins.py:6163
4085
#: bzrlib/builtins.py:6171
4071
4086
msgid ""
4072
4087
"For complicated changes, it is possible to edit the changes in a separate\n"
4073
4088
"editor program to decide what the file remaining in the working copy\n"
4074
4089
"should look like. To do this, add the configuration option"
4075
4090
msgstr ""
4076
4091
4077
#: bzrlib/builtins.py:6167
4092
#: bzrlib/builtins.py:6175
4078
4093
msgid " change_editor = PROGRAM @new_path @old_path"
4079
4094
msgstr ""
4080
4095
4081
#: bzrlib/builtins.py:6169
4096
#: bzrlib/builtins.py:6177
4082
4097
msgid ""
4083
4098
"where @new_path is replaced with the path of the new version of the \n"
4084
4099
"file and @old_path is replaced with the path of the old version of \n"
4088
4103
msgstr ""
4089
4104
4090
4105
# help of 'all' option of 'shelve' command
4091
#: bzrlib/builtins.py:6181
4106
#: bzrlib/builtins.py:6189
4092
4107
msgid "Shelve all changes."
4093
4108
msgstr ""
4094
4109
4095
4110
# help of 'writer' option of 'shelve' command
4096
#: bzrlib/builtins.py:6183
4111
#: bzrlib/builtins.py:6191
4097
4112
msgid "Method to use for writing diffs."
4098
4113
msgstr ""
4099
4114
4100
4115
# title of 'writer' option of 'shelve' command
4101
#: bzrlib/builtins.py:6183
4116
#: bzrlib/builtins.py:6191
4102
4117
msgid "writer"
4103
4118
msgstr ""
4104
4119
4105
4120
# help of 'list' option of 'shelve' command
4106
#: bzrlib/builtins.py:6187
4121
#: bzrlib/builtins.py:6195
4107
4122
msgid "List shelved changes."
4108
4123
msgstr ""
4109
4124
4110
4125
# help of 'destroy' option of 'shelve' command
4111
#: bzrlib/builtins.py:6189
4126
#: bzrlib/builtins.py:6197
4112
4127
msgid "Destroy removed changes instead of shelving them."
4113
4128
msgstr ""
4114
4129
4115
#: bzrlib/builtins.py:6218
4130
#: bzrlib/builtins.py:6226
4116
4131
msgid "No shelved changes."
4117
4132
msgstr ""
4118
4133
4119
#: bzrlib/builtins.py:6229
4134
#: bzrlib/builtins.py:6237
4120
4135
msgid "Restore shelved changes."
4121
4136
msgstr ""
4122
4137
4123
#: bzrlib/builtins.py:6231
4138
#: bzrlib/builtins.py:6239
4124
4139
msgid ""
4125
4140
"By default, the most recently shelved changes are restored. However if you\n"
4126
4141
"specify a shelf by id those changes will be restored instead. This works\n"
4128
4143
msgstr ""
4129
4144
4130
4145
# help of 'action' option of 'unshelve' command
4131
#: bzrlib/builtins.py:6240
4146
#: bzrlib/builtins.py:6248
4132
4147
msgid "The action to perform."
4133
4148
msgstr ""
4134
4149
4135
#: bzrlib/builtins.py:6262
4150
#: bzrlib/builtins.py:6270
4136
4151
msgid "Remove unwanted files from working tree."
4137
4152
msgstr ""
4138
4153
4139
#: bzrlib/builtins.py:6264
4154
#: bzrlib/builtins.py:6272
4140
4155
msgid ""
4141
4156
"By default, only unknown files, not ignored files, are deleted. Versioned\n"
4142
4157
"files are never deleted."
4143
4158
msgstr ""
4144
4159
4145
#: bzrlib/builtins.py:6267
4160
#: bzrlib/builtins.py:6275
4146
4161
msgid ""
4147
4162
"Another class is 'detritus', which includes files emitted by bzr during\n"
4148
4163
"normal operations and selftests. (The value of these files decreases with\n"
4149
4164
"time.)"
4150
4165
msgstr ""
4151
4166
4152
#: bzrlib/builtins.py:6271
4167
#: bzrlib/builtins.py:6279
4153
4168
msgid ""
4154
4169
"If no options are specified, unknown files are deleted. Otherwise, option\n"
4155
4170
"flags are respected, and may be combined."
4156
4171
msgstr ""
4157
4172
4158
#: bzrlib/builtins.py:6274
4173
#: bzrlib/builtins.py:6282
4159
4174
msgid "To check what clean-tree will do, use --dry-run."
4160
4175
msgstr ""
4161
4176
4162
4177
# help of 'ignored' option of 'clean-tree' command
4163
#: bzrlib/builtins.py:6277
4178
#: bzrlib/builtins.py:6285
4164
4179
msgid "Delete all ignored files."
4165
4180
msgstr ""
4166
4181
4167
4182
# help of 'detritus' option of 'clean-tree' command
4168
#: bzrlib/builtins.py:6278
4183
#: bzrlib/builtins.py:6286
4169
4184
msgid ""
4170
4185
"Delete conflict files, merge and revert backups, and failed selftest dirs."
4171
4186
msgstr ""
4172
4187
4173
4188
# help of 'unknown' option of 'clean-tree' command
4174
#: bzrlib/builtins.py:6281
4189
#: bzrlib/builtins.py:6289
4175
4190
msgid "Delete files unknown to bzr (default)."
4176
4191
msgstr ""
4177
4192
4178
4193
# help of 'dry-run' option of 'clean-tree' command
4179
#: bzrlib/builtins.py:6282
4194
#: bzrlib/builtins.py:6290
4180
4195
msgid "Show files to delete instead of deleting them."
4181
4196
msgstr ""
4182
4197
4183
4198
# help of 'force' option of 'clean-tree' command
4184
#: bzrlib/builtins.py:6284
4199
#: bzrlib/builtins.py:6292
4185
4200
msgid "Do not prompt before deleting."
4186
4201
msgstr ""
4187
4202
4191
4206
4192
4207
#: bzrlib/bundle/serializer/v4.py:326
4193
4208
#, python-format
4194
msgid "Bundling %d revision(s)."
4195
msgstr ""
4209
msgid "Bundling %d revision."
4210
msgid_plural "Bundling %d revisions."
4211
msgstr[0] ""
4212
msgstr[1] ""
4196
4213
4197
4214
#: bzrlib/bzrdir.py:636
4198
4215
#, python-format
4725
4742
4726
4743
#: bzrlib/conflicts.py:149
4727
4744
#, python-format
4728
msgid "%d conflict(s) auto-resolved."
4729
msgstr ""
4745
msgid "%d conflict auto-resolved."
4746
msgid_plural "%d conflicts auto-resolved."
4747
msgstr[0] ""
4748
msgstr[1] ""
4730
4749
4731
#: bzrlib/conflicts.py:150
4750
#: bzrlib/conflicts.py:152
4732
4751
msgid "Remaining conflicts:"
4733
4752
msgstr ""
4734
4753
4735
#: bzrlib/conflicts.py:155
4754
#: bzrlib/conflicts.py:157
4736
4755
msgid "All conflicts resolved."
4737
4756
msgstr ""
4738
4757
4739
#: bzrlib/conflicts.py:164
4758
#: bzrlib/conflicts.py:166
4740
4759
msgid "{0} conflict resolved, {1} remaining"
4741
4760
msgid_plural "{0} conflicts resolved, {1} remaining"
4742
4761
msgstr[0] ""
4743
4762
msgstr[1] ""
4744
4763
4745
4764
# title of 'action' option of 'resolve' command
4746
#: bzrlib/conflicts.py:690
4765
#: bzrlib/conflicts.py:692
4747
4766
msgid "action"
4748
4767
msgstr ""
4749
4768
6098
6117
msgid "unknown log formatter: %r"
6099
6118
msgstr ""
6100
6119
6120
#: bzrlib/log.py:2116
6121
msgid "fixes bug"
6122
msgid_plural "fixes bug"
6123
msgstr[0] ""
6124
msgstr[1] ""
6125
6101
6126
#: bzrlib/merge.py:715
6102
6127
msgid "All changes applied successfully."
6103
6128
msgstr ""
6706
6731
msgid "Format 0.9 does not permit bundle with no patch"
6707
6732
msgstr ""
6708
6733
6734
#: bzrlib/shelf_ui.py:45
6735
#, python-format
6736
msgid "Shelve adding file \"%(path)s\"?"
6737
msgstr ""
6738
6739
#: bzrlib/shelf_ui.py:46
6740
msgid "Shelve binary changes?"
6741
msgstr ""
6742
6743
#: bzrlib/shelf_ui.py:47
6744
msgid "Shelve changing \"%s\" from %(other)s to %(this)s?"
6745
msgstr ""
6746
6747
#: bzrlib/shelf_ui.py:49
6748
#, python-format
6749
msgid "Shelve removing file \"%(path)s\"?"
6750
msgstr ""
6751
6752
#: bzrlib/shelf_ui.py:50
6753
#, python-format
6754
msgid "Shelve %d change(s)?"
6755
msgstr ""
6756
6757
#: bzrlib/shelf_ui.py:51
6758
msgid "Shelve?"
6759
msgstr ""
6760
6761
#: bzrlib/shelf_ui.py:52
6762
#, python-format
6763
msgid ""
6764
"Shelve changing target of \"%(path)s\" from \"%(other)s\" to \"%(this)s\"?"
6765
msgstr ""
6766
6767
#: bzrlib/shelf_ui.py:54
6768
#, python-format
6769
msgid "Shelve renaming \"%(other)s\" => \"%(this)s\"?"
6770
msgstr ""
6771
6709
6772
#: bzrlib/shelf_ui.py:69
6710
6773
#, python-format
6711
6774
msgid "Changes shelved with id \"%d\"."
6719
6782
msgid "Selected changes:"
6720
6783
msgstr ""
6721
6784
6785
#: bzrlib/shelf_ui.py:97
6786
#, python-format
6787
msgid "Delete file \"%(path)s\"?"
6788
msgstr ""
6789
6790
#: bzrlib/shelf_ui.py:98
6791
msgid "Apply binary changes?"
6792
msgstr ""
6793
6794
#: bzrlib/shelf_ui.py:99
6795
#, python-format
6796
msgid "Change \"%(path)s\" from %(this)s to %(other)s?"
6797
msgstr ""
6798
6799
#: bzrlib/shelf_ui.py:101
6800
#, python-format
6801
msgid "Add file \"%(path)s\"?"
6802
msgstr ""
6803
6804
#: bzrlib/shelf_ui.py:102
6805
#, python-format
6806
msgid "Apply %d change(s)?"
6807
msgstr ""
6808
6809
#: bzrlib/shelf_ui.py:103
6810
msgid "Apply change?"
6811
msgstr ""
6812
6813
#: bzrlib/shelf_ui.py:104
6814
#, python-format
6815
msgid "Change target of \"%(path)s\" from \"%(this)s\" to \"%(other)s\"?"
6816
msgstr ""
6817
6818
#: bzrlib/shelf_ui.py:106
6819
#, python-format
6820
msgid "Rename \"%(this)s\" => \"%(other)s\"?"
6821
msgstr ""
6822
6722
6823
#: bzrlib/shelf_ui.py:265
6723
6824
msgid "You need a controlling terminal."
6724
6825
msgstr ""
Loggerhead is a web-based interface for Breezy
Version: 2.0.1