Skip to content

Commit

Permalink
Merge pull request #4 from rust-lang/master
Browse files Browse the repository at this point in the history
17.2.15.1.44
  • Loading branch information
3442853561 authored Feb 14, 2017
2 parents a449804 + 85ef02b commit 712d355
Show file tree
Hide file tree
Showing 43 changed files with 1,422 additions and 426 deletions.
12 changes: 6 additions & 6 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: The Rust Programming Language
stable: "1.15.0"
stable_date: "2017-02-02"
stable_blog: "https://blog.rust-lang.org/2017/02/02/Rust-1.15.html"
stable_full_version: "rustc 1.15.0 (10893a9a3 2017-01-19)"
stable: "1.15.1"
stable_date: "2017-02-09"
stable_blog: "https://blog.rust-lang.org/2017/02/09/Rust-1.15.1.html"
stable_full_version: "rustc 1.15.1 (021bd294c 2017-02-08)"
beta: "1.16"
beta_date: "2017-03-16"
nightly: "1.17"
channels:
- name: "stable"
vers: "1.15.0"
package: "1.15.0"
vers: "1.15.1"
package: "1.15.1"
- name: "beta"
vers: "1.16"
package: "beta"
Expand Down
11 changes: 11 additions & 0 deletions _includes/footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<a href="/en-US/">English</a>,
<a href="/es-ES/">Español</a>,
<a href="/fr-FR/">Français</a>,
<a href="/it-IT/">Italiano</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pl-PL/">Polski</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/vi-VN/">Tiếng việt</a>,
<a href="/zh-CN/">简体中文</a>
2 changes: 1 addition & 1 deletion _includes/it-IT/example.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Questo codice é modificabile e eseguibile!
// Questo codice è modificabile e eseguibile!
fn main() {
// Una semplice calcolatrice per numeri interi:
// `+` o `-` aggiunge o sottrae 1
Expand Down
22 changes: 22 additions & 0 deletions _includes/pl-PL/example.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// Ten kod można edytować oraz uruchomić!
fn main() {
// Prosty kalkulator dla liczb całkowitych:
// `+` lub `-` oznacza dodanie lub odjęcie 1
// `*` lub `/` oznacza pomnożenie lub podzielenie przez 2

let program = "+ + * - /";
let mut accumulator = 0;

for token in program.chars() {
match token {
'+' => accumulator += 1,
'-' => accumulator -= 1,
'*' => accumulator *= 2,
'/' => accumulator /= 2,
_ => { /* ignoruj wszystkie pozostałe znaki */ }
}
}

println!("Program \"{}\" wylicza wartość {}",
program, accumulator);
}
45 changes: 45 additions & 0 deletions _includes/pl-PL/example.rs.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<pre class='rust'>
<span class='kw'>fn</span> main() {
<span class='comment'>// Prosty kalkulator dla liczb całkowitych:
// `+` lub `-` oznacza dodanie lub odjęcie 1
// `*` lub `/` oznacza pomnożenie lub podzielenie przez 2</span>

<span class='kw'>let</span> program = <span class='string'>"+ + * - /"</span>;
<span class='kw'>let</span> <span class='kw'>mut</span> accumulator = <span class='number'>0</span>;

<span class='kw'>for</span> token in program.chars() {
<span class='kw'>match</span> token {
<span class='string'>'+'</span> => accumulator <span class='op'>+=</span> <span class='number'>1</span>,
<span class='string'>'-'</span> => accumulator <span class='op'>-=</span> <span class='number'>1</span>,
<span class='string'>'*'</span> => accumulator <span class='op'>*=</span> <span class='number'>2</span>,
<span class='string'>'/'</span> => accumulator <span class='op'>/=</span> <span class='number'>2</span>,
_ => { <span class='comment'>/* ignoruj wszystkie pozostałe znaki */</span> }
}
}

<span class='prelude-val'>println!</span>(<span class='string'>"Program \"{}\" wylicza wartość {}"</span>,
program, accumulator);
}
</pre>
// Ten kod można edytować oraz uruchomić!
fn main() {
// Prosty kalkulator dla liczb całkowitych:
// `+` lub `-` oznacza dodanie lub odjęcie 1
// `*` lub `/` oznacza pomnożenie lub podzielenie przez 2

let program = "+ + * - /";
let mut accumulator = 0;

for token in program.chars() {
match token {
'+' => accumulator += 1,
'-' => accumulator -= 1,
'*' => accumulator *= 2,
'/' => accumulator /= 2,
_ => { /* ignoruj wszystkie pozostałe znaki */ }
}
}

println!("Program \"{}\" wylicza wartość {}",
program, accumulator);
}
10 changes: 1 addition & 9 deletions _layouts/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,7 @@ <h2><a href="/en-US/contribute.html">Contribute</a></h2>

<footer>
<p>Our site in other languages:
<a href="/es-ES/">Español</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/zh-CN/">简体中文</a>,
<a href="/it-IT/">Italiano</a>
<a href="/vi-VN/">Tiếng việt</a>,
{% include footer.html %}
</p>
</footer>

Expand Down
27 changes: 10 additions & 17 deletions _layouts/es-ES/basic.html
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
<!DOCTYPE html>
<!-- Page last generated {{ site.time }} -->
<html lang="en">
<html lang="es">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }}</title>
<meta name="keywords" content="Rust, Rust programming language, rustlang, rust-lang, Mozilla Rust">
<meta name="description" content="A systems programming language that runs blazingly fast, prevents segfaults, and guarantees thread safety.">
<meta name="keywords" content="Rust, Rust lenguaje de programación, rustlang, rust-lang, Mozilla Rust">
<meta name="description" content="Rust es un lenguaje de programación de sistemas extremadamente rápido, previene fallas de segmentación y garantiza la seguridad de los hilos de ejecución. ">

