Update po4a.conf and regenerate .po files.

Also, I've corrected src/doc/README.md in line with this change.

Signed-off-by: OGINO Masanori <masanori.ogino@gmail.com>

src/doc/README.md

@@ -59,7 +59,7 @@ po4a --copyright-holder="The Rust Project Developers" \
     --package-name="Rust" \
     --package-version="0.10-pre" \
     -M UTF-8 -L UTF-8 \
-    po4a.conf
+    src/doc/po4a.conf
 ~~~~
 
 (the version number must be changed if it is not 0.10-pre now.)
@@ -73,7 +73,7 @@ When you want to make a commit, do the command below before staging your
 change:
 
 ~~~~
-for f in doc/po/**/*.po; do
+for f in src/doc/po/**/*.po; do
     msgattrib --translated $f -o $f.strip
     if [ -e $f.strip ]; then
        mv $f.strip $f

src/doc/po/ja/complement-cheatsheet.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,7 +17,20 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:13
+#: src/doc/complement-cheatsheet.md:8
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"Use [`ToStr`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToStr."
+"html)."
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:13
 #, fuzzy
 #| msgid ""
 #| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
@@ -30,7 +43,7 @@ msgstr ""
 "~~~~"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:17
+#: src/doc/complement-cheatsheet.md:17
 #, fuzzy
 #| msgid ""
 #| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
@@ -44,7 +57,7 @@ msgstr ""
 "[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:22
+#: src/doc/complement-cheatsheet.md:22
 #, fuzzy
 #| msgid ""
 #| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
@@ -57,7 +70,20 @@ msgstr ""
 "~~~~"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:29
+#: src/doc/complement-cheatsheet.md:26
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"Use [`ToStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait."
+"ToStrRadix.html)."
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:29
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ use std::num::ToStrRadix;"
@@ -66,7 +92,7 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:33
+#: src/doc/complement-cheatsheet.md:33
 #, fuzzy
 #| msgid ""
 #| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
@@ -79,7 +105,7 @@ msgstr ""
 "~~~~"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:37
+#: src/doc/complement-cheatsheet.md:37
 #, fuzzy
 #| msgid ""
 #| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
@@ -93,7 +119,7 @@ msgstr ""
 "[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:40
+#: src/doc/complement-cheatsheet.md:40
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ use std::num::from_str_radix;"
@@ -102,14 +128,44 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:46
+#: src/doc/complement-cheatsheet.md:44
+#, fuzzy
+#| msgid ""
+#| "~~~~ let x: f64 = 4.0; let y: uint = x as uint; assert!(y == 4u); ~~~~"
+msgid ""
+"let x: Option<i64> = from_str_radix(\"deadbeef\", 16); let y: i64 = x."
+"unwrap(); ~~~"
+msgstr ""
+"~~~~\n"
+"let x: f64 = 4.0;\n"
+"let y: uint = x as uint;\n"
+"assert!(y == 4u);\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:46
 #, fuzzy
 #| msgid "## Operators"
 msgid "# File operations"
 msgstr "## 演算子"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:54
+#: src/doc/complement-cheatsheet.md:50
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"Use [`File::open`](http://static.rust-lang.org/doc/master/std/io/fs/struct."
+"File.html#method.open) to create a [`File`](http://static.rust-lang.org/doc/"
+"master/std/io/fs/struct.File.html) struct, which implements the [`Reader`]"
+"(http://static.rust-lang.org/doc/master/std/io/trait.Reader.html) trait."
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:54
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ {.ignore} use std::path::Path; use std::io::fs::File;"
@@ -118,7 +174,7 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:63
+#: src/doc/complement-cheatsheet.md:63
 #, fuzzy
 #| msgid ""
 #| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
@@ -132,21 +188,145 @@ msgstr ""
 "[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:77
+#: src/doc/complement-cheatsheet.md:67
+#, fuzzy
+#| msgid "~~~~ use std::task::spawn;"
+msgid "~~~ use std::io::BufferedReader; # use std::io::MemReader;"
+msgstr ""
+"~~~~\n"
+"use std::task::spawn;"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:77
 #, fuzzy
 #| msgid "## Using other crates"
 msgid "# String operations"
 msgstr "## 他のクレートの利用"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:88 doc/guide-container.md:4
+#: src/doc/complement-cheatsheet.md:81
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"Use the [`find_str`](http://static.rust-lang.org/doc/master/std/str/trait."
+"StrSlice.html#tymethod.find_str) method."
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:88 src/doc/guide-container.md:4
 #, fuzzy
 msgid "# Containers"
 msgstr "## 本書の表記について"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:176
+#: src/doc/complement-cheatsheet.md:92
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"The [`Container`](http://static.rust-lang.org/doc/master/std/container/trait."
+"Container.html) trait provides the `len` method."
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:104
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"Use the [`iter`](http://static.rust-lang.org/doc/master/std/vec/trait."
+"ImmutableVector.html#tymethod.iter) method."
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:113
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid ""
+"(See also [`mut_iter`](http://static.rust-lang.org/doc/master/std/vec/trait."
+"MutableVector.html#tymethod.mut_iter) which yields `&mut int` and "
+"[`move_iter`](http://static.rust-lang.org/doc/master/std/vec/trait."
+"OwnedVector.html#tymethod.move_iter) which yields `int` while consuming the "
+"`values` vector.)"
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:115 src/doc/rust.md:3019
+#, fuzzy
+msgid "# Type system"
+msgstr "## タプル"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:122
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"~~~\n"
+"struct Foo {\n"
+"    myfunc: fn(int, uint) -> i32\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:130
+#, fuzzy, no-wrap
+#| msgid "~~~~ fn line(a: int, b: int, x: int) -> int { a * x + b } fn oops(a: int, b: int, x: int) -> ()  { a * x + b; }"
+msgid ""
+"fn a(a: int, b: uint) -> i32 {\n"
+"    (a as uint + b) as i32\n"
+"}\n"
+msgstr ""
+"~~~~\n"
+"fn line(a: int, b: int, x: int) -> int { a * x + b }\n"
+"fn oops(a: int, b: int, x: int) -> ()  { a * x + b; }"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:138
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"fn main() {\n"
+"    let f = Foo { myfunc: a };\n"
+"    let g = FooClosure { myfunc: |a, b|  { (a - b as int) as i32 } };\n"
+"    println!(\"{}\", (f.myfunc)(1, 2));\n"
+"    println!(\"{}\", (g.myfunc)(3, 4));\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:176
 #, fuzzy
 #| msgid "[The foreign function interface][ffi]"
 msgid "# FFI (Foreign Function Interface)"
 msgstr "[他言語間インターフェース (foreign function inferface)][ffi]"
+
+#. type: Plain text
+#: src/doc/complement-cheatsheet.md:178
+#, fuzzy
+#| msgid "# Control structures"
+msgid "## C function signature conversions"
+msgstr "# 制御構造"

src/doc/po/ja/complement-lang-faq.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,7 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/complement-lang-faq.md:83
+#: src/doc/complement-lang-faq.md:2
+#, fuzzy
+#| msgid "## Structs"
+msgid "% Language FAQ"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/complement-lang-faq.md:4
+#, fuzzy
+#| msgid "## Structs"
+msgid "# General language issues"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/complement-lang-faq.md:83
 #, fuzzy
 #| msgid ""
 #| "[bug-3319]: https://github.com/mozilla/rust/issues/3319 [wiki-start]: "
@@ -33,7 +47,23 @@ msgstr ""
 "developing-Rust"
 
 #. type: Plain text
