initial complete

Author: Aaaaaashu

Apps/README.md

@@ -1,42 +1,38 @@
 # Apps
 
-Here is a quick list of apps that are generally good to use and can come in handy in day to day tasks. The apps are seperated into 4 broad categories Developer Tools, Productivity Tools, Office Apps and Others.
+这里推荐的 apps 在开发者圈子内普遍评价不错，能便利的处理日常的开发和使用的任务。推荐将分为四类：
+* 开发者工具
+* 生产力工具
+* 办公工具
+* 其他
 
 ### Developer Tools
-- [Google Chrome](https://www.google.com/intl/en/chrome/browser/): Installs Chrome which is one of the best browsers currently. All chrome browsers and extensions are saved by Google so can be synced easily.
-- [Latexian](http://tacosw.com/latexian/): App for writing Latex documents. View the code and output on split screen. Supports all major packages and code completion , etc.
-- [Valentina Studio](http://www.valentina-db.com/en/valentina-studio-overview):  Valentina Studio is a gui to create, administer and query MySQL, Postgres and SQLite databases.
+- [Google Chrome](https://www.google.com/intl/en/chrome/browser/)
+- [Webstorm](http://tacosw.com/latexian/)
+- [Sketch](http://www.valentina-db.com/en/valentina-studio-overview)
+- [Dash](http://www.valentina-db.com/en/valentina-studio-overview)
+- [Sequel Pro](http://www.valentina-db.com/en/valentina-studio-overview)
+- [Parallels]()
+- [Github]()
+
 
 ### Productivity
-- [1Password](https://agilebits.com/onepassword): Cross platform password management tool.
-- [Airmail](http://airmailapp.com/): Lightweight fast email client.
+- [1Password](https://agilebits.com/onepassword): 跨平台的密码管理工具
 - [Alfred](http://www.alfredapp.com/): Replacement for spotlight. I'll mostly be upgrading to power pack.
-- [AppCleaner](http://www.freemacsoft.net/appcleaner/): Uninstall Apps.
-- [Caffeine](http://lightheadsw.com/caffeine/): Stops the machine from going into sleep mode.
-- [DoubleTwist](https://www.doubletwist.com/desktop/): Import your playlists, ratings, music and videos. Create new playlists to your heart's content. Rate your songs and videos. Play your music and videos and view all of your photos.
-- [Dropbox](https://www.dropbox.com/): File syncing to the cloud. It syncs files across all devices (laptop, mobile, tablet), and serves as a backup as well!
-- [F.lux](https://justgetflux.com/): f.lux makes the color of your computer's display adapt to the time of day, warm at night and like sunlight during the day.
-- [Google Drive](https://drive.google.com/): File syncing to the cloud too! Google Docs is a popular too to collaborate with others.
-- [Notebooks](http://www.notebooksapp.com/mac/): Notebooks for Mac allows you to share files with the mobile versions of Notebooks on the iPad and iPhone. And you can write notes in markdown.
-- [PDF Toolkit+](https://itunes.apple.com/us/app/pdf-toolkit-+/id545164971?mt=12): App to cut/split/merge pdfs easily. Really easy to use and works well.
-- [Pocket](https://getpocket.com): Save For Later. Put articles, videos or pretty much anything into Pocket. Save directly from your browser or from apps like Twitter, Flipboard, Pulse and Zite.
-- [SleepPillow](https://itunes.apple.com/us/app/sleep-pillow/id597419160?mt=12): Sleep Pillow plays sounds that create an ambient atmosphere for sleep enhancement at home, or for drowning out noise at work.
-- [Spectacle](http://spectacleapp.com/): Don't waste time resizing and moving your windows. Spectacle makes this very easy and is open source.
-- [Timing](http://timingapp.com/): Keep track of the time you spend with your Mac.
-- [Total Finder](http://totalfinder.binaryage.com/): Adds tabs and improves the Finder to a great deal.
-- [Transmission](http://www.transmissionbt.com/): A fast, easy and free BitTorrent client.
-- [Unarchiver](http://wakaba.c3.cx/s/apps/unarchiver.html): Compress/Uncompress app. Supported file formats include Zip, Tar-GZip, Tar-BZip2, RAR, 7-zip, LhA, StuffIt and many other old and obscure formats.
+- [AppCleaner](http://www.freemacsoft.net/appcleaner/): 应用程序卸载工具
+- [Dropbox](https://www.dropbox.com/): 文件同步工具
+- [Reeder]()：RSS 阅读工具
+- [Pocket](https://getpocket.com): 将未来打算阅读的内容进行离线保存，日后阅读的工具
+- [Spectacle](http://spectacleapp.com/): 让窗口成比例的显示，在写代码调试的时候很方便
+- [Unarchiver](http://wakaba.c3.cx/s/apps/unarchiver.html): 支持多种格式（包括 windows下的格式）的压缩/解压缩工具
+- [OminiFocus]()：时间管理工具
+- [Mou]()：Markdown 编辑器，国人出品
 
 ### Office Apps
-- [Keynote](http://www.apple.com/mac/keynote/): Create presentations on mac, this is supposed to be an alternate to PowerPoint.
-- [Microsoft Office](http://www.microsoft.com/mac/buy): Microsoft Office for Mac. Includes Microsoft Word, Excel, Powerpoint and Outlook.
-- [Numbers](http://www.apple.com/mac/numbers/): Create spreadsheets on mac, this is supposed to be an alternate to Excel.
-- [Pages](http://www.apple.com/mac/pages/): Create text files on mac, this is supposed to be an alternate to Word.
+- [Keynote](http://www.apple.com/mac/keynote/)
+- [Microsoft Office](http://www.microsoft.com/mac/buy)
+- [Numbers](http://www.apple.com/mac/numbers/)
+- [Pages](http://www.apple.com/mac/pages/)
 
 ### Others
-- [Asepsis](http://asepsis.binaryage.com/): Get rid of the annoying DS_Store files. It stops them from being created anywhere on the system.
-- [CheatSheet](http://www.grandtotal.biz/CheatSheet/): Tap the command key for long to see all the keyboard shortcuts of the current app.
-- [Google Voice and Video](http://www.google.com/+/learnmore/hangouts/): A voice and video chat plugin. Not sure if this is required after the release of hangouts.
-- [SuperDuper](http://www.shirt-pocket.com/SuperDuper/SuperDuperDescription.html): Take backups of your disk and use the backup disk to restore the machine incase of failure.
-- [VLC](http://www.videolan.org/vlc/index.html): VLC Media Player. Enough said.
-- [Voila](http://www.globaldelight.com/voila/): Record your screen with audio, mouse highlight and other features.
+- [CheatSheet](http://www.grandtotal.biz/CheatSheet/): 长按 `command` ，将能查看当前程序的快捷键。

Apps/Settings.md

@@ -24,12 +24,4 @@
 #### Timing
 - System Preferences -> Security and Privacy -> Accessibility -> Check
 
-#### Total Finder
-- General -> New finder window opens in the home folder
-- Sidebar -> Remove shared devices and All my files
-- Advanced -> Search in the current directory
-- TotalFinder
-    - Show progress bar
-    - Menus -> Show cut-copy-paste, All path copying, hide menubar icon
-    - Uncheck visor
-    - Folder on top
+

Git/README.md

@@ -1,6 +1,6 @@
 # Git and Github
 
-作为一名开发者怎么可能没有 [Git](http://git-scm.com/) ? 我们立马来安装：
+作为一名开发者怎么可能没有 [Git](http://git-scm.com/) ? 我们马上来安装：
 
     $ brew install git
 
@@ -29,8 +29,3 @@ SSH 的设置参考此链接 [here](https://help.github.com/articles/generating-
 
 - - -
 
-### DS_Store
-
-在 Mac 中，请记住将 `.DS_Store` 添加进 `.gitignore`，避免提交 OS X 系统的隐藏文件。
-- - -
-

Homebrew/README.md

@@ -1,6 +1,6 @@
 # Homebrew
 
-包管理工具可以让安装和更新程序变得更方便，目前在 OS X 系统中最受欢迎的包管理工具是 [Homebrew](http://brew.sh/).
+包管理工具可以让你安装和更新程序变得更方便，目前在 OS X 系统中最受欢迎的包管理工具是 [Homebrew](http://brew.sh/).
 
 ### Install
 
@@ -10,7 +10,7 @@
 
     $ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
 
-安装完成后，Homwbrew 将本地 `/usr/local` 初始化为 git 的工作树，并将目录所有者变更为当前所操作的用户，将来的操作不需要 sudo 。
+`译者注：`安装完成后，Homwbrew 将本地 `/usr/local` 初始化为 git     的工作树，并将目录所有者变更为当前所操作的用户，将来的操作不需要 sudo 。
 
 紧接着，我们需要做一件事让通过 Hombrew 安装的程序的启动链接 (在 `/usr/local/bin`中）可以直接运行，无需将完整路径写出。通过以下命令将 `/usr/local/bin` 添加至 `$PATH` 环境变量中
 

Homebrew/Usage.md

@@ -1,4 +1,4 @@
-# Using Homebrew
+# Homebrew 基本使用
 
 安装一个包，可以简单的运行：
 

Node.js/README.md

@@ -5,7 +5,7 @@
     $ brew update
     $ brew install node
 
-一般 Node modules 被安装在每个项目的本地文件夹 `node_modules`，
+一般 Node modules 通常被安装在每个项目的本地文件夹 `node_modules`，
 但至少有几个包推荐你安装在全局：
 
 [CoffeeScript](http://coffeescript.org/) and [Grunt](http://gruntjs.com/):

README.md

@@ -1,12 +1,13 @@
-Mac OS X Setup Guide
+Mac 开发配置手册
 ====================
 
-This book covers the basics of setting up development environment on a new MacBook for most major languages. All instructions covered have been tried on  Mountain Lion and Mavericks but they might be more inclined towards Mavericks. Whether you are an experienced programmer or not, this book is intended for everyone to use as a reference when installing some language/library.
+本书内容将包含「**如何在一部全新的 MacBook 进行基本的开发环境配置**」，主要面向 Web 开发者。其中的指导，在 Mavericks 和 Yosemite 上有效，更老的系统并未进行尝试。
 
-[![Screen](https://raw.githubusercontent.com/sb2nov/mac-setup/master/assets/intro.jpeg)](https://raw.githubusercontent.com/sb2nov/mac-setup/master/assets/intro.jpeg)
+如果你是一名老手，本书可以让你减少配置环境的烦恼。
+如果你是一名新手，那么恭喜你，你将会打开一个全新的世界。
 
-We will set up [Node](http://nodejs.org/) (JavaScript), [Python](http://www.python.org/), [CPlusPlus](http://www.cplusplus.com/), and [Ruby](http://www.ruby-lang.org/) environments. Even if you don't program in all three, it is good to have them as many command-line tools use one of them. We also install a few daily use application and Latex. As you read and follow these steps, feel free to send me any feedback or comments you may have.
+此书内容主要意译自：[Sourabh Bajaj](https://github.com/sb2nov/mac-setup) 的 Mac OS X Setup Guide，少部分内容由译者添加和修改。
 
-All contributions to the book are welcome. Please help add support for other libraries and languages.
+[阅读手册](http://aaaaaashu.gitbooks.io/mac-dev-setup/)  
+[提出意见]()
 
-**Note:** This book has been generated using [GitBook](http://www.gitbook.io) and is open source, feel free to contribute or signal issues on [GitHub](https://github.com/sb2nov/mac-setup).

SUMMARY.md

@@ -13,6 +13,5 @@
 * [MySql](MySql/README.md)
 * [Node.js](Node.js/README.md)
 * [Apps](Apps/README.md)
-   * [Settings](Apps/Settings.md)
 * [References](References/README.md)
 

SystemPreferences/README.md

@@ -1,10 +1,10 @@
 # 系统设置 System Preferences
 
-在任何的操作系统中，首先你需要做的就是更新系统！点击 **Apple Icon  > Software Update.**。如果这是一部新的电脑，你将需要到系统设置（System Preferences）进行一些适当调整。如何调整，取决于你个人喜欢。
+在任何的操作系统中，首先你需要做一件事就是**更新系统**！点击 **Apple Icon  > Software Update.**。如果这是一部新的电脑，你将需要到系统设置（System Preferences）进行一些适当调整。如何调整，取决于个人喜好。
 
 ### 触控板 Trackpad
 
-- System Preferences > Trackpad
+- 系统设置 > 触控板 (System Preferences > Trackpad)
     - Point & Click
         - Tap to click 「将触碰作为点击」
         - Secondary click 「双指触碰或点击呼叫菜单」
@@ -15,12 +15,12 @@
 
 ### 用户 Accounts
 
-- 添加 iCloud 用户，同步日历，联系人和 Find my mac 等等        -
+- 添加 iCloud 用户，同步日历，联系人和 Find my mac 等等
 
 ### 菜单栏 Menubar
 
-- 删除蓝牙等无需经常使用的图标
-- 将电池显示设置为百分比        -
+- 去掉蓝牙等无需经常使用的图标
+- 将电池显示设置为百分比
 
 ### Dock
 

XCode/README.md

@@ -1,6 +1,6 @@
 # XCode
 
-安装 [Xcode](https://developer.apple.com/xcode/) 从 App store 或 [苹果开发者网站](https://developer.apple.com/)。
+从 App store 或苹果开发者网站安装 [Xcode](https://developer.apple.com/xcode/) 。
 
 运行以下命令安装 Xcode command line tools