translate import-bzr.asc

Author: ousugo

book/09-git-and-other-scms/sections/import-bzr.asc

@@ -1,48 +1,45 @@
 ==== Bazaar
 (((Bazaar)))(((Importing, from Bazaar)))
 
-Bazaar is a DVCS tool much like Git, and as a result it's pretty straightforward to convert a Bazaar repository into a Git one.
-To accomplish this, you'll need to import the `bzr-fastimport` plugin.
+Bazaar 是一个和 Git 非常类似的分布式版本控制系统（DVCS)，因此将 Bazzar 仓库转换成 Git 仓库是非常简单易懂的。想要完成转换，你需要安装 `bzr-fastimport` 插件。
 
-===== Getting the bzr-fastimport plugin
+===== 安装 bzr-fastimport 插件
 
-The procedure for installing the fastimport plugin is different on UNIX-like operating systems and on Windows.
-In the first case, the simplest is to install the `bzr-fastimport` package that will install all the required dependencies.
+安装 fastimport 插件的步骤在类 UNIX 操作系统和 Windows 上是不一样的。在类 UNIX 系统上，最简单的办法就是安装 `bzr-fastimport` 包，这种方法将会自动安装所有需要的依赖。
 
-For example, with Debian and derived, you would do the following:
+例如，使用 Debian 及其派生系统，你只需要进行以下操作：
 
 [source,console]
 ----
 $ sudo apt-get install bzr-fastimport
 ----
 
-With RHEL, you would do the following:
+红帽企业版系统（RHEL），使用以下命令：
 
 [source,console]
 ----
 $ sudo yum install bzr-fastimport
 ----
 
-With Fedora, since release 22, the new package manager is dnf:
+Fedora 从 22 版本开始，采用了新的包管理器 dnf，使用以下命令：
 
 [source,console]
 ----
 $ sudo dnf install bzr-fastimport
 ----
 
-If the package is not available, you may install it as a plugin:
+如果直接安装包的方法不行，你可能需要使用安装插件的方法：
 
 [source,console]
 ----
-$ mkdir --parents ~/.bazaar/plugins     # creates the necessary folders for the plugins
+$ mkdir --parents ~/.bazaar/plugins     # 为插件创建必要的文件夹
 $ cd ~/.bazaar/plugins
-$ bzr branch lp:bzr-fastimport fastimport   # imports the fastimport plugin
+$ bzr branch lp:bzr-fastimport fastimport   # 引入 fastimport 插件
 $ cd fastimport
-$ sudo python setup.py install --record=files.txt   # installs the plugin
+$ sudo python setup.py install --record=files.txt   # 安装插件
 ----
 
-For this plugin to work, you'll also need the `fastimport` Python module.
-You can check whether it is present or not and install it with the following commands:
+为了确保插件工作，你同时也需要安装有 `fastimport` 这一 Python 模块。使用下面的命令可以检查这一模块安装与否，如果没有则安装这一模块：
 
 [source,console]
 ----
@@ -52,87 +49,79 @@ Traceback (most recent call last):
 ImportError: No module named fastimport
 $ pip install fastimport
 ----
-If it is not available, you can download it at address https://pypi.python.org/pypi/fastimport/.
+如果上面的命令安装失败，你可以直接到这个地址下载 https://pypi.python.org/pypi/fastimport/ 。
 
-In the second case (on Windows), `bzr-fastimport` is automatically installed with the standalone version and the default installation (let all the checkboxes checked).
-So in this case you have nothing to do.
+在 Windows 上，`bzr-fastimport` 插件在 Git 使用脱机安装并保持默认安装选项不变（可选框全部选中）的情况下是自动安装的。在这种情况下，你什么都不用做。
 
-At this point, the way to import a Bazaar repository differs according to that you have a single branch or you are working with a repository that has several branches.
+接下来，导入 Bazaar 仓库的方法根据你的仓库是有一个分支还是有多个分支而不同。
 
-===== Project with a single branch
+===== 单分支项目
 
-Now `cd` in the directory that contains your Bazaar repository and initialize the Git repository:
+`cd` 到包含你的 Bazaar 仓库的路径，然后初始化 Git 仓库：
 
 [source,console]
 ----
 $ cd /path/to/the/bzr/repository
 $ git init
 ----
 