-#: doc/complement-lang-faq.md:110
+#: src/doc/complement-lang-faq.md:99
+#, fuzzy
+#| msgid ""
+#| "[bug-3319]: https://github.com/mozilla/rust/issues/3319 [wiki-start]: "
+#| "https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust"
+msgid ""
+"[sprocketnes]: https://github.com/pcwalton/sprocketnes [hash]: https://"
+"github.com/mozilla/rust/blob/master/src/libstd/hash.rs [HashMap]: https://"
+"github.com/mozilla/rust/blob/master/src/libstd/hashmap.rs [json]: https://"
+"github.com/mozilla/rust/blob/master/src/libextra/json.rs"
+msgstr ""
+"[bug-3319]: https://github.com/mozilla/rust/issues/3319\n"
+"[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-"
+"developing-Rust"
+
+#. type: Plain text
+#: src/doc/complement-lang-faq.md:110
 #, fuzzy
 #| msgid ""
 #| "[bug-3319]: https://github.com/mozilla/rust/issues/3319 [wiki-start]: "
@@ -45,3 +75,10 @@ msgstr ""
 "[bug-3319]: https://github.com/mozilla/rust/issues/3319\n"
 "[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-"
 "developing-Rust"
+
+#. type: Plain text
+#: src/doc/complement-lang-faq.md:131
+#, fuzzy
+#| msgid "## Structs"
+msgid "# Specific language issues"
+msgstr "## 構造体"

src/doc/po/ja/complement-project-faq.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Bullet: '* '
-#: doc/complement-project-faq.md:36
+#: src/doc/complement-project-faq.md:36
 #, fuzzy
 #| msgid "## The standard library"
 msgid "An evolving standard library."

src/doc/po/ja/complement-usage-faq.md.po

@@ -0,0 +1,35 @@
+# Japanese translations for Rust package
+# Copyright (C) 2014 The Rust Project Developers
+# This file is distributed under the same license as the Rust package.
+# Automatically generated, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Rust 0.10-pre\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
+"PO-Revision-Date: 2014-02-03 08:13+0900\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. type: Plain text
+#: src/doc/complement-usage-faq.md:2
+#, fuzzy
+#| msgid "## Structs"
+msgid "% Usage FAQ"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/complement-usage-faq.md:18
+#, fuzzy
+#| msgid ""
+#| "[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz [win-exe]: "
+#| "http://static.rust-lang.org/dist/rust-0.7-install.exe"
+msgid "[1]:http://doc.rust-lang.org/doc/master/rust.html#logging-system"
+msgstr ""
+"[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz\n"
+"[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe"

src/doc/po/ja/guide-conditions.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,57 +17,151 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-conditions.md:2
+#: src/doc/guide-conditions.md:2
 #, fuzzy
 #| msgid "% The Rust Language Tutorial"
 msgid "% The Rust Condition and Error-handling Guide"
 msgstr "% Rust 言語チュートリアル"
 
 #. type: Plain text
-#: doc/guide-conditions.md:4 doc/guide-ffi.md:4 doc/guide-lifetimes.md:4
+#: src/doc/guide-conditions.md:4 src/doc/guide-ffi.md:4
-#: doc/guide-macros.md:4 doc/guide-rustpkg.md:4 doc/guide-tasks.md:4
+#: src/doc/guide-lifetimes.md:4 src/doc/guide-macros.md:4
-#: doc/rust.md:4 doc/rustpkg.md:4 doc/tutorial.md:4
+#: src/doc/guide-tasks.md:4 src/doc/rust.md:4 src/doc/tutorial.md:4
 msgid "# Introduction"
 msgstr "# イントロダクション"
 
 #. type: Bullet: '  - '
-#: doc/guide-conditions.md:14
+#: src/doc/guide-conditions.md:14
 #, fuzzy
 #| msgid "# Functions"
 msgid "Options"
 msgstr "# 関数"
 
 #. type: Bullet: '  - '
-#: doc/guide-conditions.md:14
+#: src/doc/guide-conditions.md:14
 #, fuzzy
 #| msgid "## Conditionals"
 msgid "Conditions"
 msgstr "## 条件式"
 
 #. type: Plain text
-#: doc/guide-conditions.md:19
+#: src/doc/guide-conditions.md:19
 #, fuzzy
 #| msgid "## Tuples"
 msgid "# Example program"
 msgstr "## タプル"
 
 #. type: Plain text
-#: doc/guide-conditions.md:112
+#: src/doc/guide-conditions.md:69 src/doc/guide-conditions.md:374
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"fn main() {\n"
+"    let pairs = read_int_pairs();\n"
+"    for &(a,b) in pairs.iter() {\n"
+"        println!(\"{:4.4d}, {:4.4d}\", a, b);\n"
+"    }\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:110
 #, fuzzy
 #| msgid "# Functions"
 msgid "# Options"
 msgstr "# 関数"
 
 #. type: Plain text
-#: doc/guide-conditions.md:318
+#: src/doc/guide-conditions.md:262
+#, fuzzy
+#| msgid ""
+#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello "
+#| "\" + world::explore()); } ~~~~"
+msgid "fn main() {"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:271 src/doc/guide-conditions.md:519
+#: src/doc/guide-conditions.md:612
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"        // The protected logic.\n"
+"        let pairs = read_int_pairs();\n"
+"        for &(a,b) in pairs.iter() {\n"
+"            println!(\"{:4.4d}, {:4.4d}\", a, b);\n"
+"        }\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:314
 #, fuzzy
 #| msgid "## Conditionals"
 msgid "# Conditions"
 msgstr "## 条件式"
 
 #. type: Plain text
-#: doc/guide-conditions.md:415
+#: src/doc/guide-conditions.md:409
 #, fuzzy
 #| msgid "## Traits"
 msgid "# Trapping a condition"
 msgstr "## トレイト"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:444
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"        // The protected logic.\n"
+"        let pairs = read_int_pairs();\n"
+"        for &(a,b) in pairs.iter() {\n"
+"                println!(\"{:4.4d}, {:4.4d}\", a, b);\n"
+"        }\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:480
+#, fuzzy
+#| msgid "## Traits"
+msgid "# Refining a condition"
+msgstr "## トレイト"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:566
+#, fuzzy
+#| msgid "## Traits"
+msgid "# Further refining a condition"
+msgstr "## トレイト"
+
+#. type: Plain text
+#: src/doc/guide-conditions.md:739
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"            // The protected logic.\n"
+"            let pairs = read_int_pairs();\n"
+"            for &(a,b) in pairs.iter() {\n"
+"                println!(\"{:4.4d}, {:4.4d}\", a, b);\n"
+"            }\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"

src/doc/po/ja/guide-container.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,97 +17,129 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/complement-cheatsheet.md:88 doc/guide-container.md:4
+#: src/doc/complement-cheatsheet.md:88 src/doc/guide-container.md:4
 #, fuzzy
 msgid "# Containers"
 msgstr "## 本書の表記について"
 
 #. type: Plain text
-#: doc/guide-container.md:2
+#: src/doc/guide-container.md:2
 #, fuzzy
 #| msgid "% The Rust Language Tutorial"
 msgid "% The Rust Containers and Iterators Guide"
 msgstr "% Rust 言語チュートリアル"
 
 #. type: Plain text
-#: doc/guide-container.md:8
+#: src/doc/guide-container.md:8
 #, fuzzy
 #| msgid "# Control structures"
 msgid "## Unique vectors"
 msgstr "# 制御構造"
 
 #. type: Plain text