<link rel="stylesheet" href="/css/bootstrap.css">
<link rel="stylesheet" href="/css/style.css">
</head>

<body class="container">
<a href="https://github.com/rust-lang/rust">
<img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me on GitHub" width="298" height="298">
<img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me en GitHub" width="298" height="298">
</a>

<header>
<ul class="row menu">
<li class="col-xs-12 col-md-2">
<a href="/en-US/index.html">
<img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
<img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Logo de Rust" />
</a>
</li>
<li class="col-xs-12 col-md-10 menu">
<h2><a href="/en-US/documentation.html">Documentation</a></h2>
<h2><a href="/en-US/install.html">Install</a></h2>
<h2><a href="/en-US/community.html">Community</a></h2>
<h2><a href="/en-US/contribute.html">Contribute</a></h2>
<h2><a href="/en-ES/documentation.html">Documentación</a></h2>
<h2><a href="/en-ES/install.html">Instalar</a></h2>
<h2><a href="/en-ES/community.html">Comunidad</a></h2>
<h2><a href="/en-ES/contribute.html">Contribuye</a></h2>
</li>
</ul>
</header>
Expand All @@ -38,14 +38,7 @@ <h2><a href="/en-US/contribute.html">Contribute</a></h2>

<footer>
<p>Our site in other languages:
<a href="/es-ES/">Español</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/vi-VN/">Tiếng việt</a>,
<a href="/zh-CN/">简体中文</a>
{% include footer.html %}
</p>
</footer>

Expand Down
9 changes: 1 addition & 8 deletions _layouts/fr-FR/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@ <h2><a href="/fr-FR/contribute.html">Contribuer</a></h2>

<footer>
<p>Notre site dans d'autres langues&nbsp;:
<a href="/en-US/">English</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/it-IT/">Italiano</a>
<a href="/vi-VN/">Tiếng việt</a>,
<a href="/zh-CN/">简体中文</a>
{% include footer.html %}
</p>
</footer>

Expand Down
10 changes: 2 additions & 8 deletions _layouts/it-IT/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<li class="col-xs-12 col-md-10 menu">
<h2><a href="/it-IT/documentation.html">Documentazione</a></h2>
<h2><a href="/it-IT/install.html">Installazione</a></h2>
<h2><a href="/it-IT/community.html">Comunitá</a></h2>
<h2><a href="/it-IT/community.html">Comunità</a></h2>
<h2><a href="/it-IT/contribute.html">Contribuisci</a></h2>
</li>
</ul>
Expand All @@ -38,13 +38,7 @@ <h2><a href="/it-IT/contribute.html">Contribuisci</a></h2>

<footer>
<p>Il nostro sito in altre lingue:
<a href="/en-US/">English</a>,
<a href="/fr/">Français</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/zh-CN/">简体中文</a>,
<a href="/it-IT/">Italiano</a>
{% include footer.html %}
</p>
</footer>

Expand Down
8 changes: 1 addition & 7 deletions _layouts/ja-JP/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ <h2><a href="/en-US/contribute.html">開発に参加する</a></h2>

<footer>
<p>他の言語のページ:
<a href="/en-US/">English</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/zh-CN/">简体中文</a>,
<a href="/it-IT/">Italiano</a>
{% include footer.html %}
</p>
</footer>

Expand Down
9 changes: 1 addition & 8 deletions _layouts/ko-KR/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@ <h2><a href="/ko-KR/contribute.html">기여하기</a></h2>

