diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-01-30 13:35:13 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2016-01-30 13:35:13 +0000 |
| commit | e53d65c6f2754c99a77e3665c3288a5763b0ec71 (patch) | |
| tree | b3d5227fcecc419e4a1a26e3e83ccafdeff34ea5 | |
| parent | b178e46818d484fffb8c659cb407350916e3805d (diff) | |
| download | redmine-e53d65c6f2754c99a77e3665c3288a5763b0ec71.tar.gz redmine-e53d65c6f2754c99a77e3665c3288a5763b0ec71.zip | |
Merged r15122 from trunk to 3.1-stable (#21747, #21899)
Catalan wiki translation for 3.1-stable updated by Helder Manuel Torres Vieira.
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@15126 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | public/help/ca/wiki_syntax_markdown.html | 48 | ||||
| -rw-r--r-- | public/help/ca/wiki_syntax_textile.html | 8 |
2 files changed, 28 insertions, 28 deletions
diff --git a/public/help/ca/wiki_syntax_markdown.html b/public/help/ca/wiki_syntax_markdown.html index c6f6eff5a..237a0c12e 100644 --- a/public/help/ca/wiki_syntax_markdown.html +++ b/public/help/ca/wiki_syntax_markdown.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Style-Type" content="text/css" /> -<title>Wiki formatting</title> +<title>Format de la Wiki</title> <style type="text/css"> h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; } body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; } @@ -20,46 +20,46 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height: </head> <body> -<h1>Wiki Syntax Quick Reference (Markdown)</h1> +<h1>Guia rapida de la Sintaxis de la Wiki (Markdown)</h1> <table style="width:100%"> <tr><th colspan="3">Font Styles</th></tr> -<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td style="width:50%;">**Strong**</td><td style="width:50%;"><strong>Strong</strong></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>*Italic*</td><td><em>Italic</em></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>~~Deleted~~</td><td><del>Deleted</del></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>`Inline Code`</td><td><code>Inline Code</code></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>~~~<br /> lines<br /> of code<br />~~~</td><td> +<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Negreta" /></th><td style="width:50%;">**Negreta**</td><td style="width:50%;"><strong>Negreta</strong></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Cursiva" /></th><td>*Cursiva*</td><td><em>Cursiva</em></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Eliminat" /></th><td>~~Eliminat~~</td><td><del>Eliminat</del></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Codi en línia" /></th><td>`Codi en línia`</td><td><code>Codi en línia</code></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Linies de codi" /></th><td>~~~<br /> linies<br /> de codi<br />~~~</td><td> <pre> - lines - of code + linies + de codi </pre> </td></tr> -<tr><th colspan="3">Lists</th></tr> -<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br /> * Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td>1. Item 1<br /> 1. Sub<br />2. Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr> +<tr><th colspan="3">Llistes</th></tr> +<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Llista desordenada" /></th><td>* Article 1<br /> * Sub<br />* Article 2</td><td><ul><li>Article 1<ul><li>Sub</li></ul></li><li>Article 2</li></ul></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Llista Ordenada" /></th><td>1. Article 1<br /> 1. Sub<br />2. Article 2</td><td><ol><li>Article 1<ol><li>Sub</li></ol></li><li>Article 2</li></ol></td></tr> -<tr><th colspan="3">Headings</th></tr> -<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td># Title 1</td><td><h1>Title 1</h1></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>## Title 2</td><td><h2>Title 2</h2></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>### Title 3</td><td><h3>Title 3</h3></td></tr> +<tr><th colspan="3">Capçaleres</th></tr> +<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td># Títol 1</td><td><h1>Títol 1</h1></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Encapçament 2" /></th><td>## Títol 2</td><td><h2>Títol 2</h2></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Encapçament 3" /></th><td>### Títol 3</td><td><h3>Títol 3</h3></td></tr> <tr><th colspan="3">Links</th></tr> <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr> <tr><th></th><td>[Foo](http://foo.bar)</td><td><a href="#">Foo</a></td></tr> <tr><th colspan="3">Redmine links</th></tr> -<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr> -<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr> -<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link a la pagina Wiki" /></th><td>[[Pagina Wiki]]</td><td><a href="#">Pagina Wiki</a></td></tr> +<tr><th></th><td>Assumpte #12</td><td>Assumpte <a href="#">#12</a></td></tr> +<tr><th></th><td>Revisió r43</td><td>Revisió <a href="#">r43</a></td></tr> <tr><th></th><td>commit:f30e13e43</td><td><a href="#">f30e13e4</a></td></tr> <tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr> -<tr><th colspan="3">Inline images</th></tr> -<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td></td><td></td></tr> -<tr><th></th><td></td><td></td></tr> +<tr><th colspan="3">Imatges</th></tr> +<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td></td><td></td></tr> +<tr><th></th><td></td><td></td></tr> -<tr><th colspan="3">Tables</th></tr> +<tr><th colspan="3">Taules</th></tr> <tr> <th></th> <td>| A | B | C |<br />|---|---|---|<br />| A | B | C |<br />| D | E | F |</td> @@ -76,7 +76,7 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height: </table> -<p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">More Information</a></p> +<p><a href="wiki_syntax_detailed_markdown.html" onclick="window.open('wiki_syntax_detailed_markdown.html', '', ''); return false;">Més informació</a></p> </body> </html> diff --git a/public/help/ca/wiki_syntax_textile.html b/public/help/ca/wiki_syntax_textile.html index 2bfea1317..5d81a44b1 100644 --- a/public/help/ca/wiki_syntax_textile.html +++ b/public/help/ca/wiki_syntax_textile.html @@ -37,9 +37,9 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height: </pre> </td></tr> -<tr><th colspan="3">Lists</th></tr> -<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />** Sub<br />* Item 2</td><td><ul><li>Item 1<ul><li>Sub</li></ul></li><li>Item 2</li></ul></td></tr> -<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br />## Sub<br /># Item 2</td><td><ol><li>Item 1<ol><li>Sub</li></ol></li><li>Item 2</li></ol></td></tr> +<tr><th colspan="3">Llistes</th></tr> +<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Llista desordenada" /></th><td>* Article 1<br />** Sub<br />* Article 2</td><td><ul><li>Article 1<ul><li>Sub</li></ul></li><li>Article 2</li></ul></td></tr> +<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Llista ordenada" /></th><td># Article 1<br />## Sub<br /># Article 2</td><td><ol><li>Article 1<ol><li>Sub</li></ol></li><li>Article 2</li></ol></td></tr> <tr><th colspan="3">Capçaleres</th></tr> <tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Encapçament 1" /></th><td>h1. Títol 1</td><td><h1>Títol 1</h1></td></tr> @@ -61,7 +61,7 @@ table.sample th, table.sample td { border: solid 1px #bbb; padding: 4px; height: <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Imatge" /></th><td>!<em>imatge_url</em>!</td><td></td></tr> <tr><th></th><td>!<em>imatge_adjunta</em>!</td><td></td></tr> -<tr><th colspan="3">Tables</th></tr> +<tr><th colspan="3">Taules</th></tr> <tr> <th></th> <td>|_. A |_. B |_. C |<br />| A | B | C |<br />|/2. row span | B | C |<br />|\2. col span |</td> |