-#: doc/guide-container.md:18
+#: src/doc/guide-container.md:18
 #, fuzzy
 #| msgid "## Managed closures"
 msgid "## Maps and sets"
 msgstr "## マネージドクロージャ"
 
 #. type: Plain text
-#: doc/guide-container.md:24
+#: src/doc/guide-container.md:24
 #, fuzzy
 #| msgid "## The standard library"
 msgid "The standard library provides three owned map/set types:"
 msgstr "## 標準ライブラリ"
 
 #. type: Plain text
-#: doc/guide-container.md:68
+#: src/doc/guide-container.md:44
+#, fuzzy
+#| msgid "# Control structures"
+msgid "## Double-ended queues"
+msgstr "# 制御構造"
+
+#. type: Plain text
+#: src/doc/guide-container.md:68
 #, fuzzy
 #| msgid "## Operators"
 msgid "# Iterators"
 msgstr "## 演算子"
 
 #. type: Plain text
-#: doc/guide-container.md:70
+#: src/doc/guide-container.md:70
 #, fuzzy
 #| msgid "# Introduction"
 msgid "## Iteration protocol"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-container.md:119
+#: src/doc/guide-container.md:85
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"impl Iterator<int> for ZeroStream {\n"
+"    fn next(&mut self) -> Option<int> {\n"
+"        Some(0)\n"
+"    }\n"
+"}\n"
+"~~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-container.md:119
 #, fuzzy
 #| msgid "# Control structures"
 msgid "## Container iterators"
 msgstr "# 制御構造"
 
 #. type: Plain text
-#: doc/guide-container.md:131
+#: src/doc/guide-container.md:131
 #, fuzzy
 #| msgid "## Freezing"
 msgid "### Freezing"
 msgstr "## 凍結"
 
 #. type: Plain text
-#: doc/guide-container.md:151
+#: src/doc/guide-container.md:151
 #, fuzzy
 #| msgid "## Operators"
 msgid "## Iterator adaptors"
 msgstr "## 演算子"
 
 #. type: Plain text
-#: doc/guide-container.md:201
+#: src/doc/guide-container.md:201
 #, fuzzy
 #| msgid "## Loops"
 msgid "## For loops"
 msgstr "## ループ"
 
 #. type: Plain text
-#: doc/guide-container.md:257
+#: src/doc/guide-container.md:257
 #, fuzzy
 #| msgid "## Conventions"
 msgid "## Conversion"
 msgstr "## 本書の表記について"
 
 #. type: Plain text
-#: doc/guide-container.md:334
+#: src/doc/guide-container.md:287
+#, fuzzy
+#| msgid "## Structs"
+msgid "### Size hints"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/guide-container.md:334
 #, fuzzy
 #| msgid "# Control structures"
 msgid "## Double-ended iterators"
 msgstr "# 制御構造"
 
 #. type: Plain text
-#: doc/guide-container.md:385
+#: src/doc/guide-container.md:385
 #, fuzzy
 #| msgid "# Control structures"
 msgid "## Random-access iterators"

src/doc/po/ja/guide-ffi.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,21 +17,21 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-conditions.md:4 doc/guide-ffi.md:4 doc/guide-lifetimes.md:4
+#: src/doc/guide-conditions.md:4 src/doc/guide-ffi.md:4
-#: doc/guide-macros.md:4 doc/guide-rustpkg.md:4 doc/guide-tasks.md:4
+#: src/doc/guide-lifetimes.md:4 src/doc/guide-macros.md:4
-#: doc/rust.md:4 doc/rustpkg.md:4 doc/tutorial.md:4
+#: src/doc/guide-tasks.md:4 src/doc/rust.md:4 src/doc/tutorial.md:4
 msgid "# Introduction"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-ffi.md:2
+#: src/doc/guide-ffi.md:2
 #, fuzzy
 #| msgid "[The foreign function interface][ffi]"
 msgid "% The Rust Foreign Function Interface Guide"
 msgstr "[他言語間インターフェース (foreign function inferface)][ffi]"
 
 #. type: Plain text
-#: doc/guide-ffi.md:16
+#: src/doc/guide-ffi.md:16
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~~ {.ignore} use std::libc::size_t;"
@@ -40,7 +40,7 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-ffi.md:48
+#: src/doc/guide-ffi.md:48
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~~ {.ignore} use std::libc::{c_int, size_t};"
@@ -49,12 +49,63 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-ffi.md:168 doc/tutorial.md:875
+#: src/doc/guide-ffi.md:145
+#, fuzzy
+#| msgid "## Structs"
+msgid "# Stack management"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:168 src/doc/tutorial.md:885
 msgid "# Destructors"
 msgstr "# デストラクタ"
 
 #. type: Plain text
-#: doc/guide-ffi.md:333
+#: src/doc/guide-ffi.md:264
+#, fuzzy
+#| msgid "## A minimal example"
+msgid "A basic example is:"
+msgstr "## 最小限の例"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:323
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"struct RustObject {\n"
+"    a: i32,\n"
+"    // other members\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:390
+#, fuzzy
+#| msgid "## Freezing"
+msgid "# Linking"
+msgstr "## 凍結"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:437
+#, fuzzy
+#| msgid "# Vectors and strings"
+msgid "## The `link_args` attribute"
+msgstr "# ベクタと文字列"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:459
+#, fuzzy
+#| msgid "## Conventions"
+msgid "# Unsafe blocks"
+msgstr "## 本書の表記について"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:470
 #, fuzzy
 #| msgid "~~~~ let square = |x: int| -> uint { (x * x) as uint }; ~~~~"
 msgid "~~~~ unsafe fn kaboom(ptr: *int) -> int { *ptr } ~~~~"
@@ -64,7 +115,7 @@ msgstr ""
 "~~~~~~~~\n"
 
 #. type: Plain text
-#: doc/guide-ffi.md:344
+#: src/doc/guide-ffi.md:481
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~{.ignore} use std::libc;"
@@ -73,10 +124,17 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-ffi.md:363
+#: src/doc/guide-ffi.md:500
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~{.ignore} use std::libc; use std::ptr;"
 msgstr ""
 "~~~~\n"
 "use std::task::spawn;"
+
+#. type: Plain text
+#: src/doc/guide-ffi.md:516
+#, fuzzy
+#| msgid "## Using the rust tool"
+msgid "# Foreign calling conventions"
+msgstr "## `rust` コマンドを利用する"

src/doc/po/ja/guide-lifetimes.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,35 +17,49 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-conditions.md:4 doc/guide-ffi.md:4 doc/guide-lifetimes.md:4
+#: src/doc/guide-conditions.md:4 src/doc/guide-ffi.md:4
-#: doc/guide-macros.md:4 doc/guide-rustpkg.md:4 doc/guide-tasks.md:4
+#: src/doc/guide-lifetimes.md:4 src/doc/guide-macros.md:4
-#: doc/rust.md:4 doc/rustpkg.md:4 doc/tutorial.md:4
+#: src/doc/guide-tasks.md:4 src/doc/rust.md:4 src/doc/tutorial.md:4
 msgid "# Introduction"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:2
+#: src/doc/guide-lifetimes.md:2
 #, fuzzy
 #| msgid "% The Rust Language Tutorial"
 msgid "% The Rust References and Lifetimes Guide"
 msgstr "% Rust 言語チュートリアル"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:26
+#: src/doc/guide-lifetimes.md:26
 #, fuzzy
 #| msgid "## A minimal example"
 msgid "# By example"
 msgstr "## 最小限の例"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:33