-Now, you can simply export your Bazaar repository and convert it into a Git repository using the following command:
+现在你可以使用以下命令轻松地导出你的 Bazaar 仓库并把它转化成 Git 仓库：
 
 [source,console]
 ----
 $ bzr fast-export --plain . | git fast-import
 ----
 
-Depending on the size of the project, your Git repository is built in a lapse from a few seconds to a few minutes.
+根据项目的大小，Git 仓库会在几秒钟到几分钟之间构建。
 
-===== Case of a project with a main branch and a working branch
+===== 多分支项目
 
-You can also import a Bazaar repository that contains branches.
-Let us suppose that you have two branches: one represents the main branch (myProject.trunk), the other one is the working branch (myProject.work).
+你同样也能够导入包含多个分支的 Bazaar 仓库。让我们假设你有两个分支，一个代表主分支（myProject.trunk），另一个是工作分支（myProject.work）。
 
 [source,console]
 ----
 $ ls
 myProject.trunk myProject.work
 ----
 
-Create the Git repository and `cd` into it:
+创建一个 Git 仓库并 `cd` 进去：
 
 [source,console]
 ----
 $ git init git-repo
 $ cd git-repo
 ----
 
-Pull the `master` branch into git:
+将 `master` 分支拉入 Git：
 
 [source,console]
 ----
 $ bzr fast-export --export-marks=../marks.bzr ../myProject.trunk | \
 git fast-import --export-marks=../marks.git
 ----
 
-Pull the working branch into Git:
+将工作分支拉入 Git：
 
 [source,console]
 ----
 $ bzr fast-export --marks=../marks.bzr --git-branch=work ../myProject.work | \
 git fast-import --import-marks=../marks.git --export-marks=../marks.git
 ----
 
-Now `git branch` shows you the `master` branch as well as the `work` branch.
-Check the logs to make sure they're complete and get rid of the `marks.bzr` and `marks.git` files.
+现在 `git branch` 会同时显示 `master` 分支和 `work` 分支。检查日志以确保它们是完整的，并删除 `marks.bzr` 和 `marks.git` 文件。
 
-===== Synchronizing the staging area
-
-Whatever the number of branches you had and the import method you used, your staging area is not synchronized with `HEAD`, and with the import of several branches, your working directory is not synchronized either.
-This situation is easily solved by the following command:
+===== 同步暂存区
+无论你有多少分支以及使用的导入方法如何，你的暂存区都不会与 `HEAD` 同步，并且在导入多个分支时，你的工作目录也不会同步。这种情况使用下面的命令可以轻松解决：
 
 [source,console]
 ----
 $ git reset --hard HEAD
 ----
 
-===== Ignoring the files that were ignored with .bzrignore
-
-Now let's have a look at the files to ignore.
-The first thing to do is to rename `.bzrignore` into `.gitignore`.
-If the `.bzrignore` file contains one or several lines starting with "!!" or "RE:", you'll have to modify it and perhaps create several `.gitignore` files in order to ignore exactly the same files that Bazaar was ignoring.
+===== 忽略被 .bzrignore 文件指明忽略的文件
+现在让我们看看要忽略的文件。第一件事情就是将 `.bzrignore` 重命名为 `.gitignore`。如果 `.bzrignore` 文件里面有一行或数行以“!!”或“RE:”开头的内容，你必须修改它，并且可能还要创建几个 `.gitignore` 文件，以便忽略与 Bazaar 忽略的文件完全相同的文件。
 
-Finally, you will have to create a commit that contains this modification for the migration:
+最后，你必须创建一个提交，其中包含此次迁移的修改。
 
 [source,console]
 ----
@@ -141,10 +130,10 @@ $ # modify .gitignore if needed
 $ git commit -am 'Migration from Bazaar to Git'
 ----
 
-===== Sending your repository to the server
+===== 推送你的仓库到服务器
 
-Here we are!
-Now you can push the repository onto its new home server:
+终于到这一步了！
+现在你可以推送仓库到它的“云端新家”了：
 
 [source,console]
 ----
@@ -153,4 +142,4 @@ $ git push origin --all
 $ git push origin --tags
 ----
 
-Your Git repository is ready to use.
+你的 Git 仓库准备就绪。