<footer>
<p>이 사이트를 다른 언어로 보기:
<a href="/en-US/">English</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/it-IT/">Italiano</a>
<a href="/vi-VN/">Tiếng việt</a>,
<a href="/zh-CN/">简体中文</a>
{% include footer.html %}
</p>
</footer>

Expand Down
56 changes: 56 additions & 0 deletions _layouts/pl-PL/basic.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<!DOCTYPE html>
<!-- Page last generated {{ site.time }} -->
<html lang="pl-PL">
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{{ page.title }}</title>
<meta name="keywords" content="Rust, Rust programming language, Język Programowania Rust, rustlang, rust-lang, Mozilla Rust">
<meta name="description" content="Systemowy język programowania, który jest niesamowicie szybki, zapobiega naruszeniom pamięci oraz gwarantuje bezpieczeństwo wątków.">

<link rel="stylesheet" href="/css/bootstrap.css">
<link rel="stylesheet" href="/css/style.css">
</head>

<body class="container">
<a href="https://github.com/rust-lang/rust">
<img class="ribbon" style="display: none" src="/logos/forkme.png" alt="Fork me on GitHub" width="298" height="298">
</a>

<header>
<ul class="row menu">
<li class="col-xs-12 col-md-2">
<a href="/pl-PL/index.html">
<img class="img-responsive" src="/logos/rust-logo-blk.svg" onerror="this.src='/logos/rust-logo-256x256-blk.png'" height="128" width="128" alt="Rust logo" />
</a>
</li>
<li class="col-xs-12 col-md-10 menu">
<h2><a href="/pl-PL/documentation.html">Dokumentacja</a></h2>
<h2><a href="/pl-PL/install.html">Instalacja</a></h2>
<h2><a href="/pl-PL/community.html">Społeczność</a></h2>
<h2><a href="/pl-PL/contribute.html">Wspomóż</a></h2>
</li>
</ul>
</header>

{{ content }}

<footer>
<p>Nasza strona w innych językach:
{% include footer.html %}
</p>
</footer>

<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');

ga('create', 'UA-58390457-1', 'auto');
ga('send', 'pageview');

</script>
</body>
</html>
7 changes: 7 additions & 0 deletions _layouts/pl-PL/default.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
layout: pl-PL/basic
---

<div class="content">
{{ content }}
</div>
9 changes: 1 addition & 8 deletions _layouts/pt-BR/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@ <h2><a href="/pt-BR/contribute.html">Contribua</a></h2>

<footer>
<p>Nosso site em outros idiomas:
<a href="/en-US/">English</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/it-IT/">Italiano</a>
<a href="/vi-VN/">Tiếng việt</a>,
<a href="/zh-CN/">简体中文</a>
{% include footer.html %}
</p>
</footer>

Expand Down
2 changes: 2 additions & 0 deletions _layouts/redirect.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
"fr-FR": "fr", // Prevents 404 on existing links
"ko": "ko-KR",
"ko-KR": "ko-KR",
"pl": "pl-PL",
"pl-PL": "pl-PL",
"pt": "pt-BR", // For now, since there's no pt-PT page, redirect to pt-BR
"pt-BR": "pt-BR",
"ru": "ru-RU",
Expand Down
9 changes: 1 addition & 8 deletions _layouts/ru-RU/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@ <h2><a href="/ru-RU/contribute.html">Участие</a></h2>

<footer>
<p>Наш сайт на других языках:
<a href="/en-US/">English</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/it-IT/">Italiano</a>
<a href="/vi-VN/">Tiếng việt</a>,
<a href="/zh-CN/">简体中文</a>
{% include footer.html %}
</p>
</footer>

Expand Down
8 changes: 1 addition & 7 deletions _layouts/vi-VN/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ <h2><a href="/vi-VN/contribute.html">Đóng góp</a></h2>

<footer>
<p>Our site in other languages:
<a href="/en-US/">English</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/zh-CN/">简体中文</a>,
<a href="/it-IT/">Italiano</a>
{% include footer.html %}
</p>
</footer>

Expand Down
9 changes: 1 addition & 8 deletions _layouts/zh-CN/basic.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,7 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>

<footer>
<p>本土化页面:
<a href="/en-US/">English</a>,
<a href="/fr-FR/">Français</a>,
<a href="/ja-JP/">日本語</a>,
<a href="/ko-KR/">한국어</a>,
<a href="/pt-BR/">Português</a>,
<a href="/ru-RU/">Русский</a>,
<a href="/it-IT/">Italiano</a>,
<a href="/vi-VN/">Tiếng việt</a>
{% include footer.html %}
</p>
</footer>

Expand Down
Loading

0 comments on commit 712d355

Please sign in to comment.