+#: src/doc/guide-lifetimes.md:33
 #, fuzzy
 #| msgid "As an example, consider a simple struct type, `Point`:"
 msgid "As an example, consider a simple struct type `Point`:"
 msgstr "例として、シンプルな構造体型の `Point` について考えます。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:41
+#: src/doc/guide-lifetimes.md:37
+#, fuzzy
+#| msgid ""
+#| "~~~ # struct Point { x: f64, y: f64 } let point = &@~Point { x: 10f, y: "
+#| "20f }; println(fmt!(\"%f\", point.x)); ~~~"
+msgid "~~~ struct Point {x: f64, y: f64} ~~~"
+msgstr ""
+"~~~\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let point = &@~Point { x: 10f, y: 20f };\n"
+"println(fmt!(\"%f\", point.x));\n"
+"~~~"
+
+#. type: Plain text
+#: src/doc/guide-lifetimes.md:41
 #, fuzzy
 #| msgid ""
 #| "We can use this simple definition to allocate points in many different "
@@ -61,7 +75,7 @@ msgstr ""
 "なった場所に `Point` 型のオブジェクトを割り当てています。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:48
+#: src/doc/guide-lifetimes.md:48
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -78,7 +92,7 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:60
+#: src/doc/guide-lifetimes.md:60
 #, fuzzy
 #| msgid ""
 #| "Suppose we want to write a procedure that computes the distance between "
@@ -115,13 +129,13 @@ msgstr ""
 "です。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:72 doc/tutorial.md:1394
+#: src/doc/guide-lifetimes.md:72 src/doc/tutorial.md:1409
 msgid "Now we can call `compute_distance()` in various ways:"
 msgstr ""
 "上記の `compute_distance()` 関数は、様々な方法で呼び出すことができます。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:82
+#: src/doc/guide-lifetimes.md:82
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -141,7 +155,7 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:89
+#: src/doc/guide-lifetimes.md:89
 #, fuzzy
 #| msgid ""
 #| "Here the `&` operator is used to take the address of the variable "
@@ -164,7 +178,7 @@ msgstr ""
 "(_borrowing_) と呼びます。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:95
+#: src/doc/guide-lifetimes.md:95
 #, fuzzy
 #| msgid ""
 #| "In the case of the boxes `managed_box` and `owned_box`, however, no "
@@ -186,7 +200,7 @@ msgstr ""
 "す。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:105
+#: src/doc/guide-lifetimes.md:105
 #, fuzzy
 #| msgid ""
 #| "Whenever a value is borrowed, there are some limitations on what you can "
@@ -216,7 +230,7 @@ msgstr ""
 "コープを抜ける) を待たなければなりません。"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:114
+#: src/doc/guide-lifetimes.md:114
 #, fuzzy
 #| msgid ""
 #| "~~~ # struct Point { x: f64, y: f64 } let point = &@~Point { x: 10f, y: "
@@ -232,7 +246,7 @@ msgstr ""
 "~~~"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:124
+#: src/doc/guide-lifetimes.md:124
 #, fuzzy
 #| msgid ""
 #| "~~~ # struct Point { x: f64, y: f64 } let point = &@~Point { x: 10f, y: "
@@ -248,7 +262,7 @@ msgstr ""
 "~~~"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:134
+#: src/doc/guide-lifetimes.md:134
 #, fuzzy
 #| msgid ""
 #| "~~~ # struct Point { x: f64, y: f64 } let point = &@~Point { x: 10f, y: "
@@ -264,35 +278,35 @@ msgstr ""
 "~~~"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:180
+#: src/doc/guide-lifetimes.md:180
 #, fuzzy
 #| msgid "# Borrowed pointers"
 msgid "# Borrowing managed boxes and rooting"
 msgstr "# 借用ポインタ"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:262
+#: src/doc/guide-lifetimes.md:262
 #, fuzzy
 #| msgid "# Borrowed pointers"
 msgid "# Borrowing owned boxes"
 msgstr "# 借用ポインタ"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:367
+#: src/doc/guide-lifetimes.md:367
 #, fuzzy
 #| msgid "# Borrowed pointers"
 msgid "# Borrowing and enums"
 msgstr "# 借用ポインタ"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:477
+#: src/doc/guide-lifetimes.md:477
 #, fuzzy
 #| msgid "# Dereferencing pointers"
 msgid "# Returning references"
 msgstr "# ポインタのデリファレンス"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:490
+#: src/doc/guide-lifetimes.md:490
 #, fuzzy
 #| msgid ""
 #| "~~~ # struct Point { x: f64, y: f64 } let point = &@~Point { x: 10f, y: "
@@ -308,7 +322,25 @@ msgstr ""
 "~~~"
 
 #. type: Plain text
-#: doc/guide-lifetimes.md:659
+#: src/doc/guide-lifetimes.md:533
+#, fuzzy, no-wrap
+#| msgid "~~~ # struct Point { x: f64, y: f64 } let point = &@~Point { x: 10f, y: 20f }; println(fmt!(\"%f\", point.x)); ~~~"
+msgid ""
+"~~~ {.ignore}\n"
+"struct Point {x: f64, y: f64}\n"
+"fn get_x_sh(p: @Point) -> &f64 {\n"
+"    &p.x // Error reported here\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let point = &@~Point { x: 10f, y: 20f };\n"
+"println(fmt!(\"%f\", point.x));\n"
+"~~~"
+
+#. type: Plain text
+#: src/doc/guide-lifetimes.md:659
 #, fuzzy
 #| msgid "## Conventions"
 msgid "# Conclusion"

src/doc/po/ja/guide-macros.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,78 +17,85 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-conditions.md:4 doc/guide-ffi.md:4 doc/guide-lifetimes.md:4
+#: src/doc/guide-conditions.md:4 src/doc/guide-ffi.md:4
-#: doc/guide-macros.md:4 doc/guide-rustpkg.md:4 doc/guide-tasks.md:4
+#: src/doc/guide-lifetimes.md:4 src/doc/guide-macros.md:4
-#: doc/rust.md:4 doc/rustpkg.md:4 doc/tutorial.md:4
+#: src/doc/guide-tasks.md:4 src/doc/rust.md:4 src/doc/tutorial.md:4
 msgid "# Introduction"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-macros.md:2
+#: src/doc/guide-macros.md:2
 #, fuzzy
 #| msgid "% The Rust Language Tutorial"
 msgid "% The Rust Macros Guide"
 msgstr "% Rust 言語チュートリアル"
 
 #. type: Plain text
-#: doc/guide-macros.md:67
+#: src/doc/guide-macros.md:67
 #, fuzzy
 #| msgid "## Do syntax"
 msgid "# Invocation syntax"
 msgstr "## do 構文"
 
 #. type: Plain text
-#: doc/guide-macros.md:100
+#: src/doc/guide-macros.md:100
 #, fuzzy
 #| msgid "# Introduction"
 msgid "## Invocation location"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-macros.md:115
+#: src/doc/guide-macros.md:115
 #, fuzzy
 #| msgid "## Traits"
 msgid "# Transcription syntax"
 msgstr "## トレイト"
 
 #. type: Plain text
-#: doc/guide-macros.md:135
+#: src/doc/guide-macros.md:135
 #, fuzzy
 #| msgid "# Introduction"
 msgid "## Interpolation location"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-macros.md:143
+#: src/doc/guide-macros.md:143
 #, fuzzy
 #| msgid "# Introduction"
 msgid "## Invocation"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-macros.md:181
+#: src/doc/guide-macros.md:181
 #, fuzzy
 #| msgid "## Traits"
 msgid "### Transcription"
 msgstr "## トレイト"
 
 #. type: Plain text
-#: doc/guide-macros.md:193
+#: src/doc/guide-macros.md:193
 #, fuzzy
 #| msgid "## Pattern matching"
 msgid "## Parsing limitations"
 msgstr "## パターンマッチ"
 
 #. type: Plain text
-#: doc/guide-macros.md:212
+#: src/doc/guide-macros.md:212
 #, fuzzy
 #| msgid "## Pattern matching"
 msgid "# Macro argument pattern matching"
 msgstr "## パターンマッチ"
 
 #. type: Plain text
-#: doc/guide-macros.md:214
+#: src/doc/guide-macros.md:214
 #, fuzzy
 #| msgid "## Conventions"
 msgid "## Motivation"
 msgstr "## 本書の表記について"
+
+#. type: Plain text
+#: src/doc/guide-macros.md:216
+#, fuzzy
+#| msgid "## Primitive types and literals"
+msgid "Now consider code like the following:"
+msgstr "## プリミティブ型とリテラル"

src/doc/po/ja/guide-pointers.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,14 +17,14 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-pointers.md:2
+#: src/doc/guide-pointers.md:2
 #, fuzzy
 #| msgid "% The Rust Language Tutorial"
 msgid "% The Rust Pointer Guide"
 msgstr "% Rust 言語チュートリアル"
 
 #. type: Plain text
-#: doc/guide-pointers.md:21
+#: src/doc/guide-pointers.md:21
 #, fuzzy
 #| msgid "~~~~ let square = |x: int| -> uint { (x * x) as uint }; ~~~~"
 msgid "~~~rust fn succ(x: &int) -> int { *x + 1 } ~~~"
@@ -34,7 +34,44 @@ msgstr ""
 "~~~~~~~~\n"
 
 #. type: Plain text
-#: doc/guide-pointers.md:58
+#: src/doc/guide-pointers.md:31
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"~~~rust{.ignore}\n"
+"fn main() {\n"
+"    let number = 5;\n"
+"    let succ_number = succ(number);\n"
+"    println!(\"{}\", succ_number);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:50
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"~~~rust\n"
+"# fn succ(x: &int) -> int { *x + 1 }\n"
+"fn main() {\n"
+"    let number = 5;\n"
+"    let succ_number = succ(&number);\n"
+"    println!(\"{}\", succ_number);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:58
 #, fuzzy
 #| msgid "~~~~ let square = |x: int| -> uint { (x * x) as uint }; ~~~~"
 msgid "~~~rust fn succ(x: int) -> int { x + 1 }"
@@ -44,7 +81,41 @@ msgstr ""
 "~~~~~~~~\n"
 
 #. type: Plain text
-#: doc/guide-pointers.md:115
+#: src/doc/guide-pointers.md:65
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"fn main() {\n"
+"    let number = 5;\n"
+"    let succ_number = succ(number);\n"
+"    println!(\"{}\", succ_number);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:109
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"~~~rust\n"
+"# fn transform(p: Point) -> Point { p }\n"
+"struct Point {\n"
+"    x: int,\n"
+"    y: int,\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:115
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -60,7 +131,7 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:129
+#: src/doc/guide-pointers.md:129
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -80,7 +151,25 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:145
+#: src/doc/guide-pointers.md:141 src/doc/guide-pointers.md:221
+#: src/doc/guide-pointers.md:238 src/doc/guide-pointers.md:300
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"~~~rust\n"
+"struct Point {\n"
+"    x: int,\n"
+"    y: int,\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:145
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -94,7 +183,7 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:152
+#: src/doc/guide-pointers.md:152
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -111,35 +200,74 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:162
+#: src/doc/guide-pointers.md:162
 #, fuzzy
 #| msgid "# Borrowed pointers"
 msgid "# Owned Pointers"
 msgstr "# 借用ポインタ"
 
 #. type: Plain text
-#: doc/guide-pointers.md:175
+#: src/doc/guide-pointers.md:175
 #, fuzzy
 msgid "## References to Traits"
 msgstr "# ポインタのデリファレンス"
 
 #. type: Plain text
-#: doc/guide-pointers.md:181
+#: src/doc/guide-pointers.md:181
 #, fuzzy
 #| msgid "# Data structures"
 msgid "## Recursive Data Structures"
 msgstr "# データ構造"
 
 #. type: Plain text
-#: doc/guide-pointers.md:229
+#: src/doc/guide-pointers.md:189
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"~~~rust\n"
+"enum List<T> {\n"
+"    Nil,\n"
+"    Cons(T, ~List<T>),\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:195
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"fn main() {\n"
+"    let list: List<int> = Cons(1, ~Cons(2, ~Cons(3, ~Nil)));\n"
+"    println!(\"{:?}\", list);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:215
+#, fuzzy
+msgid "For example, this will work:"
+msgstr "## 最小限の例"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:229
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
 "fn main() {\n"
 "    let a = Point { x: 10, y: 20 };\n"
-"    do spawn {\n"
+"    spawn(proc() {\n"
 "        println!(\"{}\", a.x);\n"
-"    }\n"
+"    });\n"
 "}\n"
 "~~~\n"
 msgstr ""
@@ -149,15 +277,15 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:246
+#: src/doc/guide-pointers.md:246
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
 "fn main() {\n"
 "    let a = ~Point { x: 10, y: 20 };\n"
-"    do spawn {\n"
+"    spawn(proc() {\n"
 "        println!(\"{}\", a.x);\n"
-"    }\n"
+"    });\n"
 "}\n"
 "~~~\n"
 msgstr ""
@@ -167,14 +295,31 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:251
+#: src/doc/guide-pointers.md:251
 #, fuzzy
 #| msgid "## Managed boxes"
 msgid "# Managed Pointers"
 msgstr "## マネージドボックス"
 
 #. type: Plain text
-#: doc/guide-pointers.md:277
+#: src/doc/guide-pointers.md:269
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"~~~rust{.ignore}\n"
+"struct Point {\n"
+"    x: int,\n"
+"    y: int,\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:277
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -192,7 +337,7 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:308
+#: src/doc/guide-pointers.md:308
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -210,13 +355,13 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:326 doc/tutorial.md:1345
+#: src/doc/guide-pointers.md:326 src/doc/tutorial.md:1360
 #, fuzzy
 msgid "# References"
 msgstr "# ポインタのデリファレンス"
 
 #. type: Plain text
-#: doc/guide-pointers.md:336
+#: src/doc/guide-pointers.md:336
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~rust use std::num::sqrt;"
@@ -225,7 +370,23 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-pointers.md:352
+#: src/doc/guide-pointers.md:341
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"struct Point {\n"
+"    x: f32,\n"
+"    y: f32,\n"
+"}\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:352
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
 msgid ""
@@ -239,7 +400,7 @@ msgstr ""
 "let origin = Point { x: 0.0, y: 0.0 };"
 
 #. type: Plain text
-#: doc/guide-pointers.md:378
+#: src/doc/guide-pointers.md:378
 #, fuzzy, no-wrap
 #| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
 msgid ""
@@ -257,14 +418,72 @@ msgstr ""
 "~~~~"
 
 #. type: Plain text
-#: doc/guide-pointers.md:433
+#: src/doc/guide-pointers.md:396
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"~~~rust\n"
+"fn main() {\n"
+"    let mut x = ~5;\n"
+"    if *x < 10 {\n"
+"        let y = &x;\n"
+"        println!(\"Oh no: {:?}\", y);\n"
+"        return;\n"
+"    }\n"
+"    *x -= 1;\n"
+"    println!(\"Oh no: {:?}\", x);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:407
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"~~~rust{.ignore}\n"
+"fn main() {\n"
+"    let mut x = ~5;\n"
+"    if *x < 10 {\n"
+"        let y = &x;\n"
+"        *x -= 1;\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:415
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} # struct Point { x: f64, y: f64 } let mut mypoint = Point { x: 1.0, y: 1.0 }; let origin = Point { x: 0.0, y: 0.0 };"
+msgid ""
+"        println!(\"Oh no: {:?}\", y);\n"
+"        return;\n"
+"    }\n"
+"    *x -= 1;\n"
+"    println!(\"Oh no: {:?}\", x);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"# struct Point { x: f64, y: f64 }\n"
+"let mut mypoint = Point { x: 1.0, y: 1.0 };\n"
+"let origin = Point { x: 0.0, y: 0.0 };"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:433
 #, fuzzy
 #| msgid "# Dereferencing pointers"
 msgid "# Returning Pointers"
 msgstr "# ポインタのデリファレンス"
 
 #. type: Plain text
-#: doc/guide-pointers.md:444
+#: src/doc/guide-pointers.md:444
 #, fuzzy, no-wrap
 #| msgid "~~~~ let square = |x: int| -> uint { (x * x) as uint }; ~~~~"
 msgid ""
@@ -278,7 +497,24 @@ msgstr ""
 "~~~~~~~~\n"
 
 #. type: Plain text
-#: doc/guide-pointers.md:457 doc/guide-pointers.md:471
+#: src/doc/guide-pointers.md:450
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"fn main() {\n"
+"    let x = ~5;\n"
+"    let y = foo(x);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:457 src/doc/guide-pointers.md:471
 #, fuzzy, no-wrap
 #| msgid "~~~~ let square = |x: int| -> uint { (x * x) as uint }; ~~~~"
 msgid ""
@@ -290,3 +526,51 @@ msgstr ""
 "~~~~\n"
 "let square = |x: int| -> uint { (x * x) as uint };\n"
 "~~~~~~~~\n"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:463
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"fn main() {\n"
+"    let x = ~5;\n"
+"    let y = ~foo(x);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:477
+#, fuzzy, no-wrap
+#| msgid "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello \" + world::explore()); } ~~~~"
+msgid ""
+"fn main() {\n"
+"    let x = ~5;\n"
+"    let y = @foo(x);\n"
+"}\n"
+"~~~\n"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-pointers.md:491
+#, fuzzy
+#| msgid "# Modules and crates"
+msgid "# Related Resources"
+msgstr "# モジュールとクレート"
+
+#. type: Bullet: '* '
+#: src/doc/guide-pointers.md:492
+#, fuzzy
+#| msgid "% The Rust Language Tutorial"
+msgid "[Lifetimes guide](guide-lifetimes.html)"
+msgstr "% Rust 言語チュートリアル"

src/doc/po/ja/guide-runtime.md.po

@@ -0,0 +1,124 @@
+# Japanese translations for Rust package
+# Copyright (C) 2014 The Rust Project Developers
+# This file is distributed under the same license as the Rust package.
+# Automatically generated, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Rust 0.10-pre\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
+"PO-Revision-Date: 2014-02-03 08:13+0900\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:18
+#, fuzzy
+#| msgid "## Using the rust tool"
+msgid "# What is the runtime?"
+msgstr "## `rust` コマンドを利用する"
+
+#. type: Bullet: '* '
+#: src/doc/guide-runtime.md:36
+#, fuzzy
+#| msgid "[Tasks and communication][tasks]"
+msgid "Task spawning"
+msgstr "[タスクと通信][tasks]"
+
+#. type: Bullet: '* '
+#: src/doc/guide-runtime.md:36
+#, fuzzy
+#| msgid "[Tasks and communication][tasks]"
+msgid "Task unwinding"
+msgstr "[タスクと通信][tasks]"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:38
+#, fuzzy
+#| msgid "## Using the rust tool"
+msgid "## What is the runtime accomplishing?"
+msgstr "## `rust` コマンドを利用する"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:64
+#, fuzzy
+#| msgid "# Introduction"
+msgid "# Architecture of the runtime"
+msgstr "# イントロダクション"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:110
+#, fuzzy
+#| msgid "[Tasks and communication][tasks]"
+msgid "## Task Spawning"
+msgstr "[タスクと通信][tasks]"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:138
+#, fuzzy
+#| msgid "# Introduction"
+msgid "# Implementations of the runtime"
+msgstr "# イントロダクション"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:149
+#, fuzzy
+#| msgid "## Using other crates"
+msgid "## 1:1 - using `libnative`"
+msgstr "## 他のクレートの利用"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:169
+#, fuzzy
+#| msgid "## Using other crates"
+msgid "## M:N - using `libgreen`"
+msgstr "## 他のクレートの利用"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:231
+#, fuzzy
+#| msgid ""
+#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello "
+#| "\" + world::explore()); } ~~~~"
+msgid "~~~{.rust} fn main() {} ~~~"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:236
+#, fuzzy
+#| msgid "~~~~ {.ignore} let foo = 10;"
+msgid "~~~{.rust} extern mod green;"
+msgstr ""
+"~~~~ {.ignore}\n"
+"let foo = 10;"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:246
+#, fuzzy
+#| msgid ""
+#| "~~~~ {.ignore} // main.rs extern mod world; fn main() { println(~\"hello "
+#| "\" + world::explore()); } ~~~~"
+msgid "fn main() {} ~~~"
+msgstr ""
+"~~~~ {.ignore}\n"
+"// main.rs\n"
+"extern mod world;\n"
+"fn main() { println(~\"hello \" + world::explore()); }\n"
+"~~~~"
+
+#. type: Plain text
+#: src/doc/guide-runtime.md:251
+#, fuzzy
+#| msgid "## Using the rust tool"
+msgid "# Finding the runtime"
+msgstr "## `rust` コマンドを利用する"

src/doc/po/ja/guide-tasks.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,28 +17,28 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-conditions.md:4 doc/guide-ffi.md:4 doc/guide-lifetimes.md:4
+#: src/doc/guide-conditions.md:4 src/doc/guide-ffi.md:4
-#: doc/guide-macros.md:4 doc/guide-rustpkg.md:4 doc/guide-tasks.md:4
+#: src/doc/guide-lifetimes.md:4 src/doc/guide-macros.md:4
-#: doc/rust.md:4 doc/rustpkg.md:4 doc/tutorial.md:4
+#: src/doc/guide-tasks.md:4 src/doc/rust.md:4 src/doc/tutorial.md:4
 msgid "# Introduction"
 msgstr "# イントロダクション"
 
 #. type: Plain text
-#: doc/guide-tasks.md:2
+#: src/doc/guide-tasks.md:2
 #, fuzzy
 #| msgid "[Tasks and communication][tasks]"
 msgid "% The Rust Tasks and Communication Guide"
 msgstr "[タスクと通信][tasks]"
 
 #. type: Plain text
-#: doc/guide-tasks.md:64
+#: src/doc/guide-tasks.md:64
 #, fuzzy
 #| msgid "# Syntax basics"
 msgid "# Basics"
 msgstr "# 基本的な構文"
 
 #. type: Plain text
-#: doc/guide-tasks.md:73 doc/guide-tasks.md:132
+#: src/doc/guide-tasks.md:73 src/doc/guide-tasks.md:127
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~~ # use std::task::spawn;"
@@ -47,14 +47,14 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-tasks.md:113
+#: src/doc/guide-tasks.md:108
 #, fuzzy
 #| msgid "## Conditionals"
 msgid "## Communication"
 msgstr "## 条件式"
 
 #. type: Plain text
-#: doc/guide-tasks.md:214
+#: src/doc/guide-tasks.md:209
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ # use std::task::spawn;"
@@ -63,7 +63,7 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-tasks.md:246
+#: src/doc/guide-tasks.md:241
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ # use std::task::spawn; # use std::vec;"
@@ -72,7 +72,7 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-tasks.md:327
+#: src/doc/guide-tasks.md:322
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ # use std::vec; # use std::rand; use extra::arc::Arc;"

src/doc/po/ja/guide-testing.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,28 +17,48 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/guide-testing.md:2
+#: src/doc/guide-testing.md:2
 #, fuzzy
 #| msgid "% The Rust Language Tutorial"
 msgid "% The Rust Testing Guide"
 msgstr "% Rust 言語チュートリアル"
 
 #. type: Plain text
-#: doc/guide-testing.md:4
+#: src/doc/guide-testing.md:4
 #, fuzzy
 #| msgid "# Getting started"
 msgid "# Quick start"
 msgstr "# はじめに"
 
 #. type: Plain text
-#: doc/guide-testing.md:127 doc/tutorial.md:776
+#: src/doc/guide-testing.md:11
+#, fuzzy, no-wrap
+#| msgid "~~~~ let square = |x: int| -> uint { (x * x) as uint }; ~~~~"
+msgid ""
+"~~~\n"
+"fn return_two() -> int {\n"
+"    2\n"
+"}\n"
+msgstr ""
+"~~~~\n"
+"let square = |x: int| -> uint { (x * x) as uint };\n"
+"~~~~~~~~\n"
+
+#. type: Plain text
+#: src/doc/guide-testing.md:97
+#, fuzzy
+#| msgid "## Structs"
+msgid "## Parallelism"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/guide-testing.md:127 src/doc/tutorial.md:786
 #, fuzzy
-#| msgid "## A minimal example"
 msgid "For example:"
 msgstr "## 最小限の例"
 
 #. type: Plain text
-#: doc/guide-testing.md:131
+#: src/doc/guide-testing.md:131
 #, fuzzy
 #| msgid "~~~~ use std::task::spawn;"
 msgid "~~~ extern mod extra; use std::vec;"
@@ -47,28 +67,56 @@ msgstr ""
 "use std::task::spawn;"
 
 #. type: Plain text
-#: doc/guide-testing.md:167
+#: src/doc/guide-testing.md:150
+#, fuzzy
+#| msgid "# Dereferencing pointers"
+msgid "Advice on writing benchmarks:"
+msgstr "# ポインタのデリファレンス"
+
+#. type: Plain text
+#: src/doc/guide-testing.md:167
 #, fuzzy
 #| msgid "## Tuples"
 msgid "## Examples"
 msgstr "## タプル"
 
 #. type: Plain text
-#: doc/guide-testing.md:169
+#: src/doc/guide-testing.md:169
 #, fuzzy
 #| msgid "## Tuple structs"
 msgid "### Typical test run"
 msgstr "## タプル構造体"
 
 #. type: Plain text
-#: doc/guide-testing.md:197
+#: src/doc/guide-testing.md:183
+#, fuzzy
+#| msgid "## Structs"
+msgid "### Test run with failures"
+msgstr "## 構造体"
+
+#. type: Plain text
+#: src/doc/guide-testing.md:197
 #, fuzzy
 #| msgid "# Dereferencing pointers"
 msgid "### Running ignored tests"
 msgstr "# ポインタのデリファレンス"
 
 #. type: Plain text
-#: doc/guide-testing.md:235
+#: src/doc/guide-testing.md:209
+#, fuzzy
+#| msgid "# Dereferencing pointers"
+msgid "### Running a subset of tests"
+msgstr "# ポインタのデリファレンス"
+
+#. type: Plain text
+#: src/doc/guide-testing.md:223
+#, fuzzy
+#| msgid "# Dereferencing pointers"
+msgid "### Running benchmarks"
+msgstr "# ポインタのデリファレンス"
+
+#. type: Plain text
+#: src/doc/guide-testing.md:235
 #, fuzzy
 #| msgid "## Declaring and implementing traits"
 msgid "## Saving and ratcheting metrics"

src/doc/po/ja/index.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-14 21:02+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-14 21:02+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,15 +17,92 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/index.md:2
+#: src/doc/index.md:2
 #, fuzzy
 #| msgid "## Using the rust tool"
 msgid "% Rust documentation"
 msgstr "## `rust` コマンドを利用する"
 
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[Containers and iterators](tutorial-container.html)"
+msgid "[Pointers](guide-pointers.html)"
+msgstr "[コンテナとイテレータ](tutorial-container.html)"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "% The Rust Language Tutorial"
+msgid "[References and Lifetimes](guide-lifetimes.html)"
+msgstr "% Rust 言語チュートリアル"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[Containers and iterators](tutorial-container.html)"
+msgid "[Containers and Iterators](guide-container.html)"
+msgstr "[コンテナとイテレータ](tutorial-container.html)"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[Tasks and communication][tasks]"
+msgid "[Tasks and Communication](guide-tasks.html)"
+msgstr "[タスクと通信][tasks]"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[The foreign function interface][ffi]"
+msgid "[Foreign Function Interface](guide-ffi.html)"
+msgstr "[他言語間インターフェース (foreign function inferface)][ffi]"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[Macros][macros]"
+msgid "[Macros](guide-macros.html)"
+msgstr "[マクロ][macros]"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[Macros][macros]"
+msgid "[Packaging](guide-rustpkg.html)"
+msgstr "[マクロ][macros]"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "% The Rust Language Tutorial"
+msgid "[Testing](guide-testing.html)"
+msgstr "% Rust 言語チュートリアル"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "[Containers and iterators](tutorial-container.html)"
+msgid "[Conditions](guide-conditions.html)"
+msgstr "[コンテナとイテレータ](tutorial-container.html)"
+
+#. type: Bullet: '* '
+#: src/doc/index.md:25
+#, fuzzy
+#| msgid "% The Rust Language Tutorial"
+msgid "[Rust's Runtime](guide-runtime.html)"
+msgstr "% Rust 言語チュートリアル"
+
 #. type: Plain text
-#: doc/index.md:26
+#: src/doc/index.md:27
 #, fuzzy
 #| msgid "## Using other crates"
 msgid "# Libraries"
 msgstr "## 他のクレートの利用"
+
+#. type: Plain text
+#: src/doc/index.md:58
+#, fuzzy
+#| msgid "## Conventions"
+msgid "# External resources"
+msgstr "## 本書の表記について"

src/doc/po/ja/rustdoc.md.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Rust 0.10-pre\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
+"POT-Creation-Date: 2014-02-03 08:13+0900\n"
 "PO-Revision-Date: 2014-01-13 12:01+0900\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -17,36 +17,43 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. type: Plain text
-#: doc/rustdoc.md:2
+#: src/doc/rustdoc.md:2
 #, fuzzy
 #| msgid "## Using the rust tool"
 msgid "% Rust Documentation"
 msgstr "## `rust` コマンドを利用する"
 
 #. type: Plain text
-#: doc/rustdoc.md:9
+#: src/doc/rustdoc.md:9
 #, fuzzy
 #| msgid "## Using the rust tool"
 msgid "# Creating Documentation"
 msgstr "## `rust` コマンドを利用する"
 
 #. type: Plain text
-#: doc/rustdoc.md:79
+#: src/doc/rustdoc.md:79
 #, fuzzy
 #| msgid "## Using the rust tool"
 msgid "# Using the Documentation"
 msgstr "## `rust` コマンドを利用する"
 
 #. type: Plain text
-#: doc/rustdoc.md:90
+#: src/doc/rustdoc.md:90
 #, fuzzy
 #| msgid "## Using the rust tool"
 msgid "# Testing the Documentation"
 msgstr "## `rust` コマンドを利用する"
 
 #. type: Plain text
-#: doc/rustdoc.md:102
+#: src/doc/rustdoc.md:102
 #, fuzzy
 #| msgid "# Dereferencing pointers"
 msgid "## Defining tests"
 msgstr "# ポインタのデリファレンス"
+
+#. type: Plain text
+#: src/doc/rustdoc.md:159
+#, fuzzy
+#| msgid "# Dereferencing pointers"
+msgid "## Running tests (advanced)"
+msgstr "# ポインタのデリファレンス"

src/doc/po/ja/rustpkg.md.po

@@ -1,65 +0,0 @@
-# Japanese translations for Rust package
-# Copyright (C) 2013 The Rust Project Developers
-# This file is distributed under the same license as the Rust package.
-# Automatically generated, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Rust 0.8\n"
-"POT-Creation-Date: 2014-01-13 12:01+0900\n"
-"PO-Revision-Date: 2013-07-28 20:32+0900\n"
-"Last-Translator: Automatically generated\n"
-"Language-Team: none\n"
-"Language: ja\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#. type: Plain text
-#: doc/guide-conditions.md:4 doc/guide-ffi.md:4 doc/guide-lifetimes.md:4
-#: doc/guide-macros.md:4 doc/guide-rustpkg.md:4 doc/guide-tasks.md:4
-#: doc/rust.md:4 doc/rustpkg.md:4 doc/tutorial.md:4
-msgid "# Introduction"
-msgstr "# イントロダクション"
-
-#. type: Plain text
-#: doc/rustpkg.md:2
-#, fuzzy
-#| msgid "% The Rust Language Tutorial"
-msgid "% Rustpkg Reference Manual"
-msgstr "% Rust 言語チュートリアル"
-
-#. type: Plain text
-#: doc/rustpkg.md:14
-#, fuzzy
-#| msgid "## Pattern matching"
-msgid "# Package searching"
-msgstr "## パターンマッチ"
-
-#. type: Plain text
-#: doc/rustpkg.md:40
-#, fuzzy
-#| msgid "# Data structures"
-msgid "# Package structure"
-msgstr "# データ構造"
-
-#. type: Plain text
-#: doc/rustpkg.md:106
-#, fuzzy
-#| msgid "## Conventions"
-msgid "## Versions"
-msgstr "## 本書の表記について"
-
-#. type: Plain text
-#: doc/rustpkg.md:133
-#, fuzzy
-msgid "# Command reference"
-msgstr "# ポインタのデリファレンス"
-
-#. type: Plain text
-#: doc/rustpkg.md:150
-#, fuzzy
-#| msgid "# Introduction"
-msgid "## install"
-msgstr "# イントロダクション"

src/doc/po4a.conf

@@ -2,25 +2,24 @@
 # generates .po for them and build .md when translated, eg:
 # [po4a_langs] es fr it pt_BR
 [po4a_langs] ja
-[po4a_paths] doc/po/$master.pot $lang:doc/po/$lang/$master.po
+[po4a_paths] doc/po/$master.pot $lang:src/doc/po/$lang/$master.po
 
 # Add here below all source documents to be translated
-[type: text] doc/complement-bugreport.md $lang:doc/l10n/$lang/complement-bugreport.md
+[type: text] src/doc/complement-bugreport.md $lang:doc/l10n/$lang/complement-bugreport.md
-[type: text] doc/complement-cheatsheet.md $lang:doc/l10n/$lang/complement-cheatsheet.md
+[type: text] src/doc/complement-cheatsheet.md $lang:doc/l10n/$lang/complement-cheatsheet.md
-[type: text] doc/complement-lang-faq.md $lang:doc/l10n/$lang/complement-lang-faq.md
+[type: text] src/doc/complement-lang-faq.md $lang:doc/l10n/$lang/complement-lang-faq.md
-[type: text] doc/complement-project-faq.md $lang:doc/l10n/$lang/complement-project-faq.md
+[type: text] src/doc/complement-project-faq.md $lang:doc/l10n/$lang/complement-project-faq.md
-[type: text] doc/complement-usage-faq.md $lang:doc/l10n/$lang/complement-usage-faq.md
+[type: text] src/doc/complement-usage-faq.md $lang:doc/l10n/$lang/complement-usage-faq.md
-[type: text] doc/guide-conditions.md $lang:doc/l10n/$lang/guide-conditions.md
+[type: text] src/doc/guide-conditions.md $lang:doc/l10n/$lang/guide-conditions.md
-[type: text] doc/guide-container.md $lang:doc/l10n/$lang/guide-container.md
+[type: text] src/doc/guide-container.md $lang:doc/l10n/$lang/guide-container.md
-[type: text] doc/guide-ffi.md $lang:doc/l10n/$lang/guide-ffi.md
+[type: text] src/doc/guide-ffi.md $lang:doc/l10n/$lang/guide-ffi.md
-[type: text] doc/guide-lifetimes.md $lang:doc/l10n/$lang/guide-lifetimes.md
+[type: text] src/doc/guide-lifetimes.md $lang:doc/l10n/$lang/guide-lifetimes.md
-[type: text] doc/guide-macros.md $lang:doc/l10n/$lang/guide-macros.md
+[type: text] src/doc/guide-macros.md $lang:doc/l10n/$lang/guide-macros.md
-[type: text] doc/guide-pointers.md $lang:doc/l10n/$lang/guide-pointers.md
+[type: text] src/doc/guide-pointers.md $lang:doc/l10n/$lang/guide-pointers.md
-[type: text] doc/guide-rustpkg.md $lang:doc/l10n/$lang/guide-rustpkg.md
+[type: text] src/doc/guide-runtime.md $lang:doc/l10n/$lang/guide-runtime.md
-[type: text] doc/guide-tasks.md $lang:doc/l10n/$lang/guide-tasks.md
+[type: text] src/doc/guide-tasks.md $lang:doc/l10n/$lang/guide-tasks.md
-[type: text] doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md
+[type: text] src/doc/guide-testing.md $lang:doc/l10n/$lang/guide-testing.md
-[type: text] doc/index.md $lang:doc/l10n/$lang/index.md
+[type: text] src/doc/index.md $lang:doc/l10n/$lang/index.md
-[type: text] doc/rust.md $lang:doc/l10n/$lang/rust.md
+[type: text] src/doc/rust.md $lang:doc/l10n/$lang/rust.md
-[type: text] doc/rustdoc.md $lang:doc/l10n/$lang/rustdoc.md
+[type: text] src/doc/rustdoc.md $lang:doc/l10n/$lang/rustdoc.md
-[type: text] doc/rustpkg.md $lang:doc/l10n/$lang/rustpkg.md
+[type: text] src/doc/tutorial.md $lang:doc/l10n/$lang/tutorial.md
-[type: text] doc/tutorial.md $lang:doc/l10n/$lang/tutorial.md